antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.92d6290f7

package/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/cjs/components/popup/popup.css

@@ -5,26 +5,52 @@
 }
 .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: 8px;
+  top: 8px;
+}
 .adm-popup-body-position-top {
   width: 100%;
   top: 0;
   left: 0;
 }
+.adm-popup-body-position-top .adm-popup-close-icon {
+  right: 8px;
+  bottom: 8px;
+}
 .adm-popup-body-position-left {
   height: 100%;
   top: 0;
   left: 0;
 }
+.adm-popup-body-position-left .adm-popup-close-icon {
+  right: 8px;
+  top: 8px;
+}
 .adm-popup-body-position-right {
   height: 100%;
   top: 0;
   right: 0;
 }
+.adm-popup-body-position-right .adm-popup-close-icon {
+  left: 8px;
+  top: 8px;
+}
+.adm-popup-close-icon {
+  cursor: pointer;
+  padding: 4px;
+  font-size: 18px;
+  color: var(--adm-color-weak);
+}

package/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/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/cjs/components/progress-bar/progress-bar.css

@@ -1,17 +1,29 @@
 .adm-progress-bar {
-  --track-width: var(--adm-progress-bar-track-width, 3px);
+  --track-width: var(--adm-progress-bar-track-width, 8px);
   --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, 40px);
+  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) + 8px);
+  padding-left: 8px;
+  color: #999999;
+}
+.adm-progress-bar-rounded .adm-progress-bar-trail,
+.adm-progress-bar-rounded .adm-progress-bar-fill {
   border-radius: var(--track-width);
 }

package/cjs/components/progress-bar/progress-bar.d.ts

@@ -1,6 +1,8 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ProgressBarProps = {
     percent?: number;
-} & NativeProps<'--track-width' | '--track-color' | '--fill-color'>;
+    rounded?: boolean;
+    text?: boolean | ReactNode | ((percent: number) => ReactNode);
+} & NativeProps<'--track-width' | '--track-color' | '--fill-color' | '--text-width'>;
 export declare const ProgressBar: FC<ProgressBarProps>;

package/cjs/components/progress-bar/progress-bar.js

@@ -11,25 +11,47 @@ var _nativeProps = require("../../utils/native-props");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _isNodeWithContent = require("../../utils/is-node-with-content");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const classPrefix = `adm-progress-bar`;
+const defaultProps = {
+  percent: 0,
+  rounded: true,
+  text: false
+};
 
 const ProgressBar = p => {
-  const props = (0, _withDefaultProps.mergeProps)({
-    percent: 0
-  }, p);
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const fillStyle = {
     width: `${props.percent}%`
   };
+
+  const textElement = function () {
+    if (props.text === true) {
+      return `${props.percent}%`;
+    }
+
+    if (typeof props.text === 'function') {
+      return props.text(props.percent);
+    }
+
+    return props.text;
+  }();
+
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: classPrefix
+    className: (0, _classnames.default)(classPrefix, props.rounded && `${classPrefix}-rounded`)
   }, _react.default.createElement("div", {
     className: `${classPrefix}-trail`
   }, _react.default.createElement("div", {
     className: `${classPrefix}-fill`,
     style: fillStyle
-  }))));
+  })), (0, _isNodeWithContent.isNodeWithContent)(textElement) && _react.default.createElement("div", {
+    className: `${classPrefix}-text`
+  }, textElement)));
 };
 
 exports.ProgressBar = ProgressBar;

package/cjs/components/radio/radio.css

@@ -1,6 +1,6 @@
 .adm-radio {
   --icon-size: 22px;
-  --font-size: 17px;
+  --font-size: var(--adm-font-size-9);
   --gap: 8px;
   display: inline-flex;
   vertical-align: text-bottom;
@@ -41,7 +41,7 @@
 .adm-radio.adm-radio-disabled .adm-radio-icon {
   color: #b7b7b7;
   border-color: var(--adm-color-light);
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
 }
 .adm-radio .adm-radio-custom-icon {
   font-size: var(--icon-size);

package/cjs/components/radio/radio.js

@@ -62,16 +62,16 @@ const Radio = p => {
 
     checked = groupContext.value.includes(value);
 
-    setChecked = checked => {
+    setChecked = innerChecked => {
       var _a;
 
-      if (checked) {
+      if (innerChecked) {
         groupContext.check(value);
       } else {
         groupContext.uncheck(value);
       }
 
-      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, checked);
+      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerChecked);
     };
 
     disabled = disabled || groupContext.disabled;

package/cjs/components/rate/rate.css

@@ -1,14 +1,18 @@
 .adm-rate {
   --star-size: 24px;
   --active-color: #ffd21e;
-  --inactive-color: var(--adm-color-light);
+  --inactive-color: #e5e5e5;
+  --inactive-color-half: #dbdbdb;
   display: inline-flex;
+  touch-action: pan-y;
+  -webkit-user-select: none;
+          user-select: none;
 }
 .adm-rate-box {
   position: relative;
 }
 .adm-rate-star {
-  padding: calc(var(--star-size) / 8);
+  padding: 0.125em;
   line-height: var(--star-size);
   font-size: var(--star-size);
   color: var(--inactive-color);
@@ -16,6 +20,7 @@
   overflow: hidden;
   cursor: pointer;
   box-sizing: border-box;
+  transition: all 0.3s;
 }
 .adm-rate-star-half {
   padding-right: 0;
@@ -30,3 +35,6 @@
 .adm-rate-star-readonly {
   cursor: unset;
 }
+.adm-rate.adm-rate-half .adm-rate-star-half:not(.adm-rate-star-active) {
+  color: var(--inactive-color-half);
+}

package/cjs/components/rate/rate.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Rate = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -13,17 +13,25 @@ var _nativeProps = require("../../utils/native-props");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
-var _antdMobileIcons = require("antd-mobile-icons");
-
 var _usePropsValue = require("../../utils/use-props-value");
 
+var _star = require("./star");
+
+var _react2 = require("@use-gesture/react");
+
+var _bound = require("../../utils/bound");
+
 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; }
+
 const classPrefix = `adm-rate`;
 const defaultProps = {
   count: 5,
   allowHalf: false,
-  character: _react.default.createElement(_antdMobileIcons.StarFill, null),
+  character: _react.default.createElement(_star.Star, null),
   defaultValue: 0,
   readOnly: false,
   allowClear: true
@@ -32,6 +40,7 @@ const defaultProps = {
 const Rate = p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
+  const containerRef = (0, _react.useRef)(null);
   const starList = Array(props.count).fill(null);
 
   function renderStar(v, half) {
@@ -41,21 +50,48 @@ const Rate = p => {
         [`${classPrefix}-star-half`]: half,
         [`${classPrefix}-star-readonly`]: props.readOnly
       }),
-      onClick: () => {
-        if (props.readOnly) return;
-
-        if (props.allowClear && value === v) {
-          setValue(0);
-        } else {
-          setValue(v);
-        }
-      }
+      role: 'radio',
+      "aria-checked": value >= v,
+      "aria-label": '' + v
     }, props.character);
   }
 
-  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: classPrefix
-  }, starList.map((_, i) => _react.default.createElement("div", {
+  const bind = (0, _react2.useDrag)(state => {
+    if (props.readOnly) return;
+    const {
+      xy: [clientX],
+      tap
+    } = state;
+    const container = containerRef.current;
+    if (!container) return;
+    const rect = container.getBoundingClientRect();
+    const rawValue = (clientX - rect.left) / rect.width * props.count;
+    const ceiledValue = props.allowHalf ? Math.ceil(rawValue * 2) / 2 : Math.ceil(rawValue);
+    const boundValue = (0, _bound.bound)(ceiledValue, 0, props.count);
+
+    if (tap) {
+      if (props.allowClear && boundValue === value) {
+        setValue(0);
+        return;
+      }
+    }
+
+    setValue(boundValue);
+  }, {
+    axis: 'x',
+    pointer: {
+      touch: true
+    },
+    filterTaps: true
+  });
+  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", Object.assign({
+    className: (0, _classnames.default)(classPrefix, {
+      [`${classPrefix}-half`]: props.allowHalf
+    }),
+    role: 'radiogroup',
+    "aria-readonly": props.readOnly,
+    ref: containerRef
+  }, bind()), starList.map((_, i) => _react.default.createElement("div", {
     key: i,
     className: (0, _classnames.default)(`${classPrefix}-box`)
   }, props.allowHalf && renderStar(i + 0.5, true), renderStar(i + 1, false)))));

