Reset settings to default

src/Common/ContextProviders.luau

@@ -1,6 +1,7 @@
 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")
@@ -20,6 +21,7 @@ local function ContextProviders(props: Props)
 				defaultScreen = "Home",
 			}),
 			React.createElement(SettingsContext.Provider),
+			React.createElement(ModalContext.Provider),
 		},
 	}, props.children)
 end

src/Common/useTag.luau

@@ -0,0 +1,31 @@
+local CollectionService = game:GetService("CollectionService")
+
+local React = require("@pkg/React")
+
+local useCallback = React.useCallback
+local useEffect = React.useEffect
+local useState = React.useState
+
+local function useTag(tagName: string): { Instance }
+	local instances, setInstances = useState({})
+
+	local sync = useCallback(function()
+		setInstances(CollectionService:GetTagged(tagName))
+	end, { tagName })
+
+	useEffect(function()
+		local added = CollectionService:GetInstanceAddedSignal(tagName):Connect(sync)
+		local removed = CollectionService:GetInstanceRemovedSignal(tagName):Connect(sync)
+
+		sync()
+
+		return function()
+			added:Disconnect()
+			removed:Disconnect()
+		end
+	end, { tagName, sync })
+
+	return instances
+end
+
+return useTag

src/Common/useTag.spec.luau

@@ -0,0 +1,44 @@
+local JestGlobals = require("@pkg/JestGlobals")
+
+local renderHook = require("@root/Testing/renderHook")
+local useTag = require("./useTag")
+
+local beforeEach = JestGlobals.beforeEach
+local afterEach = JestGlobals.afterEach
+local test = JestGlobals.test
+local expect = JestGlobals.expect
+
+local container
+
+beforeEach(function()
+	container = Instance.new("Folder")
+	container.Parent = game
+end)
+
+afterEach(function()
+	container:Destroy()
+end)
+
+test("all tagged instances are used for the initial state", function()
+	local instance = Instance.new("Part")
+	instance:SetTag("foo")
+	instance.Parent = container
+
+	local other = Instance.new("Part")
+	other:SetTag("bar")
+	other.Parent = container
+
+	local get = renderHook(function()
+		return useTag("foo")
+	end)
+
+	local instances = get()
+
+	expect(instances).toEqual({
+		instance,
+	})
+end)
+
+test("adding the tag to an instance updates state", function() end)
+
+test("removing the tag from an instance updates state", function() end)

src/Forms/Button.luau

@@ -25,23 +25,29 @@ type Props = {
 	layoutOrder: number?,
 	endIcon: any?,
 	startIcon: any?,
+	textColor: Color3?,
+	backgroundColor: Color3?,
 
 	onClick: (() -> ())?,
 }
 
 type InternalProps = Props & typeof(defaultProps)
 
 local function Button(providedProps: Props)
-	local props: InternalProps = Sift.Dictionary.join(defaultProps, providedProps)
-
 	local theme = useTheme()
+
+	local props: InternalProps = Sift.Dictionary.join(defaultProps, {
+		backgroundColor = theme.button,
+		textColor = theme.buttonText,
+	}, providedProps)
+
 	local hover, setHover = React.useState(false)
 
 	return e("ImageButton", {
 		AutoButtonColor = false,
 		AutomaticSize = Enum.AutomaticSize.XY,
 		AnchorPoint = props.anchorPoint,
-		BackgroundColor3 = if hover then shift(theme.button, 0.2) else theme.button,
+		BackgroundColor3 = if hover then shift(props.backgroundColor, 0.2) else props.backgroundColor,
 		BackgroundTransparency = if props.style == "stroke" then if hover then 0 else 1 else 0,
 		BorderSizePixel = 0,
 		LayoutOrder = props.layoutOrder,
@@ -84,12 +90,12 @@ local function Button(providedProps: Props)
 		Text = e("TextLabel", {
 			AutomaticSize = Enum.AutomaticSize.XY,
 			BackgroundTransparency = 1,
-			Font = theme.font,
+			Font = theme.buttonFont,
 			LayoutOrder = 2,
 			Size = UDim2.fromScale(0, 0),
 			Text = props.text,
-			TextColor3 = if hover then shift(theme.buttonText, 0.2) else theme.buttonText,
-			TextSize = theme.textSize,
+			TextColor3 = if hover then shift(props.textColor, 0.2) else props.textColor,
+			TextSize = theme.buttonTextSize,
 		}),
 	})
 end

