@pixpilot/formily-shadcn 0.48.0 → 0.49.1

package/dist/components/IconPicker.d.cts

@@ -1,4 +1,4 @@
-import * as react7 from "react";
+import * as react4 from "react";
 import { IconPickerProps, IconProviderProps } from "@pixpilot/shadcn-ui";
 
 //#region src/components/IconPicker.d.ts
@@ -8,8 +8,8 @@ import { IconPickerProps, IconProviderProps } from "@pixpilot/shadcn-ui";
  * Automatically connects to Formily field state
  * Supports both static and async icon providers
  */
-declare const IconPicker: react7.ForwardRefExoticComponent<Partial<Omit<IconPickerProps, "providers"> & {
+declare const IconPicker: react4.ForwardRefExoticComponent<Partial<Omit<IconPickerProps, "providers"> & {
   providers?: IconProviderProps[];
-}> & react7.RefAttributes<unknown>>;
+}> & react4.RefAttributes<unknown>>;
 //#endregion
 export { IconPicker };

package/dist/components/IconToggle.d.cts

@@ -1,4 +1,4 @@
-import * as react4 from "react";
+import * as react6 from "react";
 import * as _pixpilot_shadcn_ui0 from "@pixpilot/shadcn-ui";
 
 //#region src/components/IconToggle.d.ts
@@ -6,6 +6,6 @@ import * as _pixpilot_shadcn_ui0 from "@pixpilot/shadcn-ui";
  * Formily-connected IconToggle component
  * Toggle button with customizable icons for boolean values
  */
-declare const IconToggle: react4.ForwardRefExoticComponent<Omit<Partial<Omit<_pixpilot_shadcn_ui0.IconToggleProps, "ref"> & react4.RefAttributes<HTMLButtonElement>>, "ref"> & react4.RefAttributes<unknown>>;
+declare const IconToggle: react6.ForwardRefExoticComponent<Omit<Partial<Omit<_pixpilot_shadcn_ui0.IconToggleProps, "ref"> & react6.RefAttributes<HTMLButtonElement>>, "ref"> & react6.RefAttributes<unknown>>;
 //#endregion
 export { IconToggle };

package/dist/components/array-base/components/Addition.cjs

@@ -42,6 +42,16 @@ function ArrayAddition({ ref,...props }) {
 				if (e.defaultPrevented) return;
 			}
 			const defaultValue = require_get_default_value.getDefaultValue(props.defaultValue, array.schema);
