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

package/cjs/components/swiper/swiper.js

@@ -25,17 +25,19 @@ var _pageIndicator = _interopRequireDefault(require("../page-indicator"));
 
 var _stagedComponents = require("staged-components");
 
-var _useRefState2 = require("../../utils/use-ref-state");
+var _useRefState = require("../../utils/use-ref-state");
 
 var _bound = require("../../utils/bound");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _ahooks = require("ahooks");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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; }
+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); }
 
-var defaultProps = {
+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 defaultProps = {
   defaultIndex: 0,
   allowTouchMove: true,
   autoplay: false,
@@ -47,17 +49,19 @@ var defaultProps = {
   stuckAtBoundary: true,
   rubberband: true
 };
-var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(function (p, ref) {
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  var isVertical = props.direction === 'vertical';
-  var slideRatio = props.slideSize / 100;
-  var offsetRatio = props.trackOffset / 100;
-
-  var _useMemo = (0, _react.useMemo)(function () {
-    var count = 0;
-
-    var validChildren = _react["default"].Children.map(props.children, function (child) {
-      if (! /*#__PURE__*/_react["default"].isValidElement(child)) return null;
+const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) => {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const isVertical = props.direction === 'vertical';
+  const slideRatio = props.slideSize / 100;
+  const offsetRatio = props.trackOffset / 100;
+  const {
+    validChildren,
+    count
+  } = (0, _react.useMemo)(() => {
+    let count = 0;
+
+    const validChildren = _react.default.Children.map(props.children, child => {
+      if (!_react.default.isValidElement(child)) return null;
 
       if (child.type !== _swiperItem.SwiperItem) {
         (0, _devLog.devWarning)('Swiper', 'The children of `Swiper` must be `Swiper.Item` components.');
@@ -69,46 +73,43 @@ var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(f
     });
 
     return {
-      validChildren: validChildren,
-      count: count
+      validChildren,
+      count
     };
-  }, [props.children]),
-      validChildren = _useMemo.validChildren,
-      count = _useMemo.count;
+  }, [props.children]);
 
   if (count === 0 || !validChildren) {
     (0, _devLog.devWarning)('Swiper', '`Swiper` needs at least one child.');
     return null;
   }
 
-  return function () {
-    var loop = props.loop;
+  return () => {
+    let loop = props.loop;
 
     if (slideRatio * (count - 1) < 1) {
       loop = false;
     }
 
-    var trackRef = (0, _react.useRef)(null);
+    const trackRef = (0, _react.useRef)(null);
 
     function getSlidePixels() {
-      var track = trackRef.current;
+      const track = trackRef.current;
       if (!track) return 0;
-      var trackPixels = isVertical ? track.offsetHeight : track.offsetWidth;
+      const trackPixels = isVertical ? track.offsetHeight : track.offsetWidth;
       return trackPixels * props.slideSize / 100;
     }
 
-    var _useState = (0, _react.useState)(props.defaultIndex),
-        current = _useState[0],
-        setCurrent = _useState[1];
+    const [current, setCurrent] = (0, _react.useState)(props.defaultIndex);
+    (0, _ahooks.useUpdateEffect)(() => {
+      var _a;
 
-    var _useRefState = (0, _useRefState2.useRefState)(false),
-        dragging = _useRefState[0],
-        setDragging = _useRefState[1],
-        draggingRef = _useRefState[2];
+      (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, current);
+    }, [current]);
+    const [dragging, setDragging, draggingRef] = (0, _useRefState.useRefState)(false);
 
     function boundIndex(current) {
-      var min = 0;
-      var max = count - 1;
+      let min = 0;
+      let max = count - 1;
 
       if (props.stuckAtBoundary) {
         min += offsetRatio / slideRatio;
@@ -118,36 +119,33 @@ var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(f
       return (0, _bound.bound)(current, min, max);
     }
 
-    var _useSpring = (0, _web.useSpring)(function () {
-      return {
-        position: boundIndex(current) * 100,
-        config: {
-          tension: 200,
-          friction: 30
-        },
-        onRest: function onRest() {
-          if (draggingRef.current) return;
-          var rawX = position.get();
-          var totalWidth = 100 * count;
-          var standardPosition = modulus(rawX, totalWidth);
-          if (standardPosition === rawX) return;
-          api.start({
-            position: standardPosition,
-            immediate: true
-          });
-        }
-      };
-    }, [count]),
-        position = _useSpring[0].position,
-        api = _useSpring[1];
-
-    var bind = (0, _react2.useDrag)(function (state) {
-      var slidePixels = getSlidePixels();
+    const [{
+      position
+    }, api] = (0, _web.useSpring)(() => ({
+      position: boundIndex(current) * 100,
+      config: {
+        tension: 200,
+        friction: 30
+      },
+      onRest: () => {
+        if (draggingRef.current) return;
+        const rawX = position.get();
+        const totalWidth = 100 * count;
+        const standardPosition = modulus(rawX, totalWidth);
+        if (standardPosition === rawX) return;
+        api.start({
+          position: standardPosition,
+          immediate: true
+        });
+      }
+    }), [count]);
+    const bind = (0, _react2.useDrag)(state => {
+      const slidePixels = getSlidePixels();
       if (!slidePixels) return;
-      var paramIndex = isVertical ? 1 : 0;
-      var offset = state.offset[paramIndex];
-      var direction = state.direction[paramIndex];
-      var velocity = state.velocity[paramIndex];
+      const paramIndex = isVertical ? 1 : 0;
+      const offset = state.offset[paramIndex];
+      const direction = state.direction[paramIndex];
+      const velocity = state.velocity[paramIndex];
       setDragging(true);
 
       if (!state.last) {
@@ -156,29 +154,25 @@ var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(f
           immediate: true
         });
       } else {
-        var minIndex = Math.floor(offset / slidePixels);
-        var maxIndex = minIndex + 1;
-        var index = Math.round((offset + velocity * 2000 * direction) / slidePixels);
+        const minIndex = Math.floor(offset / slidePixels);
+        const maxIndex = minIndex + 1;
+        const index = Math.round((offset + velocity * 2000 * direction) / slidePixels);
         swipeTo((0, _bound.bound)(index, minIndex, maxIndex));
-        window.setTimeout(function () {
+        window.setTimeout(() => {
           setDragging(false);
         });
       }
     }, {
-      transform: function transform(_ref) {
-        var x = _ref[0],
-            y = _ref[1];
-        return [-x, -y];
-      },
-      from: function from() {
-        var slidePixels = getSlidePixels();
+      transform: ([x, y]) => [-x, -y],
+      from: () => {
+        const slidePixels = getSlidePixels();
         return [position.get() / 100 * slidePixels, position.get() / 100 * slidePixels];
       },
-      bounds: function bounds() {
+      bounds: () => {
         if (loop) return {};
-        var slidePixels = getSlidePixels();
-        var lowerBound = boundIndex(0) * slidePixels;
-        var upperBound = boundIndex(count - 1) * slidePixels;
+        const slidePixels = getSlidePixels();
+        const lowerBound = boundIndex(0) * slidePixels;
+        const upperBound = boundIndex(count - 1) * slidePixels;
         return isVertical ? {
           top: lowerBound,
           bottom: upperBound
@@ -195,31 +189,14 @@ var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(f
       }
     });
 
-    function swipeTo(index, immediate) {
-      if (immediate === void 0) {
-        immediate = false;
-      }
-
-      var _a, _b;
-
-      if (loop) {
-        var i = modulus(index, count);
-        setCurrent(i);
-        (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, i);
-        api.start({
-          position: index * 100,
-          immediate: immediate
-        });
-      } else {
-        var _i = (0, _bound.bound)(index, 0, count - 1);
-
-        setCurrent(_i);
-        (_b = props.onIndexChange) === null || _b === void 0 ? void 0 : _b.call(props, _i);
-        api.start({
-          position: boundIndex(_i) * 100,
-          immediate: immediate
-        });
-      }
+    function swipeTo(index, immediate = false) {
+      const roundedIndex = Math.round(index);
+      const targetIndex = loop ? modulus(roundedIndex, count) : (0, _bound.bound)(roundedIndex, 0, count - 1);
+      setCurrent(targetIndex);
+      api.start({
+        position: (loop ? roundedIndex : boundIndex(roundedIndex)) * 100,
+        immediate
+      });
     }
 
     function swipeNext() {
@@ -230,86 +207,85 @@ var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(f
       swipeTo(Math.round(position.get() / 100) - 1);
     }
 
-    (0, _react.useImperativeHandle)(ref, function () {
-      return {
-        swipeTo: swipeTo,
-        swipeNext: swipeNext,
-        swipePrev: swipePrev
-      };
-    });
-    (0, _react.useLayoutEffect)(function () {
-      var maxIndex = validChildren.length - 1;
+    (0, _react.useImperativeHandle)(ref, () => ({
+      swipeTo,
+      swipeNext,
+      swipePrev
+    }));
+    (0, _react.useLayoutEffect)(() => {
+      const maxIndex = validChildren.length - 1;
 
       if (current > maxIndex) {
         swipeTo(maxIndex, true);
       }
     });
-    var autoplay = props.autoplay,
-        autoplayInterval = props.autoplayInterval;
-    (0, _react.useEffect)(function () {
+    const {
+      autoplay,
+      autoplayInterval
+    } = props;
+    (0, _react.useEffect)(() => {
       if (!autoplay || dragging) return;
-      var interval = window.setInterval(function () {
+      const interval = window.setInterval(() => {
         swipeNext();
       }, autoplayInterval);
-      return function () {
+      return () => {
         window.clearInterval(interval);
       };
     }, [autoplay, autoplayInterval, dragging]);
 
     function renderTrackInner() {
       if (loop) {
-        return /*#__PURE__*/_react["default"].createElement("div", {
+        return _react.default.createElement("div", {
           className: 'adm-swiper-track-inner'
-        }, _react["default"].Children.map(validChildren, function (child, index) {
-          var _style;
-
-          return /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
+        }, _react.default.Children.map(validChildren, (child, index) => {
+          return _react.default.createElement(_web.animated.div, {
             className: 'adm-swiper-slide',
-            style: (_style = {}, _style[isVertical ? 'y' : 'x'] = position.to(function (position) {
-              var finalPosition = -position + index * 100;
-              var totalWidth = count * 100;
-              var flagWidth = totalWidth / 2;
-              finalPosition = modulus(finalPosition + flagWidth, totalWidth) - flagWidth;
-              return finalPosition + "%";
-            }), _style[isVertical ? 'top' : 'left'] = "-" + index * 100 + "%", _style)
+            style: {
+              [isVertical ? 'y' : 'x']: position.to(position => {
+                let finalPosition = -position + index * 100;
+                const totalWidth = count * 100;
+                const flagWidth = totalWidth / 2;
+                finalPosition = modulus(finalPosition + flagWidth, totalWidth) - flagWidth;
+                return `${finalPosition}%`;
+              }),
+              [isVertical ? 'top' : 'left']: `-${index * 100}%`
+            }
           }, child);
         }));
       } else {
-        var _style2;
-
-        return /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
+        return _react.default.createElement(_web.animated.div, {
           className: 'adm-swiper-track-inner',
-          style: (_style2 = {}, _style2[isVertical ? 'y' : 'x'] = position.to(function (position) {
-            return -position + "%";
-          }), _style2)
-        }, _react["default"].Children.map(validChildren, function (child, index) {
-          return /*#__PURE__*/_react["default"].createElement("div", {
+          style: {
+            [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
+          }
+        }, _react.default.Children.map(validChildren, (child, index) => {
+          return _react.default.createElement("div", {
             className: 'adm-swiper-slide'
           }, child);
         }));
       }
     }
 
-    var style = {
-      '--slide-size': props.slideSize + "%",
-      '--track-offset': props.trackOffset + "%"
+    const style = {
+      '--slide-size': `${props.slideSize}%`,
+      '--track-offset': `${props.trackOffset}%`
     };
-    return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])('adm-swiper', "adm-swiper-" + props.direction),
+    return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+      className: (0, _classnames.default)('adm-swiper', `adm-swiper-${props.direction}`),
       style: style
-    }, /*#__PURE__*/_react["default"].createElement("div", Object.assign({
+    }, _react.default.createElement("div", Object.assign({
       ref: trackRef,
-      className: (0, _classnames["default"])('adm-swiper-track', {
+      className: (0, _classnames.default)('adm-swiper-track', {
         'adm-swiper-track-allow-touch-move': props.allowTouchMove
       }),
-      onClickCapture: function onClickCapture(e) {
+      onClickCapture: e => {
         if (draggingRef.current) {
           e.stopPropagation();
         }
       }
-    }, props.allowTouchMove ? bind() : {}), renderTrackInner()), props.indicator === undefined ? /*#__PURE__*/_react["default"].createElement("div", {
+    }, props.allowTouchMove ? bind() : {}), renderTrackInner()), props.indicator === undefined ? _react.default.createElement("div", {
       className: 'adm-swiper-indicator'
-    }, /*#__PURE__*/_react["default"].createElement(_pageIndicator["default"], Object.assign({}, props.indicatorProps, {
+    }, _react.default.createElement(_pageIndicator.default, Object.assign({}, props.indicatorProps, {
       total: count,
       current: current,
       direction: props.direction
@@ -319,6 +295,6 @@ var Swiper = /*#__PURE__*/(0, _react.forwardRef)((0, _stagedComponents.staged)(f
 exports.Swiper = Swiper;
 
 function modulus(value, division) {
-  var remainder = value % division;
+  const remainder = value % division;
   return remainder < 0 ? remainder + division : remainder;
 }

package/cjs/components/switch/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 require("./switch.css");
 
 var _switch2 = require("./switch");
 
 var _default = _switch2.Switch;
-exports["default"] = _default;
+exports.default = _default;

package/cjs/components/switch/switch.css

@@ -5,6 +5,9 @@
 }
 .adm-switch {
   --checked-color: var(--adm-color-primary);
+  --height: 31px;
+  --width: 51px;
+  --border-width: 2px;
   display: inline-block;
   vertical-align: middle;
   box-sizing: border-box;
@@ -19,23 +22,23 @@
   display: none;
 }
 .adm-switch-checkbox {
-  min-width: 51px;
-  height: 31px;
+  min-width: var(--width);
+  height: var(--height);
   box-sizing: border-box;
   border-radius: 31px;
   background: #e5e5e5;
   z-index: 0;
   overflow: hidden;
-  line-height: 31px;
+  line-height: var(--height);
 }
 .adm-switch-checkbox:before {
   content: ' ';
   position: absolute;
-  left: 2px;
-  top: 2px;
-  width: calc(100% - 2 * 2px);
-  height: 27px;
-  border-radius: 27px;
+  left: var(--border-width);
+  top: var(--border-width);
+  width: calc(100% - 2 * var(--border-width));
+  height: calc(var(--height) - 2 * var(--border-width));
+  border-radius: calc(var(--height) - 2 * var(--border-width));
   box-sizing: border-box;
   background: #fff;
   z-index: 1;
@@ -46,23 +49,28 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 27px;
-  height: 27px;
-  border-radius: 27px;
+  width: calc(var(--height) - 2 * var(--border-width));
+  height: calc(var(--height) - 2 * var(--border-width));
+  border-radius: calc(var(--height) - 2 * var(--border-width));
   background: #fff;
   position: absolute;
   z-index: 2;
-  top: 2px;
-  left: 2px;
+  top: var(--border-width);
+  left: var(--border-width);
   transition: all 200ms;
   box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2), 0 2px 11.5px 0 rgba(0, 0, 0, 0.08), -1px 2px 2px 0 rgba(0, 0, 0, 0.1);
 }
 .adm-switch-inner {
   position: relative;
   z-index: 1;
-  margin: 0 10px 0 34px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 0 8px 0 calc(var(--height) - var(--border-width) + 4px);
+  height: 100%;
   color: var(--adm-color-weak);
   transition: margin 200ms;
+  font-size: 15px;
 }
 .adm-switch.adm-switch-checked .adm-switch-checkbox {
   background: var(--checked-color);
@@ -71,10 +79,10 @@
   transform: scale(0);
 }
 .adm-switch.adm-switch-checked .adm-switch-handle {
-  left: calc(100% - (31px - 2px));
+  left: calc(100% - (var(--height) - var(--border-width)));
 }
 .adm-switch.adm-switch-checked .adm-switch-inner {
-  margin: 0 34px 0 10px;
+  margin: 0 calc(var(--height) - var(--border-width) + 5px) 0 10px;
   color: var(--adm-color-white);
 }
 .adm-switch.adm-switch-disabled {

package/cjs/components/switch/switch.d.ts

@@ -9,5 +9,5 @@ export declare type SwitchProps = {
     onChange?: (checked: boolean) => void;
     checkedText?: ReactNode;
     uncheckedText?: ReactNode;
-} & NativeProps<'--checked-color'>;
+} & NativeProps<'--checked-color' | '--width' | '--height' | '--border-width'>;
 export declare const Switch: FC<SwitchProps>;