src/Modal/Modal.luau

@@ -0,0 +1,103 @@
+local React = require("@pkg/React")
+local Sift = require("@pkg/Sift")
+
+local useTheme = require("@root/Common/useTheme")
+
+export type Props = {
+	title: string,
+	onClose: () -> (),
+	maxSize: Vector2?,
+	children: React.Node?,
+}
+
+local defaultProps = {
+	maxSize = Vector2.new(500, math.huge),
+}
+
+type InternalProps = typeof(defaultProps) & Props
+
+local function Modal(providedProps: Props)
+	local props: InternalProps = Sift.Dictionary.join(defaultProps, providedProps)
+	local theme = useTheme()
+
+	return React.createElement("ImageButton", {
+		Size = UDim2.fromScale(1, 1),
+		BackgroundTransparency = 0.6,
+		BackgroundColor3 = Color3.fromRGB(0, 0, 0),
+		BorderSizePixel = 0,
+		AutoButtonColor = false,
+		[React.Event.Activated] = props.onClose,
+	}, {
+		Layout = React.createElement("UIListLayout", {
+			VerticalAlignment = Enum.VerticalAlignment.Center,
+			HorizontalAlignment = Enum.HorizontalAlignment.Center,
+		}),
+
+		Window = React.createElement("ImageButton", {
+			Active = true,
+			AutoButtonColor = false,
+			AutomaticSize = Enum.AutomaticSize.XY,
+			BackgroundColor3 = theme.modal,
+			BorderSizePixel = 0,
+		}, {
+			SizeConstraint = React.createElement("UISizeConstraint", {
+				MaxSize = props.maxSize,
+			}),
+
+			Padding = React.createElement("UIPadding", {
+				PaddingTop = theme.paddingLarge,
+				PaddingRight = theme.paddingLarge,
+				PaddingBottom = theme.paddingLarge,
+				PaddingLeft = theme.paddingLarge,
+			}),
+
+			UICorner = React.createElement("UICorner", {
+				CornerRadius = theme.corner,
+			}),
+
+			Layout = React.createElement("UIListLayout", {
+				SortOrder = Enum.SortOrder.LayoutOrder,
+				Padding = theme.paddingLarge,
+			}),
+
+			Header = React.createElement("Frame", {
+				LayoutOrder = 1,
+				AutomaticSize = Enum.AutomaticSize.Y,
+				Size = UDim2.fromScale(1, 0),
+				BackgroundTransparency = 1,
+			}, {
+				Title = React.createElement("TextLabel", {
+					Text = props.title,
+					Font = theme.headerFont,
+					TextColor3 = theme.text,
+					TextSize = theme.headerTextSize,
+					TextXAlignment = Enum.TextXAlignment.Left,
+					TextYAlignment = Enum.TextYAlignment.Top,
+					AutomaticSize = Enum.AutomaticSize.XY,
+					BackgroundTransparency = 1,
+				}),
+
+				Close = React.createElement("TextButton", {
+					Font = Enum.Font.BuilderSansExtraBold,
+					TextColor3 = theme.text,
+					TextSize = theme.headerTextSize,
+					Text = "X",
+					AutomaticSize = Enum.AutomaticSize.XY,
+					Position = UDim2.fromScale(1, 0),
+					AnchorPoint = Vector2.new(1, 0),
+					BackgroundTransparency = 1,
+					[React.Event.Activated] = props.onClose,
+				}),
+			}),
+
+			Content = React.createElement("Frame", {
+				LayoutOrder = 2,
+				Size = UDim2.fromScale(1, 0),
+				AutomaticSize = Enum.AutomaticSize.Y,
+				BackgroundTransparency = 1,
+			}, props.children),
+		}),
+	})
+end
+
+return Modal

