@trionesdev/antd-mobile-react 0.0.2-beta.8 → 0.0.2-beta.9

package/dist/CalendarDatetimePopup/CalendarDatetimePopup.js

@@ -106,7 +106,8 @@ export var CalendarDatetimePopup = function CalendarDatetimePopup(_ref) {
   };
   return /*#__PURE__*/React.createElement(Popup, {
     open: open,
-    onClose: onClose
+    onClose: onClose,
+    round: true
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames(cls)
   }, /*#__PURE__*/React.createElement("div", {

package/dist/CalendarPopup/calendar-range-popup.d.ts

@@ -1,4 +1,4 @@
-import { FC } from "react";
-import "./style.scss";
-import { CalendarPopupRangeProps } from "./types";
+import { FC } from 'react';
+import './style.scss';
+import { CalendarPopupRangeProps } from './types';
 export declare const CalendarRangePopup: FC<CalendarPopupRangeProps>;

package/dist/CalendarPopup/calendar-range-popup.js

@@ -4,12 +4,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 React, { memo, useEffect, useRef } from "react";
-import Popup from "../Popup";
-import classNames from "classnames";
+import classNames from 'classnames';
+import React, { memo, useEffect, useRef } from 'react';
 import Calendar from "../Calendar";
-import "./style.scss";
 import ConfigProvider from "../ConfigProvider";
+import Popup from "../Popup";
+import "./style.scss";
 var cls = 'triones-antm-calendar-popup';
 export var CalendarRangePopup = /*#__PURE__*/memo(function (_ref) {
   var mouth = _ref.mouth,
@@ -62,7 +62,8 @@ export var CalendarRangePopup = /*#__PURE__*/memo(function (_ref) {
     open: innerOpen,
     onClose: function onClose() {
       setInnerOpen(false);
-    }
+    },
+    round: true
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(cls))
   }, /*#__PURE__*/React.createElement("div", {

package/dist/CascaderPopup/cascader-popup.js

@@ -48,7 +48,8 @@ export var CascaderPopup = /*#__PURE__*/React.memo(function (_ref) {
   return /*#__PURE__*/React.createElement(Popup, {
     open: open,
     onClose: handleClose,
-    maskClosable: true,
+    overlayClosable: true,
+    round: true,
     styles: {
       body: {
         borderTopLeftRadius: 6,

package/dist/Overlay/Overlay.d.ts

@@ -1,15 +1,16 @@
-import React, { PropsWithChildren } from "react";
-import { FC } from "react";
+import React, { FC, PropsWithChildren } from 'react';
 export type OverlayProps = {
     className?: string;
     style?: React.CSSProperties;
     open: boolean;
     zIndex?: number;
     closeOnOverlayClick?: boolean;
+    destroyOnHidden?: boolean;
     onClick?: (e: any) => void;
     onClose?: () => void;
     afterClose?: () => void;
     afterOpenChange?: (open: boolean) => void;
     duration?: number;
+    getContainer?: () => HTMLElement;
 };
 export declare const Overlay: FC<PropsWithChildren<OverlayProps>>;

package/dist/Overlay/Overlay.js

@@ -10,8 +10,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 React, { useEffect, useState } from "react";
-import classNames from "classnames";
+import classNames from 'classnames';
+import React, { useEffect, useState } from 'react';
+import { createPortal } from 'react-dom';
 var cls = 'triones-antm-overlay';
 export var Overlay = function Overlay(_ref) {
   var children = _ref.children,
@@ -22,12 +23,17 @@ export var Overlay = function Overlay(_ref) {
     zIndex = _ref$zIndex === void 0 ? 1000 : _ref$zIndex,
     _ref$closeOnOverlayCl = _ref.closeOnOverlayClick,
     closeOnOverlayClick = _ref$closeOnOverlayCl === void 0 ? true : _ref$closeOnOverlayCl,
+    _ref$destroyOnHidden = _ref.destroyOnHidden,
+    destroyOnHidden = _ref$destroyOnHidden === void 0 ? false : _ref$destroyOnHidden,
     onClick = _ref.onClick,
     onClose = _ref.onClose,
     afterClose = _ref.afterClose,
     afterOpenChange = _ref.afterOpenChange,
     _ref$duration = _ref.duration,
-    duration = _ref$duration === void 0 ? 300 : _ref$duration;
+    duration = _ref$duration === void 0 ? 300 : _ref$duration,
+    getContainer = _ref.getContainer;
+  var mountRef = React.useRef(null);
+  var rootContainer = (getContainer === null || getContainer === void 0 ? void 0 : getContainer()) || document.body;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     active = _useState2[0],
@@ -40,6 +46,36 @@ export var Overlay = function Overlay(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     internalOpen = _useState6[0],
     setInternalOpen = _useState6[1];
+  var handleDestroy = function handleDestroy() {
+    if (rootContainer && mountRef.current) {
+      rootContainer.removeChild(mountRef.current);
+    }
+    mountRef.current = null;
+  };
+  var handleClose = function handleClose() {
+    setInternalOpen(false);
+    onClose === null || onClose === void 0 || onClose();
+    if (destroyOnHidden) {
+      handleDestroy();
+    }
+  };
+  var handleClick = function handleClick(e) {
+    // 只在点击遮罩层本身时触发，忽略子元素冒泡上来的点击
+    if (e.target === e.currentTarget) {
+      onClick === null || onClick === void 0 || onClick(e);
+      if (closeOnOverlayClick) {
+        handleClose();
+      }
+    }
+  };
+  useEffect(function () {
+    if (open === undefined) {
+      return;
+    }
+    if (open !== internalOpen) {
+      setInternalOpen(open);
+    }
+  }, [open]);
   useEffect(function () {
     if (internalOpen) {
       setRender(true);
@@ -63,31 +99,19 @@ export var Overlay = function Overlay(_ref) {
       };
     }
   }, [internalOpen, duration]);
-  var handleClick = function handleClick(e) {
-    // 只在点击遮罩层本身时触发，忽略子元素冒泡上来的点击
-    if (e.target === e.currentTarget) {
-      onClick === null || onClick === void 0 || onClick(e);
-      if (closeOnOverlayClick) {
-        setInternalOpen(false);
-        onClose === null || onClose === void 0 || onClose();
-      }
-    }
-  };
-  useEffect(function () {
-    if (open === undefined) {
-      return;
-    }
-    if (open !== internalOpen) {
-      setInternalOpen(open);
-    }
-  }, [open]);
   if (!render) return null;
-  return /*#__PURE__*/React.createElement("div", {
+  if (render) {
+    if (!mountRef.current) {
+      mountRef.current = document.createElement('div');
+      rootContainer === null || rootContainer === void 0 || rootContainer.appendChild(mountRef.current);
+    }
+  }
+  return render && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
     className: classNames(cls, _defineProperty({}, "".concat(cls, "-active"), active), className),
     onClick: handleClick,
     style: _objectSpread(_objectSpread({}, style), {}, {
       zIndex: zIndex,
       transitionDuration: "".concat(duration, "ms")
     })
-  }, children);
+  }, children), mountRef.current);
 };

package/dist/Overlay/demo/base.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/dist/Overlay/demo/base.js

@@ -0,0 +1,27 @@
+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 React, { useState } from 'react';
+import { DemoBlock } from "../../DemoBlock";
+import { Button, Overlay } from "../../index";
+export default (function () {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(DemoBlock, {
+    title: "\u57FA\u672C\u4F7F\u7528"
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick() {
+      return setOpen(true);
+    }
+  }, "\u70B9\u51FB\u6309\u94AE\u663E\u793A\u906E\u7F69\u5C42"), /*#__PURE__*/React.createElement(Overlay, {
+    open: open,
+    onClick: function onClick() {
+      return setOpen(false);
+    }
+  })));
+});

package/dist/Popup/demo/base.js

@@ -8,41 +8,72 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * compact: true
  */
 import { DemoBlock } from "../../DemoBlock";
-import React, { useEffect } from 'react';
+import React from 'react';
 import Button from "../../Button";
 import Popup from "../index";
 export default (function () {
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    topOpen = _React$useState2[0],
-    setTopOpen = _React$useState2[1];
+    defaultOpen = _React$useState2[0],
+    setDefaultOpen = _React$useState2[1];
   var _React$useState3 = React.useState(false),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
-    bottomOpen = _React$useState4[0],
-    setBottomOpen = _React$useState4[1];
+    topOpen = _React$useState4[0],
+    setTopOpen = _React$useState4[1];
   var _React$useState5 = React.useState(false),
     _React$useState6 = _slicedToArray(_React$useState5, 2),
-    leftOpen = _React$useState6[0],
-    setLeftOpen = _React$useState6[1];
+    bottomOpen = _React$useState6[0],
+    setBottomOpen = _React$useState6[1];
   var _React$useState7 = React.useState(false),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
-    rightOpen = _React$useState8[0],
-    setRightOpen = _React$useState8[1];
-  useEffect(function () {
-    console.log("topOpen", topOpen);
-  }, [topOpen]);
+    leftOpen = _React$useState8[0],
+    setLeftOpen = _React$useState8[1];
+  var _React$useState9 = React.useState(false),
+    _React$useState10 = _slicedToArray(_React$useState9, 2),
+    rightOpen = _React$useState10[0],
+    setRightOpen = _React$useState10[1];
+  var _React$useState11 = React.useState(false),
+    _React$useState12 = _slicedToArray(_React$useState11, 2),
+    centerOpen = _React$useState12[0],
+    setCenterOpen = _React$useState12[1];
+  var _React$useState13 = React.useState(false),
+    _React$useState14 = _slicedToArray(_React$useState13, 2),
+    roundOpen = _React$useState14[0],
+    setRoundOpen = _React$useState14[1];
+  var _React$useState15 = React.useState(false),
+    _React$useState16 = _slicedToArray(_React$useState15, 2),
+    closeIconOpen = _React$useState16[0],
+    setCloseIconOpen = _React$useState16[1];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DemoBlock, {
-    title: "\u57FA\u7840\u7528\u6CD5"
+    title: "\u57FA\u672C\u4F7F\u7528"
+  }, /*#__PURE__*/React.createElement(Popup, {
+    open: defaultOpen,
+    title: "\u6807\u9898",
+    closable: true,
+    afterClose: function afterClose() {
+      setDefaultOpen(false);
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      minHeight: '200px'
+    }
+  }, "\u57FA\u7840\u5F39\u7A97")), /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    onClick: function onClick() {
+      setDefaultOpen(true);
+    }
+  }, "\u57FA\u7840\u5F39\u7A97")), /*#__PURE__*/React.createElement(DemoBlock, {
+    title: "\u5F39\u51FA\u4F4D\u7F6E"
   }, /*#__PURE__*/React.createElement(Popup, {
     open: topOpen,
-    destroyOnClose: true,
-    onClose: function onClose() {
+    destroyOnHidden: true,
+    position: "top",
+    afterClose: function afterClose() {
       setTopOpen(false);
-    },
-    maskClosable: true
+    }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      minHeight: "200px"
+      minHeight: '200px'
     }
   }, "\u9876\u90E8\u5F39\u51FA")), /*#__PURE__*/React.createElement(Button, {
     block: true,
@@ -53,12 +84,12 @@ export default (function () {
     open: bottomOpen,
     position: "bottom",
     closable: true,
-    onClose: function onClose() {
+    afterClose: function afterClose() {
       setBottomOpen(false);
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      minHeight: "200px"
+      minHeight: '200px'
     }
   }, "\u5E95\u90E8\u5F39\u51FA")), /*#__PURE__*/React.createElement(Button, {
     block: true,
@@ -68,12 +99,12 @@ export default (function () {
   }, "\u5E95\u90E8\u5F39\u51FA"), /*#__PURE__*/React.createElement(Popup, {
     open: leftOpen,
     position: "left",
-    onClose: function onClose() {
+    afterClose: function afterClose() {
       setLeftOpen(false);
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      minWidth: "200px"
+      minWidth: '200px'
     }
   }, "\u5DE6\u90E8\u5F39\u51FA")), /*#__PURE__*/React.createElement(Button, {
     block: true,
@@ -83,17 +114,68 @@ export default (function () {
   }, "\u5DE6\u90E8\u5F39\u51FA"), /*#__PURE__*/React.createElement(Popup, {
     open: rightOpen,
     position: "right",
-    onClose: function onClose() {
+    afterClose: function afterClose() {
       setRightOpen(false);
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      minWidth: "200px"
+      minWidth: '200px'
     }
   }, "\u53F3\u90E8\u5F39\u51FA")), /*#__PURE__*/React.createElement(Button, {
     block: true,
     onClick: function onClick() {
       setRightOpen(true);
     }
-  }, "\u53F3\u90E8\u5F39\u51FA")));
+  }, "\u53F3\u90E8\u5F39\u51FA"), /*#__PURE__*/React.createElement(Popup, {
+    open: centerOpen,
+    position: "center",
+    afterClose: function afterClose() {
+      setCenterOpen(false);
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      minWidth: '200px',
+      minHeight: '200px'
+    }
+  }, "\u5C45\u4E2D\u5F39\u51FA")), /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    onClick: function onClick() {
+      setCenterOpen(true);
+    }
+  }, "\u5C45\u4E2D\u5F39\u51FA")), /*#__PURE__*/React.createElement(DemoBlock, {
+    title: "\u5706\u89D2"
+  }, /*#__PURE__*/React.createElement(Popup, {
+    open: roundOpen,
+    round: true,
+    afterClose: function afterClose() {
+      setRoundOpen(false);
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      minHeight: '200px'
+    }
+  }, "\u5706\u89D2\u5F39\u7A97")), /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    onClick: function onClick() {
+      setRoundOpen(true);
+    }
+  }, "\u5706\u89D2\u5F39\u7A97")), /*#__PURE__*/React.createElement(DemoBlock, {
+    title: "\u5173\u95ED\u56FE\u6807"
+  }, /*#__PURE__*/React.createElement(Popup, {
+    open: closeIconOpen,
+    round: true,
+    closable: true,
+    afterClose: function afterClose() {
+      setCloseIconOpen(false);
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      minHeight: '200px'
+    }
+  }, "\u5706\u89D2\u5F39\u7A97")), /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    onClick: function onClick() {
+      setCloseIconOpen(true);
+    }
+  }, "\u5173\u95ED\u56FE\u6807")));
 });

