@tiny-codes/react-easy 1.2.0 → 1.2.2

package/lib/components/ConfirmAction/withConfirmAction.js

@@ -0,0 +1,123 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/ConfirmAction/withConfirmAction.tsx
+var withConfirmAction_exports = {};
+__export(withConfirmAction_exports, {
+  default: () => withConfirmAction,
+  withConfirmActionInternal: () => withConfirmActionInternal
+});
+module.exports = __toCommonJS(withConfirmAction_exports);
+var import_react = require("react");
+var import__ = require(".");
+var import_antd = require("antd");
+var import_react_is = require("react-is");
+function withConfirmAction(ActionComponent, defaultProps) {
+  return withConfirmActionInternal(
+    ActionComponent,
+    {
+      confirmType: "normal"
+    },
+    defaultProps
+  );
+}
+function withConfirmActionInternal(ActionComponent, renderDefaultProps, defaultProps) {
+  const ConfirmActionWithRef = (0, import_react.forwardRef)((0, import__.genRenderer)(renderDefaultProps));
+  ConfirmActionWithRef.displayName = "ForwardRef(ConfirmAction)";
+  const WrappedActionComponent = (0, import_react.forwardRef)(
+    (propsWithDefaults, ref) => {
+      const actionRef = (0, import_react.useRef)(null);
+      const [customRef, setCustomRef] = (0, import_react.useState)(null);
+      const saveFuncRef = (0, import_react.useRef)(void 0);
+      const setOnOk = (0, import_react.useCallback)((handler) => {
+        saveFuncRef.current = handler;
+      }, []);
+      (0, import_react.useImperativeHandle)(ref, () => {
+        return {
+          ...actionRef.current,
+          ...customRef
+        };
+      }, [customRef]);
+      const triggerDom = /* @__PURE__ */ React.createElement(
+        ConfirmActionWithRef,
+        {
+          ...propsWithDefaults,
+          onOk: saveFuncRef.current,
+          ref: actionRef
+        }
+      );
+      return /* @__PURE__ */ React.createElement(
+        ActionComponent,
+        {
+          ...propsWithDefaults,
+          ref: (0, import_react_is.isForwardRef)(ActionComponent) ? setCustomRef : void 0,
+          setOK: setOnOk,
+          triggerDom
+        }
+      );
+    }
+  );
+  WrappedActionComponent.displayName = "ConfirmAction(ActionComponent)";
+  const withDefaults = (0, import__.withDefaultConfirmActionProps)(
+    WrappedActionComponent,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    defaultProps
+  );
+  return addTriggers(withDefaults);
+}
+function addTriggers(comp) {
+  const patchedComp = comp;
+  patchedComp.Button = (0, import__.withDefaultConfirmActionProps)(
+    // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here
+    comp,
+    {
+      triggerComponent: import_antd.Button,
+      triggerEvent: "onClick",
+      triggerProps: {}
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+  patchedComp.Switch = (0, import__.withDefaultConfirmActionProps)(
+    // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here
+    comp,
+    {
+      triggerComponent: import_antd.Switch,
+      triggerEvent: "onChange",
+      triggerProps: {}
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+  patchedComp.Link = (0, import__.withDefaultConfirmActionProps)(
+    // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here
+    comp,
+    {
+      triggerComponent: import_antd.Typography.Link,
+      triggerEvent: "onClick",
+      triggerProps: {
+        style: { whiteSpace: "nowrap" }
+      }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+  return patchedComp;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  withConfirmActionInternal
+});
+//# sourceMappingURL=withConfirmAction.js.map

package/lib/components/ConfirmAction/withConfirmAction.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/components/ConfirmAction/withConfirmAction.tsx"],
+  "sourcesContent": ["import type { ComponentType, PropsWithoutRef, ReactNode, RefAttributes } from 'react';\nimport { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react';\nimport type { ActionCompConstraint, ConfirmActionProps, ConfirmActionRef } from '.';\nimport { genRenderer, withDefaultConfirmActionProps } from '.';\nimport { Button, type ButtonProps, Switch, type SwitchProps, Typography } from 'antd';\nimport type { LinkProps } from 'antd/es/typography/Link';\nimport { isForwardRef } from 'react-is';\n\n/**\n * - **EN:** Generate a confirm box component with custom trigger and default props\n * - **CN:** 将一个组件包装成一个确认弹框组件，支持自定义触发器和默认属性\n *\n * @param actionComponent Custom trigger component | 自定义触发器组件\n * @param defaultProps Default properties of the confirm box | 确认弹框的默认属性\n */\nexport default function withConfirmAction<\n  P extends ActionCompConstraint,\n  OuterTriggerProp extends object,\n  OuterEvent extends keyof OuterTriggerProp,\n  Ref extends object,\n>(\n  ActionComponent: ActionComponentInterface<P, Ref>,\n  defaultProps?:\n    | Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>\n    | ((\n        actualProps: Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>\n      ) => Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>)\n) {\n  return withConfirmActionInternal(\n    ActionComponent,\n    {\n      confirmType: 'normal',\n    },\n    defaultProps\n  );\n}\n\nexport function withConfirmActionInternal<\n  P extends ActionCompConstraint,\n  OuterTriggerProp extends object,\n  OuterEvent extends keyof OuterTriggerProp,\n  Ref extends object,\n>(\n  ActionComponent: ActionComponentInterface<P, Ref>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  renderDefaultProps: Partial<ConfirmActionProps<any, never>> & { confirmType: 'normal' | 'delete' },\n  defaultProps?:\n    | Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>\n    | ((\n        actualProps: Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>\n      ) => Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>)\n) {\n  const ConfirmActionWithRef = forwardRef(genRenderer(renderDefaultProps));\n  ConfirmActionWithRef.displayName = 'ForwardRef(ConfirmAction)';\n\n  const WrappedActionComponent = forwardRef<Ref, ConfirmActionProps<OuterTriggerProp, OuterEvent>>(\n    (propsWithDefaults, ref) => {\n      const actionRef = useRef<ConfirmActionRef>(null);\n      const [customRef, setCustomRef] = useState<Ref | null>(null);\n      const saveFuncRef = useRef<(...triggerEventArgs: any[]) => unknown | Promise<unknown>>(undefined);\n\n      // Receive the onSave callback method passed by the form component\n      const setOnOk: ActionCompConstraint['setOK'] = useCallback((handler) => {\n        saveFuncRef.current = handler;\n      }, []);\n\n      // Merge the default ref and custom ref and output to the parent component\n      useImperativeHandle(ref, () => {\n        return {\n          ...actionRef.current,\n          ...customRef,\n        } as ConfirmActionRef<Ref>;\n      }, [customRef]);\n\n      // Render the default trigger DOM element, and pass it to the custom ActionComponent\n      const triggerDom = (\n        <ConfirmActionWithRef\n          {...(propsWithDefaults as ConfirmActionProps<object, never>)}\n          onOk={saveFuncRef.current}\n          ref={actionRef}\n        />\n      );\n\n      return (\n        <ActionComponent\n          {...(propsWithDefaults as P)}\n          ref={isForwardRef(ActionComponent) ? setCustomRef : undefined}\n          setOK={setOnOk}\n          triggerDom={triggerDom}\n        />\n      );\n    }\n  );\n  WrappedActionComponent.displayName = 'ConfirmAction(ActionComponent)';\n\n  const withDefaults = withDefaultConfirmActionProps(\n    WrappedActionComponent,\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    defaultProps as any\n  ) as unknown as ComponentType<\n    Omit<ConfirmActionProps<OuterTriggerProp, OuterEvent>, 'triggerComponent'> & RefAttributes<ConfirmActionRef>\n  >;\n  // return withDefaults;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  return addTriggers<P, OuterTriggerProp, OuterEvent, Ref>(withDefaults as any);\n}\n\n/**\n * - **EN:** Add trigger types to the ModalAction component\n * - **CN:** 给ModalAction组件添加子触发器类型\n */\nfunction addTriggers<\n  P extends ActionCompConstraint,\n  OuterTriggerProp extends object,\n  OuterEvent extends keyof OuterTriggerProp,\n  Ref extends object,\n>(comp: ComponentType<ConfirmActionProps<OuterTriggerProp, OuterEvent> & RefAttributes<ConfirmActionRef<Ref>>>) {\n  const patchedComp = comp as unknown as WithGenericTriggers<P, Ref>;\n  // Type of button trigger\n  patchedComp.Button = withDefaultConfirmActionProps<P, ButtonProps, 'onClick', Ref>(\n    // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here\n    comp,\n    {\n      triggerComponent: Button,\n      triggerEvent: 'onClick',\n      triggerProps: {},\n    }\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ) as any;\n  // Type of switch trigger\n  patchedComp.Switch = withDefaultConfirmActionProps<P, SwitchProps, 'onChange', Ref>(\n    // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here\n    comp,\n    {\n      triggerComponent: Switch,\n      triggerEvent: 'onChange',\n      triggerProps: {},\n    }\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ) as any;\n  // Type of link trigger\n  patchedComp.Link = withDefaultConfirmActionProps<P, LinkProps, 'onClick', Ref>(\n    // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here\n    comp,\n    {\n      triggerComponent: Typography.Link,\n      triggerEvent: 'onClick',\n      triggerProps: {\n        style: { whiteSpace: 'nowrap' },\n      },\n    }\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ) as any;\n  return patchedComp;\n}\n\n/**\n * - **EN:** ModalAction component type\n * - **CN:** ModalAction组件的类型\n */\nexport type ActionComponentInterface<P extends ActionCompConstraint, Ref extends object> = ComponentType<\n  P & RefAttributes<ConfirmActionRef<Ref>>\n>;\n\ntype WithGenericTriggers<P extends ActionCompConstraint, Ref extends object> = (<\n  TriggerProp extends object,\n  Event extends keyof TriggerProp,\n>(\n  props: PropsWithoutRef<Omit<P, keyof ActionCompConstraint>> &\n    ConfirmActionProps<TriggerProp, Event> &\n    RefAttributes<ConfirmActionRef<Ref>>\n) => ReactNode) &\n  TypedTriggers<P, Ref>;\n\n/**\n * - **EN:** Built-in trigger types (specified form components)\n * - **CN:** 内置的几种触发器类型（已指定表单组件）\n */\nexport interface TypedTriggers<P extends ActionCompConstraint, Ref extends object> {\n  /**\n   * - **EN:** Dialog with button type trigger\n   * - **CN:** 按钮类型的弹窗\n   */\n  Button: ConfirmActionWithTrigger<P, ButtonProps, 'onClick', Ref>;\n  /**\n   * - **EN:** Dialog with switch type trigger\n   * - **CN:** 开关类型的弹窗\n   */\n  Switch: ConfirmActionWithTrigger<P, SwitchProps, 'onChange', Ref>;\n  /**\n   * - **EN:** Dialog with link type trigger\n   * - **CN:** 链接类型的弹窗\n   */\n  Link: ConfirmActionWithTrigger<P, LinkProps, 'onClick', Ref>;\n}\n\n/**\n * - **EN:** ModalAction with specified trigger type (specified form component)\n * - **CN:** 已指定Trigger类型的ModalAction（并且已指定表单组件）\n */\ntype ConfirmActionWithTrigger<\n  P extends ActionCompConstraint,\n  TriggerProp extends object,\n  Event extends keyof TriggerProp,\n  Ref extends object,\n  OMIT extends string = never,\n> = ComponentType<\n  Omit<\n    PropsWithoutRef<Omit<P, keyof ActionCompConstraint>> & ConfirmActionProps<TriggerProp, Event>,\n    'triggerComponent' | 'triggerEvent' | OMIT\n  > &\n    RefAttributes<ConfirmActionRef<Ref>>\n>;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAA+E;AAE/E,eAA2D;AAC3D,kBAA+E;AAE/E,sBAA6B;AASd,SAAR,kBAML,iBACA,cAKA;AACA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,aAAa;AAAA,IACf;AAAA,IACA;AAAA,EACF;AACF;AAEO,SAAS,0BAMd,iBAEA,oBACA,cAKA;AACA,QAAM,2BAAuB,6BAAW,sBAAY,kBAAkB,CAAC;AACvE,uBAAqB,cAAc;AAEnC,QAAM,6BAAyB;AAAA,IAC7B,CAAC,mBAAmB,QAAQ;AAC1B,YAAM,gBAAY,qBAAyB,IAAI;AAC/C,YAAM,CAAC,WAAW,YAAY,QAAI,uBAAqB,IAAI;AAC3D,YAAM,kBAAc,qBAAmE,MAAS;AAGhG,YAAM,cAAyC,0BAAY,CAAC,YAAY;AACtE,oBAAY,UAAU;AAAA,MACxB,GAAG,CAAC,CAAC;AAGL,4CAAoB,KAAK,MAAM;AAC7B,eAAO;AAAA,UACL,GAAG,UAAU;AAAA,UACb,GAAG;AAAA,QACL;AAAA,MACF,GAAG,CAAC,SAAS,CAAC;AAGd,YAAM,aACJ;AAAA,QAAC;AAAA;AAAA,UACE,GAAI;AAAA,UACL,MAAM,YAAY;AAAA,UAClB,KAAK;AAAA;AAAA,MACP;AAGF,aACE;AAAA,QAAC;AAAA;AAAA,UACE,GAAI;AAAA,UACL,SAAK,8BAAa,eAAe,IAAI,eAAe;AAAA,UACpD,OAAO;AAAA,UACP;AAAA;AAAA,MACF;AAAA,IAEJ;AAAA,EACF;AACA,yBAAuB,cAAc;AAErC,QAAM,mBAAe;AAAA,IACnB;AAAA;AAAA,IAEA;AAAA,EACF;AAKA,SAAO,YAAkD,YAAmB;AAC9E;AAMA,SAAS,YAKP,MAA8G;AAC9G,QAAM,cAAc;AAEpB,cAAY,aAAS;AAAA;AAAA,IAEnB;AAAA,IACA;AAAA,MACE,kBAAkB;AAAA,MAClB,cAAc;AAAA,MACd,cAAc,CAAC;AAAA,IACjB;AAAA;AAAA,EAEF;AAEA,cAAY,aAAS;AAAA;AAAA,IAEnB;AAAA,IACA;AAAA,MACE,kBAAkB;AAAA,MAClB,cAAc;AAAA,MACd,cAAc,CAAC;AAAA,IACjB;AAAA;AAAA,EAEF;AAEA,cAAY,WAAO;AAAA;AAAA,IAEjB;AAAA,IACA;AAAA,MACE,kBAAkB,uBAAW;AAAA,MAC7B,cAAc;AAAA,MACd,cAAc;AAAA,QACZ,OAAO,EAAE,YAAY,SAAS;AAAA,MAChC;AAAA,IACF;AAAA;AAAA,EAEF;AACA,SAAO;AACT;",
+  "names": []
+}

package/lib/components/DeleteConfirmAction/index.d.ts

@@ -1,4 +1,4 @@
-import { type ConfirmActionWithStatic } from '../ConfirmAction';
+import type { ConfirmActionWithStatic } from '../ConfirmAction';
 /**
  * - **EN:** Delete operation confirmation box
  * - **CN:** 删除操作确认框

package/lib/components/DeleteConfirmAction/index.js

@@ -33,22 +33,34 @@ var renderDeleteConfirmAction = (0, import_ConfirmAction.genRenderer)({
 });
 var forwarded = (0, import_react.forwardRef)(renderDeleteConfirmAction);
 var DeleteConfirmAction = forwarded;
-DeleteConfirmAction.Button = (0, import_ConfirmAction.withDefaultConfirmActionProps)(forwarded, {
-  triggerComponent: import_antd.Button,
-  triggerEvent: "onClick",
-  triggerProps: {}
-});
-DeleteConfirmAction.Switch = (0, import_ConfirmAction.withDefaultConfirmActionProps)(forwarded, {
-  triggerComponent: import_antd.Switch,
-  triggerEvent: "onChange",
-  triggerProps: {}
-});
-DeleteConfirmAction.Link = (0, import_ConfirmAction.withDefaultConfirmActionProps)(forwarded, {
-  triggerComponent: import_antd.Typography.Link,
-  triggerEvent: "onClick",
-  triggerProps: {
-    style: { whiteSpace: "nowrap" }
+DeleteConfirmAction.Button = (0, import_ConfirmAction.withDefaultConfirmActionProps)(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  forwarded,
+  {
+    triggerComponent: import_antd.Button,
+    triggerEvent: "onClick",
+    triggerProps: {}
   }
-});
+);
+DeleteConfirmAction.Switch = (0, import_ConfirmAction.withDefaultConfirmActionProps)(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  forwarded,
+  {
+    triggerComponent: import_antd.Switch,
+    triggerEvent: "onChange",
+    triggerProps: {}
+  }
+);
+DeleteConfirmAction.Link = (0, import_ConfirmAction.withDefaultConfirmActionProps)(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  forwarded,
+  {
+    triggerComponent: import_antd.Typography.Link,
+    triggerEvent: "onClick",
+    triggerProps: {
+      style: { whiteSpace: "nowrap" }
+    }
+  }
+);
 var DeleteConfirmAction_default = DeleteConfirmAction;
 //# sourceMappingURL=index.js.map

package/lib/components/DeleteConfirmAction/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/DeleteConfirmAction/index.tsx"],
-  "sourcesContent": ["import { forwardRef } from 'react';\nimport type { ButtonProps, SwitchProps } from 'antd';\nimport { Button, Switch, Typography } from 'antd';\nimport type { LinkProps } from 'antd/es/typography/Link';\nimport { CloseCircleFilled } from '@ant-design/icons';\nimport { type ConfirmActionWithStatic, genRenderer, withDefaultConfirmActionProps } from '../ConfirmAction';\n\nconst renderDeleteConfirmAction = genRenderer({\n  confirmType: 'delete',\n  danger: true,\n  icon: <CloseCircleFilled />,\n});\nconst forwarded = forwardRef(renderDeleteConfirmAction);\n\n/**\n * - **EN:** Delete operation confirmation box\n * - **CN:** 删除操作确认框\n */\nconst DeleteConfirmAction = forwarded as unknown as ConfirmActionWithStatic;\n/**\n * - **EN:** Deletion confirmation box with button type\n * - **CN:** 按钮类型的删除确认框\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nDeleteConfirmAction.Button = withDefaultConfirmActionProps<ButtonProps, 'onClick'>(forwarded as any, {\n  triggerComponent: Button,\n  triggerEvent: 'onClick',\n  triggerProps: {},\n});\n/**\n * - **EN:** Deletion confirmation box with switch type\n * - **CN:** 开关类型的删除确认框\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nDeleteConfirmAction.Switch = withDefaultConfirmActionProps<SwitchProps, 'onChange'>(forwarded as any, {\n  triggerComponent: Switch,\n  triggerEvent: 'onChange',\n  triggerProps: {},\n});\n/**\n * - **EN:** Deletion confirmation box with link type\n * - **CN:** 链接类型的删除确认框\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nDeleteConfirmAction.Link = withDefaultConfirmActionProps<LinkProps, 'onClick'>(forwarded as any, {\n  triggerComponent: Typography.Link,\n  triggerEvent: 'onClick',\n  triggerProps: {\n    style: { whiteSpace: 'nowrap' },\n  },\n});\n\nexport default DeleteConfirmAction;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B;AAE3B,kBAA2C;AAE3C,mBAAkC;AAClC,2BAAyF;AAEzF,IAAM,gCAA4B,kCAAY;AAAA,EAC5C,aAAa;AAAA,EACb,QAAQ;AAAA,EACR,MAAM,oCAAC,oCAAkB;AAC3B,CAAC;AACD,IAAM,gBAAY,yBAAW,yBAAyB;AAMtD,IAAM,sBAAsB;AAM5B,oBAAoB,aAAS,oDAAsD,WAAkB;AAAA,EACnG,kBAAkB;AAAA,EAClB,cAAc;AAAA,EACd,cAAc,CAAC;AACjB,CAAC;AAMD,oBAAoB,aAAS,oDAAuD,WAAkB;AAAA,EACpG,kBAAkB;AAAA,EAClB,cAAc;AAAA,EACd,cAAc,CAAC;AACjB,CAAC;AAMD,oBAAoB,WAAO,oDAAoD,WAAkB;AAAA,EAC/F,kBAAkB,uBAAW;AAAA,EAC7B,cAAc;AAAA,EACd,cAAc;AAAA,IACZ,OAAO,EAAE,YAAY,SAAS;AAAA,EAChC;AACF,CAAC;AAED,IAAO,8BAAQ;",
+  "sourcesContent": ["import { forwardRef } from 'react';\nimport type { ButtonProps, SwitchProps } from 'antd';\nimport { Button, Switch, Typography } from 'antd';\nimport type { LinkProps } from 'antd/es/typography/Link';\nimport { CloseCircleFilled } from '@ant-design/icons';\nimport type { ActionCompConstraint, ConfirmActionWithStatic } from '../ConfirmAction';\nimport { genRenderer, withDefaultConfirmActionProps } from '../ConfirmAction';\n\nconst renderDeleteConfirmAction = genRenderer({\n  confirmType: 'delete',\n  danger: true,\n  icon: <CloseCircleFilled />,\n});\nconst forwarded = forwardRef(renderDeleteConfirmAction);\n\n/**\n * - **EN:** Delete operation confirmation box\n * - **CN:** 删除操作确认框\n */\nconst DeleteConfirmAction = forwarded as unknown as ConfirmActionWithStatic;\n/**\n * - **EN:** Deletion confirmation box with button type\n * - **CN:** 按钮类型的删除确认框\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types\nDeleteConfirmAction.Button = withDefaultConfirmActionProps<ActionCompConstraint, ButtonProps, 'onClick', {}>(\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  forwarded as any,\n  {\n    triggerComponent: Button,\n    triggerEvent: 'onClick',\n    triggerProps: {},\n  }\n);\n/**\n * - **EN:** Deletion confirmation box with switch type\n * - **CN:** 开关类型的删除确认框\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types\nDeleteConfirmAction.Switch = withDefaultConfirmActionProps<ActionCompConstraint, SwitchProps, 'onChange', {}>(\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  forwarded as any,\n  {\n    triggerComponent: Switch,\n    triggerEvent: 'onChange',\n    triggerProps: {},\n  }\n);\n/**\n * - **EN:** Deletion confirmation box with link type\n * - **CN:** 链接类型的删除确认框\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types\nDeleteConfirmAction.Link = withDefaultConfirmActionProps<ActionCompConstraint, LinkProps, 'onClick', {}>(\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  forwarded as any,\n  {\n    triggerComponent: Typography.Link,\n    triggerEvent: 'onClick',\n    triggerProps: {\n      style: { whiteSpace: 'nowrap' },\n    },\n  }\n);\n\nexport default DeleteConfirmAction;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B;AAE3B,kBAA2C;AAE3C,mBAAkC;AAElC,2BAA2D;AAE3D,IAAM,gCAA4B,kCAAY;AAAA,EAC5C,aAAa;AAAA,EACb,QAAQ;AAAA,EACR,MAAM,oCAAC,oCAAkB;AAC3B,CAAC;AACD,IAAM,gBAAY,yBAAW,yBAAyB;AAMtD,IAAM,sBAAsB;AAM5B,oBAAoB,aAAS;AAAA;AAAA,EAE3B;AAAA,EACA;AAAA,IACE,kBAAkB;AAAA,IAClB,cAAc;AAAA,IACd,cAAc,CAAC;AAAA,EACjB;AACF;AAMA,oBAAoB,aAAS;AAAA;AAAA,EAE3B;AAAA,EACA;AAAA,IACE,kBAAkB;AAAA,IAClB,cAAc;AAAA,IACd,cAAc,CAAC;AAAA,EACjB;AACF;AAMA,oBAAoB,WAAO;AAAA;AAAA,EAEzB;AAAA,EACA;AAAA,IACE,kBAAkB,uBAAW;AAAA,IAC7B,cAAc;AAAA,IACd,cAAc;AAAA,MACZ,OAAO,EAAE,YAAY,SAAS;AAAA,IAChC;AAAA,EACF;AACF;AAEA,IAAO,8BAAQ;",
   "names": []
 }

package/lib/components/DeleteConfirmAction/withDeleteConfirmAction.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="react" />
+import type { ActionCompConstraint, ConfirmActionProps } from '../ConfirmAction';
+import { type ActionComponentInterface } from '../ConfirmAction/withConfirmAction';
+/**
+ * - **EN:** Wrap a component into a delete confirmation dialog component, supporting custom triggers
+ *   and default properties
+ * - **CN:** 将一个组件包装成一个删除确认弹框组件，支持自定义触发器和默认属性
+ *
+ * @param actionComponent Custom trigger component | 自定义触发器组件
+ * @param defaultProps Default properties of the deletion confirm box | 删除确认弹框的默认属性
+ */
+export default function withDeleteConfirmAction<P extends ActionCompConstraint, OuterTriggerProp extends object, OuterEvent extends keyof OuterTriggerProp, Ref extends object>(ActionComponent: ActionComponentInterface<P, Ref>, defaultProps?: Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>> | ((actualProps: Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>) => Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>)): (<TriggerProp extends object, Event extends keyof TriggerProp>(props: import("react").PropsWithoutRef<Omit<P, keyof ActionCompConstraint>> & Omit<import("antd").ModalFuncProps, "onOk"> & import("../ConfirmAction").ConfirmActionTrigger<TriggerProp, Event> & {
+    danger?: boolean | undefined;
+    titleColor?: import("antd/es/typography/Base").BaseType | "primary" | undefined;
+    contentColor?: import("antd/es/typography/Base").BaseType | "primary" | undefined;
+    iconColor?: import("antd/es/typography/Base").BaseType | "primary" | undefined;
+    onOk?: ((...args: Parameters<TriggerProp[Event]>) => unknown) | undefined;
+    afterOk?: ((data?: any) => void) | undefined;
+} & import("react").RefAttributes<import("../ConfirmAction").ConfirmActionRef<Ref>>) => import("react").ReactNode) & import("../ConfirmAction/withConfirmAction").TypedTriggers<P, Ref>;

package/lib/components/DeleteConfirmAction/withDeleteConfirmAction.js

@@ -0,0 +1,38 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/DeleteConfirmAction/withDeleteConfirmAction.tsx
+var withDeleteConfirmAction_exports = {};
+__export(withDeleteConfirmAction_exports, {
+  default: () => withDeleteConfirmAction
+});
+module.exports = __toCommonJS(withDeleteConfirmAction_exports);
+var import_icons = require("@ant-design/icons");
+var import_withConfirmAction = require("../ConfirmAction/withConfirmAction");
+function withDeleteConfirmAction(ActionComponent, defaultProps) {
+  return (0, import_withConfirmAction.withConfirmActionInternal)(
+    ActionComponent,
+    {
+      confirmType: "delete",
+      danger: true,
+      icon: /* @__PURE__ */ React.createElement(import_icons.CloseCircleFilled, null)
+    },
+    defaultProps
+  );
+}
+//# sourceMappingURL=withDeleteConfirmAction.js.map

package/lib/components/DeleteConfirmAction/withDeleteConfirmAction.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/components/DeleteConfirmAction/withDeleteConfirmAction.tsx"],
+  "sourcesContent": ["import { CloseCircleFilled } from '@ant-design/icons';\nimport type { ActionCompConstraint, ConfirmActionProps } from '../ConfirmAction';\nimport { type ActionComponentInterface, withConfirmActionInternal } from '../ConfirmAction/withConfirmAction';\n\n/**\n * - **EN:** Wrap a component into a delete confirmation dialog component, supporting custom triggers\n *   and default properties\n * - **CN:** 将一个组件包装成一个删除确认弹框组件，支持自定义触发器和默认属性\n *\n * @param actionComponent Custom trigger component | 自定义触发器组件\n * @param defaultProps Default properties of the deletion confirm box | 删除确认弹框的默认属性\n */\nexport default function withDeleteConfirmAction<\n  P extends ActionCompConstraint,\n  OuterTriggerProp extends object,\n  OuterEvent extends keyof OuterTriggerProp,\n  Ref extends object,\n>(\n  ActionComponent: ActionComponentInterface<P, Ref>,\n  defaultProps?:\n    | Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>\n    | ((\n        actualProps: Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>\n      ) => Partial<Omit<P, keyof ActionCompConstraint> & ConfirmActionProps<OuterTriggerProp, OuterEvent>>)\n) {\n  return withConfirmActionInternal(\n    ActionComponent,\n    {\n      confirmType: 'delete',\n      danger: true,\n      icon: <CloseCircleFilled />,\n    },\n    defaultProps\n  );\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkC;AAElC,+BAAyE;AAU1D,SAAR,wBAML,iBACA,cAKA;AACA,aAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,aAAa;AAAA,MACb,QAAQ;AAAA,MACR,MAAM,oCAAC,oCAAkB;AAAA,IAC3B;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": []
+}

package/lib/components/ModalAction/index.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentType, FC, ForwardedRef, ReactElement, ReactNode, RefAttributes } from 'react';
+import type { ComponentType, FC, ForwardedRef, ReactNode, RefAttributes } from 'react';
 import type { ButtonProps, FormInstance, ModalProps, SwitchProps } from 'antd';
 import type { LinkProps } from 'antd/es/typography/Link';
 /**
@@ -7,25 +7,25 @@ import type { LinkProps } from 'antd/es/typography/Link';
  * - **CN:** 提交表单时不关闭弹框的Symbol，在编辑表单组件的`onSave`事件中返回时生效
  */
 export declare const SubmitWithoutClosingSymbol: unique symbol;
-export type ModalActionProps<FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP, CRef extends object> = Omit<ModalProps, 'onOk'> & ModalActionTrigger<FD, CP, TP, E> & {
+export type ModalActionProps<FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object> = Omit<ModalProps, 'onOk'> & ModalActionTrigger<FormData, P, TriggerProp, Event> & {
     /**
      * - **EN:** Form editing component, do not use the Form component inside the component, the form
      *   component and form instance are automatically created by the parent component
      * - **CN:** 表单编辑组件，组件内部不要使用Form组件，表单组件及表单实例由父组件自动创建
      */
-    formComp: ComponentType<CP & RefAttributes<CRef>>;
+    formComp: ComponentType<P & RefAttributes<Ref>>;
     /**
      * - **EN:** Props of the form editing component
      * - **CN:** 表单编辑组件的Props属性
      */
-    formProps?: Omit<CP, keyof FormCompPropsConstraint<FD>>;
+    formProps?: Omit<P, keyof FormCompPropsConstraint<FormData>>;
     /**
      * - **EN:** The callback when clicks the confirmation button, support asynchronous saving, return
      *   `SubmitWithoutClosingSymbol` can prevent the dialog from closing, return other values will
      *   be passed to the `afterOk` event, if any
      * - **CN:** 点击确认按钮的回调，支持异步保存，返回`SubmitWithoutClosingSymbol`可以阻止弹框关闭，返回其他值会传递给`afterOk`事件，如果有的话
      */
-    onOk?: (formData: FD, ...args: Parameters<TP[E]>) => unknown | Promise<unknown>;
+    onOk?: (formData: FormData, ...args: Parameters<TriggerProp[Event]>) => unknown | Promise<unknown>;
     /**
      * - **EN:** The callback after the confirmation event is completed, it will not be triggered when
      *   it fails, the parameter is the return value of `onOk`
@@ -33,13 +33,13 @@ export type ModalActionProps<FD extends object, CP extends FormCompPropsConstrai
      */
     afterOk?: (data?: any) => void;
 };
-export interface FormCompPropsConstraint<FD> {
+export interface FormCompPropsConstraint<FormData> {
     /**
      * - **EN:** Automatically generated form instance, use this form instance in FormComp, do not
      *   create a new instance
      * - **CN:** 自动生成的表单实例，编辑表单要使用这个表单实例，不要新创建实例
      */
-    form: FormInstance<FD>;
+    form: FormInstance<FormData>;
     /**
      * - **EN:** Register the form save event, the callback function passed in will be called when the
      *   confirm button is clicked, support asynchronous saving
@@ -52,7 +52,7 @@ export interface FormCompPropsConstraint<FD> {
      * - **EN:** Form data
      * - **CN:** 表单数据
      */
-    formData: FD, 
+    formData: FormData, 
     /**
      * - **EN:** Trigger click event data, for example, for the `Switch` type trigger, you can get
      *   the value of the switch; for the `Button` type trigger, you can get the click event
@@ -89,17 +89,17 @@ export interface FormCompPropsConstraint<FD> {
      */
     triggerEventData?: any[];
 }
-export interface ModalActionTrigger<FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP> {
+export interface ModalActionTrigger<FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp> {
     /**
      * - **EN:** Trigger component, click to show the dialog
      * - **CN:** 弹窗触发器组件，点击触发显示弹框
      */
-    triggerComponent?: ComponentType<TP> | FC<TP>;
+    triggerComponent?: ComponentType<TriggerProp> | FC<TriggerProp>;
     /**
      * - **EN:** Props of the trigger component
      * - **CN:** 触发器组件的Props属性
      */
-    triggerProps?: TP & {
+    triggerProps?: TriggerProp & {
         /**
          * - **EN:** Set a custom function to determine whether to show the trigger button
          * - **CN:** 设置一个自定义函数，用于判断是否显示触发器按钮
@@ -108,7 +108,7 @@ export interface ModalActionTrigger<FD extends object, CP extends FormCompPropsC
          *
          * @param formProps Form component props | 表单组件的props
          */
-        show?: boolean | ((formProps?: Omit<CP, keyof FormCompPropsConstraint<FD>>) => boolean);
+        show?: boolean | ((formProps?: Omit<P, keyof FormCompPropsConstraint<FormData>>) => boolean);
     };
     /**
      * - **EN:** The event name that triggers the dialog
@@ -117,7 +117,7 @@ export interface ModalActionTrigger<FD extends object, CP extends FormCompPropsC
      * - `Switch`: 'onChange'
      * - `Link`: 'onClick'
      */
-    triggerEvent?: E;
+    triggerEvent?: Event;
     /**
      * - **EN:** Custom trigger content
      * - **CN:** 自定义触发器内容
@@ -131,7 +131,7 @@ export type ModalActionRef<R> = R & {
      */
     show: () => void;
 };
-export declare const genModalActionRenderer: (defaultProps: Partial<ModalActionProps<any, any, any, never, never>>) => <FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP, CRef extends object>(props: ModalActionProps<FD, CP, TP, E, CRef>, ref: ForwardedRef<ModalActionRef<CRef>>) => import("react/jsx-runtime").JSX.Element;
+export declare const genModalActionRenderer: (defaultProps: Partial<ModalActionProps<any, any, any, never, never>>) => <FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object>(props: ModalActionProps<FormData, P, TriggerProp, Event, Ref>, ref: ForwardedRef<ModalActionRef<Ref>>) => import("react/jsx-runtime").JSX.Element;
 /**
  * - **EN:** Add default properties to the ModalAction component
  * - **CN:** 给ModalAction组件添加默认属性
@@ -139,72 +139,72 @@ export declare const genModalActionRenderer: (defaultProps: Partial<ModalActionP
  * @param WrappedComponent ModalAction component | ModalAction组件
  * @param defaultProps Default properties | 默认属性
  */
-export declare const withDefaultModalActionProps: <FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP, CRef extends object>(WrappedComponent: ComponentType<ModalActionProps<FD, CP, TP, E, CRef> & RefAttributes<ModalActionRef<CRef>>>, defaultProps?: Partial<ModalActionProps<FD, CP, TP, E, CRef>> | (() => Partial<ModalActionProps<FD, CP, TP, E, CRef>>)) => import("react").ForwardRefExoticComponent<Omit<ModalProps, "onOk"> & ModalActionTrigger<FD, CP, TP, E> & {
+export declare const withDefaultModalActionProps: <FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object>(WrappedComponent: ComponentType<ModalActionProps<FormData, P, TriggerProp, Event, Ref> & RefAttributes<ModalActionRef<Ref>>>, defaultProps?: Partial<ModalActionProps<FormData, P, TriggerProp, Event, Ref>> | ((actualProps: ModalActionProps<FormData, P, TriggerProp, Event, Ref>) => Partial<ModalActionProps<FormData, P, TriggerProp, Event, Ref>>) | undefined) => import("react").ForwardRefExoticComponent<Omit<ModalProps, "onOk"> & ModalActionTrigger<FormData, P, TriggerProp, Event> & {
     /**
      * - **EN:** Form editing component, do not use the Form component inside the component, the form
      *   component and form instance are automatically created by the parent component
      * - **CN:** 表单编辑组件，组件内部不要使用Form组件，表单组件及表单实例由父组件自动创建
      */
-    formComp: ComponentType<CP & RefAttributes<CRef>>;
+    formComp: ComponentType<P & RefAttributes<Ref>>;
     /**
      * - **EN:** Props of the form editing component
      * - **CN:** 表单编辑组件的Props属性
      */
-    formProps?: Omit<CP, keyof FormCompPropsConstraint<FD_1>> | undefined;
+    formProps?: Omit<P, keyof FormCompPropsConstraint<FormData_1>> | undefined;
     /**
      * - **EN:** The callback when clicks the confirmation button, support asynchronous saving, return
      *   `SubmitWithoutClosingSymbol` can prevent the dialog from closing, return other values will
      *   be passed to the `afterOk` event, if any
      * - **CN:** 点击确认按钮的回调，支持异步保存，返回`SubmitWithoutClosingSymbol`可以阻止弹框关闭，返回其他值会传递给`afterOk`事件，如果有的话
      */
-    onOk?: ((formData: FD, ...args: Parameters<TP[E]>) => unknown | Promise<unknown>) | undefined;
+    onOk?: ((formData: FormData, ...args: Parameters<TriggerProp[Event]>) => unknown | Promise<unknown>) | undefined;
     /**
      * - **EN:** The callback after the confirmation event is completed, it will not be triggered when
      *   it fails, the parameter is the return value of `onOk`
      * - **CN:** 确认事件完成后的回调，失败时不会触发，参数为`onOk`的返回值
      */
     afterOk?: ((data?: any) => void) | undefined;
-} & RefAttributes<ModalActionRef<CRef>>>;
+} & RefAttributes<ModalActionRef<Ref>>>;
 /**
  * - **EN:** ModalAction component type
  * - **CN:** ModalAction组件的类型
  */
-export type ModalActionInterface<FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP, CRef extends object> = ComponentType<ModalActionProps<FD, CP, TP, E, CRef> & RefAttributes<ModalActionRef<CRef>>>;
+export type ModalActionInterface<FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object> = ComponentType<ModalActionProps<FormData, P, TriggerProp, Event, Ref> & RefAttributes<ModalActionRef<Ref>>>;
 /**
  * - **EN:** ModalAction component with generic type
  * - **CN:** ModalAction泛型组件的类型
  */
-export type GenericModalActionInterface = <FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP, CRef extends object>(props: ModalActionProps<FD, CP, TP, E, CRef> & RefAttributes<ModalActionRef<CRef>>) => ReactElement;
+export type GenericModalActionInterface = <FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object>(props: ModalActionProps<FormData, P, TriggerProp, Event, Ref> & RefAttributes<ModalActionRef<Ref>>) => ReactNode;
 /**
  * - **EN:** ModalAction with specified trigger type (specified form component)
  * - **CN:** 已指定Trigger类型的ModalAction（并且已指定表单组件）
  */
-type ModalActionWithTrigger<FD extends object, CP extends FormCompPropsConstraint<FD>, TP extends object, E extends keyof TP, CRef extends object, OMIT extends string = never> = ComponentType<Omit<ModalActionProps<FD, CP, TP, E, CRef>, 'triggerComponent' | 'triggerEvent' | OMIT> & RefAttributes<ModalActionRef<CRef>>>;
+type ModalActionWithTrigger<FormData extends object, P extends FormCompPropsConstraint<FormData>, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object, OMIT extends string = never> = ComponentType<Omit<ModalActionProps<FormData, P, TriggerProp, Event, Ref>, 'triggerComponent' | 'triggerEvent' | OMIT> & RefAttributes<ModalActionRef<Ref>>>;
 /**
  * - **EN:** ModalAction with specified trigger type (unspecified form component, keep generic)
  * - **CN:** 已指定Trigger类型的ModalAction（未指定表单组件，保持泛型）
  */
-type GenericModalActionWithTrigger<TP extends object, E extends keyof TP, OMIT extends string = never> = <FD extends object, CP extends FormCompPropsConstraint<FD>, CRef extends object>(props: Omit<ModalActionProps<FD, CP, TP, E, CRef>, 'triggerComponent' | 'triggerEvent' | OMIT> & RefAttributes<ModalActionRef<CRef>>) => ReactElement;
+type GenericModalActionWithTrigger<TP extends object, E extends keyof TP, OMIT extends string = never> = <FormData extends object, P extends FormCompPropsConstraint<FormData>, Ref extends object>(props: Omit<ModalActionProps<FormData, P, TP, E, Ref>, 'triggerComponent' | 'triggerEvent' | OMIT> & RefAttributes<ModalActionRef<Ref>>) => ReactNode;
 /**
  * - **EN:** Built-in trigger types (specified form components)
  * - **CN:** 内置的几种触发器类型（已指定表单组件）
  */
-interface TypedTriggers<FD extends object, CP extends FormCompPropsConstraint<FD>, CRef extends object, OMIT extends string = never> {
+interface TypedTriggers<FormData extends object, P extends FormCompPropsConstraint<FormData>, Ref extends object, OMIT extends string = never> {
     /**
      * - **EN:** Dialog with button type trigger
      * - **CN:** 按钮类型的弹窗
      */
-    Button: ModalActionWithTrigger<FD, CP, ButtonProps, 'onClick', CRef, 'triggerComponent' | 'triggerEvent' | OMIT>;
+    Button: ModalActionWithTrigger<FormData, P, ButtonProps, 'onClick', Ref, 'triggerComponent' | 'triggerEvent' | OMIT>;
     /**
      * - **EN:** Dialog with switch type trigger
      * - **CN:** 开关类型的弹窗
      */
-    Switch: ModalActionWithTrigger<FD, CP, SwitchProps, 'onChange', CRef, 'triggerComponent' | 'triggerEvent' | OMIT>;
+    Switch: ModalActionWithTrigger<FormData, P, SwitchProps, 'onChange', Ref, 'triggerComponent' | 'triggerEvent' | OMIT>;
     /**
      * - **EN:** Dialog with link type trigger
      * - **CN:** 链接类型的弹窗
      */
-    Link: ModalActionWithTrigger<FD, CP, LinkProps, 'onClick', CRef, 'triggerComponent' | 'triggerEvent' | OMIT>;
+    Link: ModalActionWithTrigger<FormData, P, LinkProps, 'onClick', Ref, 'triggerComponent' | 'triggerEvent' | OMIT>;
 }
 /**
  * - **EN:** Built-in trigger types (generic types, unspecified form components)
@@ -227,7 +227,7 @@ interface GenericTypedTriggers<OMIT extends string = never> {
      */
     Link: GenericModalActionWithTrigger<LinkProps, 'onClick', 'triggerComponent' | 'triggerEvent' | OMIT>;
 }
-type WithGenericTriggers<FD extends object, CP extends FormCompPropsConstraint<FD>, CRef extends object, OMIT extends string = never> = (<TP extends object, E extends keyof TP>(props: Omit<ModalActionProps<FD, CP, TP, E, CRef>, OMIT> & RefAttributes<ModalActionRef<CRef>>) => ReactElement) & (CP extends never ? GenericTypedTriggers<OMIT> : TypedTriggers<FD, CP, CRef, OMIT>);
+type WithGenericTriggers<FormData extends object, P extends FormCompPropsConstraint<FormData>, Ref extends object, OMIT extends string = never> = (<TriggerProp extends object, Event extends keyof TriggerProp>(props: Omit<ModalActionProps<FormData, P, TriggerProp, Event, Ref>, OMIT> & RefAttributes<ModalActionRef<Ref>>) => ReactNode) & (P extends never ? GenericTypedTriggers<OMIT> : TypedTriggers<FormData, P, Ref, OMIT>);
 /**
  * - **EN:** Dialog component with trigger
  * - **CN:** 带触发器的弹窗组件
@@ -249,9 +249,15 @@ export type ModalActionWithStatic = typeof ModalAction & {
  * - **EN:** Generate a dialog component based on the editing form component
  * - **CN:** 基于编辑表单组件生成一个弹框组件
  *
+ * @template FormData Form data type | 表单数据类型
+ * @template P Form component props type | 表单组件的props类型
+ * @template OuterTriggerProp Outer trigger props type | 外部触发器的props类型
+ * @template OuterEvent Outer trigger event type | 外部触发器的事件类型
+ * @template Ref Form component ref type | 表单组件的ref类型
+ *
  * @param formComp Component of dialog content | 弹窗内容组件
  * @param defaultProps Default properties of the dialog | 弹窗的默认属性
  */
-export declare function withModalAction<FD extends object, CP extends FormCompPropsConstraint<FD>, OuterTP extends object, OuterE extends keyof OuterTP, CRef extends object>(formComp: ComponentType<CP & FormCompPropsConstraint<FD> & RefAttributes<CRef>>, defaultProps?: Partial<ModalActionProps<FD, CP, OuterTP, OuterE, CRef>> | (() => Partial<ModalActionProps<FD, CP, OuterTP, OuterE, CRef>>)): WithGenericTriggers<FD, CP, CRef, "formComp">;
+export declare function withModalAction<FormData extends object, P extends FormCompPropsConstraint<FormData>, OuterTriggerProp extends object, OuterEvent extends keyof OuterTriggerProp, Ref extends object>(formComp: ComponentType<P & FormCompPropsConstraint<FormData> & RefAttributes<Ref>>, defaultProps?: Partial<ModalActionProps<FormData, P, OuterTriggerProp, OuterEvent, Ref>> | ((actualProps: ModalActionProps<FormData, P, OuterTriggerProp, OuterEvent, Ref>) => Partial<ModalActionProps<FormData, P, OuterTriggerProp, OuterEvent, Ref>>)): WithGenericTriggers<FormData, P, Ref, "formComp">;
 declare const _default: ModalActionWithStatic;
 export default _default;

package/lib/components/ModalAction/index.js

@@ -265,26 +265,31 @@ function FormCreator(props) {
   return null;
 }
 var withDefaultModalActionProps = (WrappedComponent, defaultProps) => {
-  const WithDefaultProps = (0, import_react.forwardRef)((props, ref) => {
-    const useDefaultProps = typeof defaultProps === "function" ? defaultProps : () => defaultProps;
-    const defaults = useDefaultProps();
-    const mergedProps = mergeProps(defaults, props);
-    WithDefaultProps.displayName = "ForwardedRef(WithDefaultProps)";
-    return /* @__PURE__ */ React.createElement(WrappedComponent, { ref, ...mergedProps });
-  });
+  const WithDefaultProps = (0, import_react.forwardRef)(
+    (props, ref) => {
+      const useDefaultProps = typeof defaultProps === "function" ? defaultProps : () => defaultProps;
+      const defaults = useDefaultProps(props);
+      const mergedProps = typeof defaultProps === "function" ? mergeProps(props, defaults) : mergeProps(defaults, props);
+      WithDefaultProps.displayName = "ForwardRef(WithDefaultProps)";
+      return /* @__PURE__ */ React.createElement(WrappedComponent, { ref, ...mergedProps });
+    }
+  );
   return WithDefaultProps;
 };
 var renderModalAction = genModalActionRenderer({});
 var forwardedModalAction = (0, import_react.forwardRef)(renderModalAction);
-forwardedModalAction.displayName = "ForwardedRef(ModalAction)";
+forwardedModalAction.displayName = "ForwardRef(ModalAction)";
 var addTriggers = (comp) => {
   const patchedComp = comp;
-  patchedComp.Button = withDefaultModalActionProps(comp, {
-    triggerComponent: import_antd.Button,
-    triggerEvent: "onClick",
-    triggerProps: {}
+  patchedComp.Button = withDefaultModalActionProps(
+    comp,
+    {
+      triggerComponent: import_antd.Button,
+      triggerEvent: "onClick",
+      triggerProps: {}
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  });
+  );
   patchedComp.Switch = withDefaultModalActionProps(
     comp,
     {
@@ -307,18 +312,19 @@ var addTriggers = (comp) => {
 var ModalAction = addTriggers(forwardedModalAction);
 ModalAction.SubmitWithoutClosing = SubmitWithoutClosingSymbol;
 function withModalAction(formComp, defaultProps) {
-  const withForm = withDefaultModalActionProps(
+  const withDefaults = withDefaultModalActionProps(
     forwardedModalAction,
-    () => {
+    (props) => {
       const useDefaultProps = typeof defaultProps === "function" ? defaultProps : () => defaultProps;
-      const defaults = useDefaultProps();
+      const defaults = useDefaultProps(props);
+      const mergedProps = typeof defaultProps === "function" ? mergeProps(props, defaults) : mergeProps(defaults, props);
       return {
         formComp,
-        ...defaults
+        ...mergedProps
       };
     }
   );
-  return addTriggers(withForm);
+  return addTriggers(withDefaults);
 }
 var ModalAction_default = ModalAction;
 // Annotate the CommonJS export names for ESM import in node: