antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.bc248f5c7

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

@@ -29,8 +29,6 @@ var _safeArea = _interopRequireDefault(require("../safe-area"));
 
 var _pickerUtils = require("./picker-utils");
 
-var _shouldRender = require("../../utils/should-render");
-
 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); }
@@ -41,7 +39,9 @@ const classPrefix = `adm-picker`;
 const defaultProps = {
   defaultValue: [],
   closeOnMaskClick: true,
-  renderLabel: _pickerUtils.defaultRenderLabel
+  renderLabel: _pickerUtils.defaultRenderLabel,
+  destroyOnClose: false,
+  forceRender: false
 };
 const Picker = (0, _react.memo)((0, _react.forwardRef)((p, ref) => {
   var _a;
@@ -105,12 +105,12 @@ const Picker = (0, _react.memo)((0, _react.forwardRef)((p, ref) => {
       (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, val, ext);
     }
   });
-  const shouldRender = (0, _shouldRender.useShouldRender)(visible, props.forceRender, props.destroyOnClose);
   const pickerElement = (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix
   }, _react.default.createElement("div", {
     className: `${classPrefix}-header`
   }, _react.default.createElement("a", {
+    role: 'button',
     className: `${classPrefix}-header-button`,
     onClick: () => {
       var _a;
@@ -121,14 +121,19 @@ const Picker = (0, _react.memo)((0, _react.forwardRef)((p, ref) => {
   }, props.cancelText), _react.default.createElement("div", {
     className: `${classPrefix}-header-title`
   }, props.title), _react.default.createElement("a", {
-    className: `${classPrefix}-header-button`,
+    role: 'button',
+    className: (0, _classnames.default)(`${classPrefix}-header-button`, props.loading && `${classPrefix}-header-button-disabled`),
     onClick: () => {
-      setValue(innerValue);
+      if (props.loading) return;
+      setValue(innerValue, true);
       setVisible(false);
-    }
+    },
+    "aria-disabled": props.loading
   }, props.confirmText)), _react.default.createElement("div", {
     className: `${classPrefix}-body`
   }, _react.default.createElement(_pickerView.default, {
+    loading: props.loading,
+    loadingContent: props.loadingContent,
     columns: props.columns,
     renderLabel: props.renderLabel,
     value: innerValue,
@@ -149,13 +154,13 @@ const Picker = (0, _react.memo)((0, _react.forwardRef)((p, ref) => {
       setVisible(false);
     },
     getContainer: props.getContainer,
-    destroyOnClose: true,
+    destroyOnClose: props.destroyOnClose,
     afterShow: props.afterShow,
     afterClose: props.afterClose,
     onClick: props.onClick,
-    forceRender: true,
+    forceRender: props.forceRender,
     stopPropagation: props.stopPropagation
-  }, shouldRender && pickerElement, _react.default.createElement(_safeArea.default, {
+  }, pickerElement, _react.default.createElement(_safeArea.default, {
     position: 'bottom'
   }));
 

package/2x/cjs/components/picker-view/picker-view.css

@@ -1,18 +1,19 @@
 .adm-picker-view {
   --height: 480px;
   --item-height: 68px;
-  --item-font-size: 32px;
+  --item-font-size: var(--adm-font-size-8);
   height: var(--height);
   width: 100%;
   display: flex;
   position: relative;
   overflow: hidden;
-  background: var(--adm-color-white);
+  background: var(--adm-color-background);
 }
 
 .adm-picker-view-column {
   height: 100%;
   flex: 1;
+  -webkit-user-select: none;
   user-select: none;
   touch-action: none;
   position: relative;
@@ -21,6 +22,7 @@
 
 .adm-picker-view-column-wheel {
   width: 100%;
+  cursor: -webkit-grab;
   cursor: grab;
   position: absolute;
   top: calc(50% - var(--item-height) / 2);
@@ -69,6 +71,7 @@
   flex-direction: column;
   position: relative;
   z-index: 0;
+  padding-bottom: 2px;
 }
 
 .adm-picker-view-column-accessible > * {
@@ -108,14 +111,26 @@
   height: var(--item-height);
   box-sizing: border-box;
   flex: none;
-  border-top: solid 2px var(--adm-border-color);
-  border-bottom: solid 2px var(--adm-border-color);
+  border-top: solid 2px var(--adm-color-border);
+  border-bottom: solid 2px var(--adm-color-border);
 }
 
 .adm-picker-view-mask-top {
-  background: linear-gradient(0deg, rgba(255, 255, 255, 0.6) 0%, rgba(255, 255, 255, 0.8) 50%, #ffffff);
+  background: var(--adm-color-background);
+  -webkit-mask: linear-gradient(0deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
+  mask: linear-gradient(0deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
 }
 
 .adm-picker-view-mask-bottom {
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.6) 0%, rgba(255, 255, 255, 0.8) 50%, #ffffff);
+  background: var(--adm-color-background);
+  -webkit-mask: linear-gradient(180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
+  mask: linear-gradient(180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
+}
+
+.adm-picker-view-loading-content {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }

package/2x/cjs/components/picker-view/picker-view.d.ts

@@ -17,6 +17,8 @@ export declare type PickerViewProps = {
     value?: PickerValue[];
     defaultValue?: PickerValue[];
     mouseWheel?: boolean;
+    loading?: boolean;
+    loadingContent?: ReactNode;
     onChange?: (value: PickerValue[], extend: PickerValueExtend) => void;
 } & Pick<PickerProps, 'renderLabel'> & NativeProps<'--height' | '--item-height' | '--item-font-size'>;
 export declare const PickerView: React.NamedExoticComponent<PickerViewProps>;

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

@@ -19,6 +19,10 @@ var _ahooks = require("ahooks");
 
 var _pickerUtils = require("../picker/picker-utils");
 
+var _spinLoading = _interopRequireDefault(require("../spin-loading"));
+
+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); }
 
 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; }
@@ -27,7 +31,10 @@ const classPrefix = `adm-picker-view`;
 const defaultProps = {
   defaultValue: [],
   renderLabel: _pickerUtils.defaultRenderLabel,
-  mouseWheel: false
+  mouseWheel: false,
+  loadingContent: _react.default.createElement("div", {
+    className: `${classPrefix}-loading-content`
+  }, _react.default.createElement(_spinLoading.default, null))
 };
 const PickerView = (0, _react.memo)(p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
@@ -71,7 +78,7 @@ const PickerView = (0, _react.memo)(p => {
   }, []);
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: `${classPrefix}`
-  }, columns.map((column, index) => _react.default.createElement(_wheel.Wheel, {
+  }, props.loading ? props.loadingContent : _react.default.createElement(_react.default.Fragment, null, columns.map((column, index) => _react.default.createElement(_wheel.Wheel, {
     key: index,
     index: index,
     column: column,
@@ -87,7 +94,7 @@ const PickerView = (0, _react.memo)(p => {
     className: `${classPrefix}-mask-middle`
   }), _react.default.createElement("div", {
     className: `${classPrefix}-mask-bottom`
-  }))));
+  })))));
 });
 exports.PickerView = PickerView;
 PickerView.displayName = 'PickerView';

package/2x/cjs/components/picker-view/wheel.js

@@ -62,7 +62,7 @@ const Wheel = (0, _react.memo)(props => {
   });
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     if (draggingRef.current) return;
-    if (!value) return;
+    if (value === null) return;
     const targetIndex = column.findIndex(item => item.value === value);
     if (targetIndex < 0) return;
     const finalPosition = targetIndex * -itemHeight.current;
@@ -154,27 +154,29 @@ const Wheel = (0, _react.memo)(props => {
       className: 'adm-picker-view-column-accessible-current',
       role: 'button',
       "aria-label": current ? `当前选择的是：${current.label}` : '当前未选择'
-    }, "-"), _react.default.createElement("div", null, previous && _react.default.createElement("div", {
+    }, "-"), _react.default.createElement("div", {
       className: 'adm-picker-view-column-accessible-button',
       onClick: () => {
+        if (!previous) return;
         scrollSelect(previousIndex);
       },
-      role: 'button',
-      "aria-label": `选择上一项：${previous.label}`
-    }, "-")), _react.default.createElement("div", null, next && _react.default.createElement("div", {
+      role: previous ? 'button' : 'text',
+      "aria-label": !previous ? '没有上一项' : `选择上一项：${previous.label}`
+    }, "-"), _react.default.createElement("div", {
       className: 'adm-picker-view-column-accessible-button',
       onClick: () => {
+        if (!next) return;
         scrollSelect(nextIndex);
       },
-      role: 'button',
-      "aria-label": `选择下一项：${next.label}`
-    }, "-")));
+      role: next ? 'button' : 'text',
+      "aria-label": !next ? '没有下一项' : `选择下一项：${next.label}`
+    }, "-"));
   }
 
   return _react.default.createElement("div", {
-    ref: rootRef,
     className: `${classPrefix}-column`
   }, _react.default.createElement(_web.animated.div, {
+    ref: rootRef,
     style: {
       translateY: y
     },

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

@@ -17,7 +17,11 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     placement?: DeprecatedPlacement | Placement | undefined;
     stopPropagation?: "click"[] | undefined;
     content: import("react").ReactNode;
-} & import("../../utils/native-props").NativeProps<"--z-index"> & import("react").RefAttributes<import("./popover").PopoverRef>> & {
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--z-index", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./popover").PopoverRef>> & {
     Menu: import("react").ForwardRefExoticComponent<Omit<import("./popover").PopoverProps, "content"> & {
         actions: import("./popover-menu").Action[];
         onAction?: ((item: import("./popover-menu").Action) => void) | undefined;

package/2x/cjs/components/popover/popover-menu.css

@@ -1,5 +1,5 @@
 .adm-popover-menu {
-  --border-color: var(--adm-border-color);
+  --border-color: #eeeeee;
 }
 
 .adm-popover-menu.adm-popover {

package/2x/cjs/components/popover/popover-menu.patch.css

@@ -0,0 +1,31 @@
+.adm-popover-menu.adm-popover .adm-popover-inner-content {
+  padding: 0 !important;
+}
+
+.adm-popover-menu-item-text {
+  border-top: solid 2px #eeeeee;
+}
+
+.adm-popover-menu-item:active:not(.adm-popover-menu-item-disabled) {
+  background-color: #eeeeee;
+}
+
+.adm-popover-menu-item:active:not(.adm-popover-menu-item-disabled)::after {
+  border-bottom: solid 2px #eeeeee;
+}
+
+.adm-popover.adm-popover-dark.adm-popover-menu.adm-popover-menu .adm-popover-menu-item-text {
+  border-color: #333333;
+}
+
+.adm-popover.adm-popover-dark.adm-popover-menu.adm-popover-menu .adm-popover-menu-item:active:not(.adm-popover-menu-item-disabled) {
+  background-color: #333333;
+}
+
+.adm-popover.adm-popover-dark.adm-popover-menu.adm-popover-menu .adm-popover-menu-item:active:not(.adm-popover-menu-item-disabled)::after {
+  border-color: #333333;
+}
+
+.adm-popover.adm-popover-dark.adm-popover-menu.adm-popover-menu .adm-popover-inner.adm-popover-inner.adm-popover-inner {
+  background-color: rgba(0, 0, 0, 0.9);
+}

package/2x/cjs/components/popover/popover.css

@@ -3,6 +3,7 @@
   --background: #ffffff;
   --arrow-size: 16px;
   --content-padding: 16px 24px;
+  color: #333333;
   position: absolute;
   top: 0;
   left: 0;
@@ -10,6 +11,7 @@
   white-space: normal;
   text-align: left;
   cursor: auto;
+  -webkit-user-select: text;
   user-select: text;
   animation: none;
 }
@@ -17,7 +19,7 @@
 .adm-popover.adm-popover-dark {
   --background: rgba(0, 0, 0, 0.75);
   --adm-color-text: #ffffff;
-  color: white;
+  color: #ffffff;
 }
 
 .adm-popover.adm-popover-dark .adm-popover-inner {
@@ -39,7 +41,9 @@
   background-clip: padding-box;
   border-radius: 16px;
   box-shadow: 0 0 60px 0 rgba(51, 51, 51, 0.2);
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
+  width: -webkit-max-content;
+  width: max-content;
   min-width: 64px;
   max-width: calc(100vw - 48px);
   overflow-y: hidden;

package/2x/cjs/components/popover/popover.d.ts

@@ -33,4 +33,8 @@ export declare const Popover: React.ForwardRefExoticComponent<{
     placement?: DeprecatedPlacement | Placement | undefined;
     stopPropagation?: "click"[] | undefined;
     content: React.ReactNode;
-} & NativeProps<"--z-index"> & React.RefAttributes<PopoverRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--z-index", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<PopoverRef>>;

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

@@ -160,7 +160,9 @@ const Popover = (0, _react.forwardRef)((p, ref) => {
   (0, _react.useEffect)(() => {
     const floatingElement = floatingRef.current;
     if (!targetElement || !floatingElement) return;
-    return (0, _dom.autoUpdate)(targetElement, floatingElement, update);
+    return (0, _dom.autoUpdate)(targetElement, floatingElement, update, {
+      elementResize: typeof ResizeObserver !== 'undefined'
+    });
   }, [targetElement]);
   (0, _ahooks.useClickAway)(() => {
     if (!props.trigger) return;

package/2x/cjs/components/popover/popover.patch.css

@@ -0,0 +1,24 @@
+.adm-popover {
+  z-index: 1030;
+}
+
+.adm-popover.adm-popover-dark {
+  color: #ffffff;
+}
+
+.adm-popover.adm-popover-dark .adm-popover-inner {
+  background-color: rgba(0, 0, 0, 0.75);
+}
+
+.adm-popover-inner {
+  background-color: #ffffff;
+  font-size: 30px;
+}
+
+.adm-popover-inner-content {
+  padding: 16px 24px;
+}
+
+.adm-popover-arrow {
+  display: none !important;
+}

package/2x/cjs/components/popup/popup-base-props.d.ts

@@ -0,0 +1,35 @@
+import React from 'react';
+import { GetContainer } from '../../utils/render-to-container';
+import { MaskProps } from '../mask';
+import { PropagationEvent } from '../../utils/with-stop-propagation';
+export declare type PopupBaseProps = {
+    afterClose?: () => void;
+    afterShow?: () => void;
+    bodyClassName?: string;
+    bodyStyle?: React.CSSProperties;
+    closeOnMaskClick?: boolean;
+    destroyOnClose?: boolean;
+    disableBodyScroll?: boolean;
+    forceRender?: boolean;
+    getContainer?: GetContainer;
+    mask?: boolean;
+    maskClassName?: string;
+    maskStyle?: MaskProps['style'];
+    onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    onClose?: () => void;
+    onMaskClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    showCloseButton?: boolean;
+    stopPropagation?: PropagationEvent[];
+    visible?: boolean;
+};
+export declare const defaultPopupBaseProps: {
+    closeOnMaskClick: boolean;
+    destroyOnClose: boolean;
+    disableBodyScroll: boolean;
+    forceRender: boolean;
+    getContainer: () => HTMLElement;
+    mask: boolean;
+    showCloseButton: boolean;
+    stopPropagation: string[];
+    visible: boolean;
+};

package/2x/cjs/components/popup/popup-base-props.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.defaultPopupBaseProps = void 0;
+const defaultPopupBaseProps = {
+  closeOnMaskClick: false,
+  destroyOnClose: false,
+  disableBodyScroll: true,
+  forceRender: false,
+  getContainer: () => document.body,
+  mask: true,
+  showCloseButton: false,
+  stopPropagation: ['click'],
+  visible: false
+};
+exports.defaultPopupBaseProps = defaultPopupBaseProps;

package/2x/cjs/components/popup/popup.css

@@ -6,30 +6,62 @@
 
 .adm-popup-body {
   position: fixed;
-  background-color: #ffffff;
+  background-color: var(--adm-color-background);
   z-index: calc(var(--z-index) + 10);
 }
 
+.adm-popup-body .adm-popup-close-icon {
+  position: absolute;
+  z-index: 100;
+}
+
 .adm-popup-body-position-bottom {
   width: 100%;
   bottom: 0;
   left: 0;
 }
 
+.adm-popup-body-position-bottom .adm-popup-close-icon {
+  right: 16px;
+  top: 16px;
+}
+
 .adm-popup-body-position-top {
   width: 100%;
   top: 0;
   left: 0;
 }
 
+.adm-popup-body-position-top .adm-popup-close-icon {
+  right: 16px;
+  bottom: 16px;
+}
+
 .adm-popup-body-position-left {
   height: 100%;
   top: 0;
   left: 0;
 }
 
+.adm-popup-body-position-left .adm-popup-close-icon {
+  right: 16px;
+  top: 16px;
+}
+
 .adm-popup-body-position-right {
   height: 100%;
   top: 0;
   right: 0;
+}
+
+.adm-popup-body-position-right .adm-popup-close-icon {
+  left: 16px;
+  top: 16px;
+}
+
+.adm-popup-close-icon {
+  cursor: pointer;
+  padding: 8px;
+  font-size: 36px;
+  color: var(--adm-color-weak);
 }

package/2x/cjs/components/popup/popup.d.ts

@@ -1,23 +1,7 @@
-import React, { FC } from 'react';
+import { FC, PropsWithChildren } from 'react';
 import { NativeProps } from '../../utils/native-props';
-import { GetContainer } from '../../utils/render-to-container';
-import { PropagationEvent } from '../../utils/with-stop-propagation';
-export declare type PopupProps = {
-    visible?: boolean;
-    mask?: boolean;
-    onMaskClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
-    destroyOnClose?: boolean;
-    forceRender?: boolean;
-    getContainer?: GetContainer;
-    afterShow?: () => void;
-    afterClose?: () => void;
+import { PopupBaseProps } from './popup-base-props';
+export declare type PopupProps = PopupBaseProps & PropsWithChildren<{
     position?: 'bottom' | 'top' | 'left' | 'right';
-    bodyClassName?: string;
-    bodyStyle?: React.CSSProperties;
-    maskClassName?: string;
-    maskStyle?: React.CSSProperties;
-    onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
-    stopPropagation?: PropagationEvent[];
-    children?: React.ReactNode;
-} & NativeProps<'--z-index'>;
+}> & NativeProps<'--z-index'>;
 export declare const Popup: FC<PopupProps>;

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

@@ -23,9 +23,15 @@ var _renderToContainer = require("../../utils/render-to-container");
 
 var _web = require("@react-spring/web");
 
+var _withStopPropagation = require("../../utils/with-stop-propagation");
+
 var _shouldRender = require("../../utils/should-render");
 
-var _withStopPropagation = require("../../utils/with-stop-propagation");
+var _antdMobileIcons = require("antd-mobile-icons");
+
+var _popupBaseProps = require("./popup-base-props");
+
+var _useInnerVisible = require("../../utils/use-inner-visible");
 
 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); }
 
@@ -34,21 +40,21 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const classPrefix = `adm-popup`;
-const defaultProps = {
-  position: 'bottom',
-  visible: false,
-  getContainer: () => document.body,
-  mask: true,
-  stopPropagation: ['click']
-};
+const defaultProps = Object.assign(Object.assign({}, _popupBaseProps.defaultPopupBaseProps), {
+  position: 'bottom'
+});
 
 const Popup = p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const bodyCls = (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
-  const ref = (0, _react.useRef)(null);
   const [active, setActive] = (0, _react.useState)(props.visible);
-  (0, _useLockScroll.useLockScroll)(ref, active);
-  const shouldRender = (0, _shouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
+    if (props.visible) {
+      setActive(true);
+    }
+  }, [props.visible]);
+  const ref = (0, _react.useRef)(null);
+  (0, _useLockScroll.useLockScroll)(ref, props.disableBodyScroll && active);
   const unmountedRef = (0, _ahooks.useUnmountedRef)();
   const {
     percent
@@ -60,9 +66,6 @@ const Popup = p => {
       tension: 300,
       friction: 30
     },
-    onStart: () => {
-      setActive(true);
-    },
     onRest: () => {
       var _a, _b;
 
@@ -76,6 +79,7 @@ const Popup = p => {
       }
     }
   });
+  const maskVisible = (0, _useInnerVisible.useInnerVisible)(active && props.visible);
   const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix,
     onClick: props.onClick,
@@ -83,8 +87,18 @@ const Popup = p => {
       display: active ? undefined : 'none'
     }
   }, props.mask && _react.default.createElement(_mask.default, {
-    visible: props.visible,
-    onMaskClick: props.onMaskClick,
+    visible: maskVisible,
+    forceRender: props.forceRender,
+    destroyOnClose: props.destroyOnClose,
+    onMaskClick: e => {
+      var _a, _b;
+
+      (_a = props.onMaskClick) === null || _a === void 0 ? void 0 : _a.call(props, e);
+
+      if (props.closeOnMaskClick) {
+        (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
+      }
+    },
     className: props.maskClassName,
     style: props.maskStyle,
     disableBodyScroll: false,
@@ -113,8 +127,19 @@ const Popup = p => {
       })
     }),
     ref: ref
-  }, shouldRender && props.children))));
-  return (0, _renderToContainer.renderToContainer)(props.getContainer, node);
+  }, props.showCloseButton && _react.default.createElement("a", {
+    className: (0, _classnames.default)(`${classPrefix}-close-icon`, 'adm-plain-anchor'),
+    onClick: () => {
+      var _a;
+
+      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+    }
+  }, _react.default.createElement(_antdMobileIcons.CloseOutline, null)), props.children))));
+  return _react.default.createElement(_shouldRender.ShouldRender, {
+    active: active,
+    forceRender: props.forceRender,
+    destroyOnClose: props.destroyOnClose
+  }, (0, _renderToContainer.renderToContainer)(props.getContainer, node));
 };
 
 exports.Popup = Popup;

package/2x/cjs/components/progress-bar/progress-bar.css

@@ -1,19 +1,33 @@
 .adm-progress-bar {
-  --track-width: var(--adm-progress-bar-track-width, 6px);
+  --track-width: var(--adm-progress-bar-track-width, 16px);
   --track-color: var(--adm-progress-bar-track-color, #e5e5e5);
   --fill-color: var(--adm-progress-bar-fill-color, var(--adm-color-primary));
+  --text-width: var(--adm-progress-bar-text-width, 80px);
+  display: flex;
+  align-items: center;
 }
 
 .adm-progress-bar-trail {
+  flex: auto;
   background: var(--track-color);
   overflow: hidden;
   height: var(--track-width);
-  border-radius: var(--track-width);
 }
 
 .adm-progress-bar-fill {
   transition: width 0.3s;
   background: var(--fill-color);
-  height: 100%;
+  height: var(--track-width);
+}
+
+.adm-progress-bar-text {
+  flex: none;
+  width: calc(var(--text-width) + 16px);
+  padding-left: 16px;
+  color: #999999;
+}
+
+.adm-progress-bar-rounded .adm-progress-bar-trail,
+.adm-progress-bar-rounded .adm-progress-bar-fill {
   border-radius: var(--track-width);
 }