package/cjs/components/rate/star.d.ts

@@ -0,0 +1,2 @@
+import { FC } from 'react';
+export declare const Star: FC;

package/cjs/components/rate/star.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Star = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const Star = () => {
+  return _react.default.createElement("svg", {
+    viewBox: '0 0 42 40',
+    height: '1em',
+    xmlns: 'http://www.w3.org/2000/svg',
+    style: {
+      verticalAlign: '-0.125em'
+    }
+  }, _react.default.createElement("path", {
+    d: 'm21 34-10.52 5.53a2 2 0 0 1-2.902-2.108l2.01-11.714-8.511-8.296a2 2 0 0 1 1.108-3.411l11.762-1.71 5.26-10.657a2 2 0 0 1 3.586 0l5.26 10.658L39.815 14a2 2 0 0 1 1.108 3.411l-8.51 8.296 2.009 11.714a2 2 0 0 1-2.902 2.109L21 34Z',
+    fill: 'currentColor',
+    fillRule: 'evenodd'
+  }));
+};
+
+exports.Star = Star;

package/cjs/components/result/result.css

@@ -1,6 +1,6 @@
 .adm-result {
   padding: 32px 12px;
-  background-color: var(--adm-color-white);
+  background-color: var(--adm-color-background);
 }
 .adm-result-icon {
   box-sizing: border-box;
@@ -14,14 +14,14 @@
 }
 .adm-result-title {
   color: var(--adm-color-text);
-  font-size: 18px;
+  font-size: var(--adm-font-size-10);
   line-height: 1.4;
   text-align: center;
 }
 .adm-result-description {
   margin-top: 8px;
   color: var(--adm-color-weak);
-  font-size: 13px;
+  font-size: var(--adm-font-size-main);
   line-height: 1.4;
   text-align: center;
 }

package/cjs/components/result/result.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ResultProps = {
-    status: 'success' | 'error' | 'info' | 'waiting' | 'warning';
+    status?: 'success' | 'error' | 'info' | 'waiting' | 'warning';
     title: ReactNode;
     description?: ReactNode;
     icon?: ReactNode;

package/cjs/components/result/result.js

@@ -13,6 +13,8 @@ var _antdMobileIcons = require("antd-mobile-icons");
 
 var _nativeProps = require("../../utils/native-props");
 
+var _withDefaultProps = require("../../utils/with-default-props");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const classPrefix = `adm-result`;
@@ -23,8 +25,12 @@ const iconRecord = {
   waiting: _antdMobileIcons.ClockCircleFill,
   warning: _antdMobileIcons.ExclamationCircleFill
 };
+const defaultProps = {
+  status: 'info'
+};
 
-const Result = props => {
+const Result = p => {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const {
     status,
     title,

package/cjs/components/result-page/index.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import './result-page.less';
+export type { ResultPageProps } from './result-page';
+declare const _default: import("react").FC<import("./result-page").ResultPageProps> & {
+    Card: import("react").FC<import("./result-page-card").ResultPageCardProps>;
+};
+export default _default;

package/cjs/components/result-page/index.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("./result-page.css");
+
+var _resultPage2 = require("./result-page");
+
+var _attachPropertiesToComponent = require("../../utils/attach-properties-to-component");
+
+var _resultPageCard = require("./result-page-card");
+
+var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_resultPage2.ResultPage, {
+  Card: _resultPageCard.ResultPageCard
+});
+
+exports.default = _default;

package/cjs/components/result-page/result-page-card.d.ts

@@ -0,0 +1,6 @@
+import { FC, ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type ResultPageCardProps = {
+    children?: ReactNode;
+} & NativeProps;
+export declare const ResultPageCard: FC<ResultPageCardProps>;

package/cjs/components/result-page/result-page-card.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ResultPageCard = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _nativeProps = require("../../utils/native-props");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const classPrefix = `adm-result-page-card`;
+
+const ResultPageCard = props => {
+  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement('div', {
+    className: (0, _classnames.default)(`${classPrefix}`)
+  }, props.children));
+};
+
+exports.ResultPageCard = ResultPageCard;