@pixpilot/formily-shadcn 1.5.0 → 1.7.0

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

@@ -1,3 +1,5 @@
+import { useFormContext } from "../../hooks/use-form-context.js";
+import "../../hooks/index.js";
 import { ArrayItemDraftFields } from "../array-common/ArrayItemDraftFields.js";
 import { ShakeStyles } from "../array-common/ShakeStyles.js";
 import { useArrayItemEditState } from "../array-common/use-array-item-edit-state.js";
@@ -5,10 +7,10 @@ import { observer } from "@formily/react";
 import React from "react";
 import { XIcon } from "lucide-react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Button, PopoverContent } from "@pixpilot/shadcn";
+import { Button, PopoverContent, cn } from "@pixpilot/shadcn";
 
 //#region src/components/array-popover/Popover.tsx
-const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel, activeItemManager, autoSave,...rest }) => {
+const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel, activeItemManager, autoSave, className,...rest }) => {
 	const { arrayField, activeIndex, isNewItem, normalizedAutoSave, draftForm, basePath, validationPath, isolatedForm, isDirty, title, description, shouldShake, triggerShake, handleSave, handleCancel } = useArrayItemEditState({
 		schema,
 		activeItemManager,
@@ -17,6 +19,12 @@ const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel,
 		onAutoSave,
 		autoSave
 	});
+	const { settings = {} } = useFormContext();
+	const { autoSave: _globalAutoSave,...popoverSettings } = settings.popover || {};
+	const contentProps = {
+		...popoverSettings,
+		...rest
+	};
 	const handleDiscard = React.useCallback(() => {
 		if (activeIndex === void 0) return;
 		if (normalizedAutoSave && isNewItem) arrayField.remove?.(activeIndex).catch(console.error);
@@ -48,10 +56,12 @@ const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel,
 		validationPath
 	]);
 	return /* @__PURE__ */ jsxs(PopoverContent, {
-		className: shouldShake ? "relative w-96 pp-shake" : "relative w-96",
 		side: "top",
-		...rest,
+		...contentProps,
+		className: cn(shouldShake ? "relative w-96 pp-shake" : "relative w-96", contentProps.className, className),
 		onInteractOutside: (event) => {
+			contentProps.onInteractOutside?.(event);
+			if (event.defaultPrevented) return;
 			if (isDirty) {
 				event.preventDefault();
 				triggerShake();
@@ -61,6 +71,8 @@ const ArrayItemsEditPopover = observer(({ schema, onSave, onAutoSave, onCancel,
 			validateAndClose();
 		},
 		onEscapeKeyDown: (event) => {
+			contentProps.onEscapeKeyDown?.(event);
+			if (event.defaultPrevented) return;
 			if (isDirty) {
 				event.preventDefault();
 				triggerShake();

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 { DialogContentProps, FileUploadProgressCallBacks, IconProvider, RichTextEditorProps } from "@pixpilot/shadcn-ui";
+import { DialogContentProps, FileUploadProgressCallBacks, IconProvider, PopoverContentProps, RichTextEditorProps } from "@pixpilot/shadcn-ui";
 
 //#region src/components/context/types.d.ts
 interface FomFileUpload {
@@ -37,7 +37,12 @@ interface FormSettings {
       actions?: ActionItem[] | false;
     };
   };
-  dialog?: DialogContentProps;
+  dialog?: DialogContentProps & {
+    autoSave?: boolean;
+  };
+  popover?: PopoverContentProps & {
+    autoSave?: boolean;
+  };
 }
 /**
  * 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 { DialogContentProps, FileUploadProgressCallBacks, IconProvider, RichTextEditorProps } from "@pixpilot/shadcn-ui";
+import { DialogContentProps, FileUploadProgressCallBacks, IconProvider, PopoverContentProps, RichTextEditorProps } from "@pixpilot/shadcn-ui";
 
 //#region src/components/context/types.d.ts
 interface FomFileUpload {
@@ -37,7 +37,12 @@ interface FormSettings {
       actions?: ActionItem[] | false;
     };
   };
-  dialog?: DialogContentProps;
+  dialog?: DialogContentProps & {
+    autoSave?: boolean;
+  };
+  popover?: PopoverContentProps & {
+    autoSave?: boolean;
+  };
 }
 /**
  * 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_ui13 from "@pixpilot/shadcn-ui";
+import * as _pixpilot_shadcn_ui511 from "@pixpilot/shadcn-ui";
 
 //#region src/components/file-upload/FileUpload.d.ts
 
@@ -7,14 +7,14 @@ import * as _pixpilot_shadcn_ui13 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_ui13.FileUploadInlineBaseProps & _pixpilot_shadcn_ui13.FileUploadRootPropsBaseProps & {
+declare const FileUpload$1: React.ForwardRefExoticComponent<(Omit<Partial<_pixpilot_shadcn_ui511.FileUploadInlineBaseProps & _pixpilot_shadcn_ui511.FileUploadRootPropsBaseProps & {
   multiple: true;
-  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 & {
+  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 & {
   multiple?: false;
-  value?: _pixpilot_shadcn_ui13.FileMetadata | null;
-  onChange?: _pixpilot_shadcn_ui13.OnChangeSingleFile;
-} & _pixpilot_shadcn_ui13.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
+  value?: _pixpilot_shadcn_ui511.FileMetadata | null;
+  onChange?: _pixpilot_shadcn_ui511.OnChangeSingleFile;
+} & _pixpilot_shadcn_ui511.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_ui3 from "@pixpilot/shadcn-ui";
+import * as _pixpilot_shadcn_ui501 from "@pixpilot/shadcn-ui";
 
 //#region src/components/file-upload/FileUploadInline.d.ts
 
@@ -7,14 +7,14 @@ import * as _pixpilot_shadcn_ui3 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_ui3.FileUploadInlineBaseProps & _pixpilot_shadcn_ui3.FileUploadRootPropsBaseProps & {
+declare const FileUploadInline$1: React.ForwardRefExoticComponent<(Omit<Partial<_pixpilot_shadcn_ui501.FileUploadInlineBaseProps & _pixpilot_shadcn_ui501.FileUploadRootPropsBaseProps & {
   multiple: true;
-  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 & {
+  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 & {
   multiple?: false;
-  value?: _pixpilot_shadcn_ui3.FileMetadata | null;
-  onChange?: _pixpilot_shadcn_ui3.OnChangeSingleFile;
-} & _pixpilot_shadcn_ui3.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
+  value?: _pixpilot_shadcn_ui501.FileMetadata | null;
+  onChange?: _pixpilot_shadcn_ui501.OnChangeSingleFile;
+} & _pixpilot_shadcn_ui501.FileUploadBaseProps>, "ref">) & React.RefAttributes<unknown>>;
 //#endregion
 export { FileUploadInline$1 as FileUploadInline };