@lattice-ui/dialog 0.3.2 → 0.4.0

package/out/Dialog/DialogClose.luau

@@ -15,18 +15,22 @@ local function DialogClose(props)
 			error("[DialogClose] `asChild` requires a child element.")
 		end
 		return React.createElement(Slot, {
+			Active = true,
 			Event = {
 				Activated = handleActivated,
 			},
+			Selectable = false,
 		}, child)
 	end
 	return React.createElement("textbutton", {
+		Active = true,
 		AutoButtonColor = false,
 		BackgroundTransparency = 1,
 		BorderSizePixel = 0,
 		Event = {
 			Activated = handleActivated,
 		},
+		Selectable = false,
 		Size = UDim2.fromOffset(110, 34),
 		Text = "Close",
 		TextColor3 = Color3.fromRGB(240, 244, 250),

package/out/Dialog/DialogContent.luau

@@ -11,7 +11,6 @@ local function DialogContentImpl(props)
 		enabled = props.enabled,
 		modal = props.modal,
 		onDismiss = props.onDismiss,
-		onEscapeKeyDown = props.onEscapeKeyDown,
 		onInteractOutside = props.onInteractOutside,
 		onPointerDownOutside = props.onPointerDownOutside,
 	}, React.createElement(FocusScope, {
@@ -45,7 +44,6 @@ local function DialogContent(props)
 			enabled = open,
 			modal = dialogContext.modal,
 			onDismiss = handleDismiss,
-			onEscapeKeyDown = props.onEscapeKeyDown,
 			onInteractOutside = props.onInteractOutside,
 			onPointerDownOutside = props.onPointerDownOutside,
 			restoreFocus = restoreFocus,
@@ -60,7 +58,6 @@ local function DialogContent(props)
 				enabled = state.isPresent,
 				modal = dialogContext.modal,
 				onDismiss = handleDismiss,
-				onEscapeKeyDown = props.onEscapeKeyDown,
 				onInteractOutside = props.onInteractOutside,
 				onPointerDownOutside = props.onPointerDownOutside,
 				restoreFocus = restoreFocus,

package/out/Dialog/DialogTrigger.luau

@@ -1,8 +1,10 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 local _core = TS.import(script, TS.getModule(script, "@lattice-ui", "core").out)
+local focusGuiObject = _core.focusGuiObject
 local React = _core.React
 local Slot = _core.Slot
+local useFocusNode = _core.useFocusNode
 local useDialogContext = TS.import(script, script.Parent, "context").useDialogContext
 local function toGuiObject(instance)
 	if not instance or not instance:IsA("GuiObject") then
@@ -12,24 +14,33 @@ local function toGuiObject(instance)
 end
 local function DialogTrigger(props)
 	local dialogContext = useDialogContext()
+	local triggerRef = dialogContext.triggerRef
 	local setTriggerRef = React.useCallback(function(instance)
-		dialogContext.triggerRef.current = toGuiObject(instance)
-	end, { dialogContext.triggerRef })
+		triggerRef.current = toGuiObject(instance)
+	end, { triggerRef })
+	useFocusNode({
+		ref = triggerRef,
+		disabled = props.disabled == true,
+		syncToRoblox = false,
+	})
 	local handleActivated = React.useCallback(function()
 		if props.disabled then
 			return nil
 		end
+		focusGuiObject(triggerRef.current)
 		dialogContext.setOpen(true)
-	end, { dialogContext.setOpen, props.disabled })
+	end, { dialogContext.setOpen, props.disabled, triggerRef })
 	if props.asChild then
 		local child = props.children
 		if not child then
 			error("[DialogTrigger] `asChild` requires a child element.")
 		end
 		return React.createElement(Slot, {
+			Active = props.disabled ~= true,
 			Event = {
 				Activated = handleActivated,
 			},
+			Selectable = false,
 			ref = setTriggerRef,
 		}, child)
 	end
@@ -41,6 +52,7 @@ local function DialogTrigger(props)
 		Event = {
 			Activated = handleActivated,
 		},
+		Selectable = false,
 		Size = UDim2.fromOffset(140, 38),
 		Text = "Open Dialog",
 		TextColor3 = Color3.fromRGB(240, 244, 250),

package/out/Dialog/types.d.ts

@@ -33,7 +33,6 @@ export type DialogContentProps = {
     forceMount?: boolean;
     trapFocus?: boolean;
     restoreFocus?: boolean;
-    onEscapeKeyDown?: (event: LayerInteractEvent) => void;
     onPointerDownOutside?: (event: LayerInteractEvent) => void;
     onInteractOutside?: (event: LayerInteractEvent) => void;
     children?: React.ReactNode;

package/out/index.d.ts

@@ -12,5 +12,5 @@ export declare const Dialog: {
     readonly Overlay: typeof DialogOverlay;
     readonly Close: typeof DialogClose;
 };
-export { DialogClose, DialogContent, DialogOverlay, DialogPortal, DialogRoot, DialogTrigger };
 export type { DialogCloseProps, DialogContentProps, DialogOverlayProps, DialogPortalProps, DialogProps, DialogTriggerProps, } from "./Dialog/types";
+export { DialogClose, DialogContent, DialogOverlay, DialogPortal, DialogRoot, DialogTrigger };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lattice-ui/dialog",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "private": false,
   "main": "out/init.luau",
   "types": "out/index.d.ts",
@@ -9,9 +9,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@lattice-ui/core": "0.3.2",
-    "@lattice-ui/layer": "0.3.2",
-    "@lattice-ui/focus": "0.3.2"
+    "@lattice-ui/core": "0.4.0",
+    "@lattice-ui/focus": "0.4.0",
+    "@lattice-ui/layer": "0.4.0"
   },
   "devDependencies": {
     "@rbxts/react": "17.3.7-ts.1",