antd-mobile 5.0.0-rc.2 → 5.0.0-rc.23

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

@@ -1,35 +1,4 @@
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
+import { __awaiter } from "tslib";
 import { mergeProps } from '../../utils/with-default-props';
 import { animated, useSpring } from '@react-spring/web';
 import { useDrag } from '@use-gesture/react';
@@ -39,141 +8,78 @@ import { supportsPassive } from '../../utils/supports-passive';
 import { convertPx } from '../../utils/convert-px';
 import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
 import { sleep } from '../../utils/sleep';
-var classPrefix = "adm-pull-to-refresh";
-export var defaultProps = {
+const classPrefix = `adm-pull-to-refresh`;
+export const defaultProps = {
   pullingText: '下拉刷新',
   canReleaseText: '释放立即刷新',
   refreshingText: '加载中……',
   completeText: '刷新成功',
   completeDelay: 500,
-  onRefresh: function onRefresh() {}
+  disabled: false,
+  onRefresh: () => {}
 };
-export var PullToRefresh = function PullToRefresh(p) {
+export const 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('pulling'),
-      status = _useState[0],
-      setStatus = _useState[1];
-
-  var _useSpring = useSpring(function () {
-    return {
-      from: {
-        height: 0
-      },
-      config: {
-        tension: 300,
-        friction: 30,
-        clamp: true
-      }
-    };
-  }),
-      springStyles = _useSpring[0],
-      api = _useSpring[1];
-
-  var elementRef = useRef(null);
-  var pullingRef = useRef(false);
+  const props = mergeProps(defaultProps, p);
+  const headHeight = (_a = props.headHeight) !== null && _a !== void 0 ? _a : convertPx(40);
+  const threshold = (_b = props.threshold) !== null && _b !== void 0 ? _b : convertPx(60);
+  const [status, setStatus] = useState('pulling');
+  const [springStyles, api] = useSpring(() => ({
+    from: {
+      height: 0
+    },
+    config: {
+      tension: 300,
+      friction: 30,
+      clamp: true
+    }
+  }));
+  const elementRef = useRef(null);
+  const pullingRef = useRef(false);
 
   function doRefresh() {
-    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-      var _this = this;
-
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              api.start({
-                height: headHeight
-              });
-              setStatus('refreshing');
-              _context3.prev = 2;
-              _context3.next = 5;
-              return props.onRefresh();
-
-            case 5:
-              setStatus('complete');
-              _context3.next = 12;
-              break;
-
-            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() {
-                    return regeneratorRuntime.wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            _context.next = 2;
-                            return next({
-                              height: 0
-                            });
-
-                          case 2:
-                            setStatus('pulling');
-
-                          case 3:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }));
-                }
-              });
-              throw _context3.t0;
-
-            case 12:
-              if (!(props.completeDelay > 0)) {
-                _context3.next = 15;
-                break;
-              }
+    return __awaiter(this, void 0, void 0, function* () {
+      api.start({
+        height: headHeight
+      });
+      setStatus('refreshing');
 
-              _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 2:
-                            setStatus('pulling');
+      try {
+        yield props.onRefresh();
+        setStatus('complete');
+      } catch (e) {
+        api.start({
+          to: next => __awaiter(this, void 0, void 0, function* () {
+            yield next({
+              height: 0
+            });
+            setStatus('pulling');
+          })
+        });
+        throw e;
+      }
 
-                          case 3:
-                          case "end":
-                            return _context2.stop();
-                        }
-                      }
-                    }, _callee2);
-                  }));
-                }
-              });
+      if (props.completeDelay > 0) {
+        yield sleep(props.completeDelay);
+      }
 
-            case 16:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3, null, [[2, 8]]);
-    }));
+      api.start({
+        to: next => __awaiter(this, void 0, void 0, function* () {
+          yield next({
+            height: 0
+          });
+          setStatus('pulling');
+        })
+      });
+    });
   }
 
