@destyler/switch 0.2.11 → 0.2.12

package/dist/index.d.mts

@@ -1,10 +1,7 @@
-import * as _destyler_anatomy0 from "@destyler/anatomy";
-import * as _destyler_xstate0 from "@destyler/xstate";
 import { AnyEventObject, Machine, XSend, XState } from "@destyler/xstate";
 import { CommonProperties, DirectionProperty, NormalizeProps, PropTypes, RequiredBy } from "@destyler/types";
-
 //#region src/anatomy.d.ts
-declare const anatomy: _destyler_anatomy0.AnatomyInstance<"root" | "label" | "control" | "thumb">;
+export declare const anatomy: import("@destyler/anatomy").AnatomyInstance<"root" | "label" | "control" | "thumb">;
 //#endregion
 //#region src/types.d.ts
 interface CheckedChangeDetails {
@@ -140,13 +137,13 @@ interface MachineApi<T extends PropTypes = PropTypes> {
 }
 //#endregion
 //#region src/connect.d.ts
-declare function connect<T extends PropTypes>(state: State, send: Send, normalize: NormalizeProps<T>): MachineApi<T>;
+export declare function connect<T extends PropTypes>(state: State, send: Send, normalize: NormalizeProps<T>): MachineApi<T>;
 //#endregion
 //#region src/machine.d.ts
-declare function machine(userContext: UserDefinedContext): _destyler_xstate0.Machine<MachineContext, MachineState, _destyler_xstate0.AnyEventObject>;
+export declare function machine(userContext: UserDefinedContext): import("@destyler/xstate").Machine<MachineContext, MachineState, import("@destyler/xstate").AnyEventObject>;
 //#endregion
 //#region src/props.d.ts
-declare const props: ("label" | "id" | "ids" | "disabled" | "invalid" | "required" | "readOnly" | "onCheckedChange" | "checked" | "defaultChecked" | "name" | "form" | "value" | "dir" | "getRootNode")[];
-declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "label" | "id" | "ids" | "disabled" | "invalid" | "required" | "readOnly" | "onCheckedChange" | "checked" | "defaultChecked" | "name" | "form" | "value" | "dir" | "getRootNode">];
+export declare const props: ("label" | "value" | "ids" | "disabled" | "invalid" | "required" | "readOnly" | "onCheckedChange" | "checked" | "defaultChecked" | "name" | "form" | "dir" | "id" | "getRootNode")[];
+export declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "label" | "value" | "ids" | "disabled" | "invalid" | "required" | "readOnly" | "onCheckedChange" | "checked" | "defaultChecked" | "name" | "form" | "dir" | "id" | "getRootNode">];
 //#endregion
-export { type MachineApi as Api, type CheckedChangeDetails, type UserDefinedContext as Context, type ElementIds, type Service, anatomy, connect, machine, props, splitProps };
+export type { MachineApi as Api, CheckedChangeDetails, UserDefinedContext as Context, ElementIds, Service };

package/dist/index.mjs

@@ -1,14 +1,12 @@
 import { createAnatomy } from "@destyler/anatomy";
-import { createScope, dataAttr, dispatchInputCheckedEvent, getEventTarget, trackFormControl, trackPress, visuallyHiddenStyle } from "@destyler/dom";
+import { createScope, dataAttr, dispatchInputCheckedEvent, getEventTarget, trackCanceledInputClick, trackFormControl, trackPress, visuallyHiddenStyle } from "@destyler/dom";
 import { isFocusVisible, trackFocusVisible } from "@destyler/focus-visible";
 import { compact, createSplitProps, isControlled, isEqual, isPropUserProvided, resolveControllableProp, withControllableProvided } from "@destyler/utils";
 import { createMachine, guards } from "@destyler/xstate";
 import { createProps } from "@destyler/types";
-
 //#region src/anatomy.ts
 const anatomy = createAnatomy("switch").parts("root", "label", "control", "thumb");
 const parts = anatomy.build();