package/dist/Popup/index.d.ts

@@ -1,3 +1,4 @@
 import { Popup, PopupProps } from "./popup";
+import "./style.scss";
 export type { PopupProps };
 export default Popup;

package/dist/Popup/index.js

@@ -1,2 +1,3 @@
 import { Popup } from "./popup";
+import "./style.scss";
 export default Popup;

package/dist/Popup/popup.d.ts

@@ -1,4 +1,31 @@
-import { FC, PropsWithChildren } from 'react';
-import { PopupModalProps } from './popup-modal';
-export type PopupProps = Omit<PopupModalProps, 'onDestroy'>;
+import React, { FC, PropsWithChildren } from 'react';
+export type PopupProps = {
+    open?: boolean;
+    title?: React.ReactNode;
+    position?: 'top' | 'bottom' | 'left' | 'right' | 'center';
+    closable?: boolean;
+    closeIconPosition?: 'top-left' | 'top-right';
+    closeIcon?: React.ReactNode;
+    /**
+     * @description 点击遮罩层是否关闭
+     * @default true
+     */
+    overlayClosable?: boolean;
+    destroyOnHidden?: boolean;
+    onClose?: () => void;
+    afterClose?: () => void;
+    afterOpenChange?: (open: boolean) => void;
+    className?: string;
+    style?: React.CSSProperties;
+    round?: boolean;
+    safeArea?: boolean;
+    zIndex?: number;
+    styles?: {
+        overlay?: React.CSSProperties;
+        container?: React.CSSProperties;
+        header?: React.CSSProperties;
+        title?: React.CSSProperties;
+        body?: React.CSSProperties;
+    };
+};
 export declare const Popup: FC<PropsWithChildren<PopupProps>>;