src/Modal/Modal.story.luau

@@ -0,0 +1,55 @@
+local React = require("@pkg/React")
+
+local ContextProviders = require("@root/Common/ContextProviders")
+local MockPlugin = require("@root/Testing/MockPlugin")
+local Modal = require("./Modal")
+local useTheme = require("@root/Common/useTheme")
+
+local function ExampleContent()
+	local theme = useTheme()
+
+	local paragraphs = {}
+	for i = 1, 2 do
+		paragraphs[`Paragraph{i}`] = React.createElement("TextLabel", {
+			LayoutOrder = i,
+			AutomaticSize = Enum.AutomaticSize.XY,
+			BackgroundTransparency = 1,
+			Text = "Occaecat commodo fugiat fugiat minim adipisicing esse duis anim ea elit enim officia ut. Deserunt exercitation sit nisi ullamco labore in mollit nostrud Lorem. Commodo laboris est qui enim aute ea dolore voluptate dolor nulla. Quis duis ut voluptate magna dolore pariatur mollit in occaecat aute. Adipisicing magna mollit non sit eiusmod reprehenderit id officia officia non dolore aute voluptate ex.",
+			TextWrapped = true,
+			Font = theme.font,
+			TextColor3 = theme.text,
+			TextSize = theme.textSize,
+			LineHeight = 1.5,
+			TextXAlignment = Enum.TextXAlignment.Left,
+			TextYAlignment = Enum.TextYAlignment.Top,
+		})
+	end
+
+	return React.createElement("Frame", {
+		Size = UDim2.fromScale(1, 0),
+		AutomaticSize = Enum.AutomaticSize.Y,
+		BackgroundTransparency = 1,
+	}, {
+		Layout = React.createElement("UIListLayout", {
+			SortOrder = Enum.SortOrder.LayoutOrder,
+			Padding = theme.padding,
+		}),
+	}, paragraphs)
+end
+
+return {
+	story = function()
+		return React.createElement(ContextProviders, {
+			plugin = MockPlugin.new(),
+		}, {
+			Model = React.createElement(Modal, {
+				title = "Example Modal",
+				onClose = function()
+					print("close")
+				end,
+			}, {
+				Content = React.createElement(ExampleContent),
+			}),
+		})
+	end,
+}

src/Modal/ModalContext.luau

@@ -0,0 +1,40 @@
+local React = require("@pkg/React")
+
+local useTag = require("@root/Common/useTag")
+
+local useContext = React.useContext
+
+local MODAL_TAG = "modal-root"
+
+local Context = React.createContext({})
+
+export type ModalContext = {
+	tag: string,
+	close: () -> (),
+	open: (element: React.Node) -> (),
+}
+
+export type Props = {
+	children: any,
+}
+
+local function Provider(props: Props)
+	local target = useTag(MODAL_TAG)[1]
+
+	return React.createElement(Context.Provider, {
+		value = {
+			tag = MODAL_TAG,
+			target = target,
+		},
+	}, props.children)
+end
+
+local function use(): ModalContext
+	return useContext(Context)
+end
+
+return {
+	Context = Context,
+	Provider = Provider,
+	use = use,
+}

src/Modal/ModalPortal.luau

@@ -0,0 +1,20 @@
+local React = require("@pkg/React")
+local ReactRoblox = require("@pkg/ReactRoblox")
+
+local ModalContext = require("@root/Modal/ModalContext")
+
+export type Props = {
+	children: React.Node?,
+}
+
+local function ModalPortal(props: Props)
+	local modalContext = ModalContext.use()
+
+	if modalContext.target then
+		return ReactRoblox.createPortal(props.children, modalContext.target)
+	else
+		return nil
+	end
+end
+
+return ModalPortal

src/Modal/ModalRoot.luau

@@ -0,0 +1,13 @@
+local React = require("@pkg/React")
+
+local ModalContext = require("@root/Modal/ModalContext")
+
+local function ModalRoot()
+	local modalContext = ModalContext.use()
+
+	return React.createElement("Folder", {
+		[React.Tag] = modalContext.tag,
+	})
+end
+
+return ModalRoot