+			if (!(array.props?.autoSave === true)) {
+				const method = props.method ?? "push";
+				const insertionIndex = method === "unshift" ? 0 : currentLength;
+				array.props?.onAdd?.(insertionIndex, {
+					mode: "draft-only",
+					method,
+					initialDraftValue: defaultValue
+				});
+				return;
+			}
 			if (props.method === "unshift") {
 				array.field?.unshift?.(defaultValue).catch(console.error);
 				array.props?.onAdd?.(0);

package/dist/components/array-base/components/Addition.js

@@ -36,6 +36,16 @@ function ArrayAddition({ ref,...props }) {
 				if (e.defaultPrevented) return;
 			}
 			const defaultValue = getDefaultValue(props.defaultValue, array.schema);
+			if (!(array.props?.autoSave === true)) {
+				const method = props.method ?? "push";
+				const insertionIndex = method === "unshift" ? 0 : currentLength;
+				array.props?.onAdd?.(insertionIndex, {
+					mode: "draft-only",
+					method,
+					initialDraftValue: defaultValue
+				});
+				return;
+			}
 			if (props.method === "unshift") {
 				array.field?.unshift?.(defaultValue).catch(console.error);
 				array.props?.onAdd?.(0);

package/dist/components/array-base/types.d.cts

@@ -53,7 +53,16 @@ interface ArrayBaseMixins extends ArrayBaseComponents {
 }
 interface IArrayBaseProps {
   disabled?: boolean;
-  onAdd?: (index: number) => void;
+  /**
+   * When true, array editors (dialog/popover) commit changes live.
+   * When false/undefined, changes should only commit on Save.
+   */
+  autoSave?: boolean;
+  onAdd?: (index: number, options?: {
+    method?: 'push' | 'unshift';
+    initialDraftValue?: unknown;
+    mode?: 'inserted' | 'draft-only';
+  }) => void;
   onRemove?: (index: number) => void;
   onMoveDown?: (index: number) => void;
   onMoveUp?: (index: number) => void;

package/dist/components/array-base/types.d.ts

@@ -53,7 +53,16 @@ interface ArrayBaseMixins extends ArrayBaseComponents {
 }
 interface IArrayBaseProps {
   disabled?: boolean;
-  onAdd?: (index: number) => void;
+  /**
+   * When true, array editors (dialog/popover) commit changes live.
+   * When false/undefined, changes should only commit on Save.
+   */
+  autoSave?: boolean;
+  onAdd?: (index: number, options?: {
+    method?: 'push' | 'unshift';
+    initialDraftValue?: unknown;
+    mode?: 'inserted' | 'draft-only';
+  }) => void;
   onRemove?: (index: number) => void;
   onMoveDown?: (index: number) => void;
   onMoveUp?: (index: number) => void;

package/dist/components/array-common/create-active-item-manager.cjs

@@ -7,9 +7,15 @@ function createActiveItemManager() {
 	const panelState = (0, __formily_reactive.model)({
 		activeItem: void 0,
 		isNew: false,
-		setActiveItem(key, isNew) {
+		newItemMode: void 0,
+		newItemMethod: void 0,
+		draftInitialValue: void 0,
+		setActiveItem(key, isNew, options) {
 			panelState.activeItem = key;
 			panelState.isNew = isNew;
+			panelState.newItemMode = isNew ? options?.newItemMode : void 0;
+			panelState.newItemMethod = isNew ? options?.newItemMethod : void 0;
+			panelState.draftInitialValue = isNew && options?.newItemMode === "draft-only" ? options?.draftInitialValue : void 0;
 		},
 		hasActiveItem(key) {
 			return panelState.activeItem === key;
@@ -17,6 +23,9 @@ function createActiveItemManager() {
 		removeActiveItem(key) {
 			if (panelState.activeItem === key) panelState.activeItem = void 0;
 			panelState.isNew = false;
+			panelState.newItemMode = void 0;
+			panelState.newItemMethod = void 0;
+			panelState.draftInitialValue = void 0;
 		},
 		isNewItem(index) {
 			return panelState.isNew && panelState.activeItem === index;

package/dist/components/array-common/create-active-item-manager.js

@@ -5,9 +5,15 @@ function createActiveItemManager() {
 	const panelState = model({
 		activeItem: void 0,
 		isNew: false,
-		setActiveItem(key, isNew) {
+		newItemMode: void 0,
+		newItemMethod: void 0,
+		draftInitialValue: void 0,
+		setActiveItem(key, isNew, options) {
 			panelState.activeItem = key;
 			panelState.isNew = isNew;
+			panelState.newItemMode = isNew ? options?.newItemMode : void 0;
+			panelState.newItemMethod = isNew ? options?.newItemMethod : void 0;
+			panelState.draftInitialValue = isNew && options?.newItemMode === "draft-only" ? options?.draftInitialValue : void 0;
 		},
 		hasActiveItem(key) {
 			return panelState.activeItem === key;
@@ -15,6 +21,9 @@ function createActiveItemManager() {
 		removeActiveItem(key) {
 			if (panelState.activeItem === key) panelState.activeItem = void 0;
 			panelState.isNew = false;
+			panelState.newItemMode = void 0;
+			panelState.newItemMethod = void 0;
+			panelState.draftInitialValue = void 0;
 		},
 		isNewItem(index) {
 			return panelState.isNew && panelState.activeItem === index;

package/dist/components/array-common/use-array-editor.cjs

@@ -32,11 +32,27 @@ function useArrayEditor(props) {
 		activeItemManager.setActiveItem(index, false);
 		onEdit?.(index);
 	};
-	const handleAdd = (index) => {
-		activeItemManager.setActiveItem(index, true);
+	const handleAdd = (index, options) => {
+		const isAutoSave = autoSave === true;
+		if (options?.mode === "draft-only" || !isAutoSave) {
+			activeItemManager.setActiveItem(-1, true, {
+				newItemMode: "draft-only",
+				newItemMethod: options?.method,
+				draftInitialValue: options?.initialDraftValue
+			});
+			onAdd?.(index);
+			return;
+		}
+		activeItemManager.setActiveItem(index, true, { newItemMode: "inserted" });
 		onAdd?.(index);
 	};
 	const handleSaveClick = (itemIndex, nextValue) => {
+		if (activeItemManager.isNew && activeItemManager.newItemMode === "draft-only") {
+			if ((activeItemManager.newItemMethod ?? "push") === "unshift") field.unshift?.(nextValue).catch(console.error);
+			else field.push?.(nextValue).catch(console.error);
+			activeItemManager.removeActiveItem(itemIndex);
+			return;
+		}
 		setArrayItemValue(field, itemIndex, nextValue);
 		activeItemManager.removeActiveItem(itemIndex);
 	};
@@ -44,7 +60,7 @@ function useArrayEditor(props) {
 		setArrayItemValue(field, itemIndex, nextValue);
 	};
 	const handleCancelClick = (itemIndex) => {
-		if (!autoSave && activeItemManager.isNewItem(itemIndex)) field.remove?.(itemIndex).catch(console.error);
+		if (!autoSave && activeItemManager.isNewItem(itemIndex) && activeItemManager.newItemMode !== "draft-only") field.remove?.(itemIndex).catch(console.error);
 		activeItemManager.removeActiveItem(itemIndex);
 	};
 	return {

package/dist/components/array-common/use-array-editor.js

@@ -29,11 +29,27 @@ function useArrayEditor(props) {
 		activeItemManager.setActiveItem(index, false);
 		onEdit?.(index);
 	};
-	const handleAdd = (index) => {
-		activeItemManager.setActiveItem(index, true);
+	const handleAdd = (index, options) => {
+		const isAutoSave = autoSave === true;
+		if (options?.mode === "draft-only" || !isAutoSave) {
+			activeItemManager.setActiveItem(-1, true, {
+				newItemMode: "draft-only",
+				newItemMethod: options?.method,
+				draftInitialValue: options?.initialDraftValue
+			});
+			onAdd?.(index);
+			return;
+		}
+		activeItemManager.setActiveItem(index, true, { newItemMode: "inserted" });
 		onAdd?.(index);
 	};
 	const handleSaveClick = (itemIndex, nextValue) => {
+		if (activeItemManager.isNew && activeItemManager.newItemMode === "draft-only") {
+			if ((activeItemManager.newItemMethod ?? "push") === "unshift") field.unshift?.(nextValue).catch(console.error);
+			else field.push?.(nextValue).catch(console.error);
+			activeItemManager.removeActiveItem(itemIndex);
+			return;
+		}
 		setArrayItemValue(field, itemIndex, nextValue);
 		activeItemManager.removeActiveItem(itemIndex);
 	};
@@ -41,7 +57,7 @@ function useArrayEditor(props) {
 		setArrayItemValue(field, itemIndex, nextValue);
 	};
 	const handleCancelClick = (itemIndex) => {
-		if (!autoSave && activeItemManager.isNewItem(itemIndex)) field.remove?.(itemIndex).catch(console.error);
+		if (!autoSave && activeItemManager.isNewItem(itemIndex) && activeItemManager.newItemMode !== "draft-only") field.remove?.(itemIndex).catch(console.error);
 		activeItemManager.removeActiveItem(itemIndex);
 	};
 	return {

package/dist/components/array-common/use-array-item-draft-form.cjs

@@ -5,14 +5,16 @@ let __formily_core = require("@formily/core");
 __formily_core = require_rolldown_runtime.__toESM(__formily_core);
 
 //#region src/components/array-common/use-array-item-draft-form.ts
-function useArrayItemDraftForm({ arrayField, index, autoSave, onDraftChange }) {
+function useArrayItemDraftForm({ arrayField, index, autoSave, onDraftChange, initialDraftValue }) {
 	const onDraftChangeRef = react.default.useRef(onDraftChange);
 	react.default.useEffect(() => {
 		onDraftChangeRef.current = onDraftChange;
 	}, [onDraftChange]);
 	return react.default.useMemo(() => {
 		const arrayValue = arrayField.value;
-		const currentItemValue = index != null && Array.isArray(arrayValue) ? arrayValue[index] : void 0;
+		const hasArray = Array.isArray(arrayValue);
+		const arrayLength = hasArray ? arrayValue.length : 0;
+		const currentItemValue = index != null && hasArray && index >= 0 && index < arrayLength ? arrayValue[index] : initialDraftValue;
 		let didSkipInitial = false;
 		return (0, __formily_core.createForm)({
 			values: { draft: currentItemValue },
@@ -31,7 +33,8 @@ function useArrayItemDraftForm({ arrayField, index, autoSave, onDraftChange }) {
 		arrayField.value,
 		index,
 		autoSave,
-		onDraftChange
+		onDraftChange,
+		initialDraftValue
 	]);
 }
 

package/dist/components/array-common/use-array-item-draft-form.js

@@ -2,14 +2,16 @@ import React from "react";
 import { createForm, onFormValuesChange } from "@formily/core";
 
 //#region src/components/array-common/use-array-item-draft-form.ts
-function useArrayItemDraftForm({ arrayField, index, autoSave, onDraftChange }) {
+function useArrayItemDraftForm({ arrayField, index, autoSave, onDraftChange, initialDraftValue }) {
 	const onDraftChangeRef = React.useRef(onDraftChange);
 	React.useEffect(() => {
 		onDraftChangeRef.current = onDraftChange;
 	}, [onDraftChange]);
 	return React.useMemo(() => {
 		const arrayValue = arrayField.value;
-		const currentItemValue = index != null && Array.isArray(arrayValue) ? arrayValue[index] : void 0;
+		const hasArray = Array.isArray(arrayValue);
+		const arrayLength = hasArray ? arrayValue.length : 0;
+		const currentItemValue = index != null && hasArray && index >= 0 && index < arrayLength ? arrayValue[index] : initialDraftValue;
 		let didSkipInitial = false;
 		return createForm({
 			values: { draft: currentItemValue },
@@ -28,7 +30,8 @@ function useArrayItemDraftForm({ arrayField, index, autoSave, onDraftChange }) {
 		arrayField.value,
 		index,
 		autoSave,
-		onDraftChange
+		onDraftChange,
+		initialDraftValue
 	]);
 }
 

package/dist/components/array-common/use-array-item-edit-state.cjs

@@ -0,0 +1,66 @@
+const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
+const require_use_array_item_draft_form = require('./use-array-item-draft-form.cjs');
+const require_use_array_item_edit_labels = require('./use-array-item-edit-labels.cjs');
+const require_use_edit_handlers = require('./use-edit-handlers.cjs');
+const require_use_shake_animation = require('./use-shake-animation.cjs');
+let __formily_react = require("@formily/react");
+__formily_react = require_rolldown_runtime.__toESM(__formily_react);
+let react = require("react");
+react = require_rolldown_runtime.__toESM(react);
+
+//#region src/components/array-common/use-array-item-edit-state.ts
+function useArrayItemEditState({ schema, activeItemManager, onSave, onCancel, onAutoSave, autoSave }) {
+	const arrayField = (0, __formily_react.useField)();
+	const activeIndex = activeItemManager.activeItem;
+	const isNewItem = activeItemManager.isNew;
+	const open = activeIndex !== void 0;
+	const normalizedAutoSave = autoSave === true || autoSave === "true";
+	const handleDraftChange = react.default.useCallback((nextValue) => {
+		if (!normalizedAutoSave) return;
+		if (activeIndex === void 0) return;
+		onAutoSave?.(activeIndex, nextValue);
+	}, [
+		activeIndex,
+		normalizedAutoSave,
+		onAutoSave
+	]);
+	const draftForm = require_use_array_item_draft_form.useArrayItemDraftForm({
+		arrayField,
+		index: activeIndex,
+		autoSave: normalizedAutoSave,
+		onDraftChange: normalizedAutoSave ? handleDraftChange : void 0,
+		initialDraftValue: activeItemManager.draftInitialValue
+	});
+	const isDirty = !normalizedAutoSave && draftForm.modified;
+	const { shouldShake, triggerShake } = require_use_shake_animation.useShakeAnimation();
+	const { handleSave, handleCancel } = require_use_edit_handlers.useEditHandlers({
+		itemIndex: activeIndex,
+		draftForm,
+		onSave,
+		onCancel
+	});
+	const { title, description } = require_use_array_item_edit_labels.useArrayItemEditLabels({
+		schema,
+		isNew: isNewItem,
+		autoSave: normalizedAutoSave,
+		itemIndex: activeIndex
+	});
+	return {
+		arrayField,
+		activeIndex,
+		isNewItem,
+		open,
+		normalizedAutoSave,
+		draftForm,
+		isDirty,
+		title,
+		description,
+		shouldShake,
+		triggerShake,
+		handleSave,
+		handleCancel
+	};
+}
+
+//#endregion
+exports.useArrayItemEditState = useArrayItemEditState;

package/dist/components/array-common/use-array-item-edit-state.js

@@ -0,0 +1,63 @@
+import { useArrayItemDraftForm } from "./use-array-item-draft-form.js";
+import { useArrayItemEditLabels } from "./use-array-item-edit-labels.js";
+import { useEditHandlers } from "./use-edit-handlers.js";
+import { useShakeAnimation } from "./use-shake-animation.js";
+import { useField } from "@formily/react";
+import React from "react";
+
+//#region src/components/array-common/use-array-item-edit-state.ts
+function useArrayItemEditState({ schema, activeItemManager, onSave, onCancel, onAutoSave, autoSave }) {
+	const arrayField = useField();
+	const activeIndex = activeItemManager.activeItem;
+	const isNewItem = activeItemManager.isNew;
+	const open = activeIndex !== void 0;
+	const normalizedAutoSave = autoSave === true || autoSave === "true";
+	const handleDraftChange = React.useCallback((nextValue) => {
+		if (!normalizedAutoSave) return;
+		if (activeIndex === void 0) return;
+		onAutoSave?.(activeIndex, nextValue);
+	}, [
+		activeIndex,
+		normalizedAutoSave,
+		onAutoSave
+	]);
+	const draftForm = useArrayItemDraftForm({
+		arrayField,
+		index: activeIndex,
+		autoSave: normalizedAutoSave,
+		onDraftChange: normalizedAutoSave ? handleDraftChange : void 0,
+		initialDraftValue: activeItemManager.draftInitialValue
+	});
+	const isDirty = !normalizedAutoSave && draftForm.modified;
+	const { shouldShake, triggerShake } = useShakeAnimation();
+	const { handleSave, handleCancel } = useEditHandlers({
+		itemIndex: activeIndex,
+		draftForm,
+		onSave,
+		onCancel
+	});
+	const { title, description } = useArrayItemEditLabels({
+		schema,
+		isNew: isNewItem,
+		autoSave: normalizedAutoSave,
+		itemIndex: activeIndex
+	});
+	return {
+		arrayField,
+		activeIndex,
+		isNewItem,
+		open,
+		normalizedAutoSave,
+		draftForm,
+		isDirty,
+		title,
+		description,
+		shouldShake,
+		triggerShake,
+		handleSave,
+		handleCancel
+	};
+}
+
+//#endregion
+export { useArrayItemEditState };

package/dist/components/array-dialog/EditDialog.cjs

@@ -1,10 +1,7 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
 const require_ArrayItemDraftFields = require('../array-common/ArrayItemDraftFields.cjs');
 const require_ShakeStyles = require('../array-common/ShakeStyles.cjs');
-const require_use_array_item_draft_form = require('../array-common/use-array-item-draft-form.cjs');
-const require_use_array_item_edit_labels = require('../array-common/use-array-item-edit-labels.cjs');
-const require_use_edit_handlers = require('../array-common/use-edit-handlers.cjs');
-const require_use_shake_animation = require('../array-common/use-shake-animation.cjs');
+const require_use_array_item_edit_state = require('../array-common/use-array-item-edit-state.cjs');
 let __formily_react = require("@formily/react");
 __formily_react = require_rolldown_runtime.__toESM(__formily_react);
 let react = require("react");
@@ -21,38 +18,13 @@ react_jsx_runtime = require_rolldown_runtime.__toESM(react_jsx_runtime);
 * RecursionField inherits component registry from parent SchemaField context (preserved through Radix Portal)
 */
 const EditDialog = (0, __formily_react.observer)(({ schema, onSave, onAutoSave, onCancel, activeItemManager, autoSave, className,...rest }) => {
-	const arrayField = (0, __formily_react.useField)();
-	const itemIndex = activeItemManager.activeItem;
-	const { isNew } = activeItemManager;
-	const open = itemIndex !== void 0;
-	const handleDraftChange = react.default.useCallback((nextValue) => {
-		if (!autoSave) return;
-		if (itemIndex === void 0) return;
-		onAutoSave?.(itemIndex, nextValue);
-	}, [
-		itemIndex,
-		autoSave,
-		onAutoSave
-	]);
-	const draftForm = require_use_array_item_draft_form.useArrayItemDraftForm({
-		arrayField,
-		index: itemIndex,
-		autoSave,
-		onDraftChange: autoSave ? handleDraftChange : void 0
-	});
-	const isDirty = !autoSave && draftForm.modified;
-	const { shouldShake, triggerShake } = require_use_shake_animation.useShakeAnimation();
-	const { handleSave, handleCancel } = require_use_edit_handlers.useEditHandlers({
-		itemIndex,
-		draftForm,
-		onSave,
-		onCancel
-	});
-	const { title, description } = require_use_array_item_edit_labels.useArrayItemEditLabels({
+	const { activeIndex: itemIndex, open, normalizedAutoSave, draftForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = require_use_array_item_edit_state.useArrayItemEditState({
 		schema,
-		isNew,
-		autoSave,
-		itemIndex
+		activeItemManager,
+		onSave,
+		onCancel,
+		onAutoSave,
+		autoSave
 	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.Dialog, {
 		open,
@@ -76,7 +48,7 @@ const EditDialog = (0, __formily_react.observer)(({ schema, onSave, onAutoSave,
 					form: draftForm,
 					className: (0, __pixpilot_shadcn_ui.cn)("grid gap-4 py-4")
 				}),
-				!autoSave && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn_ui.DialogFooter, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.Button, {
+				!normalizedAutoSave && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn_ui.DialogFooter, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.Button, {
 					type: "button",
 					variant: "outline",
 					onClick: handleCancel,

package/dist/components/array-dialog/EditDialog.js

@@ -1,10 +1,7 @@
 import { ArrayItemDraftFields } from "../array-common/ArrayItemDraftFields.js";
 import { ShakeStyles } from "../array-common/ShakeStyles.js";
-import { useArrayItemDraftForm } from "../array-common/use-array-item-draft-form.js";
-import { useArrayItemEditLabels } from "../array-common/use-array-item-edit-labels.js";
-import { useEditHandlers } from "../array-common/use-edit-handlers.js";
-import { useShakeAnimation } from "../array-common/use-shake-animation.js";
-import { observer, useField } from "@formily/react";
+import { useArrayItemEditState } from "../array-common/use-array-item-edit-state.js";
+import { observer } from "@formily/react";
 import React from "react";
 import { Button, Dialog, DialogBody, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, cn } from "@pixpilot/shadcn-ui";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -16,38 +13,13 @@ import { jsx, jsxs } from "react/jsx-runtime";
 * RecursionField inherits component registry from parent SchemaField context (preserved through Radix Portal)
 */
 const EditDialog = observer(({ schema, onSave, onAutoSave, onCancel, activeItemManager, autoSave, className,...rest }) => {
-	const arrayField = useField();
-	const itemIndex = activeItemManager.activeItem;
-	const { isNew } = activeItemManager;
-	const open = itemIndex !== void 0;
-	const handleDraftChange = React.useCallback((nextValue) => {
-		if (!autoSave) return;
-		if (itemIndex === void 0) return;
-		onAutoSave?.(itemIndex, nextValue);
-	}, [
-		itemIndex,
-		autoSave,
-		onAutoSave
-	]);
-	const draftForm = useArrayItemDraftForm({
-		arrayField,
-		index: itemIndex,
-		autoSave,
-		onDraftChange: autoSave ? handleDraftChange : void 0
-	});
-	const isDirty = !autoSave && draftForm.modified;
-	const { shouldShake, triggerShake } = useShakeAnimation();
-	const { handleSave, handleCancel } = useEditHandlers({
-		itemIndex,
-		draftForm,
-		onSave,
-		onCancel
-	});
-	const { title, description } = useArrayItemEditLabels({
+	const { activeIndex: itemIndex, open, normalizedAutoSave, draftForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = useArrayItemEditState({
 		schema,
-		isNew,
-		autoSave,
-		itemIndex
+		activeItemManager,
+		onSave,
+		onCancel,
+		onAutoSave,
+		autoSave
 	});
 	return /* @__PURE__ */ jsx(Dialog, {
 		open,
@@ -71,7 +43,7 @@ const EditDialog = observer(({ schema, onSave, onAutoSave, onCancel, activeItemM
 					form: draftForm,
 					className: cn("grid gap-4 py-4")
 				}),
-				!autoSave && /* @__PURE__ */ jsxs(DialogFooter, { children: [/* @__PURE__ */ jsx(Button, {
+				!normalizedAutoSave && /* @__PURE__ */ jsxs(DialogFooter, { children: [/* @__PURE__ */ jsx(Button, {
 					type: "button",
 					variant: "outline",
 					onClick: handleCancel,

package/dist/components/array-popover/ArrayPopover.cjs

@@ -19,7 +19,7 @@ __pixpilot_shadcn = require_rolldown_runtime.__toESM(__pixpilot_shadcn);
 //#region src/components/array-popover/ArrayPopover.tsx
 const ArrayPopoverBase = (0, __formily_react.observer)((props) => {
 	const { onAdd, onRemove, onMoveDown, onMoveUp, onEdit, autoSave: autoSaveProp, className, children, transformActions, popoverProps,...rest } = props;
-	const autoSave = autoSaveProp !== false;
+	const autoSave = autoSaveProp === true;
 	const { activeItemManager, handleAdd, isNewItem, handleEdit, handleSaveClick, handleLiveChange, handleCancelClick } = require_use_array_editor.useArrayEditor({
 		onAdd,
 		onEdit,

package/dist/components/array-popover/ArrayPopover.js

@@ -14,7 +14,7 @@ import { cn } from "@pixpilot/shadcn";
 //#region src/components/array-popover/ArrayPopover.tsx
 const ArrayPopoverBase = observer((props) => {
 	const { onAdd, onRemove, onMoveDown, onMoveUp, onEdit, autoSave: autoSaveProp, className, children, transformActions, popoverProps,...rest } = props;
-	const autoSave = autoSaveProp !== false;
+	const autoSave = autoSaveProp === true;
 	const { activeItemManager, handleAdd, isNewItem, handleEdit, handleSaveClick, handleLiveChange, handleCancelClick } = useArrayEditor({
 		onAdd,
 		onEdit,

package/dist/components/array-popover/Popover.cjs

@@ -1,10 +1,7 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
 const require_ArrayItemDraftFields = require('../array-common/ArrayItemDraftFields.cjs');
 const require_ShakeStyles = require('../array-common/ShakeStyles.cjs');
-const require_use_array_item_draft_form = require('../array-common/use-array-item-draft-form.cjs');
-const require_use_array_item_edit_labels = require('../array-common/use-array-item-edit-labels.cjs');
-const require_use_edit_handlers = require('../array-common/use-edit-handlers.cjs');
-const require_use_shake_animation = require('../array-common/use-shake-animation.cjs');
+const require_use_array_item_edit_state = require('../array-common/use-array-item-edit-state.cjs');
 let __formily_react = require("@formily/react");
 __formily_react = require_rolldown_runtime.__toESM(__formily_react);
 let react = require("react");
@@ -18,33 +15,13 @@ react_dom = require_rolldown_runtime.__toESM(react_dom);
 
 //#region src/components/array-popover/Popover.tsx
 const ArrayItemsEditPopover = (0, __formily_react.observer)(({ schema, onSave, onAutoSave, onCancel, children, activeItemManager, autoSave, modal = true,...rest }) => {
-	const arrayField = (0, __formily_react.useField)();
-	const activeIndex = activeItemManager.activeItem;
-	const isNewItem = activeItemManager.isNew;
-	const open = activeIndex !== void 0;
-	const normalizedAutoSave = autoSave !== false && autoSave !== "false";
-	const handleDraftChange = react.default.useCallback((nextValue) => {
-		if (!normalizedAutoSave) return;
-		if (activeIndex === void 0) return;
-		onAutoSave?.(activeIndex, nextValue);
-	}, [
-		activeIndex,
-		normalizedAutoSave,
-		onAutoSave
-	]);
-	const draftForm = require_use_array_item_draft_form.useArrayItemDraftForm({
-		arrayField,
-		index: activeIndex,
-		autoSave: normalizedAutoSave,
-		onDraftChange: normalizedAutoSave ? handleDraftChange : void 0
-	});
-	const isDirty = !normalizedAutoSave && draftForm.modified;
-	const { shouldShake, triggerShake } = require_use_shake_animation.useShakeAnimation();
-	const { handleSave, handleCancel } = require_use_edit_handlers.useEditHandlers({
-		itemIndex: activeIndex,
-		draftForm,
+	const { arrayField, activeIndex, isNewItem, open, normalizedAutoSave, draftForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = require_use_array_item_edit_state.useArrayItemEditState({
+		schema,
+		activeItemManager,
 		onSave,
-		onCancel
+		onCancel,
+		onAutoSave,
+		autoSave
 	});
 	const handleDiscard = react.default.useCallback(() => {
 		if (activeIndex === void 0) return;
@@ -75,19 +52,12 @@ const ArrayItemsEditPopover = (0, __formily_react.observer)(({ schema, onSave, o
 		isDirty,
 		triggerShake
 	]);
-	const handleOpenChange = react.default.useCallback((isOpen) => {
-		if (isOpen) return;
-		validateAndClose();
-	}, [validateAndClose]);
-	const { title, description } = require_use_array_item_edit_labels.useArrayItemEditLabels({
-		schema,
-		isNew: isNewItem,
-		autoSave: normalizedAutoSave,
-		itemIndex: activeIndex
-	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.Popover, {
 		open,
-		onOpenChange: handleOpenChange,
+		onOpenChange: react.default.useCallback((isOpen) => {
+			if (isOpen) return;
+			validateAndClose();
+		}, [validateAndClose]),
 		modal,
 		children: [
 			children !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.PopoverTrigger, {