antd-mobile 5.0.0-beta.9 → 5.0.0-rc.3

package/es/components/pull-to-refresh/pull-to-refresh.js

@@ -30,9 +30,9 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
   });
 };
 
-import { withDefaultProps } from '../../utils/with-default-props';
-import { useSpring, animated } from '@react-spring/web';
-import { useDrag } from 'react-use-gesture';
+import { mergeProps } from '../../utils/with-default-props';
+import { animated, useSpring } from '@react-spring/web';
+import { useDrag } from '@use-gesture/react';
 import { getScrollParent } from '../../utils/get-scroll-parent';
 import React, { useRef, useState } from 'react';
 import { supportsPassive } from '../../utils/supports-passive';
@@ -40,30 +40,22 @@ import { convertPx } from '../../utils/convert-px';
 import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
 import { sleep } from '../../utils/sleep';
 var classPrefix = "adm-pull-to-refresh";
-var PullStatus;
-
-(function (PullStatus) {
-  PullStatus[PullStatus["idle"] = 0] = "idle";
-  PullStatus[PullStatus["thresholdMet"] = 1] = "thresholdMet";
-  PullStatus[PullStatus["refreshing"] = 2] = "refreshing";
-  PullStatus[PullStatus["complete"] = 3] = "complete";
-})(PullStatus || (PullStatus = {}));
-
 export var defaultProps = {
   pullingText: '下拉刷新',
-  releaseText: '释放立即刷新',
+  canReleaseText: '释放立即刷新',
   refreshingText: '加载中……',
   completeText: '刷新成功',
   completeDelay: 500,
   onRefresh: function onRefresh() {}
 };
-export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
+export var PullToRefresh = function PullToRefresh(p) {
   var _a, _b;
 
+  var props = mergeProps(defaultProps, p);
   var headHeight = (_a = props.headHeight) !== null && _a !== void 0 ? _a : convertPx(40);
   var threshold = (_b = props.threshold) !== null && _b !== void 0 ? _b : convertPx(60);
 
-  var _useState = useState(PullStatus.idle),
+  var _useState = useState('pulling'),
       status = _useState[0],
       setStatus = _useState[1];
 
@@ -86,43 +78,29 @@ export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
   var pullingRef = useRef(false);
 
   function doRefresh() {
-    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
       var _this = this;
 
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               api.start({
                 height: headHeight
               });
-              setStatus(PullStatus.refreshing);
-              setStatus(PullStatus.refreshing);
-              _context2.prev = 3;
-              _context2.next = 6;
+              setStatus('refreshing');
+              _context3.prev = 2;
+              _context3.next = 5;
               return props.onRefresh();
 
-            case 6:
-              setStatus(PullStatus.complete);
-              _context2.next = 13;
+            case 5:
+              setStatus('complete');
+              _context3.next = 12;
               break;
 
-            case 9:
-              _context2.prev = 9;
-              _context2.t0 = _context2["catch"](3);
-              setStatus(PullStatus.idle);
-              throw _context2.t0;
-
-            case 13:
-              if (!(props.completeDelay > 0)) {
-                _context2.next = 16;
-                break;
-              }
-
-              _context2.next = 16;
-              return sleep(props.completeDelay);
-
-            case 16:
+            case 8:
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](2);
               api.start({
                 to: function to(next) {
                   return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -136,41 +114,71 @@ export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
                             });
 
                           case 2:
-                            _context.next = 4;
+                            setStatus('pulling');
+
+                          case 3:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+                }
+              });
+              throw _context3.t0;
+
+            case 12:
+              if (!(props.completeDelay > 0)) {
+                _context3.next = 15;
+                break;
+              }
+
+              _context3.next = 15;
+              return sleep(props.completeDelay);
+
+            case 15:
+              api.start({
+                to: function to(next) {
+                  return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+                    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+                      while (1) {
+                        switch (_context2.prev = _context2.next) {
+                          case 0:
+                            _context2.next = 2;
                             return next({
                               height: 0
                             });
 
-                          case 4:
-                            setStatus(PullStatus.idle);
+                          case 2:
+                            setStatus('pulling');
 
-                          case 5:
+                          case 3:
                           case "end":
-                            return _context.stop();
+                            return _context2.stop();
                         }
                       }
-                    }, _callee);
+                    }, _callee2);
                   }));
                 }
               });
 
