@pixpilot/formily-shadcn 0.34.1 → 0.35.0

package/dist/components/IconPicker.d.ts

@@ -1,4 +1,4 @@
-import * as react8 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$1: react8.ForwardRefExoticComponent<Partial<Omit<IconPickerProps, "providers"> & {
+declare const IconPicker$1: react4.ForwardRefExoticComponent<Partial<Omit<IconPickerProps, "providers"> & {
   providers?: IconProviderProps[];
-}> & react8.RefAttributes<unknown>>;
+}> & react4.RefAttributes<unknown>>;
 //#endregion
 export { IconPicker$1 as IconPicker };

package/dist/components/IconToggle.d.ts

@@ -1,4 +1,4 @@
-import * as react10 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$1: react10.ForwardRefExoticComponent<Omit<Partial<Omit<_pixpilot_shadcn_ui0.IconToggleProps, "ref"> & react10.RefAttributes<HTMLButtonElement>>, "ref"> & react10.RefAttributes<unknown>>;
+declare const IconToggle$1: react6.ForwardRefExoticComponent<Omit<Partial<Omit<_pixpilot_shadcn_ui0.IconToggleProps, "ref"> & react6.RefAttributes<HTMLButtonElement>>, "ref"> & react6.RefAttributes<unknown>>;
 //#endregion
 export { IconToggle$1 as IconToggle };

package/dist/components/Input.d.ts

@@ -1,4 +1,4 @@
-import * as react4 from "react";
+import * as react9 from "react";
 
 //#region src/components/Input.d.ts
 
@@ -6,12 +6,12 @@ import * as react4 from "react";
  * Formily-connected Input component
  * Automatically connects shadcn Input to Formily field state
  */
-declare const Input: react4.ForwardRefExoticComponent<Omit<Partial<react4.ClassAttributes<HTMLInputElement> & react4.InputHTMLAttributes<HTMLInputElement> & {
+declare const Input: react9.ForwardRefExoticComponent<Omit<Partial<react9.ClassAttributes<HTMLInputElement> & react9.InputHTMLAttributes<HTMLInputElement> & {
   prefix?: React.ReactNode;
   suffix?: React.ReactNode;
   groupClassName?: string;
   prefixClassName?: string;
   suffixClassName?: string;
-}>, "ref"> & react4.RefAttributes<unknown>>;
+}>, "ref"> & react9.RefAttributes<unknown>>;
 //#endregion
 export { Input };

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