package/dist/Popup/popup.js

@@ -1,56 +1,87 @@
-var _excluded = ["children", "open"];
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { memo } from 'react';
-import { PopupModal } from "./popup-modal";
+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 _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 React, { memo, useEffect, useState } from 'react';
+import classNames from 'classnames';
+import { CloseOutline } from '@trionesdev/antd-mobile-icons-react';
+import Overlay from "../Overlay";
+import SafeArea from "../SafeArea";
+var cls = 'triones-antm-popup';
 export var Popup = /*#__PURE__*/memo(function (_ref) {
-  var children = _ref.children,
-    _ref$open = _ref.open,
+  var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  // const [renderEnable, setRenderEnable] = React.useState(false);
-  // const containerRef = React.useRef<HTMLDivElement>(null);
-  // const mountRef = React.useRef<HTMLDivElement | null>(null);
-  // const rootContainer = getContainer?.() || containerRef.current!;
-  //
-  // const Portal = () => {
-  //   if (!mountRef.current) {
-  //     mountRef.current = document.createElement('div');
-  //     rootContainer.appendChild(mountRef.current);
-  //   }
-  //
-  //   const destroy = () => {
-  //     if (rootContainer && mountRef.current) {
-  //       rootContainer.removeChild(mountRef.current);
-  //     }
-  //     mountRef.current = null;
-  //     setRenderEnable(false);
-  //   };
-  //
-  //   return (
-  //     <>
-  //       {createPortal(
-  //         <PopupModal {...rest} onDestroy={destroy} open={open}>
-  //           {children}
-  //         </PopupModal>,
-  //         mountRef.current!,
-  //       )}
-  //     </>
-  //   );
-  // };
-
-  // useEffect(() => {
-  //   if (open && !renderEnable) {
-  //     setRenderEnable(true);
-  //   }
-  //   // rest.afterOpenChange?.(open);
-  // }, [open]);
-
-  if (!open) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(PopupModal, _extends({}, rest, {
-    open: open
-  }), children);
+    title = _ref.title,
+    _ref$position = _ref.position,
+    position = _ref$position === void 0 ? 'bottom' : _ref$position,
+    _ref$closable = _ref.closable,
+    closable = _ref$closable === void 0 ? false : _ref$closable,
+    _ref$closeIconPositio = _ref.closeIconPosition,
+    closeIconPosition = _ref$closeIconPositio === void 0 ? 'top-right' : _ref$closeIconPositio,
+    closeIcon = _ref.closeIcon,
+    _ref$overlayClosable = _ref.overlayClosable,
+    overlayClosable = _ref$overlayClosable === void 0 ? true : _ref$overlayClosable,
+    _ref$destroyOnHidden = _ref.destroyOnHidden,
+    destroyOnHidden = _ref$destroyOnHidden === void 0 ? false : _ref$destroyOnHidden,
+    onClose = _ref.onClose,
+    afterClose = _ref.afterClose,
+    afterOpenChange = _ref.afterOpenChange,
+    className = _ref.className,
+    style = _ref.style,
+    _ref$round = _ref.round,
+    round = _ref$round === void 0 ? false : _ref$round,
+    _ref$safeArea = _ref.safeArea,
+    safeArea = _ref$safeArea === void 0 ? true : _ref$safeArea,
+    zIndex = _ref.zIndex,
+    children = _ref.children,
+    styles = _ref.styles;
+  var _useState = useState(open || false),
+    _useState2 = _slicedToArray(_useState, 2),
+    internalOpen = _useState2[0],
+    setInternalOpen = _useState2[1];
+  var handleClose = function handleClose() {
+    setInternalOpen(false);
+    onClose === null || onClose === void 0 || onClose();
+  };
+  useEffect(function () {
+    if (open === undefined) {
+      return;
+    }
+    if (open !== internalOpen) {
+      setInternalOpen(open);
+    }
+  }, [open]);
+  var popupInner = /*#__PURE__*/React.createElement(React.Fragment, null, closable && /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(cls, "-close"), "".concat(cls, "-close-").concat(closeIconPosition)),
+    onClick: handleClose
+  }, closeIcon || /*#__PURE__*/React.createElement(CloseOutline, null)), title && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(cls, "-header"),
+    style: styles === null || styles === void 0 ? void 0 : styles.header
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(cls, "-title"),
+    style: styles === null || styles === void 0 ? void 0 : styles.title
+  }, title)), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(cls, "-body"),
+    style: styles === null || styles === void 0 ? void 0 : styles.body
+  }, children));
+  return /*#__PURE__*/React.createElement(Overlay, {
+    open: internalOpen,
+    onClose: handleClose,
+    closeOnOverlayClick: overlayClosable,
+    zIndex: zIndex,
+    className: classNames("".concat(cls, "-overlay"), "".concat(cls, "-").concat(position)),
+    afterClose: afterClose,
+    afterOpenChange: afterOpenChange,
+    destroyOnHidden: destroyOnHidden,
+    style: styles === null || styles === void 0 ? void 0 : styles.overlay
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(cls, "-container"), _defineProperty({}, "".concat(cls, "-round"), round)),
+    style: styles === null || styles === void 0 ? void 0 : styles.container
+  }, ['top', 'bottom', 'left', 'right'].includes(position) ? /*#__PURE__*/React.createElement(SafeArea, null, popupInner) : popupInner));
 });