-            case 17:
+            case 16:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[3, 9]]);
+      }, _callee3, null, [[2, 8]]);
     }));
   }
 
   useDrag(function (state) {
-    if (status === PullStatus.refreshing || status === PullStatus.complete) return;
+    if (status === 'refreshing' || status === 'complete') return;
     var event = state.event;
 
     if (state.last) {
       pullingRef.current = false;
 
-      if (status === PullStatus.thresholdMet) {
+      if (status === 'canRelease') {
         doRefresh();
       } else {
         api.start({
@@ -182,7 +190,6 @@ export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
     }
 
     var _state$movement = state.movement,
-        x = _state$movement[0],
         y = _state$movement[1];
 
     if (state.first) {
@@ -199,7 +206,7 @@ export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
 
     if (!pullingRef.current) return;
 
-    if (typeof event.cancelable !== 'boolean' || event.cancelable) {
+    if (event.cancelable) {
       event.preventDefault();
     }
 
@@ -208,15 +215,31 @@ export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
     api.start({
       height: height
     });
-    setStatus(height > threshold ? PullStatus.thresholdMet : PullStatus.idle);
+    setStatus(height > threshold ? 'canRelease' : 'pulling');
   }, {
-    useTouch: true,
+    pointer: {
+      touch: true
+    },
     axis: 'y',
-    domTarget: elementRef,
+    target: elementRef,
     eventOptions: supportsPassive ? {
       passive: false
     } : false
   });
+
+  var renderStatusText = function renderStatusText() {
+    var _a;
+
+    if (props.renderText) {
+      return (_a = props.renderText) === null || _a === void 0 ? void 0 : _a.call(props, status);
+    }
+
+    if (status === 'pulling') return props.pullingText;
+    if (status === 'canRelease') return props.canReleaseText;
+    if (status === 'refreshing') return props.refreshingText;
+    if (status === 'complete') return props.completeText;
+  };
+
   return /*#__PURE__*/React.createElement(animated.div, {
     ref: elementRef,
     className: classPrefix
@@ -228,5 +251,7 @@ export var PullToRefresh = withDefaultProps(defaultProps)(function (props) {
     style: {
       height: headHeight
     }
-  }, status === PullStatus.idle && props.pullingText, status === PullStatus.thresholdMet && props.releaseText, status === PullStatus.refreshing && props.refreshingText, status === PullStatus.complete && props.completeText)), /*#__PURE__*/React.createElement("div", null, props.children));
-});
+  }, renderStatusText())), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-content"
+  }, props.children));
+};

