@pixpilot/formily-shadcn 1.4.4 → 1.5.0

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

@@ -6,16 +6,16 @@ let __formily_react = require("@formily/react");
 __formily_react = require_rolldown_runtime.__toESM(__formily_react);
 let react = require("react");
 react = require_rolldown_runtime.__toESM(react);
+let lucide_react = require("lucide-react");
+lucide_react = require_rolldown_runtime.__toESM(lucide_react);
 let react_jsx_runtime = require("react/jsx-runtime");
 react_jsx_runtime = require_rolldown_runtime.__toESM(react_jsx_runtime);
 let __pixpilot_shadcn = require("@pixpilot/shadcn");
 __pixpilot_shadcn = require_rolldown_runtime.__toESM(__pixpilot_shadcn);
-let react_dom = require("react-dom");
-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, activeIndex, isNewItem, open, normalizedAutoSave, draftForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = require_use_array_item_edit_state.useArrayItemEditState({
+const ArrayItemsEditPopover = (0, __formily_react.observer)(({ schema, onSave, onAutoSave, onCancel, activeItemManager, autoSave,...rest }) => {
+	const { arrayField, activeIndex, isNewItem, normalizedAutoSave, draftForm, basePath, validationPath, isolatedForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = require_use_array_item_edit_state.useArrayItemEditState({
 		schema,
 		activeItemManager,
 		onSave,
@@ -40,7 +40,7 @@ const ArrayItemsEditPopover = (0, __formily_react.observer)(({ schema, onSave, o
 			triggerShake();
 			return;
 		}
-		Promise.resolve(draftForm.validate()).then(() => {
+		Promise.resolve(draftForm.validate(validationPath)).then(() => {
 			handleCancel();
 		}).catch(() => {
 			triggerShake();
@@ -50,93 +50,93 @@ const ArrayItemsEditPopover = (0, __formily_react.observer)(({ schema, onSave, o
 		draftForm,
 		handleCancel,
 		isDirty,
-		triggerShake
+		triggerShake,
+		validationPath
 	]);
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.Popover, {
-		open,
-		onOpenChange: react.default.useCallback((isOpen) => {
-			if (isOpen) return;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.PopoverContent, {
+		className: shouldShake ? "relative w-96 pp-shake" : "relative w-96",
+		side: "top",
+		...rest,
+		onInteractOutside: (event) => {
+			if (isDirty) {
+				event.preventDefault();
+				triggerShake();
+				return;
+			}
+			event.preventDefault();
 			validateAndClose();
-		}, [validateAndClose]),
-		modal,
+		},
+		onEscapeKeyDown: (event) => {
+			if (isDirty) {
+				event.preventDefault();
+				triggerShake();
+				return;
+			}
+			event.preventDefault();
+			validateAndClose();
+		},
 		children: [
-			children !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.PopoverTrigger, {
-				asChild: true,
-				children
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_ShakeStyles.ShakeStyles, {}),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
+				type: "button",
+				variant: "ghost",
+				size: "icon",
+				className: "absolute right-2 top-2 z-10 size-8",
+				"aria-label": "Close",
+				onClick: validateAndClose,
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.XIcon, { className: "size-4" })
 			}),
-			typeof document !== "undefined" && open && modal && (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "fixed inset-0 z-40 backdrop-brightness-90" }), document.body),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.PopoverContent, {
-				className: shouldShake ? "w-96 pp-shake" : "w-96",
-				side: "top",
-				...rest,
-				onInteractOutside: (event) => {
-					if (isDirty) {
-						event.preventDefault();
-						triggerShake();
-						return;
-					}
-					event.preventDefault();
-					validateAndClose();
-				},
-				onEscapeKeyDown: (event) => {
-					if (isDirty) {
-						event.preventDefault();
-						triggerShake();
-						return;
-					}
-					event.preventDefault();
-					validateAndClose();
-				},
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_ShakeStyles.ShakeStyles, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: "space-y-4",
-					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "space-y-2",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
-								className: "font-medium leading-none",
-								children: title
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "text-muted-foreground text-sm",
-								children: description
-							})]
-						}),
-						activeIndex != null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_ArrayItemDraftFields.ArrayItemDraftFields, {
-							schema,
-							form: draftForm,
-							className: "space-y-4"
-						}),
-						!normalizedAutoSave && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "flex justify-end gap-2",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
-								type: "button",
-								variant: "outline",
-								size: "sm",
-								onClick: handleCancel,
-								children: "Cancel"
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
-								type: "button",
-								size: "sm",
-								onClick: handleSave,
-								children: "Save"
-							})]
-						}),
-						normalizedAutoSave && isNewItem && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "flex justify-end gap-2",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
-								type: "button",
-								variant: "outline",
-								size: "sm",
-								onClick: handleDiscard,
-								children: "Discard"
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
-								type: "button",
-								size: "sm",
-								onClick: validateAndClose,
-								children: "Done"
-							})]
-						})
-					]
-				})]
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "space-y-4",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "space-y-2",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
+							className: "font-medium leading-none",
+							children: title
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "text-muted-foreground text-sm",
+							children: description
+						})]
+					}),
+					activeIndex != null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_ArrayItemDraftFields.ArrayItemDraftFields, {
+						schema,
+						form: draftForm,
+						basePath,
+						isolated: isolatedForm,
+						className: "space-y-4"
+					}),
+					!normalizedAutoSave && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "flex justify-end gap-2",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
+							type: "button",
+							variant: "outline",
+							size: "sm",
+							onClick: handleCancel,
+							children: "Cancel"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
+							type: "button",
+							size: "sm",
+							onClick: handleSave,
+							children: "Save"
+						})]
+					}),
+					normalizedAutoSave && isNewItem && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "flex justify-end gap-2",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
+							type: "button",
+							variant: "outline",
+							size: "sm",
+							onClick: handleDiscard,
+							children: "Discard"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Button, {
+							type: "button",
+							size: "sm",
+							onClick: validateAndClose,
+							children: "Done"
+						})]
+					})
+				]
 			})
 		]
 	});

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

