antd-mobile 5.33.2 → 5.34.0

package/cjs/components/stepper/stepper.js

@@ -8,7 +8,7 @@ exports.Stepper = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _antdMobileIcons = require("antd-mobile-icons");
-var _useMergedState = _interopRequireDefault(require("rc-util/lib/hooks/useMergedState"));
+var _rcUtil = require("rc-util");
 var _miniDecimal = _interopRequireWildcard(require("@rc-component/mini-decimal"));
 var _nativeProps = require("../../utils/native-props");
 var _withDefaultProps = require("../../utils/with-default-props");
@@ -77,7 +77,7 @@ function InnerStepper(p, ref) {
     return formatter ? formatter(value) : fixedValue(value);
   };
   // ======================== Value & InputValue ========================
-  const [mergedValue, setMergedValue] = (0, _useMergedState.default)(defaultValue, {
+  const [mergedValue, setMergedValue] = (0, _rcUtil.useMergedState)(defaultValue, {
     value,
     onChange: nextValue => {
       onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);

package/cjs/components/swiper/index.d.ts

@@ -9,13 +9,14 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     direction?: "vertical" | "horizontal" | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
     indicatorProps?: Pick<import("../page-indicator").PageIndicatorProps, "style" | "className" | "color"> | undefined;
-    indicator?: ((total: number, current: number) => import("react").ReactNode) | undefined;
+    indicator?: false | ((total: number, current: number) => import("react").ReactNode) | undefined;
     slideSize?: number | undefined;
     trackOffset?: number | undefined;
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     stopPropagation?: ("mousedown" | "mousemove" | "mouseup")[] | undefined;
-    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
+    total?: number | undefined;
+    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | ((index: number) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) | undefined;
 } & {
     className?: string | undefined;
     style?: (import("react").CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;

package/cjs/components/swiper/swiper.css

@@ -31,7 +31,8 @@
   display: flex;
   flex-wrap: nowrap;
 }
-.adm-swiper-slide {
+.adm-swiper-slide,
+.adm-swiper-slide-placeholder {
   width: 100%;
   height: 100%;
   display: block;

package/cjs/components/swiper/swiper.d.ts

@@ -22,13 +22,20 @@ export declare type SwiperProps = {
     direction?: 'horizontal' | 'vertical';
     onIndexChange?: (index: number) => void;
     indicatorProps?: Pick<PageIndicatorProps, 'color' | 'style' | 'className'>;
-    indicator?: (total: number, current: number) => ReactNode;
+    indicator?: false | ((total: number, current: number) => ReactNode);
     slideSize?: number;
     trackOffset?: number;
     stuckAtBoundary?: boolean;
     rubberband?: boolean;
     stopPropagation?: PropagationEvent[];
-    children?: ReactElement | ReactElement[];
+    /**
+     * Virtual scroll usage. Should work with renderProps `children`
+     */
+    total?: number;
+    /**
+     * renderProps is only work when `total` used
+     */
+    children?: ReactElement | ReactElement[] | ((index: number) => ReactElement);
 } & NativeProps<'--height' | '--width' | '--border-radius' | '--track-padding'>;
 export declare const Swiper: React.ForwardRefExoticComponent<{
     defaultIndex?: number | undefined;
@@ -39,13 +46,20 @@ export declare const Swiper: React.ForwardRefExoticComponent<{
     direction?: "vertical" | "horizontal" | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
     indicatorProps?: Pick<PageIndicatorProps, "style" | "className" | "color"> | undefined;
-    indicator?: ((total: number, current: number) => ReactNode) | undefined;
+    indicator?: false | ((total: number, current: number) => ReactNode) | undefined;
     slideSize?: number | undefined;
     trackOffset?: number | undefined;
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     stopPropagation?: ("mousedown" | "mousemove" | "mouseup")[] | undefined;
-    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
+    /**
+     * Virtual scroll usage. Should work with renderProps `children`
+     */
+    total?: number | undefined;
+    /**
+     * renderProps is only work when `total` used
+     */
+    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | ((index: number) => ReactElement) | undefined;
 } & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;

package/cjs/components/swiper/swiper.js

@@ -43,37 +43,52 @@ const defaultProps = {
 let currentUid;
 const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const {
+    direction,
+    total,
+    children,
+    indicator
+  } = props;
   const [uid] = (0, _react.useState)({});
   const timeoutRef = (0, _react.useRef)(null);
-  const isVertical = props.direction === 'vertical';
+  const isVertical = direction === 'vertical';
   const slideRatio = props.slideSize / 100;
   const offsetRatio = props.trackOffset / 100;
   const {
     validChildren,
-    count
+    count,
+    renderChildren
   } = (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.');
-        return null;
-      }
-      count++;
-      return child;
-    });
+    let renderChildren = undefined;
+    let validChildren = undefined;
+    if (typeof children === 'function') {
+      renderChildren = children;
+    } else {
+      validChildren = _react.default.Children.map(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.');
+          return null;
+        }
+        count++;
+        return child;
+      });
+    }
     return {
+      renderChildren,
       validChildren,
       count
     };
-  }, [props.children]);
-  if (count === 0 || !validChildren) {
+  }, [children]);
+  const mergedTotal = total !== null && total !== void 0 ? total : count;
+  if (mergedTotal === 0 || !validChildren && !renderChildren) {
     (0, _devLog.devWarning)('Swiper', '`Swiper` needs at least one child.');
     return null;
   }
   return () => {
     let loop = props.loop;
-    if (slideRatio * (count - 1) < 1) {
+    if (slideRatio * (mergedTotal - 1) < 1) {
       loop = false;
     }
     const trackRef = (0, _react.useRef)(null);
@@ -87,7 +102,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
     const [dragging, setDragging, draggingRef] = (0, _useRefState.useRefState)(false);
     function boundIndex(current) {
       let min = 0;
-      let max = count - 1;
+      let max = mergedTotal - 1;
       if (props.stuckAtBoundary) {
         min += offsetRatio / slideRatio;
         max -= (1 - slideRatio - offsetRatio) / slideRatio;
@@ -106,7 +121,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         if (draggingRef.current) return;
         if (!loop) return;
         const rawX = position.get();
-        const totalWidth = 100 * count;
+        const totalWidth = 100 * mergedTotal;
         const standardPosition = modulus(rawX, totalWidth);
         if (standardPosition === rawX) return;
         api.start({
@@ -114,7 +129,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
           immediate: true
         });
       }
-    }), [count]);
+    }), [mergedTotal]);
     const dragCancelRef = (0, _react.useRef)(null);
     function forceCancelDrag() {
       var _a;
@@ -161,7 +176,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         if (loop) return {};
         const slidePixels = getSlidePixels();
         const lowerBound = boundIndex(0) * slidePixels;
-        const upperBound = boundIndex(count - 1) * slidePixels;
+        const upperBound = boundIndex(mergedTotal - 1) * slidePixels;
         return isVertical ? {
           top: lowerBound,
           bottom: upperBound
@@ -180,7 +195,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
     function swipeTo(index, immediate = false) {
       var _a;
       const roundedIndex = Math.round(index);
-      const targetIndex = loop ? modulus(roundedIndex, count) : (0, _bound.bound)(roundedIndex, 0, count - 1);
+      const targetIndex = loop ? modulus(roundedIndex, mergedTotal) : (0, _bound.bound)(roundedIndex, 0, mergedTotal - 1);
       if (targetIndex !== getCurrent()) {
         (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, targetIndex);
       }
@@ -202,7 +217,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       swipePrev
     }));
     (0, _ahooks.useIsomorphicLayoutEffect)(() => {
-      const maxIndex = validChildren.length - 1;
+      const maxIndex = mergedTotal - 1;
       if (current > maxIndex) {
         swipeTo(maxIndex, true);
       }
@@ -223,43 +238,67 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       return () => {
         if (timeoutRef.current) window.clearTimeout(timeoutRef.current);
       };
-    }, [autoplay, autoplayInterval, dragging, count]);
+    }, [autoplay, autoplayInterval, dragging, mergedTotal]);
+    // ============================== Render ==============================
+    // Render Item
+    function renderItem(index, child) {
+      let itemStyle = {};
+      if (loop) {
+        itemStyle = {
+          [isVertical ? 'y' : 'x']: position.to(position => {
+            let finalPosition = -position + index * 100;
+            const totalWidth = mergedTotal * 100;
+            const flagWidth = totalWidth / 2;
+            finalPosition = modulus(finalPosition + flagWidth, totalWidth) - flagWidth;
+            return `${finalPosition}%`;
+          }),
+          [isVertical ? 'top' : 'left']: `-${index * 100}%`
+        };
+      }
+      return _react.default.createElement(_web.animated.div, {
+        className: (0, _classnames.default)(`${classPrefix}-slide`, {
+          [`${classPrefix}-slide-active`]: current === index
+        }),
+        style: itemStyle,
+        key: index
+      }, child);
+    }
+    function renderItems() {
+      if (renderChildren && total) {
+        const offsetCount = 2;
+        const startIndex = Math.max(current - offsetCount, 0);
+        const endIndex = Math.min(current + offsetCount, total - 1);
+        const items = [];
+        for (let index = startIndex; index <= endIndex; index += 1) {
+          items.push(renderItem(index, renderChildren(index)));
+        }
+        return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
+          className: `${classPrefix}-slide-placeholder`,
+          style: {
+            width: `${startIndex * 100}%`
+          }
+        }), items);
+      }
+      return _react.default.Children.map(validChildren, (child, index) => {
+        return renderItem(index, child);
+      });
+    }
+    // Render Track Inner
     function renderTrackInner() {
       if (loop) {
         return _react.default.createElement("div", {
           className: `${classPrefix}-track-inner`
-        }, _react.default.Children.map(validChildren, (child, index) => {
-          return _react.default.createElement(_web.animated.div, {
-            className: (0, _classnames.default)(`${classPrefix}-slide`, {
-              [`${classPrefix}-slide-active`]: current === index
-            }),
-            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);
-        }));
+        }, renderItems());
       } else {
         return _react.default.createElement(_web.animated.div, {
           className: `${classPrefix}-track-inner`,
           style: {
             [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
           }
-        }, _react.default.Children.map(validChildren, (child, index) => {
-          return _react.default.createElement("div", {
-            className: (0, _classnames.default)(`${classPrefix}-slide`, {
-              [`${classPrefix}-slide-active`]: current === index
-            })
-          }, child);
-        }));
+        }, renderItems());
       }
     }
