antd-mobile 5.5.1 → 5.6.0

package/2x/cjs/components/action-sheet/action-sheet.d.ts

@@ -10,7 +10,7 @@ export declare type Action = {
     onClick?: () => void;
 };
 export declare type ActionSheetProps = {
-    visible: boolean;
+    visible?: boolean;
     actions: Action[];
     extra?: React.ReactNode;
     cancelText?: React.ReactNode;
@@ -22,11 +22,11 @@ export declare type ActionSheetProps = {
     closeOnMaskClick?: boolean;
     getContainer?: GetContainer;
     safeArea?: boolean;
+    popupClassName?: string;
+    popupStyle?: React.CSSProperties;
 } & NativeProps;
 export declare const ActionSheet: FC<ActionSheetProps>;
-export declare type ActionSheetRef = {
-    close: () => void;
-};
-export declare function showActionSheet(props: Omit<ActionSheetProps, 'visible'>): {
+export declare type ActionSheetShowHandler = {
     close: () => void;
 };
+export declare function showActionSheet(props: Omit<ActionSheetProps, 'visible'>): ActionSheetShowHandler;

package/2x/cjs/components/action-sheet/action-sheet.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ActionSheet = void 0;
 exports.showActionSheet = showActionSheet;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _nativeProps = require("../../utils/native-props");
 
@@ -18,15 +18,11 @@ var _popup = _interopRequireDefault(require("../popup"));
 
 var _button = _interopRequireDefault(require("../button"));
 
-var _renderToBody = require("../../utils/render-to-body");
-
 var _safeArea = _interopRequireDefault(require("../safe-area"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _renderImperatively = require("../../utils/render-imperatively");
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const classPrefix = `adm-action-sheet`;
 const defaultProps = {
@@ -52,7 +48,8 @@ const ActionSheet = p => {
       }
     },
     afterClose: props.afterClose,
-    className: `${classPrefix}-popup`,
+    className: (0, _classnames.default)(`${classPrefix}-popup`, props.popupClassName),
+    style: props.popupStyle,
     getContainer: props.getContainer
   }, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix
@@ -109,42 +106,5 @@ const ActionSheet = p => {
 exports.ActionSheet = ActionSheet;
 
 function showActionSheet(props) {
-  const Wrapper = (0, _react.forwardRef)((_, ref) => {
-    const [visible, setVisible] = (0, _react.useState)(false);
-    (0, _react.useEffect)(() => {
-      setVisible(true);
-    }, []);
-
-    function handleClose() {
-      var _a;
-
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      setVisible(false);
-    }
-
-    (0, _react.useImperativeHandle)(ref, () => ({
-      close: handleClose
-    }));
-    return _react.default.createElement(ActionSheet, Object.assign({}, props, {
-      visible: visible,
-      onClose: handleClose,
-      afterClose: () => {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  const ref = (0, _react.createRef)();
-  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: () => {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
+  return (0, _renderImperatively.renderImperatively)(_react.default.createElement(ActionSheet, Object.assign({}, props)));
 }

package/2x/cjs/components/action-sheet/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import './action-sheet.less';
 import { showActionSheet } from './action-sheet';
-export type { Action, ActionSheetProps, ActionSheetRef } from './action-sheet';
+export type { Action, ActionSheetProps, ActionSheetShowHandler, } from './action-sheet';
 declare const _default: import("react").FC<import("./action-sheet").ActionSheetProps> & {
     show: typeof showActionSheet;
 };

package/2x/cjs/components/badge/badge.js

@@ -25,7 +25,7 @@ const Badge = props => {
   } = props;
   const isDot = content === dot;
   const badgeCls = (0, _classnames.default)(classPrefix, !!children && `${classPrefix}-fixed`, isDot && `${classPrefix}-dot`, props.bordered && `${classPrefix}-bordered`);
-  const element = content ? (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+  const element = content || content === 0 ? (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: badgeCls,
     style: {
       '--color': color

package/2x/cjs/components/cascader-view/cascader-view.js

@@ -86,6 +86,13 @@ const CascaderView = p => {
   (0, _react.useEffect)(() => {
     setTabActiveKey(levels.length - 1);
   }, [value]);
+  (0, _react.useEffect)(() => {
+    const max = levels.length - 1;
+
+    if (tabActiveKey > max) {
+      setTabActiveKey(max);
+    }
+  }, [tabActiveKey, levels]);
 
   const onItemSelect = (selectValue, depth) => {
     const next = value.slice(0, depth);

package/2x/cjs/components/checkbox/checkbox.js

@@ -25,6 +25,8 @@ var _indeterminateIcon = require("./indeterminate-icon");
 
 var _isDev = require("../../utils/is-dev");
 
+var _nativeInput = require("./native-input");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -90,35 +92,17 @@ const Checkbox = p => {
     }, props.indeterminate ? _react.default.createElement(_indeterminateIcon.IndeterminateIcon, null) : checked && _react.default.createElement(_checkIcon.CheckIcon, null));
   };
 
-  const inputRef = (0, _react.useRef)(null);
-  const labelRef = (0, _react.useRef)(null);
-  (0, _react.useEffect)(() => {
-    var _a;
-
-    (_a = labelRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('click', e => {
-      if (e.target !== inputRef.current) {
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-      }
-    }, {
-      capture: false
-    });
-  }, []);
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("label", {
-    ref: labelRef,
     className: (0, _classnames.default)(classPrefix, {
       [`${classPrefix}-checked`]: checked && !props.indeterminate,
       [`${classPrefix}-indeterminate`]: props.indeterminate,
       [`${classPrefix}-disabled`]: disabled,
       [`${classPrefix}-block`]: props.block
     })
-  }, _react.default.createElement("input", {
-    ref: inputRef,
+  }, _react.default.createElement(_nativeInput.NativeInput, {
     type: 'checkbox',
     checked: checked,
-    onChange: e => {
-      setChecked(e.target.checked);
-    },
+    onChange: setChecked,
     disabled: disabled,
     id: props.id
   }), renderIcon(), props.children && _react.default.createElement("div", {

package/2x/cjs/components/checkbox/native-input.d.ts

@@ -0,0 +1,10 @@
+import { FC } from 'react';
+interface Props {
+    type: 'checkbox' | 'radio';
+    checked: boolean;
+    onChange: (checked: boolean) => void;
+    disabled?: boolean;
+    id?: string;
+}
+export declare const NativeInput: FC<Props>;
+export {};

package/2x/cjs/components/checkbox/native-input.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NativeInput = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const NativeInput = props => {
+  const inputRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(() => {
+    if (props.disabled) return;
+    if (!inputRef.current) return;
+    const input = inputRef.current;
+
+    function handleClick(e) {
+      e.stopPropagation();
+      e.stopImmediatePropagation();
+      props.onChange(input.checked);
+    }
+
+    input.addEventListener('click', handleClick);
+    return () => {
+      input.removeEventListener('click', handleClick);
+    };
+  }, [props.disabled, props.onChange]);
+  return _react.default.createElement("input", {
+    ref: inputRef,
+    type: 'checkbox',
+    checked: props.checked,
+    onChange: () => {},
+    disabled: props.disabled,
+    id: props.id
+  });
+};
+
+exports.NativeInput = NativeInput;

package/2x/cjs/components/dialog/index.d.ts

@@ -6,7 +6,7 @@ import { confirm } from './confirm';
 import { clear } from './clear';
 export type { DialogProps } from './dialog';
 export type { Action } from './dialog-action-button';
-export type { DialogShowProps, DialogShowRef } from './show';
+export type { DialogShowProps, DialogShowHandler } from './show';
 export type { DialogAlertProps } from './alert';
 export type { DialogConfirmProps } from './confirm';
 declare const _default: import("react").FC<import("./dialog").DialogProps> & {

package/2x/cjs/components/dialog/show.d.ts

@@ -1,9 +1,7 @@
 import { DialogProps } from './dialog';
 export declare type DialogShowProps = Omit<DialogProps, 'visible'>;
-export declare type DialogShowRef = {
+export declare type DialogShowHandler = {
     close: () => void;
 };
 export declare const closeFnSet: Set<() => void>;
-export declare function show(props: DialogShowProps): {
-    close: () => void;
-};
+export declare function show(props: DialogShowProps): DialogShowHandler;

package/2x/cjs/components/dialog/show.js

@@ -6,64 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.closeFnSet = void 0;
 exports.show = show;
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _renderToBody = require("../../utils/render-to-body");
+var _react = _interopRequireDefault(require("react"));
 
 var _dialog = require("./dialog");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _renderImperatively = require("../../utils/render-imperatively");
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const closeFnSet = new Set();
 exports.closeFnSet = closeFnSet;
 
 function show(props) {
-  const Wrapper = (0, _react.forwardRef)((_, ref) => {
-    const [visible, setVisible] = (0, _react.useState)(false);
-    (0, _react.useEffect)(() => {
-      setVisible(true);
-    }, []);
-
-    function handleClose() {
-      var _a;
-
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      setVisible(false);
-    }
-
-    (0, _react.useImperativeHandle)(ref, () => ({
-      close: handleClose
-    }));
-
-    function handleAfterClose() {
+  const handler = (0, _renderImperatively.renderImperatively)(_react.default.createElement(_dialog.Dialog, Object.assign({}, props, {
+    afterClose: () => {
       var _a;
 
+      closeFnSet.delete(handler.close);
       (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      unmount();
-      closeFnSet.delete(close);
     }
-
-    return _react.default.createElement(_dialog.Dialog, Object.assign({}, props, {
-      visible: visible,
-      onClose: handleClose,
-      afterClose: handleAfterClose
-    }));
-  });
-  const ref = (0, _react.createRef)();
-  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
-    ref: ref
-  }));
-
-  const close = () => {
-    var _a;
-
-    (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-  };
-
-  closeFnSet.add(close);
-  return {
-    close
-  };
+  })));
+  closeFnSet.add(handler.close);
+  return handler;
 }

package/2x/cjs/components/dot-loading/dot-loading.js

@@ -70,8 +70,7 @@ const DotLoading = (0, _react.memo)(p => {
     begin: `${i * 0.2}s`,
     repeatCount: 'indefinite',
     values: '16; 6; 26; 16; 16',
-    keyTimes: '0; 0.1; 0.3; 0.4; 1',
-    id: 'circ-anim'
+    keyTimes: '0; 0.1; 0.3; 0.4; 1'
   }))))))))));
 });
 exports.DotLoading = DotLoading;

package/2x/cjs/components/error-block/error-block.js

@@ -35,13 +35,15 @@ const ErrorBlock = p => {
   const title = 'title' in props ? props.title : contentPack.title;
 
   let imageNode = _react.default.createElement("img", {
-    src: icon
+    src: icon,
+    alt: 'error block image'
   });
 
   if (props.image) {
     if (typeof props.image === 'string') {
       imageNode = _react.default.createElement("img", {
-        src: props.image
+        src: props.image,
+        alt: 'error block image'
       });
     } else {
       imageNode = props.image;

package/2x/cjs/components/floating-bubble/floating-bubble.css

@@ -7,6 +7,7 @@
   --edge-distance: 0;
   --size: 96px;
   --border-radius: 50%;
+  --background: var(--adm-color-primary);
 }
 
 .adm-floating-bubble-boundary-outer {
@@ -43,7 +44,7 @@
   transition: opacity ease 0.15s;
   user-select: none;
   touch-action: none;
-  background: var(--adm-color-primary);
+  background: var(--background);
   color: var(--adm-color-white);
   border-radius: var(--border-radius);
   z-index: var(--z-index);

package/2x/cjs/components/floating-bubble/floating-bubble.d.ts

@@ -4,5 +4,5 @@ export declare type FloatingBubbleProps = {
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     axis?: 'x' | 'y' | 'xy' | 'lock';
     magnetic?: 'x' | 'y';
-} & NativeProps<'--initial-position-left' | '--initial-position-right' | '--initial-position-top' | '--initial-position-bottom' | '--z-index' | '--edge-distance' | '--size' | '--border-radius'>;
+} & NativeProps<'--initial-position-left' | '--initial-position-right' | '--initial-position-top' | '--initial-position-bottom' | '--z-index' | '--edge-distance' | '--size' | '--border-radius' | '--background'>;
 export declare const FloatingBubble: FC<FloatingBubbleProps>;

package/2x/cjs/components/image-viewer/index.d.ts

@@ -2,7 +2,7 @@
 import './image-viewer.less';
 import { showMultiImageViewer, showImageViewer, clearImageViewer } from './methods';
 export type { ImageViewerProps, MultiImageViewerProps, MultiImageViewerRef, } from './image-viewer';
-export type { ImageViewerHandler } from './methods';
+export type { ImageViewerShowHandler } from './methods';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
     Multi: import("react").ForwardRefExoticComponent<Omit<import("./image-viewer").ImageViewerProps, "image"> & {
         images?: string[] | undefined;

package/2x/cjs/components/image-viewer/methods.d.ts

@@ -1,11 +1,10 @@
 import { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
-export declare type ImageViewerHandler = {
-    close: () => void;
-};
-export declare function showImageViewer(props: Omit<ImageViewerProps, 'visible'>): {
+export declare type ImageViewerShowHandler = {
     close: () => void;
 };
+export declare function showImageViewer(props: Omit<ImageViewerProps, 'visible'>): ImageViewerShowHandler;
 export declare function showMultiImageViewer(props: Omit<MultiImageViewerProps, 'visible'>): {
     close: () => void;
 };
 export declare function clearImageViewer(): void;
+export declare const getH: () => void;

package/2x/cjs/components/image-viewer/methods.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.clearImageViewer = clearImageViewer;
+exports.getH = void 0;
 exports.showImageViewer = showImageViewer;
 exports.showMultiImageViewer = showMultiImageViewer;
 
@@ -13,7 +14,7 @@ var _renderToBody = require("../../utils/render-to-body");
 
 var _imageViewer = require("./image-viewer");
 
-var _ahooks = require("ahooks");
+var _renderImperatively = require("../../utils/render-imperatively");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -23,45 +24,14 @@ const handlerSet = new Set();
 
 function showImageViewer(props) {
   clearImageViewer();
-  const Wrapper = (0, _react.forwardRef)((_, ref) => {
-    const [visible, setVisible] = (0, _react.useState)(false);
-    (0, _react.useEffect)(() => {
-      setVisible(true);
-    }, []);
-    const isUnmountedRef = (0, _ahooks.useUnmountedRef)();
-    (0, _react.useImperativeHandle)(ref, () => ({
-      close: () => {
-        if (isUnmountedRef.current) return;
-        setVisible(false);
-      }
-    }));
-    return _react.default.createElement(_imageViewer.ImageViewer, Object.assign({}, props, {
-      visible: visible,
-      onClose: () => {
-        var _a;
-
-        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        setVisible(false);
-      },
-      afterClose: () => {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  const ref = (0, _react.createRef)();
-  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
-    ref: ref
-  }));
-  const handler = {
-    close: () => {
+  const handler = (0, _renderImperatively.renderImperatively)(_react.default.createElement(_imageViewer.ImageViewer, Object.assign({}, props, {
+    afterClose: () => {
       var _a;
 
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+      handlerSet.delete(handler);
+      (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
     }
-  };
+  })));
   handlerSet.add(handler);
   return handler;
 }
@@ -70,30 +40,39 @@ function showMultiImageViewer(props) {
   clearImageViewer();
   const Wrapper = (0, _react.forwardRef)((_, ref) => {
     const [visible, setVisible] = (0, _react.useState)(false);
+    const closedRef = (0, _react.useRef)(false);
     (0, _react.useEffect)(() => {
-      setVisible(true);
+      if (!closedRef.current) {
+        setVisible(true);
+      } else {
+        handleAfterClose();
+      }
     }, []);
-    const isUnmountedRef = (0, _ahooks.useUnmountedRef)();
+
+    function handleClose() {
+      var _a;
+
+      closedRef.current = true;
+      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      setVisible(false);
+    }
+
     (0, _react.useImperativeHandle)(ref, () => ({
-      close: () => {
-        if (isUnmountedRef.current) return;
-        setVisible(false);
-      }
+      close: handleClose
     }));
-    return _react.default.createElement(_imageViewer.MultiImageViewer, Object.assign({}, props, {
-      visible: visible,
-      onClose: () => {
-        var _a;
 
-        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        setVisible(false);
-      },
-      afterClose: () => {
-        var _a;
+    function handleAfterClose() {
+      var _a;
 
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
+      (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      unmount();
+      handlerSet.delete(handler);
+    }
+
+    return _react.default.createElement(_imageViewer.MultiImageViewer, Object.assign({}, props, {
+      visible: visible,
+      onClose: handleClose,
+      afterClose: handleAfterClose
     }));
   });
   const ref = (0, _react.createRef)();
@@ -116,4 +95,10 @@ function clearImageViewer() {
     handler.close();
   });
   handlerSet.clear();
-}
+}
+
+const getH = () => {
+  console.log(handlerSet);
+};
+
+exports.getH = getH;

package/2x/cjs/components/modal/index.d.ts

@@ -6,7 +6,7 @@ import { confirm } from './confirm';
 import { clear } from './clear';
 export type { ModalProps } from './modal';
 export type { Action } from './modal-action-button';
-export type { ModalShowProps, ModalShowRef } from './show';
+export type { ModalShowProps, ModalShowHandler } from './show';
 export type { ModalAlertProps } from './alert';
 export type { ModalConfirmProps } from './confirm';
 declare const _default: import("react").FC<import("./modal").ModalProps> & {

package/2x/cjs/components/modal/show.d.ts

@@ -1,9 +1,7 @@
 import { ModalProps } from './modal';
 export declare type ModalShowProps = Omit<ModalProps, 'visible'>;
-export declare type ModalShowRef = {
+export declare type ModalShowHandler = {
     close: () => void;
 };
 export declare const closeFnSet: Set<() => void>;
-export declare function show(props: ModalShowProps): {
-    close: () => void;
-};
+export declare function show(props: ModalShowProps): ModalShowHandler;

package/2x/cjs/components/modal/show.js

@@ -6,64 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.closeFnSet = void 0;
 exports.show = show;
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _renderToBody = require("../../utils/render-to-body");
+var _react = _interopRequireDefault(require("react"));
 
 var _modal = require("./modal");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _renderImperatively = require("../../utils/render-imperatively");
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const closeFnSet = new Set();
 exports.closeFnSet = closeFnSet;
 
 function show(props) {
-  const Wrapper = (0, _react.forwardRef)((_, ref) => {
-    const [visible, setVisible] = (0, _react.useState)(false);
-    (0, _react.useEffect)(() => {
-      setVisible(true);
-    }, []);
-
-    function handleClose() {
-      var _a;
-
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      setVisible(false);
-    }
-
-    (0, _react.useImperativeHandle)(ref, () => ({
-      close: handleClose
-    }));
-
-    function handleAfterClose() {
+  const handler = (0, _renderImperatively.renderImperatively)(_react.default.createElement(_modal.Modal, Object.assign({}, props, {
+    afterClose: () => {
       var _a;
 
+      closeFnSet.delete(handler.close);
       (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      unmount();
-      closeFnSet.delete(close);
     }
-
-    return _react.default.createElement(_modal.Modal, Object.assign({}, props, {
-      visible: visible,
-      onClose: handleClose,
-      afterClose: handleAfterClose
-    }));
-  });
-  const ref = (0, _react.createRef)();
-  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
-    ref: ref
-  }));
-
-  const close = () => {
-    var _a;
-
-    (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-  };
-
-  closeFnSet.add(close);
-  return {
-    close
-  };
+  })));
+  closeFnSet.add(handler.close);
+  return handler;
 }