package/dist/Popup/style.scss

@@ -1,51 +1,129 @@
 @use "../style/variable" as variable;
-$popupCls: 'triones-antm-popup';
-
-.#{$popupCls} {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-
-  &-mask {
-    height: 100%;
-    width: 100%;
-    background-color: rgba(0, 0, 0, .55);
-  }
 
-  &-close {
-    position: absolute;
-    right: 10Px;
-    top: 10Px;
-  }
+$trionesPopupCls: 'triones-antm-popup';
+
+.#{$trionesPopupCls} {
+  &-overlay {
+    display: flex;
+
+    .#{$trionesPopupCls} {
+      &-container {
+        position: relative;
+        background-color: white;
+
+        .#{$trionesPopupCls} {
+          &-header {
+            padding-block: variable.$trionesPaddingContentVertical;
+            padding-inline: variable.$trionesPaddingContentHorizontal;
+          }
+        }
+      }
+
+      &-title {
+        text-align: center;
+      }
 
-  &-body {
-    background-color: white;
-    position: fixed;
+      &-close {
+        position: absolute;
+
+        &-top-right {
+          top: variable.$trionesPaddingContentVertical;
+          right: variable.$trionesPaddingContentHorizontal;
+        }
+
+        &-top-left {
+          top: variable.$trionesPaddingContentVertical;
+          left: variable.$trionesPaddingContentHorizontal;
+        }
+      }
+    }
   }
 
   &-top {
-    top: 0;
-    left: 0;
-    right: 0;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: flex-start;
+
+    .#{$trionesPopupCls} {
+      &-container {
+        width: 100%;
+        min-height: 20%;
+        max-height: 90%;
+      }
+
+      &-round {
+        border-bottom-left-radius: variable.$trionesBorderRadius;
+        border-bottom-right-radius: variable.$trionesBorderRadius;
+      }
+    }
   }
 
   &-bottom {
-    bottom: 0;
-    left: 0;
-    right: 0;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: flex-end;
+
+    .#{$trionesPopupCls} {
+      &-container {
+        width: 100%;
+        min-height: 20%;
+        max-height: 90%;
+      }
+
+      &-round {
+        border-top-left-radius: variable.$trionesBorderRadius;
+        border-top-right-radius: variable.$trionesBorderRadius;
+      }
+    }
   }
 
   &-left {
-    left: 0;
-    top: 0;
-    bottom: 0;
+    flex-direction: row;
+    justify-content: flex-start;
+
+    .#{$trionesPopupCls} {
+      &-container {
+        height: 100%;
+        min-width: 20%;
+        max-width: 90%;
+      }
+
+      &-round {
+        border-top-right-radius: variable.$trionesBorderRadius;
+        border-bottom-right-radius: variable.$trionesBorderRadius;
+      }
+    }
   }
 
