antd-mobile 5.11.0 → 5.11.1

package/cjs/components/cascade-picker-view/cascade-picker-view.js

@@ -11,8 +11,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _pickerView = _interopRequireDefault(require("../picker-view"));
 
-var _useCascadePickerOptions = require("../cascade-picker/use-cascade-picker-options");
-
 var _cascadePickerUtils = require("../cascade-picker/cascade-picker-utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -22,12 +20,9 @@ const CascadePickerView = props => {
     options
   } = props,
         pickerProps = (0, _tslib.__rest)(props, ["options"]);
-  const {
-    depth,
-    subOptionsRecord
-  } = (0, _useCascadePickerOptions.useCascadePickerOptions)(options);
+  const columnsFn = (0, _cascadePickerUtils.useColumnsFn)(options);
   return _react.default.createElement(_pickerView.default, Object.assign({}, pickerProps, {
-    columns: selected => (0, _cascadePickerUtils.generateCascadePickerColumns)(selected, options, depth, subOptionsRecord)
+    columns: columnsFn
   }));
 };
 

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

@@ -1,7 +1,22 @@
 /// <reference types="react" />
 import './swiper.less';
 export type { SwiperProps, SwiperRef } from './swiper';
-declare const _default: import("react").ForwardRefExoticComponent<import("react").RefAttributes<unknown>> & {
+declare const _default: import("react").ForwardRefExoticComponent<{
+    defaultIndex?: number | undefined;
+    allowTouchMove?: boolean | undefined;
+    autoplay?: boolean | undefined;
+    autoplayInterval?: number | undefined;
+    loop?: boolean | undefined;
+    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;
+    slideSize?: number | undefined;
+    trackOffset?: number | undefined;
+    stuckAtBoundary?: boolean | undefined;
+    rubberband?: boolean | undefined;
+    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
+} & import("../../utils/native-props").NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
         children?: import("react").ReactNode;

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

@@ -22,4 +22,19 @@ export declare type SwiperProps = {
     rubberband?: boolean;
     children?: ReactElement | ReactElement[];
 } & NativeProps<'--height' | '--width' | '--border-radius' | '--track-padding'>;
-export declare const Swiper: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+export declare const Swiper: React.ForwardRefExoticComponent<{
+    defaultIndex?: number | undefined;
+    allowTouchMove?: boolean | undefined;
+    autoplay?: boolean | undefined;
+    autoplayInterval?: number | undefined;
+    loop?: boolean | undefined;
+    direction?: "vertical" | "horizontal" | undefined;
+    onIndexChange?: ((index: number) => void) | undefined;
+    indicatorProps?: Pick<PageIndicatorProps, "style" | "className" | "color"> | undefined;
+    indicator?: ((total: number, current: number) => ReactNode) | undefined;
+    slideSize?: number | undefined;
+    trackOffset?: number | undefined;
+    stuckAtBoundary?: boolean | undefined;
+    rubberband?: boolean | undefined;
+    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
+} & NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & React.RefAttributes<SwiperRef>>;

package/es/components/cascade-picker/cascade-picker-utils.d.ts

@@ -1,3 +1,3 @@
-import { PickerColumn } from '../picker-view';
+import { PickerColumn, PickerValue } from '../picker-view';
 import { CascadePickerOption } from './cascade-picker';
-export declare function generateCascadePickerColumns(value: string[], options: CascadePickerOption[], depth: number, subOptionsRecord: Record<string, CascadePickerOption[]>): PickerColumn[];
+export declare function useColumnsFn(options: CascadePickerOption[]): (selected: PickerValue[]) => PickerColumn[];

package/es/components/cascade-picker/cascade-picker-utils.js

@@ -1,23 +1,43 @@
-export function generateCascadePickerColumns(value, options, depth, subOptionsRecord) {
-  const columns = [];
-  columns.push(options.map(option => ({
-    label: option.label,
-    value: option.value
-  })));
+import { useMemo } from 'react';
+export function useColumnsFn(options) {
+  const depth = useMemo(() => {
+    let depth = 0;
 
-  for (let i = 0; i < depth - 1; i++) {
-    const x = value[i];
-    const subOptions = subOptionsRecord[x];
+    function traverse(options, currentDepth) {
+      if (currentDepth > depth) depth = currentDepth;
+      const nextDepth = currentDepth + 1;
+      options.forEach(option => {
+        if (option.children) {
+          traverse(option.children, nextDepth);
+        }
+      });
+    }
 
-    if (!subOptions) {
-      columns.push([]);
-    } else {
-      columns.push(subOptions.map(option => ({
+    traverse(options, 1);
+    return depth;
+  }, [options]);
+  return selected => {
+    const columns = [];
+    let currentOptions = options;
+    let i = 0;
+
+    while (true) {
+      columns.push(currentOptions.map(option => ({
         label: option.label,
         value: option.value
       })));
+      const x = selected[i];
+      const targetOptions = currentOptions.find(option => option.value === x);
+      if (!targetOptions || !targetOptions.children) break;
+      currentOptions = targetOptions.children;
+      i++;
+    }
+
+    while (i < depth - 1) {
+      columns.push([]);
+      i++;
     }
-  }
 
-  return columns;
+    return columns;
+  };
 }

package/es/components/cascade-picker/cascade-picker.js

@@ -1,19 +1,15 @@
 import { __rest } from "tslib";
 import React from 'react';
 import Picker from '../picker';
-import { useCascadePickerOptions } from './use-cascade-picker-options';
-import { generateCascadePickerColumns } from './cascade-picker-utils';
+import { useColumnsFn } from './cascade-picker-utils';
 export const CascadePicker = props => {
   const {
     options
   } = props,
         pickerProps = __rest(props, ["options"]);
 
-  const {
-    depth,
-    subOptionsRecord
-  } = useCascadePickerOptions(options);
+  const columnsFn = useColumnsFn(options);
   return React.createElement(Picker, Object.assign({}, pickerProps, {
-    columns: selected => generateCascadePickerColumns(selected, options, depth, subOptionsRecord)
+    columns: columnsFn
   }));
 };

package/es/components/cascade-picker-view/cascade-picker-view.js

@@ -1,19 +1,15 @@
 import { __rest } from "tslib";
 import React from 'react';
 import PickerView from '../picker-view';
-import { useCascadePickerOptions } from '../cascade-picker/use-cascade-picker-options';
-import { generateCascadePickerColumns } from '../cascade-picker/cascade-picker-utils';
+import { useColumnsFn } from '../cascade-picker/cascade-picker-utils';
 export const CascadePickerView = props => {
   const {
     options
   } = props,
         pickerProps = __rest(props, ["options"]);
 
-  const {
-    depth,
-    subOptionsRecord
-  } = useCascadePickerOptions(options);
+  const columnsFn = useColumnsFn(options);
   return React.createElement(PickerView, Object.assign({}, pickerProps, {
-    columns: selected => generateCascadePickerColumns(selected, options, depth, subOptionsRecord)
+    columns: columnsFn
   }));
 };

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

@@ -1,7 +1,22 @@
 /// <reference types="react" />
 import './swiper.less';
 export type { SwiperProps, SwiperRef } from './swiper';
-declare const _default: import("react").ForwardRefExoticComponent<import("react").RefAttributes<unknown>> & {
+declare const _default: import("react").ForwardRefExoticComponent<{
+    defaultIndex?: number | undefined;
+    allowTouchMove?: boolean | undefined;
+    autoplay?: boolean | undefined;
+    autoplayInterval?: number | undefined;
+    loop?: boolean | undefined;
+    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;
+    slideSize?: number | undefined;
+    trackOffset?: number | undefined;
+    stuckAtBoundary?: boolean | undefined;
+    rubberband?: boolean | undefined;
+    children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
+} & import("../../utils/native-props").NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
         children?: import("react").ReactNode;

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

@@ -22,4 +22,19 @@ export declare type SwiperProps = {
     rubberband?: boolean;
     children?: ReactElement | ReactElement[];
 } & NativeProps<'--height' | '--width' | '--border-radius' | '--track-padding'>;
-export declare const Swiper: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+export declare const Swiper: React.ForwardRefExoticComponent<{
+    defaultIndex?: number | undefined;
+    allowTouchMove?: boolean | undefined;
+    autoplay?: boolean | undefined;
+    autoplayInterval?: number | undefined;
+    loop?: boolean | undefined;
+    direction?: "vertical" | "horizontal" | undefined;
+    onIndexChange?: ((index: number) => void) | undefined;
+    indicatorProps?: Pick<PageIndicatorProps, "style" | "className" | "color"> | undefined;
+    indicator?: ((total: number, current: number) => ReactNode) | undefined;
+    slideSize?: number | undefined;
+    trackOffset?: number | undefined;
+    stuckAtBoundary?: boolean | undefined;
+    rubberband?: boolean | undefined;
+    children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
+} & NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & React.RefAttributes<SwiperRef>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "dependencies": {
     "@floating-ui/dom": "^0.4.2",
     "@react-spring/web": "^9.4.4",