+    // Render
     const style = {
       '--slide-size': `${props.slideSize}%`,
       '--track-offset': `${props.trackOffset}%`
@@ -273,8 +312,20 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       };
     }
     const mergedProps = (0, _withFuncProps.mergeFuncProps)(dragProps, stopPropagationProps);
+    let indicatorNode = null;
+    if (typeof indicator === 'function') {
+      indicatorNode = indicator(mergedTotal, current);
+    } else if (indicator !== false) {
+      indicatorNode = _react.default.createElement("div", {
+        className: `${classPrefix}-indicator`
+      }, _react.default.createElement(_pageIndicator.default, Object.assign({}, props.indicatorProps, {
+        total: mergedTotal,
+        current: current,
+        direction: direction
+      })));
+    }
     return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-      className: (0, _classnames.default)(classPrefix, `${classPrefix}-${props.direction}`),
+      className: (0, _classnames.default)(classPrefix, `${classPrefix}-${direction}`),
       style: style
     }, _react.default.createElement("div", Object.assign({
       ref: trackRef,
@@ -287,13 +338,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
         }
         forceCancelDrag();
       }
-    }, mergedProps), renderTrackInner()), props.indicator === undefined ? _react.default.createElement("div", {
-      className: `${classPrefix}-indicator`
-    }, _react.default.createElement(_pageIndicator.default, Object.assign({}, props.indicatorProps, {
-      total: count,
-      current: current,
-      direction: props.direction
-    }))) : props.indicator(count, current)));
+    }, mergedProps), renderTrackInner()), indicatorNode));
   };
 }));
 exports.Swiper = Swiper;