@@ -3,13 +3,13 @@ import { ShakeStyles } from "../array-common/ShakeStyles.js";
 import { useArrayItemEditState } from "../array-common/use-array-item-edit-state.js";
 import { observer } from "@formily/react";
 import React from "react";
+import { XIcon } from "lucide-react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Button, Popover, PopoverContent, PopoverTrigger } from "@pixpilot/shadcn";
-import { createPortal } from "react-dom";
+import { Button, PopoverContent } from "@pixpilot/shadcn";
 
 //#region src/components/array-popover/Popover.tsx
-const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel, children, activeItemManager, autoSave, modal = true,...rest }) => {
-	const { arrayField, activeIndex, isNewItem, open, normalizedAutoSave, draftForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = useArrayItemEditState({
+const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel, activeItemManager, autoSave,...rest }) => {
+	const { arrayField, activeIndex, isNewItem, normalizedAutoSave, draftForm, basePath, validationPath, isolatedForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = useArrayItemEditState({
 		schema,
 		activeItemManager,
 		onSave,
@@ -34,7 +34,7 @@ const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel,
 			triggerShake();
 			return;
 		}
-		Promise.resolve(draftForm.validate()).then(() => {
+		Promise.resolve(draftForm.validate(validationPath)).then(() => {
 			handleCancel();
 		}).catch(() => {
 			triggerShake();
@@ -44,93 +44,93 @@ const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel,
 		draftForm,
 		handleCancel,
 		isDirty,
-		triggerShake
+		triggerShake,
+		validationPath
 	]);
-	return /* @__PURE__ */ jsxs(Popover, {
-		open,
-		onOpenChange: React.useCallback((isOpen) => {
-			if (isOpen) return;
+	return /* @__PURE__ */ jsxs(PopoverContent, {
+		className: shouldShake ? "relative w-96 pp-shake" : "relative w-96",
+		side: "top",
+		...rest,
+		onInteractOutside: (event) => {
+			if (isDirty) {
+				event.preventDefault();
+				triggerShake();
+				return;
+			}
+			event.preventDefault();
 			validateAndClose();
-		}, [validateAndClose]),
-		modal,
+		},
+		onEscapeKeyDown: (event) => {
+			if (isDirty) {
+				event.preventDefault();
+				triggerShake();
+				return;
+			}
+			event.preventDefault();
+			validateAndClose();
+		},
 		children: [
-			children !== void 0 && /* @__PURE__ */ jsx(PopoverTrigger, {
-				asChild: true,
-				children
+			/* @__PURE__ */ jsx(ShakeStyles, {}),
+			/* @__PURE__ */ jsx(Button, {
+				type: "button",
+				variant: "ghost",
+				size: "icon",
+				className: "absolute right-2 top-2 z-10 size-8",
+				"aria-label": "Close",
+				onClick: validateAndClose,
+				children: /* @__PURE__ */ jsx(XIcon, { className: "size-4" })
 			}),
-			typeof document !== "undefined" && open && modal && createPortal(/* @__PURE__ */ jsx("div", { className: "fixed inset-0 z-40 backdrop-brightness-90" }), document.body),
-			/* @__PURE__ */ jsxs(PopoverContent, {
-				className: shouldShake ? "w-96 pp-shake" : "w-96",
-				side: "top",
-				...rest,
-				onInteractOutside: (event) => {
-					if (isDirty) {
-						event.preventDefault();
-						triggerShake();
-						return;
-					}
-					event.preventDefault();
-					validateAndClose();
-				},
-				onEscapeKeyDown: (event) => {
-					if (isDirty) {
-						event.preventDefault();
-						triggerShake();
-						return;
-					}
-					event.preventDefault();
-					validateAndClose();
-				},
-				children: [/* @__PURE__ */ jsx(ShakeStyles, {}), /* @__PURE__ */ jsxs("div", {
-					className: "space-y-4",
-					children: [
-						/* @__PURE__ */ jsxs("div", {
-							className: "space-y-2",
-							children: [/* @__PURE__ */ jsx("h4", {
-								className: "font-medium leading-none",
-								children: title
-							}), /* @__PURE__ */ jsx("p", {
-								className: "text-muted-foreground text-sm",
-								children: description
-							})]
-						}),
-						activeIndex != null && /* @__PURE__ */ jsx(ArrayItemDraftFields, {
-							schema,
-							form: draftForm,
-							className: "space-y-4"
-						}),
-						!normalizedAutoSave && /* @__PURE__ */ jsxs("div", {
-							className: "flex justify-end gap-2",
-							children: [/* @__PURE__ */ jsx(Button, {
-								type: "button",
-								variant: "outline",
-								size: "sm",
-								onClick: handleCancel,
-								children: "Cancel"
-							}), /* @__PURE__ */ jsx(Button, {
-								type: "button",
-								size: "sm",
-								onClick: handleSave,
-								children: "Save"
-							})]
-						}),
-						normalizedAutoSave && isNewItem && /* @__PURE__ */ jsxs("div", {
-							className: "flex justify-end gap-2",
-							children: [/* @__PURE__ */ jsx(Button, {
-								type: "button",
-								variant: "outline",
-								size: "sm",
-								onClick: handleDiscard,
-								children: "Discard"
-							}), /* @__PURE__ */ jsx(Button, {
-								type: "button",
-								size: "sm",
-								onClick: validateAndClose,
-								children: "Done"
-							})]
-						})
-					]
-				})]
+			/* @__PURE__ */ jsxs("div", {
+				className: "space-y-4",
+				children: [
+					/* @__PURE__ */ jsxs("div", {
+						className: "space-y-2",
+						children: [/* @__PURE__ */ jsx("h4", {
+							className: "font-medium leading-none",
+							children: title
+						}), /* @__PURE__ */ jsx("p", {
+							className: "text-muted-foreground text-sm",
+							children: description
+						})]
+					}),
+					activeIndex != null && /* @__PURE__ */ jsx(ArrayItemDraftFields, {
+						schema,
+						form: draftForm,
+						basePath,
+						isolated: isolatedForm,
+						className: "space-y-4"
+					}),
+					!normalizedAutoSave && /* @__PURE__ */ jsxs("div", {
+						className: "flex justify-end gap-2",
+						children: [/* @__PURE__ */ jsx(Button, {
+							type: "button",
+							variant: "outline",
+							size: "sm",
+							onClick: handleCancel,
+							children: "Cancel"
+						}), /* @__PURE__ */ jsx(Button, {
+							type: "button",
+							size: "sm",
+							onClick: handleSave,
+							children: "Save"
+						})]
+					}),
+					normalizedAutoSave && isNewItem && /* @__PURE__ */ jsxs("div", {
+						className: "flex justify-end gap-2",
+						children: [/* @__PURE__ */ jsx(Button, {
+							type: "button",
+							variant: "outline",
+							size: "sm",
+							onClick: handleDiscard,
+							children: "Discard"
+						}), /* @__PURE__ */ jsx(Button, {
+							type: "button",
+							size: "sm",
+							onClick: validateAndClose,
+							children: "Done"
+						})]
+					})
+				]
 			})
 		]
 	});

package/dist/components/context/types.d.cts

@@ -2,7 +2,7 @@ import { ActionItem } from "../array-base/types.cjs";
 import "../array-base/index.cjs";
 import { FormSpace } from "../../types/form.cjs";
 import { DescriptionPlacement, LabelPlacement } from "../../types/form-item.cjs";
-import { FileUploadProgressCallBacks, IconProvider, RichTextEditorProps } from "@pixpilot/shadcn-ui";
+import { DialogContentProps, FileUploadProgressCallBacks, IconProvider, RichTextEditorProps } from "@pixpilot/shadcn-ui";
 
 //#region src/components/context/types.d.ts
 interface FomFileUpload {
@@ -37,6 +37,7 @@ interface FormSettings {
       actions?: ActionItem[] | false;
     };
   };
+  dialog?: DialogContentProps;
 }
 /**
  * Layout configuration options for form components.

package/dist/components/context/types.d.ts

@@ -2,7 +2,7 @@ import { ActionItem } from "../array-base/types.js";
 import "../array-base/index.js";
 import { FormSpace } from "../../types/form.js";
 import { DescriptionPlacement, LabelPlacement } from "../../types/form-item.js";
-import { FileUploadProgressCallBacks, IconProvider, RichTextEditorProps } from "@pixpilot/shadcn-ui";
+import { DialogContentProps, FileUploadProgressCallBacks, IconProvider, RichTextEditorProps } from "@pixpilot/shadcn-ui";
 
 //#region src/components/context/types.d.ts
 interface FomFileUpload {
@@ -37,6 +37,7 @@ interface FormSettings {
       actions?: ActionItem[] | false;
     };
   };
+  dialog?: DialogContentProps;
 }
 /**
  * Layout configuration options for form components.

package/dist/components/file-upload/FileUpload.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import * as _pixpilot_shadcn_ui511 from "@pixpilot/shadcn-ui";
+import * as _pixpilot_shadcn_ui13 from "@pixpilot/shadcn-ui";
 
 //#region src/components/file-upload/FileUpload.d.ts
 
@@ -7,14 +7,14 @@ import * as _pixpilot_shadcn_ui511 from "@pixpilot/shadcn-ui";
  * Formily-connected FileUploadInline component
  * Automatically connects shadcn FileUploadInline to Formily field state
  */
-declare const FileUpload$1: React.ForwardRefExoticComponent<(Omit<Partial<_pixpilot_shadcn_ui511.FileUploadInlineBaseProps & _pixpilot_shadcn_ui511.FileUploadRootPropsBaseProps & {
+declare const FileUpload$1: React.ForwardRefExoticComponent<(Omit<Partial<_pixpilot_shadcn_ui13.FileUploadInlineBaseProps & _pixpilot_shadcn_ui13.FileUploadRootPropsBaseProps & {
   multiple: true;
-  value?: _pixpilot_shadcn_ui511.FileMetadata[];
-  onChange?: _pixpilot_shadcn_ui511.OnChangeMultipleFiles;
-} & _pixpilot_shadcn_ui511.FileUploadBaseProps>, "ref"> | Omit<Partial<_pixpilot_shadcn_ui511.FileUploadInlineBaseProps & _pixpilot_shadcn_ui511.FileUploadRootPropsBaseProps & {
+  value?: _pixpilot_shadcn_ui13.FileMetadata[];
+  onChange?: _pixpilot_shadcn_ui13.OnChangeMultipleFiles;
+} & _pixpilot_shadcn_ui13.FileUploadBaseProps>, "ref"> | Omit<Partial<_pixpilot_shadcn_ui13.FileUploadInlineBaseProps & _pixpilot_shadcn_ui13.FileUploadRootPropsBaseProps & {
   multiple?: false;
-  value?: _pixpilot_shadcn_ui511.FileMetadata | null;
-  onChange?: _pixpilot_shadcn_ui511.OnChangeSingleFile;
-} & _pixpilot_shadcn_ui511.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
+  value?: _pixpilot_shadcn_ui13.FileMetadata | null;
+  onChange?: _pixpilot_shadcn_ui13.OnChangeSingleFile;
+} & _pixpilot_shadcn_ui13.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
 //#endregion
 export { FileUpload$1 as FileUpload };

package/dist/components/file-upload/FileUploadInline.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import * as _pixpilot_shadcn_ui501 from "@pixpilot/shadcn-ui";
+import * as _pixpilot_shadcn_ui3 from "@pixpilot/shadcn-ui";
 
 //#region src/components/file-upload/FileUploadInline.d.ts
 
@@ -7,14 +7,14 @@ import * as _pixpilot_shadcn_ui501 from "@pixpilot/shadcn-ui";
  * Formily-connected FileUploadInline component
  * Automatically connects shadcn FileUploadInline to Formily field state
  */
-declare const FileUploadInline$1: React.ForwardRefExoticComponent<(Omit<Partial<_pixpilot_shadcn_ui501.FileUploadInlineBaseProps & _pixpilot_shadcn_ui501.FileUploadRootPropsBaseProps & {
+declare const FileUploadInline$1: React.ForwardRefExoticComponent<(Omit<Partial<_pixpilot_shadcn_ui3.FileUploadInlineBaseProps & _pixpilot_shadcn_ui3.FileUploadRootPropsBaseProps & {
   multiple: true;
-  value?: _pixpilot_shadcn_ui501.FileMetadata[];
-  onChange?: _pixpilot_shadcn_ui501.OnChangeMultipleFiles;
-} & _pixpilot_shadcn_ui501.FileUploadBaseProps>, "ref"> | Omit<Partial<_pixpilot_shadcn_ui501.FileUploadInlineBaseProps & _pixpilot_shadcn_ui501.FileUploadRootPropsBaseProps & {
+  value?: _pixpilot_shadcn_ui3.FileMetadata[];
+  onChange?: _pixpilot_shadcn_ui3.OnChangeMultipleFiles;
+} & _pixpilot_shadcn_ui3.FileUploadBaseProps>, "ref"> | Omit<Partial<_pixpilot_shadcn_ui3.FileUploadInlineBaseProps & _pixpilot_shadcn_ui3.FileUploadRootPropsBaseProps & {
   multiple?: false;
-  value?: _pixpilot_shadcn_ui501.FileMetadata | null;
-  onChange?: _pixpilot_shadcn_ui501.OnChangeSingleFile;
-} & _pixpilot_shadcn_ui501.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
+  value?: _pixpilot_shadcn_ui3.FileMetadata | null;
+  onChange?: _pixpilot_shadcn_ui3.OnChangeSingleFile;
+} & _pixpilot_shadcn_ui3.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
 //#endregion
 export { FileUploadInline$1 as FileUploadInline };