@tiny-codes/react-easy 1.2.0 → 1.2.1

package/es/components/ConfirmAction/withConfirmAction.d.ts

@@ -0,0 +1,48 @@
+import type { ComponentType, PropsWithoutRef, ReactNode, RefAttributes } from 'react';
+import type { ActionCompConstraint, ConfirmActionProps, ConfirmActionRef } from '.';
+import { type ButtonProps, type SwitchProps } from 'antd';
+import type { LinkProps } from 'antd/es/typography/Link';
+/**
+ * - **EN:** Generate a confirm box component with custom trigger and default props
+ * - **CN:** 将一个组件包装成一个确认弹框组件，支持自定义触发器和默认属性
+ *
+ * @param actionComponent Custom trigger component | 自定义触发器组件
+ * @param defaultProps Default properties of the confirm box | 确认弹框的默认属性
+ */
+export default function withConfirmAction<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>>)): WithGenericTriggers<P, Ref>;
+export declare function withConfirmActionInternal<P extends ActionCompConstraint, OuterTriggerProp extends object, OuterEvent extends keyof OuterTriggerProp, Ref extends object>(ActionComponent: ActionComponentInterface<P, Ref>, renderDefaultProps: Partial<ConfirmActionProps<any, never>> & {
+    confirmType: 'normal' | 'delete';
+}, 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>>)): WithGenericTriggers<P, Ref>;
+/**
+ * - **EN:** ModalAction component type
+ * - **CN:** ModalAction组件的类型
+ */
+export type ActionComponentInterface<P extends ActionCompConstraint, Ref extends object> = ComponentType<P & RefAttributes<ConfirmActionRef<Ref>>>;
+type WithGenericTriggers<P extends ActionCompConstraint, Ref extends object> = (<TriggerProp extends object, Event extends keyof TriggerProp>(props: PropsWithoutRef<Omit<P, keyof ActionCompConstraint>> & ConfirmActionProps<TriggerProp, Event> & RefAttributes<ConfirmActionRef<Ref>>) => ReactNode) & TypedTriggers<P, Ref>;
+/**
+ * - **EN:** Built-in trigger types (specified form components)
+ * - **CN:** 内置的几种触发器类型（已指定表单组件）
+ */
+export interface TypedTriggers<P extends ActionCompConstraint, Ref extends object> {
+    /**
+     * - **EN:** Dialog with button type trigger
+     * - **CN:** 按钮类型的弹窗
+     */
+    Button: ConfirmActionWithTrigger<P, ButtonProps, 'onClick', Ref>;
+    /**
+     * - **EN:** Dialog with switch type trigger
+     * - **CN:** 开关类型的弹窗
+     */
+    Switch: ConfirmActionWithTrigger<P, SwitchProps, 'onChange', Ref>;
+    /**
+     * - **EN:** Dialog with link type trigger
+     * - **CN:** 链接类型的弹窗
+     */
+    Link: ConfirmActionWithTrigger<P, LinkProps, 'onClick', Ref>;
+}
+/**
+ * - **EN:** ModalAction with specified trigger type (specified form component)
+ * - **CN:** 已指定Trigger类型的ModalAction（并且已指定表单组件）
+ */
+type ConfirmActionWithTrigger<P extends ActionCompConstraint, TriggerProp extends object, Event extends keyof TriggerProp, Ref extends object, OMIT extends string = never> = ComponentType<Omit<PropsWithoutRef<Omit<P, keyof ActionCompConstraint>> & ConfirmActionProps<TriggerProp, Event>, 'triggerComponent' | 'triggerEvent' | OMIT> & RefAttributes<ConfirmActionRef<Ref>>>;
+export {};

package/es/components/ConfirmAction/withConfirmAction.js