-  useDrag(function (state) {
+  useDrag(state => {
     if (status === 'refreshing' || status === 'complete') return;
-    var event = state.event;
+    const {
+      event
+    } = state;
 
     if (state.last) {
       pullingRef.current = false;
@@ -189,15 +95,14 @@ export var PullToRefresh = function PullToRefresh(p) {
       return;
     }
 
-    var _state$movement = state.movement,
-        y = _state$movement[1];
+    const [, y] = state.movement;
 
     if (state.first) {
-      var element = elementRef.current;
+      const element = elementRef.current;
       if (!element) return;
-      var scrollParent = getScrollParent(element);
+      const scrollParent = getScrollParent(element);
       if (!scrollParent) return;
-      var top = 'scrollTop' in scrollParent ? scrollParent.scrollTop : scrollParent.pageYOffset;
+      const top = 'scrollTop' in scrollParent ? scrollParent.scrollTop : scrollParent.pageYOffset;
 
       if (top <= 0 && y > 0) {
         pullingRef.current = true;
@@ -211,9 +116,9 @@ export var PullToRefresh = function PullToRefresh(p) {
     }
 
     event.stopPropagation();
-    var height = Math.max(rubberbandIfOutOfBounds(y, 0, 0, headHeight * 5, 0.5), 0);
+    const height = Math.max(rubberbandIfOutOfBounds(y, 0, 0, headHeight * 5, 0.5), 0);
     api.start({
-      height: height
+      height
     });
     setStatus(height > threshold ? 'canRelease' : 'pulling');
   }, {
@@ -222,12 +127,13 @@ export var PullToRefresh = function PullToRefresh(p) {
     },
     axis: 'y',
     target: elementRef,
+    enabled: !props.disabled,
     eventOptions: supportsPassive ? {
       passive: false
     } : false
   });
 
-  var renderStatusText = function renderStatusText() {
+  const renderStatusText = () => {
     var _a;
 
     if (props.renderText) {
@@ -240,18 +146,18 @@ export var PullToRefresh = function PullToRefresh(p) {
     if (status === 'complete') return props.completeText;
   };
 
-  return /*#__PURE__*/React.createElement(animated.div, {
+  return React.createElement(animated.div, {
     ref: elementRef,
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(animated.div, {
+  }, React.createElement(animated.div, {
     style: springStyles,
-    className: classPrefix + "-head"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-head-content",
+    className: `${classPrefix}-head`
+  }, React.createElement("div", {
+    className: `${classPrefix}-head-content`,
     style: {
       height: headHeight
     }
-  }, renderStatusText())), /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-content"
+  }, renderStatusText())), React.createElement("div", {
+    className: `${classPrefix}-content`
   }, props.children));
 };

package/2x/es/components/radio/group-context.js

@@ -1,2 +1,2 @@
 import { createContext } from 'react';
-export var RadioGroupContext = /*#__PURE__*/createContext(null);
+export const RadioGroupContext = createContext(null);

package/2x/es/components/radio/group.js

@@ -2,26 +2,31 @@ import React from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { RadioGroupContext } from './group-context';
 import { usePropsValue } from '../../utils/use-props-value';
-var defaultProps = {
+const defaultProps = {
   disabled: false,
   defaultValue: null
 };
-export var Group = function Group(p) {
-  var props = mergeProps(defaultProps, p);
+export const Group = p => {
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue({
+    value: props.value,
+    defaultValue: props.defaultValue,
+    onChange: v => {
+      var _a;
 
-  var _usePropsValue = usePropsValue(props),
-      value = _usePropsValue[0],
-      setValue = _usePropsValue[1];
-
-  return /*#__PURE__*/React.createElement(RadioGroupContext.Provider // TODO: 性能优化
+      if (v === null) return;
+      (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v);
+    }
+  });
+  return React.createElement(RadioGroupContext.Provider // TODO: 性能优化
   , {
     // TODO: 性能优化
     value: {
       value: value === null ? [] : [value],
-      check: function check(v) {
+      check: v => {
         setValue(v);
       },
-      uncheck: function uncheck() {},
+      uncheck: () => {},
       disabled: props.disabled
     }
   }, props.children);

package/2x/es/components/radio/index.js

@@ -3,5 +3,5 @@ import { attachPropertiesToComponent } from '../../utils/attach-properties-to-co
 import { Group } from './group';
 import { Radio } from './radio';
 export default attachPropertiesToComponent(Radio, {
-  Group: Group
+  Group
 });

package/2x/es/components/radio/radio.css

@@ -15,21 +15,18 @@
 
 .adm-radio .adm-radio-icon {
   flex: none;
-  border: 2px solid #ccc;
+  border: 2px solid var(--adm-color-light);
   border-radius: var(--icon-size);
   box-sizing: border-box;
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: var(--icon-size);
   height: var(--icon-size);
-  color: #ffffff;
+  color: var(--adm-color-white);
 }
 
-.adm-radio .adm-radio-icon-checked {
+.adm-radio .adm-radio-icon > svg {
   display: block;
-  width: 65%;
-  height: 65%;
+  width: 100%;
+  height: 100%;
 }
 
 .adm-radio.adm-radio-block {
@@ -46,13 +43,13 @@
 }
 
 .adm-radio.adm-radio-disabled .adm-radio-content {
-  color: var(--adm-color-weak);
+  opacity: 0.4;
 }
 
 .adm-radio.adm-radio-disabled .adm-radio-icon {
-  color: #ccc;
-  border-color: #ccc;
-  background-color: #ebedf0;
+  color: #b7b7b7;
+  border-color: var(--adm-color-light);
+  background-color: #f5f5f5;
 }
 
 .adm-radio .adm-radio-custom-icon {
@@ -60,7 +57,7 @@
 }
 
 .adm-radio-content {
-  flex: none;
+  flex: 0 1 auto;
   font-size: var(--font-size);
   padding-left: var(--gap);
 }

package/2x/es/components/radio/radio.js

@@ -5,31 +5,27 @@ import { RadioGroupContext } from './group-context';
 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 = {
+const classPrefix = `adm-radio`;
+const defaultProps = {
   defaultChecked: false
 };
-export var Radio = function Radio(p) {
-  var _classNames;
-
-  var props = mergeProps(defaultProps, p);
-  var groupContext = useContext(RadioGroupContext);
-
-  var _usePropsValue = usePropsValue({
+export const Radio = p => {
+  const props = mergeProps(defaultProps, p);
+  const groupContext = useContext(RadioGroupContext);
+  let [checked, setChecked] = usePropsValue({
     value: props.checked,
     defaultValue: props.defaultChecked,
     onChange: props.onChange
-  }),
-      checked = _usePropsValue[0],
-      setChecked = _usePropsValue[1];
-
-  var disabled = props.disabled;
-  var value = props.value;
+  });
+  let disabled = props.disabled;
+  const {
+    value
+  } = props;
 
   if (groupContext && value !== undefined) {
     checked = groupContext.value.includes(value);
 
-    setChecked = function setChecked(checked) {
+    setChecked = checked => {
       var _a;
 
       if (checked) {
@@ -44,36 +40,38 @@ export var Radio = function Radio(p) {
     disabled = disabled || groupContext.disabled;
   }
 
-  var renderIcon = function renderIcon() {
+  const renderIcon = () => {
     if (props.icon) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: classPrefix + "-custom-icon"
+      return React.createElement("div", {
+        className: `${classPrefix}-custom-icon`
       }, props.icon(checked));
     }
 
-    return /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-icon"
-    }, checked && /*#__PURE__*/React.createElement(CheckIcon, {
-      className: classPrefix + "-icon-checked"
-    }));
+    return React.createElement("div", {
+      className: `${classPrefix}-icon`
+    }, checked && React.createElement(CheckIcon, null));
   };
 
-  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)),
+  return withNativeProps(props, React.createElement("label", {
+    className: classNames(classPrefix, props.className, {
+      [`${classPrefix}-checked`]: checked,
+      [`${classPrefix}-disabled`]: disabled,
+      [`${classPrefix}-block`]: props.block
+    }),
     style: props.style
-  }, /*#__PURE__*/React.createElement("input", {
+  }, React.createElement("input", {
     type: 'radio',
     checked: checked,
-    onChange: function onChange(e) {
+    onChange: e => {
       setChecked(e.target.checked);
     },
-    onClick: function onClick(e) {
+    onClick: e => {
       e.stopPropagation();
       e.nativeEvent.stopImmediatePropagation();
     },
     disabled: disabled,
     id: props.id
-  }), renderIcon(), props.children && /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-content"
+  }), renderIcon(), props.children && React.createElement("div", {
+    className: `${classPrefix}-content`
   }, props.children)));
 };

package/2x/es/components/rate/rate.css

@@ -16,6 +16,7 @@
   text-align: center;
   overflow: hidden;
   cursor: pointer;
+  box-sizing: border-box;
 }
 
 .adm-rate-star-half {

package/2x/es/components/rate/rate.js

@@ -4,30 +4,28 @@ import { withNativeProps } from '../../utils/native-props';
 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 = {
+const classPrefix = `adm-rate`;
+const defaultProps = {
   count: 5,
   allowHalf: false,
-  character: /*#__PURE__*/React.createElement(StarFill, null),
+  character: React.createElement(StarFill, null),
   defaultValue: 0,
   readOnly: false,
   allowClear: true
 };
-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);
+export const Rate = p => {
+  const props = mergeProps(defaultProps, p);
+  const [value, setValue] = usePropsValue(props);
+  const starList = Array(props.count).fill(null);
 
   function renderStar(v, half) {
-    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)),
-      onClick: function onClick() {
+    return React.createElement("div", {
+      className: classNames(`${classPrefix}-star`, {
+        [`${classPrefix}-star-active`]: value >= v,
+        [`${classPrefix}-star-half`]: half,
+        [`${classPrefix}-star-readonly`]: props.readOnly
+      }),
+      onClick: () => {
         if (props.readOnly) return;
 
         if (props.allowClear && value === v) {
@@ -39,12 +37,10 @@ export var Rate = function Rate(p) {
     }, props.character);
   }
 
-  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+  return withNativeProps(props, React.createElement("div", {
     className: classPrefix
-  }, starList.map(function (_, i) {
-    return /*#__PURE__*/React.createElement("div", {
-      key: i,
-      className: classNames(classPrefix + "-box")
-    }, props.allowHalf && renderStar(i + 0.5, true), renderStar(i + 1, false));
-  })));
+  }, starList.map((_, i) => React.createElement("div", {
+    key: i,
+    className: classNames(`${classPrefix}-box`)
+  }, props.allowHalf && renderStar(i + 0.5, true), renderStar(i + 1, false)))));
 };

package/2x/es/components/result/result.css

@@ -1,9 +1,6 @@
 .adm-result {
-  --bg-color: var(--adm-color-white);
-  --color: var(--adm-color-text);
-  --adm-color-weak: var(--adm-color-weak);
   padding: 64px 24px;
-  background-color: var(--bg-color);
+  background-color: var(--adm-color-white);
 }
 
 .adm-result-icon {
@@ -19,7 +16,7 @@
 }
 
 .adm-result-title {
-  color: var(--color);
+  color: var(--adm-color-text);
   font-size: 36px;
   line-height: 1.4;
   text-align: center;

package/2x/es/components/result/result.js

@@ -2,28 +2,30 @@ import React from 'react';
 import classNames from 'classnames';
 import { CheckCircleFill, CloseCircleFill, InformationCircleFill, ClockCircleFill, ExclamationCircleFill } from 'antd-mobile-icons';
 import { withNativeProps } from '../../utils/native-props';
-var classPrefix = "adm-result";
-var iconRecord = {
+const classPrefix = `adm-result`;
+const iconRecord = {
   success: CheckCircleFill,
   error: CloseCircleFill,
   info: InformationCircleFill,
   waiting: ClockCircleFill,
   warning: ExclamationCircleFill
 };
-export var Result = function Result(props) {
-  var status = props.status,
-      title = props.title,
-      description = props.description,
-      icon = props.icon;
+export const Result = props => {
+  const {
+    status,
+    title,
+    description,
+    icon
+  } = props;
   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"
+  const resultIcon = icon || React.createElement(iconRecord[status]);
+  return withNativeProps(props, React.createElement("div", {
+    className: classNames(classPrefix, `${classPrefix}-${status}`)
+  }, React.createElement("div", {
+    className: `${classPrefix}-icon`
+  }, resultIcon), React.createElement("div", {
+    className: `${classPrefix}-title`
+  }, title), description ? React.createElement("div", {
+    className: `${classPrefix}-description`
   }, description) : null));
 };

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

@@ -1,9 +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)
+const classPrefix = 'adm-safe-area';
+export const SafeArea = props => {
+  return withNativeProps(props, React.createElement("div", {
+    className: classNames(classPrefix, `${classPrefix}-position-${props.position}`)
   }));
 };