@destyler/dialog 0.2.6 → 0.2.9

package/dist/index.d.mts

@@ -80,9 +80,10 @@ interface PublicContext extends DirectionProperty, CommonProperties, Dismissable
    */
   'open'?: boolean | undefined;
   /**
-   * Whether the dialog is controlled by the user
+   * The initial open state of the dialog when it is not controlled.
+   * Prefer this over seeding with `open` for uncontrolled usage.
    */
-  'open.controlled'?: boolean | undefined;
+  'defaultOpen'?: boolean | undefined;
 }
 type UserDefinedContext = RequiredBy<PublicContext, 'id'>;
 type ComputedContext = Readonly<{}>;
@@ -128,7 +129,7 @@ declare function connect<T extends PropTypes>(state: State, send: Send, normaliz
 declare function machine(userContext: UserDefinedContext): _destyler_xstate0.Machine<MachineContext, MachineState, _destyler_xstate0.AnyEventObject>;
 //#endregion
 //#region src/props.d.ts
-declare const props: ("open" | "id" | "ids" | "trapFocus" | "preventScroll" | "modal" | "initialFocusEl" | "finalFocusEl" | "restoreFocus" | "onOpenChange" | "closeOnInteractOutside" | "closeOnEscape" | "aria-label" | "role" | "open.controlled" | "dir" | "getRootNode" | "onEscapeKeyDown" | "onPointerDownOutside" | "onFocusOutside" | "onInteractOutside" | "persistentElements")[];
-declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "open" | "id" | "ids" | "trapFocus" | "preventScroll" | "modal" | "initialFocusEl" | "finalFocusEl" | "restoreFocus" | "onOpenChange" | "closeOnInteractOutside" | "closeOnEscape" | "aria-label" | "role" | "open.controlled" | "dir" | "getRootNode" | "onEscapeKeyDown" | "onPointerDownOutside" | "onFocusOutside" | "onInteractOutside" | "persistentElements">];
+declare const props: ("open" | "ids" | "trapFocus" | "preventScroll" | "modal" | "initialFocusEl" | "finalFocusEl" | "restoreFocus" | "onOpenChange" | "closeOnInteractOutside" | "closeOnEscape" | "aria-label" | "role" | "defaultOpen" | "dir" | "id" | "getRootNode" | "onEscapeKeyDown" | "onPointerDownOutside" | "onFocusOutside" | "onInteractOutside" | "persistentElements")[];
+declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "open" | "ids" | "trapFocus" | "preventScroll" | "modal" | "initialFocusEl" | "finalFocusEl" | "restoreFocus" | "onOpenChange" | "closeOnInteractOutside" | "closeOnEscape" | "aria-label" | "role" | "defaultOpen" | "dir" | "id" | "getRootNode" | "onEscapeKeyDown" | "onPointerDownOutside" | "onFocusOutside" | "onInteractOutside" | "persistentElements">];
 //#endregion
 export { type MachineApi as Api, type UserDefinedContext as Context, type ElementIds, type FocusOutsideEvent, type InteractOutsideEvent, type OpenChangeDetails, type PointerDownOutsideEvent, type Service, anatomy, connect, machine, props, splitProps };

package/dist/index.mjs

@@ -4,7 +4,7 @@ import { ariaHidden } from "@destyler/aria-hidden";
 import { trackDismissableElement } from "@destyler/dismissable";
 import { trapFocus } from "@destyler/focus-trap";
 import { preventBodyScroll } from "@destyler/remove-scroll";
-import { compact, createSplitProps } from "@destyler/utils";
+import { compact, createSplitProps, isControlled, resolveControllableOpen, withControllableProvided } from "@destyler/utils";
 import { createMachine } from "@destyler/xstate";
 import { createProps } from "@destyler/types";
 
@@ -85,7 +85,7 @@ function connect(state, send, normalize) {
 				"id": dom.getContentId(state.context),
 				"tabIndex": -1,
 				"data-state": open ? "open" : "closed",
-				"aria-modal": true,
+				"aria-modal": !!state.context.modal,
 				"aria-label": ariaLabel || void 0,
 				"aria-labelledby": ariaLabel || !rendered.title ? void 0 : dom.getTitleId(state.context),
 				"aria-describedby": rendered.description ? dom.getDescriptionId(state.context) : void 0
@@ -124,10 +124,11 @@ function connect(state, send, normalize) {
 //#endregion
 //#region src/machine.ts
 function machine(userContext) {
-	const ctx = compact(userContext);
+	const ctx = compact(withControllableProvided(userContext, ["open"]));
+	const { initialOpen } = resolveControllableOpen(ctx);
 	return createMachine({
 		id: "dialog",
-		initial: ctx.open ? "open" : "closed",
+		initial: initialOpen ? "open" : "closed",
 		context: {
 			role: "dialog",
 			renderedElements: {
@@ -143,7 +144,10 @@ function machine(userContext) {
 			...ctx
 		},
 		created: ["setAlertDialogProps"],
-		watch: { open: ["toggleVisibility"] },
+		watch: {
+			open: ["toggleVisibility"],
+			role: ["setAlertDialogProps"]
+		},
 		states: {
 			open: {
 				entry: ["checkRenderedElements", "syncZIndex"],
@@ -190,7 +194,7 @@ function machine(userContext) {
 			} }
 		}
 	}, {
-		guards: { isOpenControlled: (ctx$1) => !!ctx$1["open.controlled"] },
+		guards: { isOpenControlled: (ctx$1) => isControlled(ctx$1, "open") },
 		activities: {
 			trackDismissableElement(ctx$1, _evt, { send }) {
 				const getContentEl = () => dom.getContentEl(ctx$1);
@@ -295,8 +299,8 @@ const props = createProps()([
 	"onInteractOutside",
 	"onOpenChange",
 	"onPointerDownOutside",
-	"open.controlled",
 	"open",
+	"defaultOpen",
 	"persistentElements",
 	"preventScroll",
 	"restoreFocus",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@destyler/dialog",
   "type": "module",
-  "version": "0.2.6",
+  "version": "0.2.9",
   "description": "before taking action, please confirm.",
   "author": "Elone Hoo <elonehoo@gmail.com>",
   "license": "MIT",
@@ -22,15 +22,15 @@
     "dist"
   ],
   "dependencies": {
-    "@destyler/anatomy": "0.2.6",
-    "@destyler/aria-hidden": "0.2.6",
-    "@destyler/dismissable": "0.2.6",
-    "@destyler/dom": "0.2.6",
-    "@destyler/remove-scroll": "0.2.6",
-    "@destyler/xstate": "0.2.6",
-    "@destyler/focus-trap": "0.2.6",
-    "@destyler/utils": "0.2.6",
-    "@destyler/types": "0.2.6"
+    "@destyler/anatomy": "0.2.9",
+    "@destyler/aria-hidden": "0.2.9",
+    "@destyler/dismissable": "0.2.9",
+    "@destyler/dom": "0.2.9",
+    "@destyler/remove-scroll": "0.2.9",
+    "@destyler/focus-trap": "0.2.9",
+    "@destyler/types": "0.2.9",
+    "@destyler/utils": "0.2.9",
+    "@destyler/xstate": "0.2.9"
   },
   "publishConfig": {
     "access": "public"