Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modals #251

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into modals
vocksel committed May 9, 2024
commit 3da080b8e06dd1f4726a3060dc15d456f6b7e3eb
6 changes: 6 additions & 0 deletions src/Common/ContextProviders.luau
Original file line number Diff line number Diff line change
@@ -2,7 +2,9 @@ local React = require("@pkg/React")

local ContextStack = require("@root/Common/ContextStack")
local ModalContext = require("@root/Modal/ModalContext")
local NavigationContext = require("@root/Navigation/NavigationContext")
local PluginContext = require("@root/Plugin/PluginContext")
local SettingsContext = require("@root/UserSettings/SettingsContext")

export type Props = {
plugin: Plugin,
@@ -15,6 +17,10 @@ local function ContextProviders(props: Props)
React.createElement(PluginContext.Provider, {
plugin = props.plugin,
}),
React.createElement(NavigationContext.Provider, {
defaultScreen = "Home",
}),
React.createElement(SettingsContext.Provider),
React.createElement(ModalContext.Provider),
},
}, props.children)
3 changes: 1 addition & 2 deletions src/Plugin/PluginApp.luau
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
local Modal = require("@root/Modal/Modal")
local ModalPortal = require("@root/Modal/ModalPortal")
local ModalRoot = require("@root/Modal/ModalRoot")
local NavigationContext = require("@root/Navigation/NavigationContext")
local React = require("@pkg/React")
local ResizablePanel = require("@root/Panels/ResizablePanel")
local Screen = require("@root/Navigation/Screen")
local Sidebar = require("@root/Panels/Sidebar")
local Topbar = require("@root/Panels/Topbar")
local constants = require("@root/constants")
local nextLayoutOrder = require("@root/Common/nextLayoutOrder")
You are viewing a condensed version of this merge commit. You can view the full changes here.