package/es/components/radio/group.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { FC } from 'react';
 import { RadioValue } from '.';
 export interface RadioGroupProps {
     value?: RadioValue | null;
@@ -6,4 +6,4 @@ export interface RadioGroupProps {
     defaultValue?: RadioValue | null;
     disabled?: boolean;
 }
-export declare const Group: React.FC<RadioGroupProps>;
+export declare const Group: FC<RadioGroupProps>;

package/es/components/radio/group.js

@@ -1,15 +1,17 @@
 import React from 'react';
-import { withDefaultProps } from '../../utils/with-default-props';
+import { mergeProps } from '../../utils/with-default-props';
 import { RadioGroupContext } from './group-context';
-import { useNewControllableValue } from '../../utils/use-controllable-value';
+import { usePropsValue } from '../../utils/use-props-value';
 var defaultProps = {
   disabled: false,
   defaultValue: null
 };
-export var Group = withDefaultProps(defaultProps)(function (props) {
-  var _useNewControllableVa = useNewControllableValue(props),
-      value = _useNewControllableVa[0],
-      setValue = _useNewControllableVa[1];
+export var Group = function Group(p) {
+  var props = mergeProps(defaultProps, p);
+
+  var _usePropsValue = usePropsValue(props),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
 
   return /*#__PURE__*/React.createElement(RadioGroupContext.Provider // TODO: 性能优化
   , {
@@ -23,4 +25,4 @@ export var Group = withDefaultProps(defaultProps)(function (props) {
       disabled: props.disabled
     }
   }, props.children);
-});
+};

package/es/components/radio/radio.css

@@ -1,5 +1,9 @@
 .adm-radio {
+  --icon-size: 22px;
+  --font-size: 17px;
+  --gap: 8px;
   display: inline-flex;
+  vertical-align: text-bottom;
   justify-content: flex-start;
   align-items: center;
   cursor: pointer;
@@ -10,25 +14,24 @@
 .adm-radio .adm-radio-icon {
   flex: none;
   border: 1px solid #ccc;
-  border-radius: 22px;
+  border-radius: var(--icon-size);
   box-sizing: border-box;
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 22px;
-  height: 22px;
-  font-size: 12px;
-  color: transparent;
+  width: var(--icon-size);
+  height: var(--icon-size);
+  color: #ffffff;
 }
-.adm-radio .adm-radio-icon > span {
-  font-size: 12px;
+.adm-radio .adm-radio-icon-checked {
   display: block;
+  width: 65%;
+  height: 65%;
 }
 .adm-radio.adm-radio-block {
   display: flex;
 }
 .adm-radio.adm-radio-checked .adm-radio-icon {
-  color: #ffffff;
   border-color: var(--adm-color-primary);
   background-color: var(--adm-color-primary);
 }
@@ -39,18 +42,15 @@
   color: var(--adm-color-weak);
 }
 .adm-radio.adm-radio-disabled .adm-radio-icon {
-  background-color: #ebedf0;
-}
-.adm-radio.adm-radio-disabled.adm-radio-checked .adm-radio-icon {
   color: #ccc;
   border-color: #ccc;
   background-color: #ebedf0;
 }
 .adm-radio .adm-radio-custom-icon {
-  font-size: 17px;
+  font-size: var(--icon-size);
 }
 .adm-radio-content {
   flex: none;
-  font-size: 17px;
-  padding-left: 8px;
+  font-size: var(--font-size);
+  padding-left: var(--gap);
 }

package/es/components/radio/radio.d.ts

@@ -10,5 +10,5 @@ export declare type RadioProps = {
     block?: boolean;
     id?: string;
     icon?: (checked: boolean) => React.ReactNode;
-} & NativeProps;
+} & NativeProps<'--icon-size' | '--font-size' | '--gap'>;
 export declare const Radio: FC<RadioProps>;

package/es/components/radio/radio.js

@@ -1,9 +1,10 @@
 import React, { useContext } from 'react';
+import { withNativeProps } from '../../utils/native-props';
 import classNames from 'classnames';
-import { CheckOutlined } from '@ant-design/icons';
 import { RadioGroupContext } from './group-context';
-import { useNewControllableValue } from '../../utils/use-controllable-value';
+import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
+import { CheckIcon } from '../checkbox/check-icon';
 var classPrefix = "adm-radio";
 var defaultProps = {
   defaultChecked: false
@@ -14,13 +15,13 @@ export var Radio = function Radio(p) {
   var props = mergeProps(defaultProps, p);
   var groupContext = useContext(RadioGroupContext);
 
-  var _useNewControllableVa = useNewControllableValue({
+  var _usePropsValue = usePropsValue({
     value: props.checked,
     defaultValue: props.defaultChecked,
     onChange: props.onChange
   }),
-      checked = _useNewControllableVa[0],
-      setChecked = _useNewControllableVa[1];
+      checked = _usePropsValue[0],
+      setChecked = _usePropsValue[1];
 
   var disabled = props.disabled;
   var value = props.value;
@@ -52,12 +53,12 @@ export var Radio = function Radio(p) {
 
     return /*#__PURE__*/React.createElement("div", {
       className: classPrefix + "-icon"
-    }, /*#__PURE__*/React.createElement(CheckOutlined, {
+    }, checked && /*#__PURE__*/React.createElement(CheckIcon, {
       className: classPrefix + "-icon-checked"
     }));
   };
 
-  return /*#__PURE__*/React.createElement("label", {
+  return withNativeProps(props, /*#__PURE__*/React.createElement("label", {
     className: classNames(classPrefix, props.className, (_classNames = {}, _classNames[classPrefix + "-checked"] = checked, _classNames[classPrefix + "-disabled"] = disabled, _classNames[classPrefix + "-block"] = props.block, _classNames)),
     style: props.style
   }, /*#__PURE__*/React.createElement("input", {
@@ -74,5 +75,5 @@ export var Radio = function Radio(p) {
     id: props.id
   }), renderIcon(), props.children && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-content"
-  }, props.children));
+  }, props.children)));
 };

package/es/components/rate/rate.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type RateProps = {
     allowClear?: boolean;
@@ -6,8 +6,8 @@ export declare type RateProps = {
     character?: React.ReactNode;
     count?: number;
     defaultValue?: number;
-    readonly?: boolean;
+    readOnly?: boolean;
     value?: number;
     onChange?: (value: number) => void;
 } & NativeProps<'--star-size' | '--active-color'>;
-export declare const Rate: React.FC<RateProps>;
+export declare const Rate: FC<RateProps>;

package/es/components/rate/rate.js

@@ -1,22 +1,24 @@
 import React from 'react';
 import classNames from 'classnames';
 import { withNativeProps } from '../../utils/native-props';
-import { withDefaultProps } from '../../utils/with-default-props';
-import { StarFilled } from '@ant-design/icons';
-import { useNewControllableValue } from '../../utils/use-controllable-value';
+import { mergeProps } from '../../utils/with-default-props';
+import { StarFill } from 'antd-mobile-icons';
+import { usePropsValue } from '../../utils/use-props-value';
 var classPrefix = "adm-rate";
 var defaultProps = {
   count: 5,
   allowHalf: false,
-  character: /*#__PURE__*/React.createElement(StarFilled, null),
+  character: /*#__PURE__*/React.createElement(StarFill, null),
   defaultValue: 0,
-  readonly: false,
+  readOnly: false,
   allowClear: true
 };
-export var Rate = withDefaultProps(defaultProps)(function (props) {
-  var _useNewControllableVa = useNewControllableValue(props),
-      value = _useNewControllableVa[0],
-      setValue = _useNewControllableVa[1];
+export var Rate = function Rate(p) {
+  var props = mergeProps(defaultProps, p);
+
+  var _usePropsValue = usePropsValue(props),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
 
   var starList = Array(props.count).fill(null);
 
@@ -24,9 +26,9 @@ export var Rate = withDefaultProps(defaultProps)(function (props) {
     var _classNames;
 
     return /*#__PURE__*/React.createElement("div", {
-      className: classNames(classPrefix + "-star", (_classNames = {}, _classNames[classPrefix + "-star-active"] = value >= v, _classNames[classPrefix + "-star-half"] = half, _classNames[classPrefix + "-star-readonly"] = props.readonly, _classNames)),
+      className: classNames(classPrefix + "-star", (_classNames = {}, _classNames[classPrefix + "-star-active"] = value >= v, _classNames[classPrefix + "-star-half"] = half, _classNames[classPrefix + "-star-readonly"] = props.readOnly, _classNames)),
       onClick: function onClick() {
-        if (props.readonly) return;
+        if (props.readOnly) return;
 
         if (props.allowClear && value === v) {
           setValue(0);
@@ -45,4 +47,4 @@ export var Rate = withDefaultProps(defaultProps)(function (props) {
       className: classNames(classPrefix + "-box")
     }, props.allowHalf && renderStar(i + 0.5, true), renderStar(i + 1, false));
   })));
-});
+};

package/es/components/result/result.css

@@ -12,7 +12,7 @@
   margin: 0 auto 20px auto;
   padding: 6px;
 }
-.adm-result-icon .anticon {
+.adm-result-icon .antd-mobile-icon {
   font-size: 52px;
 }
 .adm-result-title {
@@ -28,18 +28,18 @@
   line-height: 1.4;
   text-align: center;
 }
-.adm-result-success .adm-result-icon .anticon {
+.adm-result-success .adm-result-icon .antd-mobile-icon {
   color: var(--adm-color-primary);
 }
-.adm-result-error .adm-result-icon .anticon {
+.adm-result-error .adm-result-icon .antd-mobile-icon {
   color: var(--adm-color-danger);
 }
-.adm-result-info .adm-result-icon .anticon {
+.adm-result-info .adm-result-icon .antd-mobile-icon {
   color: var(--adm-color-primary);
 }
-.adm-result-waiting .adm-result-icon .anticon {
+.adm-result-waiting .adm-result-icon .antd-mobile-icon {
   color: var(--adm-color-success);
 }
-.adm-result-warning .adm-result-icon .anticon {
+.adm-result-warning .adm-result-icon .antd-mobile-icon {
   color: var(--adm-color-warning);
 }

package/es/components/result/result.d.ts

@@ -1,10 +1,9 @@
-import React, { FC, ReactNode } from 'react';
-export interface ResultProps {
+import { FC, ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type ResultProps = {
     status: 'success' | 'error' | 'info' | 'waiting' | 'warning';
     title: string;
     description?: string;
     icon?: ReactNode;
-    className?: string;
-    style?: React.CSSProperties;
-}
+} & NativeProps;
 export declare const Result: FC<ResultProps>;

package/es/components/result/result.js

@@ -1,33 +1,29 @@
 import React from 'react';
 import classNames from 'classnames';
-import { CheckCircleFilled, CloseCircleFilled, InfoCircleFilled, ClockCircleFilled, ExclamationCircleFilled } from '@ant-design/icons';
+import { CheckCircleFill, CloseCircleFill, InformationCircleFill, ClockCircleFill, ExclamationCircleFill } from 'antd-mobile-icons';
+import { withNativeProps } from '../../utils/native-props';
 var classPrefix = "adm-result";
-var ICONS = {
-  success: CheckCircleFilled,
-  error: CloseCircleFilled,
-  info: InfoCircleFilled,
-  waiting: ClockCircleFilled,
-  warning: ExclamationCircleFilled
+var iconRecord = {
+  success: CheckCircleFill,
+  error: CloseCircleFill,
+  info: InformationCircleFill,
+  waiting: ClockCircleFill,
+  warning: ExclamationCircleFill
 };
 export var Result = function Result(props) {
-  var className = props.className,
-      style = props.style,
-      status = props.status,
+  var status = props.status,
       title = props.title,
       description = props.description,
       icon = props.icon;
-  var resultIcon = icon || /*#__PURE__*/React.createElement(ICONS[status]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix, classPrefix + "-" + status, className),
-    style: style
+  if (!status) return null;
+  var resultIcon = icon || /*#__PURE__*/React.createElement(iconRecord[status]);
+  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    className: classNames(classPrefix, classPrefix + "-" + status)
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-icon"
   }, resultIcon), /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-title"
   }, title), description ? /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-description"
-  }, description) : null);
-};
-Result.defaultProps = {
-  description: ''
+  }, description) : null));
 };

package/es/components/safe-area/index.d.ts

@@ -0,0 +1,4 @@
+import './safe-area.less';
+import { SafeArea } from './safe-area';
+export type { SafeAreaProps } from './safe-area';
+export default SafeArea;

package/es/components/safe-area/index.js

@@ -0,0 +1,3 @@
+import "./safe-area.css";
+import { SafeArea } from './safe-area';
+export default SafeArea;

package/es/components/safe-area/safe-area.css

@@ -0,0 +1,10 @@
+.adm-safe-area {
+  display: block;
+  width: 100%;
+}
+.adm-safe-area-position-top {
+  padding-top: env(safe-area-inset-top);
+}
+.adm-safe-area-position-bottom {
+  padding-bottom: env(safe-area-inset-bottom);
+}

package/es/components/safe-area/safe-area.d.ts

@@ -0,0 +1,6 @@
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type SafeAreaProps = {
+    position: 'top' | 'bottom';
+} & NativeProps;
+export declare const SafeArea: FC<SafeAreaProps>;

package/es/components/safe-area/safe-area.js

@@ -0,0 +1,9 @@
+import { withNativeProps } from '../../utils/native-props';
+import React from 'react';
+import classNames from 'classnames';
+var classPrefix = 'adm-safe-area';
+export var SafeArea = function SafeArea(props) {
+  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    className: classNames(classPrefix, classPrefix + "-position-" + props.position)
+  }));
+};

package/es/components/scroll-mask/index.d.ts

@@ -0,0 +1,4 @@
+import './scroll-mask.less';
+import { ScrollMask } from './scroll-mask';
+export type { ScrollMaskProps } from './scroll-mask';
+export default ScrollMask;

package/es/components/scroll-mask/index.js

@@ -0,0 +1,3 @@
+import "./scroll-mask.css";
+import { ScrollMask } from './scroll-mask';
+export default ScrollMask;

package/es/components/scroll-mask/scroll-mask.css

@@ -0,0 +1,17 @@
+.adm-scroll-mask {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  z-index: 1;
+  width: 30px;
+  height: 100%;
+  pointer-events: none;
+}
+.adm-scroll-mask-left {
+  left: 0;
+  background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
+}
+.adm-scroll-mask-right {
+  right: 0;
+  background: linear-gradient(to left, #fff, rgba(255, 255, 255, 0));
+}

package/es/components/scroll-mask/scroll-mask.d.ts

@@ -0,0 +1,5 @@
+import { FC, RefObject } from 'react';
+export declare type ScrollMaskProps = {
+    scrollTrackRef: RefObject<HTMLElement>;
+};
+export declare const ScrollMask: FC<ScrollMaskProps>;