package/es/components/stepper/stepper.js

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import React, { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
 import { MinusOutline, AddOutline } from 'antd-mobile-icons';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import { useMergedState } from 'rc-util';
 import getMiniDecimal, { toFixed } from '@rc-component/mini-decimal';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';

package/es/components/swiper/index.d.ts

@@ -9,13 +9,14 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     direction?: "vertical" | "horizontal" | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
     indicatorProps?: Pick<import("../page-indicator").PageIndicatorProps, "style" | "className" | "color"> | undefined;
-    indicator?: ((total: number, current: number) => import("react").ReactNode) | undefined;
+    indicator?: false | ((total: number, current: number) => import("react").ReactNode) | undefined;
     slideSize?: number | undefined;
     trackOffset?: number | undefined;
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     stopPropagation?: ("mousedown" | "mousemove" | "mouseup")[] | undefined;
-    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
+    total?: number | undefined;
+    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | ((index: number) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) | undefined;
 } & {
     className?: string | undefined;
     style?: (import("react").CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;

package/es/components/swiper/swiper.css

@@ -31,7 +31,8 @@
   display: flex;
   flex-wrap: nowrap;
 }
-.adm-swiper-slide {
+.adm-swiper-slide,
+.adm-swiper-slide-placeholder {
   width: 100%;
   height: 100%;
   display: block;

package/es/components/swiper/swiper.d.ts

@@ -22,13 +22,20 @@ export declare type SwiperProps = {
     direction?: 'horizontal' | 'vertical';
     onIndexChange?: (index: number) => void;
     indicatorProps?: Pick<PageIndicatorProps, 'color' | 'style' | 'className'>;
-    indicator?: (total: number, current: number) => ReactNode;
+    indicator?: false | ((total: number, current: number) => ReactNode);
     slideSize?: number;
     trackOffset?: number;
     stuckAtBoundary?: boolean;
     rubberband?: boolean;
     stopPropagation?: PropagationEvent[];
-    children?: ReactElement | ReactElement[];
+    /**
+     * Virtual scroll usage. Should work with renderProps `children`
+     */
+    total?: number;
+    /**
+     * renderProps is only work when `total` used
+     */
+    children?: ReactElement | ReactElement[] | ((index: number) => ReactElement);
 } & NativeProps<'--height' | '--width' | '--border-radius' | '--track-padding'>;
 export declare const Swiper: React.ForwardRefExoticComponent<{
     defaultIndex?: number | undefined;
@@ -39,13 +46,20 @@ export declare const Swiper: React.ForwardRefExoticComponent<{
     direction?: "vertical" | "horizontal" | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
     indicatorProps?: Pick<PageIndicatorProps, "style" | "className" | "color"> | undefined;
-    indicator?: ((total: number, current: number) => ReactNode) | undefined;
+    indicator?: false | ((total: number, current: number) => ReactNode) | undefined;
     slideSize?: number | undefined;
     trackOffset?: number | undefined;
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     stopPropagation?: ("mousedown" | "mousemove" | "mouseup")[] | undefined;
-    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
+    /**
+     * Virtual scroll usage. Should work with renderProps `children`
+     */
+    total?: number | undefined;
+    /**
+     * renderProps is only work when `total` used
+     */
+    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | ((index: number) => ReactElement) | undefined;
 } & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;