@@ -25,7 +25,7 @@ interface CustomAction {
   type?: 'button';
   icon: React.ReactNode;
   tooltip?: string;
-  onClick: (ctx: ActionContext) => void;
+  onClick: (event: React.MouseEvent<HTMLButtonElement>, ctx: ActionContext) => void;
   hidden?: boolean | ((ctx: ActionContext) => boolean);
   disabled?: boolean | ((ctx: ActionContext) => boolean);
   buttonProps?: Omit<ButtonProps, 'children' | 'onClick'>;
@@ -39,7 +39,8 @@ interface ToggleAction {
   inactiveTooltip?: string;
   tooltip?: string;
   isActive: (ctx: ActionContext) => boolean;
-  onToggle: (ctx: ActionContext, nextActive: boolean) => void;
+  onToggle?: (ctx: ActionContext, nextActive: boolean) => void;
+  onClick?: (event: React.MouseEvent<HTMLButtonElement>, context: ActionContext) => void;
   hidden?: boolean | ((ctx: ActionContext) => boolean);
   disabled?: boolean | ((ctx: ActionContext) => boolean);
   buttonProps?: Omit<ButtonProps, 'children' | 'onClick'>;
@@ -71,6 +72,7 @@ interface IArrayBaseProps {
    * Runs per item render (context includes index/record/etc).
    */
   transformActions?: (actions: ActionItem[], context: TransformContext) => ActionItem[];
+  description?: React.ReactNode;
 }
 interface IArrayBaseOperationProps extends ButtonProps {
   title?: string;

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

@@ -25,7 +25,7 @@ interface CustomAction {
   type?: 'button';
   icon: React.ReactNode;
   tooltip?: string;
-  onClick: (ctx: ActionContext) => void;
+  onClick: (event: React.MouseEvent<HTMLButtonElement>, ctx: ActionContext) => void;
   hidden?: boolean | ((ctx: ActionContext) => boolean);
   disabled?: boolean | ((ctx: ActionContext) => boolean);
   buttonProps?: Omit<ButtonProps, 'children' | 'onClick'>;
@@ -39,7 +39,8 @@ interface ToggleAction {
   inactiveTooltip?: string;
   tooltip?: string;
   isActive: (ctx: ActionContext) => boolean;
-  onToggle: (ctx: ActionContext, nextActive: boolean) => void;
+  onToggle?: (ctx: ActionContext, nextActive: boolean) => void;
+  onClick?: (event: React.MouseEvent<HTMLButtonElement>, context: ActionContext) => void;
   hidden?: boolean | ((ctx: ActionContext) => boolean);
   disabled?: boolean | ((ctx: ActionContext) => boolean);
   buttonProps?: Omit<ButtonProps, 'children' | 'onClick'>;
@@ -71,6 +72,7 @@ interface IArrayBaseProps {
    * Runs per item render (context includes index/record/etc).
    */
   transformActions?: (actions: ActionItem[], context: TransformContext) => ActionItem[];
+  description?: React.ReactNode;
 }
 interface IArrayBaseOperationProps extends ButtonProps {
   title?: string;

package/dist/components/array-cards/ArrayCards.cjs

@@ -20,7 +20,7 @@ react_jsx_runtime = require_rolldown_runtime.__toESM(react_jsx_runtime);
 const ArrayCardsBase = (0, __formily_react.observer)((props) => {
 	const field = (0, __formily_react.useField)();
 	const schema = (0, __formily_react.useFieldSchema)();
-	const { onAdd, onCopy, onRemove, onMoveDown, onMoveUp, disabled, actions, transformActions, className, title: titleProp, children,...otherProps } = props;
+	const { onAdd, onCopy, onRemove, onMoveDown, onMoveUp, disabled, actions, transformActions, className, title: titleProp, children, description,...otherProps } = props;
 	const dataSource = require_use_array_data_source.useArrayDataSource();
 	const { ArrayItemsContainer, AddButton } = require_component_context.useArrayComponents();
 	const renderItems = () => {

package/dist/components/array-cards/ArrayCards.js

@@ -16,7 +16,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 const ArrayCardsBase = observer((props) => {
 	const field = useField();
 	const schema = useFieldSchema();
-	const { onAdd, onCopy, onRemove, onMoveDown, onMoveUp, disabled, actions, transformActions, className, title: titleProp, children,...otherProps } = props;
+	const { onAdd, onCopy, onRemove, onMoveDown, onMoveUp, disabled, actions, transformActions, className, title: titleProp, children, description,...otherProps } = props;
 	const dataSource = useArrayDataSource();
 	const { ArrayItemsContainer, AddButton } = useArrayComponents();
 	const renderItems = () => {

package/dist/components/array-collapse/Item.cjs

@@ -8,6 +8,7 @@ const require_SortableItem = require('../array-sortable/SortableItem.cjs');
 require('../array-sortable/index.cjs');
 const require_ArrayItemHeaderRow = require('../array-common/ArrayItemHeaderRow.cjs');
 const require_ItemWrapper = require('../array-common/ItemWrapper.cjs');
+const require_use_array_item_schema = require('../array-common/use-array-item-schema.cjs');
 require('../array-common/index.cjs');
 let __formily_react = require("@formily/react");
 __formily_react = require_rolldown_runtime.__toESM(__formily_react);
@@ -25,7 +26,7 @@ const ArrayCollapseItem = react.default.memo((props) => {
 	const { index, itemId, itemKey, formCollapse, isOpen, isNewItem, onClick } = props;
 	const field = (0, __formily_react.useField)();
 	const schema = (0, __formily_react.useFieldSchema)();
-	const items = Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items;
+	const items = require_use_array_item_schema.useArrayItemSchema();
 	const itemWrapperProps = require_get_x_component_props.getXComponentProps(items);
 	react.default.useEffect(() => {
 		if (isNewItem(index)) formCollapse.addActiveKey(itemId);
@@ -62,7 +63,7 @@ const ArrayCollapseItem = react.default.memo((props) => {
 						}).catch(() => {});
 						else formCollapse.addActiveKey(itemId);
 					} }
-				}), isOpen && items && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				}), isOpen && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 					className: "border-t px-3 pb-4",
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "space-y-4 pt-4",

package/dist/components/array-collapse/Item.js

@@ -7,6 +7,7 @@ import { SortableItem } from "../array-sortable/SortableItem.js";
 import "../array-sortable/index.js";
 import { ArrayItemHeaderRow } from "../array-common/ArrayItemHeaderRow.js";
 import { ItemWrapper } from "../array-common/ItemWrapper.js";
+import { useArrayItemSchema } from "../array-common/use-array-item-schema.js";
 import "../array-common/index.js";
 import { RecursionField, useField, useFieldSchema } from "@formily/react";
 import React from "react";
@@ -19,7 +20,7 @@ const ArrayCollapseItem = React.memo((props) => {
 	const { index, itemId, itemKey, formCollapse, isOpen, isNewItem, onClick } = props;
 	const field = useField();
 	const schema = useFieldSchema();
-	const items = Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items;
+	const items = useArrayItemSchema();
 	const itemWrapperProps = getXComponentProps(items);
 	React.useEffect(() => {
 		if (isNewItem(index)) formCollapse.addActiveKey(itemId);
@@ -56,7 +57,7 @@ const ArrayCollapseItem = React.memo((props) => {
 						}).catch(() => {});
 						else formCollapse.addActiveKey(itemId);
 					} }
-				}), isOpen && items && /* @__PURE__ */ jsx("div", {
+				}), isOpen && /* @__PURE__ */ jsx("div", {
 					className: "border-t px-3 pb-4",
 					children: /* @__PURE__ */ jsx("div", {
 						className: "space-y-4 pt-4",

package/dist/components/array-common/RenderAction.cjs

@@ -51,7 +51,7 @@ const RenderAction = ({ action, ctx, isHidden, isDisabled, index, array, schema
 		onClick: (e) => {
 			e.stopPropagation();
 			if (disabled) return;
-			customAction.onClick(ctx);
+			customAction.onClick?.(e, ctx);
 		},
 		children: customAction.icon
 	}, customAction.key);

package/dist/components/array-common/RenderAction.js

@@ -47,7 +47,7 @@ const RenderAction = ({ action, ctx, isHidden, isDisabled, index, array, schema
 		onClick: (e) => {
 			e.stopPropagation();
 			if (disabled) return;
-			customAction.onClick(ctx);
+			customAction.onClick?.(e, ctx);
 		},
 		children: customAction.icon
 	}, customAction.key);

package/dist/components/array-common/ToggleActionButton.cjs

@@ -23,8 +23,9 @@ const ToggleActionButton = ({ action, actionContext, disabled }) => {
 		onClick: (e) => {
 			e.stopPropagation();
 			if (disabled) return;
+			action.onClick?.(e, actionContext);
 			const nextActive = !active;
-			action.onToggle(actionContext, nextActive);
+			action.onToggle?.(actionContext, nextActive);
 		},
 		children: iconNode
 	}, action.key);

package/dist/components/array-common/ToggleActionButton.js

@@ -19,8 +19,9 @@ const ToggleActionButton = ({ action, actionContext, disabled }) => {
 		onClick: (e) => {
 			e.stopPropagation();
 			if (disabled) return;
+			action.onClick?.(e, actionContext);
 			const nextActive = !active;
-			action.onToggle(actionContext, nextActive);
+			action.onToggle?.(actionContext, nextActive);
 		},
 		children: iconNode
 	}, action.key);

package/dist/components/array-common/get-edit-description.cjs

@@ -4,8 +4,8 @@
 * Get description text for edit dialog/popover based on context
 */
 function getEditDescription(isNew, autoSave) {
-	if (isNew) return autoSave ? "Fill in the details for the new item. Changes are applied immediately." : "Fill in the details for the new item. Click save when you're done.";
-	return autoSave ? "Make changes to the item. Changes are applied immediately." : "Make changes to the item. Click save when you're done.";
+	if (isNew) return autoSave ? "Enter details. Changes apply instantly." : "Enter details, then click save.";
+	return autoSave ? "Edit details. Changes apply instantly." : "Edit details, then click save.";
 }
 
 //#endregion

package/dist/components/array-common/get-edit-description.js

@@ -3,8 +3,8 @@
 * Get description text for edit dialog/popover based on context
 */
 function getEditDescription(isNew, autoSave) {
-	if (isNew) return autoSave ? "Fill in the details for the new item. Changes are applied immediately." : "Fill in the details for the new item. Click save when you're done.";
-	return autoSave ? "Make changes to the item. Changes are applied immediately." : "Make changes to the item. Click save when you're done.";
+	if (isNew) return autoSave ? "Enter details. Changes apply instantly." : "Enter details, then click save.";
+	return autoSave ? "Edit details. Changes apply instantly." : "Edit details, then click save.";
 }
 
 //#endregion

package/dist/components/array-common/index.cjs

@@ -9,5 +9,7 @@ const require_get_edit_description = require('./get-edit-description.cjs');
 const require_ShakeStyles = require('./ShakeStyles.cjs');
 const require_use_array_editor = require('./use-array-editor.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_array_item_schema = require('./use-array-item-schema.cjs');
 const require_use_edit_handlers = require('./use-edit-handlers.cjs');
 const require_use_shake_animation = require('./use-shake-animation.cjs');

package/dist/components/array-common/index.js

@@ -9,5 +9,7 @@ import { getEditDescription } from "./get-edit-description.js";
 import { ShakeStyles } from "./ShakeStyles.js";
 import { useArrayEditor } from "./use-array-editor.js";
 import { useArrayItemDraftForm } from "./use-array-item-draft-form.js";
+import { useArrayItemEditLabels } from "./use-array-item-edit-labels.js";
+import { useArrayItemSchema } from "./use-array-item-schema.js";
 import { useEditHandlers } from "./use-edit-handlers.js";
 import { useShakeAnimation } from "./use-shake-animation.js";

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

@@ -27,7 +27,6 @@ function setArrayItemValue(arrayField, index, value) {
 function useArrayEditor(props) {
 	const { onAdd, onEdit, autoSave } = props;
 	const field = (0, __formily_react.useField)();
-	const schema = (0, __formily_react.useFieldSchema)();
 	const activeItemManager = react.default.useMemo(() => require_create_active_item_manager.createActiveItemManager(), []);
 	const handleEdit = (index) => {
 		activeItemManager.setActiveItem(index, false);
@@ -48,7 +47,6 @@ function useArrayEditor(props) {
 		if (!autoSave && activeItemManager.isNewItem(itemIndex)) field.remove?.(itemIndex).catch(console.error);
 		activeItemManager.removeActiveItem(itemIndex);
 	};
-	const isNewItem = react.default.useCallback((index) => activeItemManager.activeItem === index && activeItemManager.isNew, [activeItemManager]);
 	return {
 		activeItemManager,
 		handleEdit,
@@ -57,8 +55,7 @@ function useArrayEditor(props) {
 		handleLiveChange,
 		handleCancelClick,
 		field,
-		items: Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items,
-		isNewItem
+		isNewItem: react.default.useCallback((index) => activeItemManager.activeItem === index && activeItemManager.isNew, [activeItemManager])
 	};
 }
 

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

@@ -1,5 +1,5 @@
 import { createActiveItemManager } from "./create-active-item-manager.js";
-import { useField, useFieldSchema } from "@formily/react";
+import { useField } from "@formily/react";
 import React from "react";
 
 //#region src/components/array-common/use-array-editor.ts
@@ -24,7 +24,6 @@ function setArrayItemValue(arrayField, index, value) {
 function useArrayEditor(props) {
 	const { onAdd, onEdit, autoSave } = props;
 	const field = useField();
-	const schema = useFieldSchema();
 	const activeItemManager = React.useMemo(() => createActiveItemManager(), []);
 	const handleEdit = (index) => {
 		activeItemManager.setActiveItem(index, false);
@@ -45,7 +44,6 @@ function useArrayEditor(props) {
 		if (!autoSave && activeItemManager.isNewItem(itemIndex)) field.remove?.(itemIndex).catch(console.error);
 		activeItemManager.removeActiveItem(itemIndex);
 	};
-	const isNewItem = React.useCallback((index) => activeItemManager.activeItem === index && activeItemManager.isNew, [activeItemManager]);
 	return {
 		activeItemManager,
 		handleEdit,
@@ -54,8 +52,7 @@ function useArrayEditor(props) {
 		handleLiveChange,
 		handleCancelClick,
 		field,
-		items: Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items,
-		isNewItem
+		isNewItem: React.useCallback((index) => activeItemManager.activeItem === index && activeItemManager.isNew, [activeItemManager])
 	};
 }
 

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

@@ -0,0 +1,42 @@
+const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
+const require_get_edit_description = require('./get-edit-description.cjs');
+let react = require("react");
+react = require_rolldown_runtime.__toESM(react);
+
+//#region src/components/array-common/use-array-item-edit-labels.ts
+/**
+* Hook to get title and description for array item edit dialogs/popovers
+* Uses schema title/description when available, falls back to defaults
+*/
+function useArrayItemEditLabels({ schema, isNew, autoSave, itemIndex }) {
+	const getNonEmptyString = (0, react.useCallback)((value) => {
+		if (typeof value !== "string") return void 0;
+		const trimmed = value.trim();
+		return trimmed.length > 0 ? trimmed : void 0;
+	}, []);
+	return {
+		title: (0, react.useMemo)(() => {
+			const schemaTitle = getNonEmptyString(schema?.title);
+			if (schemaTitle !== void 0) return isNew ? `Add ${schemaTitle}` : `Edit ${schemaTitle}`;
+			return isNew ? "Add New Item" : `Edit Item #${(itemIndex ?? 0) + 1}`;
+		}, [
+			getNonEmptyString,
+			isNew,
+			itemIndex,
+			schema?.title
+		]),
+		description: (0, react.useMemo)(() => {
+			const schemaDescription = getNonEmptyString(schema?.description);
+			if (schemaDescription !== void 0) return schemaDescription;
+			return require_get_edit_description.getEditDescription(isNew, autoSave ?? false);
+		}, [
+			getNonEmptyString,
+			isNew,
+			autoSave,
+			schema?.description
+		])
+	};
+}
+
+//#endregion
+exports.useArrayItemEditLabels = useArrayItemEditLabels;

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

@@ -0,0 +1,40 @@
+import { getEditDescription } from "./get-edit-description.js";
+import { useCallback, useMemo } from "react";
+
+//#region src/components/array-common/use-array-item-edit-labels.ts
+/**
+* Hook to get title and description for array item edit dialogs/popovers
+* Uses schema title/description when available, falls back to defaults
+*/
+function useArrayItemEditLabels({ schema, isNew, autoSave, itemIndex }) {
+	const getNonEmptyString = useCallback((value) => {
+		if (typeof value !== "string") return void 0;
+		const trimmed = value.trim();
+		return trimmed.length > 0 ? trimmed : void 0;
+	}, []);
+	return {
+		title: useMemo(() => {
+			const schemaTitle = getNonEmptyString(schema?.title);
+			if (schemaTitle !== void 0) return isNew ? `Add ${schemaTitle}` : `Edit ${schemaTitle}`;
+			return isNew ? "Add New Item" : `Edit Item #${(itemIndex ?? 0) + 1}`;
+		}, [
+			getNonEmptyString,
+			isNew,
+			itemIndex,
+			schema?.title
+		]),
+		description: useMemo(() => {
+			const schemaDescription = getNonEmptyString(schema?.description);
+			if (schemaDescription !== void 0) return schemaDescription;
+			return getEditDescription(isNew, autoSave ?? false);
+		}, [
+			getNonEmptyString,
+			isNew,
+			autoSave,
+			schema?.description
+		])
+	};
+}
+
+//#endregion
+export { useArrayItemEditLabels };

package/dist/components/array-common/use-array-item-schema.cjs

@@ -0,0 +1,21 @@
+const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.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-schema.ts
+/**
+* Hook to get the schema for individual array items
+* Handles both single schema and array of schemas (takes first item)
+*/
+function useArrayItemSchema() {
+	const schema = (0, __formily_react.useFieldSchema)();
+	return (0, react.useMemo)(() => {
+		if (!schema?.items) throw new Error("Array schema must have items defined");
+		return Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items;
+	}, [schema]);
+}
+
+//#endregion
+exports.useArrayItemSchema = useArrayItemSchema;

package/dist/components/array-common/use-array-item-schema.js

@@ -0,0 +1,18 @@
+import { useFieldSchema } from "@formily/react";
+import { useMemo } from "react";
+
+//#region src/components/array-common/use-array-item-schema.ts
+/**
+* Hook to get the schema for individual array items
+* Handles both single schema and array of schemas (takes first item)
+*/
+function useArrayItemSchema() {
+	const schema = useFieldSchema();
+	return useMemo(() => {
+		if (!schema?.items) throw new Error("Array schema must have items defined");
+		return Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items;
+	}, [schema]);
+}
+
+//#endregion
+export { useArrayItemSchema };

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

@@ -4,6 +4,7 @@ const require_component_context = require('../array-base/component-context.cjs')
 require('../array-base/index.cjs');
 const require_ArrayItemsList = require('../array-common/ArrayItemsList.cjs');
 const require_use_array_editor = require('../array-common/use-array-editor.cjs');
+const require_use_array_item_schema = require('../array-common/use-array-item-schema.cjs');
 require('../array-common/index.cjs');
 const require_EditDialog = require('./EditDialog.cjs');
 let __formily_react = require("@formily/react");
@@ -31,7 +32,7 @@ const ArrayDialogBase = (0, __formily_react.observer)((props) => {
 		autoSave
 	});
 	const { AddButton } = require_component_context.useArrayComponents();
-	const items = Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items;
+	const items = require_use_array_item_schema.useArrayItemSchema();
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(require_array_base.ArrayBase, {
 		...props,
 		transformActions,

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

@@ -3,6 +3,7 @@ import { ArrayComponentProvider, useArrayComponents } from "../array-base/compon
 import "../array-base/index.js";
 import { ArrayItemsList } from "../array-common/ArrayItemsList.js";
 import { useArrayEditor } from "../array-common/use-array-editor.js";
+import { useArrayItemSchema } from "../array-common/use-array-item-schema.js";
 import "../array-common/index.js";
 import { EditDialog } from "./EditDialog.js";
 import { observer, useFieldSchema } from "@formily/react";
@@ -27,7 +28,7 @@ const ArrayDialogBase = observer((props) => {
 		autoSave
 	});
 	const { AddButton } = useArrayComponents();
-	const items = Array.isArray(schema.items) ? schema.items[0] ?? schema.items : schema.items;
+	const items = useArrayItemSchema();
 	return /* @__PURE__ */ jsxs(ArrayBase, {
 		...props,
 		transformActions,

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

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
 const require_ArrayItemDraftFields = require('../array-common/ArrayItemDraftFields.cjs');
-const require_get_edit_description = require('../array-common/get-edit-description.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');
 let __formily_react = require("@formily/react");
@@ -48,9 +48,12 @@ const EditDialog = (0, __formily_react.observer)(({ schema, onSave, onAutoSave,
 		onSave,
 		onCancel
 	});
-	const description = react.default.useMemo(() => {
-		return require_get_edit_description.getEditDescription(isNew, autoSave ?? false);
-	}, [isNew, autoSave]);
+	const { title, description } = require_use_array_item_edit_labels.useArrayItemEditLabels({
+		schema,
+		isNew,
+		autoSave,
+		itemIndex
+	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.Dialog, {
 		open,
 		onOpenChange: (isOpen) => {
@@ -65,7 +68,7 @@ const EditDialog = (0, __formily_react.observer)(({ schema, onSave, onAutoSave,
 			},
 			children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_ShakeStyles.ShakeStyles, {}),
-				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn_ui.DialogHeader, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.DialogTitle, { children: isNew ? "Add New Item" : `Edit Item #${(itemIndex ?? 0) + 1}` }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.DialogDescription, { children: description })] }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn_ui.DialogHeader, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.DialogTitle, { children: title }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn_ui.DialogDescription, { children: description })] }),
 				itemIndex != null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_ArrayItemDraftFields.ArrayItemDraftFields, {
 					as: __pixpilot_shadcn_ui.DialogBody,
 					schema,

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

@@ -1,7 +1,7 @@
 import { ArrayItemDraftFields } from "../array-common/ArrayItemDraftFields.js";
-import { getEditDescription } from "../array-common/get-edit-description.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";
@@ -43,9 +43,12 @@ const EditDialog = observer(({ schema, onSave, onAutoSave, onCancel, activeItemM
 		onSave,
 		onCancel
 	});
-	const description = React.useMemo(() => {
-		return getEditDescription(isNew, autoSave ?? false);
-	}, [isNew, autoSave]);
+	const { title, description } = useArrayItemEditLabels({
+		schema,
+		isNew,
+		autoSave,
+		itemIndex
+	});
 	return /* @__PURE__ */ jsx(Dialog, {
 		open,
 		onOpenChange: (isOpen) => {
@@ -60,7 +63,7 @@ const EditDialog = observer(({ schema, onSave, onAutoSave, onCancel, activeItemM
 			},
 			children: [
 				/* @__PURE__ */ jsx(ShakeStyles, {}),
-				/* @__PURE__ */ jsxs(DialogHeader, { children: [/* @__PURE__ */ jsx(DialogTitle, { children: isNew ? "Add New Item" : `Edit Item #${(itemIndex ?? 0) + 1}` }), /* @__PURE__ */ jsx(DialogDescription, { children: description })] }),
+				/* @__PURE__ */ jsxs(DialogHeader, { children: [/* @__PURE__ */ jsx(DialogTitle, { children: title }), /* @__PURE__ */ jsx(DialogDescription, { children: description })] }),
 				itemIndex != null && /* @__PURE__ */ jsx(ArrayItemDraftFields, {
 					as: DialogBody,
 					schema,

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

@@ -4,6 +4,7 @@ const require_component_context = require('../array-base/component-context.cjs')
 require('../array-base/index.cjs');
 const require_ArrayItemsList = require('../array-common/ArrayItemsList.cjs');
 const require_use_array_editor = require('../array-common/use-array-editor.cjs');
+const require_use_array_item_schema = require('../array-common/use-array-item-schema.cjs');
 require('../array-common/index.cjs');
 const require_Popover = require('./Popover.cjs');
 let __formily_react = require("@formily/react");
@@ -18,11 +19,12 @@ __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 = true, className, children, transformActions,...rest } = props;
-	const { activeItemManager, items, handleAdd, isNewItem, handleEdit, handleSaveClick, handleLiveChange, handleCancelClick } = require_use_array_editor.useArrayEditor({
+	const { activeItemManager, handleAdd, isNewItem, handleEdit, handleSaveClick, handleLiveChange, handleCancelClick } = require_use_array_editor.useArrayEditor({
 		onAdd,
 		onEdit,
 		autoSave
 	});
+	const schema = require_use_array_item_schema.useArrayItemSchema();
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_array_base.ArrayBase, {
 		...props,
 		transformActions,
@@ -41,7 +43,7 @@ const ArrayPopoverBase = (0, __formily_react.observer)((props) => {
 					onCancel: handleCancelClick,
 					onAutoSave: handleLiveChange,
 					autoSave,
-					schema: items,
+					schema,
 					onSave: handleSaveClick,
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_array_base.ArrayBase.Addition, {})
 				})

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

@@ -3,6 +3,7 @@ import { ArrayComponentProvider } from "../array-base/component-context.js";
 import "../array-base/index.js";
 import { ArrayItemsList } from "../array-common/ArrayItemsList.js";
 import { useArrayEditor } from "../array-common/use-array-editor.js";
+import { useArrayItemSchema } from "../array-common/use-array-item-schema.js";
 import "../array-common/index.js";
 import { ArrayItemsEditPopover } from "./Popover.js";
 import { observer } from "@formily/react";
@@ -13,11 +14,12 @@ import { cn } from "@pixpilot/shadcn";
 //#region src/components/array-popover/ArrayPopover.tsx
 const ArrayPopoverBase = observer((props) => {
 	const { onAdd, onRemove, onMoveDown, onMoveUp, onEdit, autoSave = true, className, children, transformActions,...rest } = props;
-	const { activeItemManager, items, handleAdd, isNewItem, handleEdit, handleSaveClick, handleLiveChange, handleCancelClick } = useArrayEditor({
+	const { activeItemManager, handleAdd, isNewItem, handleEdit, handleSaveClick, handleLiveChange, handleCancelClick } = useArrayEditor({
 		onAdd,
 		onEdit,
 		autoSave
 	});
+	const schema = useArrayItemSchema();
 	return /* @__PURE__ */ jsx(ArrayBase, {
 		...props,
 		transformActions,
@@ -36,7 +38,7 @@ const ArrayPopoverBase = observer((props) => {
 					onCancel: handleCancelClick,
 					onAutoSave: handleLiveChange,
 					autoSave,
-					schema: items,
+					schema,
 					onSave: handleSaveClick,
 					children: /* @__PURE__ */ jsx(ArrayBase.Addition, {})
 				})