+
   &-right {
-    right: 0;
-    top: 0;
-    bottom: 0;
+    flex-direction: row;
+    justify-content: flex-end;
+
+    .#{$trionesPopupCls} {
+      &-container {
+        height: 100%;
+        min-width: 20%;
+        max-width: 90%;
+      }
+
+      &-round {
+        border-top-left-radius: variable.$trionesBorderRadius;
+        border-bottom-left-radius: variable.$trionesBorderRadius;
+      }
+    }
   }
+
+  &-center {
+    justify-content: center;
+    align-items: center;
+
+    .#{$trionesPopupCls} {
+      &-round {
+        border-radius: variable.$trionesBorderRadius;
+      }
+    }
+  }
+
+
 }

package/dist/utils/use-isomorphic-update-layout-effect.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="react" />
-export declare const useIsomorphicUpdateLayoutEffect: typeof import("react").useLayoutEffect | typeof import("react").useEffect;
+export declare const useIsomorphicUpdateLayoutEffect: typeof import("react").useEffect | typeof import("react").useLayoutEffect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trionesdev/antd-mobile-react",
-  "version": "0.0.2-beta.8",
+  "version": "0.0.2-beta.9",
   "description": "antd mobile react ",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -89,17 +89,15 @@
     "stylelint": "^16.12.0"
   },
   "dependencies": {
-    "@trionesdev/antd-mobile-base-react": "^0.0.2-beta.8",
+    "@trionesdev/antd-mobile-base-react": "^0.0.2-beta.9",
     "ahooks": "^3.8.4",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.19",
-    "rc-field-form": "^2.7.0",
-    "rc-util": "^5.44.3",
-    "runes2": "^1.1.4"
+    "rc-field-form": "^2.7.0"
   },
   "optionalDependencies": {
     "@trionesdev/antd-mobile-base-react": "workspace:*",
-    "@trionesdev/antd-mobile-icons-react": "0.0.2-beta.8"
+    "@trionesdev/antd-mobile-icons-react": "0.0.2-beta.9"
   },
