react-toolkits 2.13.16 → 2.13.17

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.13.17
+
+### Patch Changes
+
+- 5e18613: feat: add Skelton for modal
+
 ## 2.13.16
 
 ### Patch Changes

package/lib/index.d.ts

@@ -157,7 +157,7 @@ interface UseModalProps extends Omit<ModalProps, 'open' | 'confirmLoading' | 'on
 }
 declare function useModal(props: UseModalProps): {
     id: number;
-    show: () => void;
+    show: () => Promise<void>;
     hide: () => void;
     modal: react_jsx_runtime.JSX.Element;
 };

package/lib/index.js

@@ -3,7 +3,7 @@ import { jwtDecode } from 'jwt-decode';
 import { useStore, create, createStore } from 'zustand';
 import { persist, createJSONStorage } from 'zustand/middleware';
 import * as Antd2 from 'antd';
-import { Modal, Form, Spin, Result, Table, Button, Card, Input, Select, theme, Space, Tag, Typography, Alert, Divider, Menu, App, Switch, InputNumber, Row, Col, Breadcrumb, Descriptions, Skeleton, Empty, Dropdown, Tooltip, Popconfirm, Collapse, Checkbox } from 'antd';
+import { Modal, Skeleton, Form, Spin, Result, Table, Button, Card, Input, Select, theme, Space, Tag, Typography, Alert, Divider, Menu, App, Switch, InputNumber, Row, Col, Breadcrumb, Descriptions, Empty, Dropdown, Tooltip, Popconfirm, Collapse, Checkbox } from 'antd';
 import { forwardRef, lazy, useContext, useMemo, useState, useEffect, useImperativeHandle, cloneElement, useRef, createContext, memo, useCallback, Fragment as Fragment$1, Suspense } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { last, has, template, get, isEqual, first } from 'lodash-es';
@@ -1043,9 +1043,12 @@ function useModal(props) {
   const open = isOpen(_id);
   const [confirmLoading, setConfirmLoading] = useState(false);
   const isRenderFunction = typeof content === "function";
-  const _show = () => {
+  const [loading, setLoading] = useState(false);
+  const _show = async () => {
     show(_id);
-    afterOpen?.();
+    setLoading(true);
+    await afterOpen?.();
+    setLoading(false);
   };
   const _hide = () => {
     hide(_id);
@@ -1062,7 +1065,7 @@ function useModal(props) {
       setConfirmLoading(false);
     }
   };
-  const internalModal = /* @__PURE__ */ jsx(Modal, { ...modalProps, open, confirmLoading, onOk, onCancel, children: isRenderFunction ? content({ hide: _hide }) : content });
+  const internalModal = /* @__PURE__ */ jsx(Modal, { ...modalProps, open, confirmLoading, onOk, onCancel, children: /* @__PURE__ */ jsx(Skeleton, { loading, children: isRenderFunction ? content({ hide: _hide }) : content }) });
   return {
     id: _id,
     show: _show,