-
 //#endregion
 //#region src/dom.ts
 const dom = createScope({
@@ -20,7 +18,6 @@ const dom = createScope({
 	getRootEl: (ctx) => dom.getById(ctx, dom.getRootId(ctx)),
 	getHiddenInputEl: (ctx) => dom.getById(ctx, dom.getHiddenInputId(ctx))
 });
-
 //#endregion
 //#region src/connect.ts
 function connect(state, send, normalize) {
@@ -43,10 +40,10 @@ function connect(state, send, normalize) {
 		checked,
 		disabled,
 		focused,
-		setChecked(checked$1) {
+		setChecked(checked) {
 			send({
 				type: "CHECKED.SET",
-				checked: checked$1,
+				checked,
 				isTrusted: false
 			});
 		},
@@ -146,10 +143,10 @@ function connect(state, send, normalize) {
 						event.preventDefault();
 						return;
 					}
-					const checked$1 = event.currentTarget.checked;
+					const checked = event.currentTarget.checked;
 					send({
 						type: "CHECKED.SET",
-						checked: checked$1,
+						checked,
 						isTrusted: true
 					});
 				}
@@ -157,7 +154,6 @@ function connect(state, send, normalize) {
 		}
 	};
 }
-
 //#endregion
 //#region src/machine.ts
 const { not } = guards;
@@ -193,12 +189,13 @@ function machine(userContext) {
 			fieldsetDisabled: false,
 			focusVisible: false
 		},
-		computed: { isDisabled: (ctx$1) => !!ctx$1.disabled || ctx$1.fieldsetDisabled },
+		computed: { isDisabled: (ctx) => !!ctx.disabled || ctx.fieldsetDisabled },
 		watch: {
 			disabled: "removeFocusIfNeeded",
 			checked: "syncInputElement"
 		},
 		activities: [
+			"trackCanceledInputClick",
 			"trackFormControlState",
 			"trackPressEvent",
 			"trackFocusVisible"
@@ -211,32 +208,38 @@ function machine(userContext) {
 			"CHECKED.SET": [{
 				guard: not("isTrusted"),
 				actions: ["setChecked", "dispatchChangeEvent"]
-			}, { actions: ["setChecked"] }],
+			}, { actions: ["setChecked", "syncInputElement"] }],
 			"CONTEXT.SET": { actions: ["setContext"] }
 		},
 		states: { ready: {} }
 	}, {
 		guards: { isTrusted: (_ctx, evt) => !!evt.isTrusted },
 		activities: {
-			trackPressEvent(ctx$1) {
-				if (ctx$1.isDisabled) return;
+			trackCanceledInputClick(ctx) {
+				const input = dom.getHiddenInputEl(ctx);
+				return trackCanceledInputClick(input, (target) => {
+					if (target === input) target.checked = !!ctx.checked;
+				});
+			},
+			trackPressEvent(ctx) {
+				if (ctx.isDisabled) return;
 				return trackPress({
-					pointerNode: dom.getRootEl(ctx$1),
-					keyboardNode: dom.getHiddenInputEl(ctx$1),
+					pointerNode: dom.getRootEl(ctx),
+					keyboardNode: dom.getHiddenInputEl(ctx),
 					isValidKey: (event) => event.key === " ",
-					onPress: () => ctx$1.active = false,
-					onPressStart: () => ctx$1.active = true,
-					onPressEnd: () => ctx$1.active = false
+					onPress: () => ctx.active = false,
+					onPressStart: () => ctx.active = true,
+					onPressEnd: () => ctx.active = false
 				});
 			},
-			trackFocusVisible(ctx$1) {
-				if (ctx$1.isDisabled) return;
-				return trackFocusVisible({ root: dom.getRootNode(ctx$1) });
+			trackFocusVisible(ctx) {
+				if (ctx.isDisabled) return;
+				return trackFocusVisible({ root: dom.getRootNode(ctx) });
 			},
-			trackFormControlState(ctx$1, _evt, { send, initialContext }) {
-				return trackFormControl(dom.getHiddenInputEl(ctx$1), {
+			trackFormControlState(ctx, _evt, { send, initialContext }) {
+				return trackFormControl(dom.getHiddenInputEl(ctx), {
 					onFieldsetDisabledChange(disabled) {
-						ctx$1.fieldsetDisabled = disabled;
+						ctx.fieldsetDisabled = disabled;
 					},
 					onFormReset() {
 						send({
@@ -249,30 +252,30 @@ function machine(userContext) {
 			}
 		},
 		actions: {
-			setContext(ctx$1, evt) {
-				Object.assign(ctx$1, evt.context);
+			setContext(ctx, evt) {
+				Object.assign(ctx, evt.context);
 			},
-			syncInputElement(ctx$1) {
-				const inputEl = dom.getHiddenInputEl(ctx$1);
+			syncInputElement(ctx) {
+				const inputEl = dom.getHiddenInputEl(ctx);
 				if (!inputEl) return;
-				inputEl.checked = !!ctx$1.checked;
+				inputEl.checked = !!ctx.checked;
 			},
-			removeFocusIfNeeded(ctx$1) {
-				if (ctx$1.disabled && ctx$1.focused) ctx$1.focused = false;
+			removeFocusIfNeeded(ctx) {
+				if (ctx.disabled && ctx.focused) ctx.focused = false;
 			},
-			setChecked(ctx$1, evt) {
-				set.checked(ctx$1, evt.checked);
+			setChecked(ctx, evt) {
+				set.checked(ctx, evt.checked);
 			},
-			toggleChecked(ctx$1, _evt) {
-				set.checked(ctx$1, !ctx$1.checked);
+			toggleChecked(ctx, _evt) {
+				set.checked(ctx, !ctx.checked);
 			},
-			dispatchChangeEvent(ctx$1) {
-				dispatchInputCheckedEvent(dom.getHiddenInputEl(ctx$1), { checked: !!ctx$1.checked });
+			dispatchChangeEvent(ctx) {
+				const inputEl = dom.getHiddenInputEl(ctx);
+				dispatchInputCheckedEvent(inputEl, { checked: !!ctx.checked });
 			}
 		}
 	});
 }
-
 //#endregion
 //#region src/props.ts
 const props = createProps()([
@@ -293,6 +296,5 @@ const props = createProps()([
 	"value"
 ]);
 const splitProps = createSplitProps(props);
-
 //#endregion
-export { anatomy, connect, machine, props, splitProps };
+export { anatomy, connect, machine, props, splitProps };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@destyler/switch",
   "type": "module",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "A control that allows the user to toggle between checked and not checked.",
   "author": "Elone Hoo <elonehoo@gmail.com>",
   "license": "MIT",
@@ -22,12 +22,12 @@
     "dist"
   ],
   "dependencies": {
-    "@destyler/anatomy": "0.2.11",
-    "@destyler/focus-visible": "0.2.11",
-    "@destyler/types": "0.2.11",
-    "@destyler/dom": "0.2.11",
-    "@destyler/utils": "0.2.11",
-    "@destyler/xstate": "0.2.11"
+    "@destyler/anatomy": "0.2.12",
+    "@destyler/dom": "0.2.12",
+    "@destyler/focus-visible": "0.2.12",
+    "@destyler/types": "0.2.12",
+    "@destyler/utils": "0.2.12",
+    "@destyler/xstate": "0.2.12"
   },
   "publishConfig": {
     "access": "public"