-  "gitHead": "5a4c14af9410f6044246bb868278ed01313baac2"
+  "gitHead": "c062f3bd8651ea933f9385279c05a1ab0245b2b8"
 }

package/dist/Popup/popup-modal.d.ts

@@ -1,52 +0,0 @@
-import { CSSProperties, FC, PropsWithChildren } from 'react';
-import './style.scss';
-export type Position = 'top' | 'bottom' | 'left' | 'right';
-export type PopupModalProps = {
-    className?: string;
-    /**
-     * @description 样式
-     * @default horizontal
-     */
-    styles?: {
-        body?: CSSProperties;
-    };
-    /**
-     * @description Modal 完全关闭后的回调
-     * @default
-     */
-    afterClose?: () => void;
-    /**
-     * @description 是否打开
-     * @default false
-     */
-    open?: boolean;
-    /**
-     * @description 打开位置
-     * @default bottom
-     */
-    position?: Position;
-    /**
-     * @description 是否可以关闭(显示关闭按钮)
-     * @default false
-     */
-    closable?: boolean;
-    /**
-     * @description 是否蒙层关闭
-     * @default true
-     */
-    maskClosable?: boolean;
-    onMaskClick?: () => void;
-    /**
-     * @description 关闭时销毁 Modal 里的子元素
-     * @default false
-     */
-    destroyOnClose?: boolean;
-    /**
-     * @description 设置 Modal 的 z-index
-     * @default 1000
-     */
-    zIndex?: number;
-    onClose?: () => void;
-    onDestroy?: () => void;
-};
-export declare const PopupModal: FC<PropsWithChildren<PopupModalProps>>;