@@ -0,0 +1,131 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react';
+import { genRenderer, withDefaultConfirmActionProps } from '.';
+import { Button, Switch, Typography } from 'antd';
+import { isForwardRef } from 'react-is';
+
+/**
+ * - **EN:** Generate a confirm box component with custom trigger and default props
+ * - **CN:** 将一个组件包装成一个确认弹框组件，支持自定义触发器和默认属性
+ *
+ * @param actionComponent Custom trigger component | 自定义触发器组件
+ * @param defaultProps Default properties of the confirm box | 确认弹框的默认属性
+ */
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function withConfirmAction(ActionComponent, defaultProps) {
+  return withConfirmActionInternal(ActionComponent, {
+    confirmType: 'normal'
+  }, defaultProps);
+}
+export function withConfirmActionInternal(ActionComponent,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+renderDefaultProps, defaultProps) {
+  var ConfirmActionWithRef = /*#__PURE__*/forwardRef(genRenderer(renderDefaultProps));
+  ConfirmActionWithRef.displayName = 'ForwardRef(ConfirmAction)';
+  var WrappedActionComponent = /*#__PURE__*/forwardRef(function (propsWithDefaults, ref) {
+    var actionRef = useRef(null);
+    var _useState = useState(null),
+      _useState2 = _slicedToArray(_useState, 2),
+      customRef = _useState2[0],
+      setCustomRef = _useState2[1];
+    var saveFuncRef = useRef(undefined);
+
+    // Receive the onSave callback method passed by the form component
+    var setOnOk = useCallback(function (handler) {
+      saveFuncRef.current = handler;
+    }, []);
+
+    // Merge the default ref and custom ref and output to the parent component
+    useImperativeHandle(ref, function () {
+      return _objectSpread(_objectSpread({}, actionRef.current), customRef);
+    }, [customRef]);
+
+    // Render the default trigger DOM element, and pass it to the custom ActionComponent
+    var triggerDom = /*#__PURE__*/_jsx(ConfirmActionWithRef, _objectSpread(_objectSpread({}, propsWithDefaults), {}, {
+      onOk: saveFuncRef.current,
+      ref: actionRef
+    }));
+    return /*#__PURE__*/_jsx(ActionComponent, _objectSpread(_objectSpread({}, propsWithDefaults), {}, {
+      ref: isForwardRef(ActionComponent) ? setCustomRef : undefined,
+      setOK: setOnOk,
+      triggerDom: triggerDom
+    }));
+  });
+  WrappedActionComponent.displayName = 'ConfirmAction(ActionComponent)';
+  var withDefaults = withDefaultConfirmActionProps(WrappedActionComponent,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  defaultProps);
+  // return withDefaults;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return addTriggers(withDefaults);
+}
+
+/**
+ * - **EN:** Add trigger types to the ModalAction component
+ * - **CN:** 给ModalAction组件添加子触发器类型
+ */
+function addTriggers(comp) {
+  var patchedComp = comp;
+  // Type of button trigger
+  patchedComp.Button = withDefaultConfirmActionProps(
+  // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here
+  comp, {
+    triggerComponent: Button,
+    triggerEvent: 'onClick',
+    triggerProps: {}
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+  // Type of switch trigger
+  patchedComp.Switch = withDefaultConfirmActionProps(
+  // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here
+  comp, {
+    triggerComponent: Switch,
+    triggerEvent: 'onChange',
+    triggerProps: {}
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+  // Type of link trigger
+  patchedComp.Link = withDefaultConfirmActionProps(
+  // @ts-expect-error: because the type is a little bit complex, so we ignore the type error here
+  comp, {
+    triggerComponent: Typography.Link,
+    triggerEvent: 'onClick',
+    triggerProps: {
+      style: {
+        whiteSpace: 'nowrap'
+      }
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+  return patchedComp;
+}
+
+/**
+ * - **EN:** ModalAction component type
+ * - **CN:** ModalAction组件的类型
+ */
+
+/**
+ * - **EN:** Built-in trigger types (specified form components)
+ * - **CN:** 内置的几种触发器类型（已指定表单组件）
+ */
+
+/**
+ * - **EN:** ModalAction with specified trigger type (specified form component)
+ * - **CN:** 已指定Trigger类型的ModalAction（并且已指定表单组件）
+ */
+//# sourceMappingURL=withConfirmAction.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["forwardRef","useCallback","useImperativeHandle","useRef","useState","genRenderer","withDefaultConfirmActionProps","Button","Switch","Typography","isForwardRef","jsx","_jsx","withConfirmAction","ActionComponent","defaultProps","withConfirmActionInternal","confirmType","renderDefaultProps","ConfirmActionWithRef","displayName","WrappedActionComponent","propsWithDefaults","ref","actionRef","_useState","_useState2","_slicedToArray","customRef","setCustomRef","saveFuncRef","undefined","setOnOk","handler","current","_objectSpread","triggerDom","onOk","setOK","withDefaults","addTriggers","comp","patchedComp","triggerComponent","triggerEvent","triggerProps","Link","style","whiteSpace"],"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":"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"}

package/es/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/es/components/DeleteConfirmAction/index.js

@@ -19,8 +19,10 @@ var DeleteConfirmAction = forwarded;
  * - **EN:** Deletion confirmation box with button type
  * - **CN:** 按钮类型的删除确认框
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+DeleteConfirmAction.Button = withDefaultConfirmActionProps(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-DeleteConfirmAction.Button = withDefaultConfirmActionProps(forwarded, {
+forwarded, {
   triggerComponent: Button,
   triggerEvent: 'onClick',
   triggerProps: {}
@@ -29,8 +31,10 @@ DeleteConfirmAction.Button = withDefaultConfirmActionProps(forwarded, {
  * - **EN:** Deletion confirmation box with switch type
  * - **CN:** 开关类型的删除确认框
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+DeleteConfirmAction.Switch = withDefaultConfirmActionProps(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-DeleteConfirmAction.Switch = withDefaultConfirmActionProps(forwarded, {
+forwarded, {
   triggerComponent: Switch,
   triggerEvent: 'onChange',
   triggerProps: {}
@@ -39,8 +43,10 @@ DeleteConfirmAction.Switch = withDefaultConfirmActionProps(forwarded, {
  * - **EN:** Deletion confirmation box with link type
  * - **CN:** 链接类型的删除确认框
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+DeleteConfirmAction.Link = withDefaultConfirmActionProps(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-DeleteConfirmAction.Link = withDefaultConfirmActionProps(forwarded, {
+forwarded, {
   triggerComponent: Typography.Link,
   triggerEvent: 'onClick',
   triggerProps: {

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","Button","Switch","Typography","CloseCircleFilled","genRenderer","withDefaultConfirmActionProps","jsx","_jsx","renderDeleteConfirmAction","confirmType","danger","icon","forwarded","DeleteConfirmAction","triggerComponent","triggerEvent","triggerProps","Link","style","whiteSpace"],"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,SAASA,UAAU,QAAQ,OAAO;AAElC,SAASC,MAAM,EAAEC,MAAM,EAAEC,UAAU,QAAQ,MAAM;AAEjD,SAASC,iBAAiB,QAAQ,mBAAmB;AACrD,SAAuCC,WAAW,EAAEC,6BAA6B;AAA2B,SAAAC,GAAA,IAAAC,IAAA;AAE5G,IAAMC,yBAAyB,GAAGJ,WAAW,CAAC;EAC5CK,WAAW,EAAE,QAAQ;EACrBC,MAAM,EAAE,IAAI;EACZC,IAAI,eAAEJ,IAAA,CAACJ,iBAAiB,IAAE;AAC5B,CAAC,CAAC;AACF,IAAMS,SAAS,gBAAGb,UAAU,CAACS,yBAAyB,CAAC;;AAEvD;AACA;AACA;AACA;AACA,IAAMK,mBAAmB,GAAGD,SAA+C;AAC3E;AACA;AACA;AACA;AACA;AACAC,mBAAmB,CAACb,MAAM,GAAGK,6BAA6B,CAAyBO,SAAS,EAAS;EACnGE,gBAAgB,EAAEd,MAAM;EACxBe,YAAY,EAAE,SAAS;EACvBC,YAAY,EAAE,CAAC;AACjB,CAAC,CAAC;AACF;AACA;AACA;AACA;AACA;AACAH,mBAAmB,CAACZ,MAAM,GAAGI,6BAA6B,CAA0BO,SAAS,EAAS;EACpGE,gBAAgB,EAAEb,MAAM;EACxBc,YAAY,EAAE,UAAU;EACxBC,YAAY,EAAE,CAAC;AACjB,CAAC,CAAC;AACF;AACA;AACA;AACA;AACA;AACAH,mBAAmB,CAACI,IAAI,GAAGZ,6BAA6B,CAAuBO,SAAS,EAAS;EAC/FE,gBAAgB,EAAEZ,UAAU,CAACe,IAAI;EACjCF,YAAY,EAAE,SAAS;EACvBC,YAAY,EAAE;IACZE,KAAK,EAAE;MAAEC,UAAU,EAAE;IAAS;EAChC;AACF,CAAC,CAAC;AAEF,eAAeN,mBAAmB"}
+{"version":3,"names":["forwardRef","Button","Switch","Typography","CloseCircleFilled","genRenderer","withDefaultConfirmActionProps","jsx","_jsx","renderDeleteConfirmAction","confirmType","danger","icon","forwarded","DeleteConfirmAction","triggerComponent","triggerEvent","triggerProps","Link","style","whiteSpace"],"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 { 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,SAASA,UAAU,QAAQ,OAAO;AAElC,SAASC,MAAM,EAAEC,MAAM,EAAEC,UAAU,QAAQ,MAAM;AAEjD,SAASC,iBAAiB,QAAQ,mBAAmB;AAErD,SAASC,WAAW,EAAEC,6BAA6B;AAA2B,SAAAC,GAAA,IAAAC,IAAA;AAE9E,IAAMC,yBAAyB,GAAGJ,WAAW,CAAC;EAC5CK,WAAW,EAAE,QAAQ;EACrBC,MAAM,EAAE,IAAI;EACZC,IAAI,eAAEJ,IAAA,CAACJ,iBAAiB,IAAE;AAC5B,CAAC,CAAC;AACF,IAAMS,SAAS,gBAAGb,UAAU,CAACS,yBAAyB,CAAC;;AAEvD;AACA;AACA;AACA;AACA,IAAMK,mBAAmB,GAAGD,SAA+C;AAC3E;AACA;AACA;AACA;AACA;AACAC,mBAAmB,CAACb,MAAM,GAAGK,6BAA6B;AACxD;AACAO,SAAS,EACT;EACEE,gBAAgB,EAAEd,MAAM;EACxBe,YAAY,EAAE,SAAS;EACvBC,YAAY,EAAE,CAAC;AACjB,CACF,CAAC;AACD;AACA;AACA;AACA;AACA;AACAH,mBAAmB,CAACZ,MAAM,GAAGI,6BAA6B;AACxD;AACAO,SAAS,EACT;EACEE,gBAAgB,EAAEb,MAAM;EACxBc,YAAY,EAAE,UAAU;EACxBC,YAAY,EAAE,CAAC;AACjB,CACF,CAAC;AACD;AACA;AACA;AACA;AACA;AACAH,mBAAmB,CAACI,IAAI,GAAGZ,6BAA6B;AACtD;AACAO,SAAS,EACT;EACEE,gBAAgB,EAAEZ,UAAU,CAACe,IAAI;EACjCF,YAAY,EAAE,SAAS;EACvBC,YAAY,EAAE;IACZE,KAAK,EAAE;MAAEC,UAAU,EAAE;IAAS;EAChC;AACF,CACF,CAAC;AAED,eAAeN,mBAAmB"}

package/es/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/es/components/DeleteConfirmAction/withDeleteConfirmAction.js

@@ -0,0 +1,20 @@
+import { CloseCircleFilled } from '@ant-design/icons';
+import { withConfirmActionInternal } 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 | 删除确认弹框的默认属性
+ */
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function withDeleteConfirmAction(ActionComponent, defaultProps) {
+  return withConfirmActionInternal(ActionComponent, {
+    confirmType: 'delete',
+    danger: true,
+    icon: /*#__PURE__*/_jsx(CloseCircleFilled, {})
+  }, defaultProps);
+}
+//# sourceMappingURL=withDeleteConfirmAction.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["CloseCircleFilled","withConfirmActionInternal","jsx","_jsx","withDeleteConfirmAction","ActionComponent","defaultProps","confirmType","danger","icon"],"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,SAASA,iBAAiB,QAAQ,mBAAmB;AAErD,SAAwCC,yBAAyB;;AAEjE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,SAAAC,GAAA,IAAAC,IAAA;AAQA,eAAe,SAASC,uBAAuBA,CAM7CC,eAAiD,EACjDC,YAIyG,EACzG;EACA,OAAOL,yBAAyB,CAC9BI,eAAe,EACf;IACEE,WAAW,EAAE,QAAQ;IACrBC,MAAM,EAAE,IAAI;IACZC,IAAI,eAAEN,IAAA,CAACH,iBAAiB,IAAE;EAC5B,CAAC,EACDM,YACF,CAAC;AACH"}

package/es/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/es/components/ModalAction/index.js

@@ -324,9 +324,9 @@ export var withDefaultModalActionProps = function withDefaultModalActionProps(Wr
     var useDefaultProps = typeof defaultProps === 'function' ? defaultProps : function () {
       return defaultProps;
     };
-    var defaults = useDefaultProps();
-    var mergedProps = mergeProps(defaults, props);
-    WithDefaultProps.displayName = 'ForwardedRef(WithDefaultProps)';
+    var defaults = useDefaultProps(props);
+    var mergedProps = typeof defaultProps === 'function' ? mergeProps(props, defaults) : mergeProps(defaults, props);
+    WithDefaultProps.displayName = 'ForwardRef(WithDefaultProps)';
     return /*#__PURE__*/_jsx(WrappedComponent, _objectSpread({
       ref: ref
     }, mergedProps));
@@ -335,7 +335,7 @@ export var withDefaultModalActionProps = function withDefaultModalActionProps(Wr
 };
 var renderModalAction = genModalActionRenderer({});
 var forwardedModalAction = /*#__PURE__*/forwardRef(renderModalAction);
-forwardedModalAction.displayName = 'ForwardedRef(ModalAction)';
+forwardedModalAction.displayName = 'ForwardRef(ModalAction)';
 /**
  * - **EN:** ModalAction component type
  * - **CN:** ModalAction组件的类型
@@ -377,8 +377,9 @@ var addTriggers = function addTriggers(comp) {
     triggerComponent: Button,
     triggerEvent: 'onClick',
     triggerProps: {}
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  });
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
   // Type of switch trigger
   patchedComp.Switch = withDefaultModalActionProps(comp, {
     triggerComponent: Switch,
@@ -418,20 +419,26 @@ ModalAction.SubmitWithoutClosing = SubmitWithoutClosingSymbol;
  * - **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 function withModalAction(formComp, defaultProps) {
-  var withForm = withDefaultModalActionProps(forwardedModalAction, function () {
+  var withDefaults = withDefaultModalActionProps(forwardedModalAction, function (props) {
     var useDefaultProps = typeof defaultProps === 'function' ? defaultProps : function () {
       return defaultProps;
     };
-    var defaults = useDefaultProps();
+    var defaults = useDefaultProps(props);
     return _objectSpread({
       formComp: formComp
     }, defaults);
   });
-  return addTriggers(withForm);
+  return addTriggers(withDefaults);
 }
 export default ModalAction;
 //# sourceMappingURL=index.js.map