package/dist/Popup/popup-modal.js

@@ -1,74 +0,0 @@
-import classNames from 'classnames';
-import React, { memo, useMemo } from 'react';
-import SafeArea from "../SafeArea";
-import "./style.scss";
-import { CloseOutline } from "@trionesdev/antd-mobile-icons-react";
-var popupCls = 'triones-antm-popup';
-export var PopupModal = /*#__PURE__*/memo(function (_ref) {
-  var children = _ref.children,
-    styles = _ref.styles,
-    afterClose = _ref.afterClose,
-    _ref$open = _ref.open,
-    open = _ref$open === void 0 ? false : _ref$open,
-    _ref$position = _ref.position,
-    position = _ref$position === void 0 ? 'bottom' : _ref$position,
-    _ref$closable = _ref.closable,
-    closable = _ref$closable === void 0 ? false : _ref$closable,
-    _ref$maskClosable = _ref.maskClosable,
-    maskClosable = _ref$maskClosable === void 0 ? true : _ref$maskClosable,
-    onMaskClick = _ref.onMaskClick,
-    _ref$destroyOnClose = _ref.destroyOnClose,
-    destroyOnClose = _ref$destroyOnClose === void 0 ? false : _ref$destroyOnClose,
-    _ref$zIndex = _ref.zIndex,
-    zIndex = _ref$zIndex === void 0 ? 1000 : _ref$zIndex,
-    onClose = _ref.onClose,
-    onDestroy = _ref.onDestroy;
-  var safeAreaPosition = useMemo(function () {
-    if (position === 'bottom') {
-      return 'bottom';
-    } else if (position === 'top') {
-      return 'top';
-    }
-    return undefined;
-  }, [position]);
-  var handleClose = function handleClose() {
-    onClose === null || onClose === void 0 || onClose();
-    afterClose === null || afterClose === void 0 || afterClose();
-    if (destroyOnClose) {
-      onDestroy === null || onDestroy === void 0 || onDestroy();
-    }
-  };
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames(popupCls),
-    style: {
-      zIndex: zIndex,
-      display: open ? 'block' : 'none'
-    },
-    onClick: function onClick(e) {
-      e.stopPropagation();
-      e.preventDefault();
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(popupCls, "-mask")),
-    onClick: function onClick() {
-      if (maskClosable) {
-        onMaskClick === null || onMaskClick === void 0 || onMaskClick();
-        handleClose();
-      }
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(popupCls, "-body"), "".concat(popupCls, "-").concat(position)),
-    style: styles === null || styles === void 0 ? void 0 : styles.body,
-    onClick: function onClick(e) {
-      e.stopPropagation();
-      e.preventDefault();
-    }
-  }, closable && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CloseOutline, {
-    className: classNames("".concat(popupCls, "-close")),
-    onClick: function onClick() {
-      handleClose();
-    }
-  })), /*#__PURE__*/React.createElement(SafeArea, {
-    position: safeAreaPosition
-  }, children)));
-});