antd-mobile 5.6.1 → 5.7.0

package/es/components/calendar/calendar.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useMemo, useState, useImperativeHandle } from 'react';
+import React, { forwardRef, useState, useImperativeHandle } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import dayjs from 'dayjs';
 import classNames from 'classnames';
@@ -7,11 +7,15 @@ import { ArrowLeft } from './arrow-left';
 import { ArrowLeftDouble } from './arrow-left-double';
 import { useConfig } from '../config-provider';
 import isoWeek from 'dayjs/plugin/isoWeek';
-import { useIsomorphicLayoutEffect, useUpdateEffect } from 'ahooks';
+import { useUpdateEffect } from 'ahooks';
+import { usePropsValue } from '../../utils/use-props-value';
+import { convertValueToRange } from './convert';
 dayjs.extend(isoWeek);
 const classPrefix = 'adm-calendar';
 const defaultProps = {
-  weekStartsOn: 'Sunday'
+  weekStartsOn: 'Sunday',
+  defaultValue: null,
+  allowClear: true
 };
 export const Calendar = forwardRef((p, ref) => {
   const today = dayjs();
@@ -26,29 +30,21 @@ export const Calendar = forwardRef((p, ref) => {
     if (item) markItems.unshift(item);
   }
 
-  const dateRange = useMemo(() => {
-    var _a, _b, _c, _d;
+  const [dateRange, setDateRange] = usePropsValue({
+    value: props.value === undefined ? undefined : convertValueToRange(props.selectionMode, props.value),
+    defaultValue: convertValueToRange(props.selectionMode, props.defaultValue),
+    onChange: v => {
+      var _a, _b;
 
-    if (props.selectionMode === 'single') {
-      const value = (_b = (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null;
-      return [value, value];
-    } else if (props.selectionMode === 'range') {
-      return (_d = (_c = props.value) !== null && _c !== void 0 ? _c : props.defaultValue) !== null && _d !== void 0 ? _d : [null, null];
-    } else {
-      return [null, null];
+      if (props.selectionMode === 'single') {
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, v ? v[0] : null);
+      } else if (props.selectionMode === 'range') {
+        (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, v);
+      }
     }
-  }, [props.selectionMode, props.value, props.defaultValue]);
-  const [begin, setBegin] = useState(null);
-  const [end, setEnd] = useState(null);
-  useIsomorphicLayoutEffect(() => {
-    setBegin(dateRange[0] ? dayjs(dateRange[0]) : null);
-    setEnd(dateRange[1] ? dayjs(dateRange[1]) : null);
-  }, [dateRange[0], dateRange[1]]);
-  const [current, setCurrent] = useState(() => {
-    var _a;
-
-    return dayjs((_a = dateRange[0]) !== null && _a !== void 0 ? _a : today).date(1);
   });
+  const [intermediate, setIntermediate] = useState(false);
+  const [current, setCurrent] = useState(() => dayjs(dateRange ? dateRange[0] : today).date(1));
   useUpdateEffect(() => {
     var _a;
 
@@ -111,14 +107,16 @@ export const Calendar = forwardRef((p, ref) => {
 
     while (cells.length < 6 * 7) {
       const d = iterator;
-
-      const isSelect = (() => {
-        if (!begin) return false;
-        if (d.isSame(begin, 'day')) return true;
-        if (!end) return false;
-        if (d.isSame(end, 'day')) return true;
-        return d.isAfter(begin, 'day') && d.isBefore(end, 'day');
-      })();
+      let isSelect = false;
+      let isBegin = false;
+      let isEnd = false;
+
+      if (dateRange) {
+        const [begin, end] = dateRange;
+        isBegin = d.isSame(begin, 'day');
+        isEnd = d.isSame(end, 'day');
+        isSelect = isBegin || isEnd || d.isAfter(begin, 'day') && d.isBefore(end, 'day');
+      }
 
       const inThisMonth = d.month() === current.month();
       cells.push(React.createElement("div", {
@@ -126,41 +124,52 @@ export const Calendar = forwardRef((p, ref) => {
         className: classNames(`${classPrefix}-cell`, inThisMonth ? `${classPrefix}-cell-in` : `${classPrefix}-cell-out`, inThisMonth && {
           [`${classPrefix}-cell-today`]: d.isSame(today, 'day'),
           [`${classPrefix}-cell-selected`]: isSelect,
-          [`${classPrefix}-cell-selected-begin`]: isSelect && d.isSame(begin, 'day'),
-          [`${classPrefix}-cell-selected-end`]: isSelect && (!end || d.isSame(end, 'day'))
+          [`${classPrefix}-cell-selected-begin`]: isBegin,
+          [`${classPrefix}-cell-selected-end`]: isEnd
         }),
         onClick: () => {
-          var _a, _b, _c;
-
           if (!props.selectionMode) return;
+          const date = d.toDate();
+
+          if (!inThisMonth) {
+            setCurrent(d.clone().date(1));
+          }
+
+          function shouldClear() {
+            if (!props.allowClear) return false;
+            if (!dateRange) return false;
+            const [begin, end] = dateRange;
+            return d.isSame(begin, 'date') && d.isSame(end, 'day');
+          }
 
           if (props.selectionMode === 'single') {
-            setBegin(d);
-            setEnd(d);
-            (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, d.toDate());
+            if (props.allowClear && shouldClear()) {
+              setDateRange(null);
+              return;
+            }
+
+            setDateRange([date, date]);
           } else if (props.selectionMode === 'range') {
-            if (begin !== null && end === null) {
-              if (begin.isSame(d.toDate())) {
-                setBegin(null);
-                setEnd(null);
-              } else {
-                if (d.isBefore(begin)) {
-                  setEnd(begin);
-                  setBegin(d);
-                  (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, [d.toDate(), begin.toDate()]);
-                } else {
-                  setEnd(d);
-                  (_c = props.onChange) === null || _c === void 0 ? void 0 : _c.call(props, [begin.toDate(), d.toDate()]);
-                }
-              }
-            } else {
-              setBegin(d);
-              setEnd(null);
+            if (!dateRange) {
+              setDateRange([date, date]);
+              setIntermediate(true);
+              return;
             }
-          }
 
-          if (!inThisMonth) {
-            setCurrent(d.clone().date(1));
+            if (shouldClear()) {
+              setDateRange(null);
+              setIntermediate(false);
+              return;
+            }
+
+            if (intermediate) {
+              const another = dateRange[0];
+              setDateRange(another > date ? [date, another] : [another, date]);
+              setIntermediate(false);
+            } else {
+              setDateRange([date, date]);
+              setIntermediate(true);
+            }
           }
         }
       }, React.createElement("div", {

package/es/components/calendar/convert.d.ts

@@ -0,0 +1,2 @@
+export declare type DateRange = [Date, Date] | null;
+export declare function convertValueToRange(selectionMode: 'single' | 'range' | undefined, value: Date | [Date, Date] | null): DateRange;

package/es/components/calendar/convert.js

@@ -0,0 +1,15 @@
+export function convertValueToRange(selectionMode, value) {
+  if (selectionMode === undefined) {
+    return null;
+  }
+
+  if (value === null) {
+    return null;
+  }
+
+  if (Array.isArray(value)) {
+    return value;
+  }
+
+  return [value, value];
+}

package/es/components/picker/picker.js

@@ -4,9 +4,8 @@ import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import PickerView from '../picker-view';
-import { useColumns } from '../picker-view/use-columns';
+import { generateColumnsExtend, useColumnsExtend } from '../picker-view/columns-extend';
 import { useConfig } from '../config-provider';
-import { usePickerValueExtend } from '../picker-view/use-picker-value-extend';
 import { useMemoizedFn } from 'ahooks';
 import SafeArea from '../safe-area';
 const classPrefix = `adm-picker`;
@@ -28,12 +27,11 @@ export const Picker = memo(p => {
     onChange: val => {
       var _a;
 
-      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val, generateValueExtend(val));
+      const extend = generateColumnsExtend(props.columns, val);
+      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val, extend);
     }
-  })); // TODO: columns generated twice in Picker and PickerView, which can be improved
-
-  const columns = useColumns(props.columns, value);
-  const generateValueExtend = usePickerValueExtend(columns);
+  }));
+  const extend = useColumnsExtend(props.columns, value);
   const [innerValue, setInnerValue] = useState(value);
   useEffect(() => {
     if (innerValue !== value) {
@@ -104,6 +102,6 @@ export const Picker = memo(p => {
   }, pickerElement, React.createElement(SafeArea, {
     position: 'bottom'
   }));
-  return React.createElement(React.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, generateValueExtend(value).items));
+  return React.createElement(React.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, extend.items));
 });
 Picker.displayName = 'Picker';

package/es/components/picker-view/columns-extend.d.ts

@@ -0,0 +1,3 @@
+import type { PickerViewProps, PickerValue, PickerValueExtend } from './picker-view';
+export declare function generateColumnsExtend(rawColumns: PickerViewProps['columns'], val: PickerValue[]): PickerValueExtend;
+export declare function useColumnsExtend(rawColumns: PickerViewProps['columns'], value: PickerValue[]): PickerValueExtend;

package/es/components/picker-view/columns-extend.js

@@ -0,0 +1,34 @@
+import { useMemo } from 'react';
+import { withCache } from '../../utils/with-cache';
+export function generateColumnsExtend(rawColumns, val) {
+  const columns = withCache(() => {
+    const c = typeof rawColumns === 'function' ? rawColumns(val) : rawColumns;
+    return c.map(column => column.map(item => typeof item === 'string' ? {
+      label: item,
+      value: item
+    } : item));
+  });
+  const items = withCache(() => {
+    return val.map((v, index) => {
+      var _a;
+
+      const column = columns()[index];
+      if (!column) return null;
+      return (_a = column.find(item => item.value === v)) !== null && _a !== void 0 ? _a : null;
+    });
+  });
+  const extend = {
+    get columns() {
+      return columns();
+    },
+
+    get items() {
+      return items();
+    }
+
+  };
+  return extend;
+}
+export function useColumnsExtend(rawColumns, value) {
+  return useMemo(() => generateColumnsExtend(rawColumns, value), [rawColumns, value]);
+}

package/es/components/picker-view/picker-view.d.ts

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type PickerValue = string | null;
 export declare type PickerValueExtend = {
+    columns: PickerColumnItem[][];
     items: (PickerColumnItem | null)[];
 };
 export declare type PickerColumnItem = {

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

@@ -1,9 +1,8 @@
 import React, { memo, useCallback, useEffect, useState } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { Wheel } from './wheel';
-import { useColumns } from './use-columns';
+import { useColumnsExtend } from './columns-extend';
 import { withNativeProps } from '../../utils/native-props';
-import { usePickerValueExtend } from './use-picker-value-extend';
 import { useDebounceEffect } from 'ahooks';
 const classPrefix = `adm-picker-view`;
 const defaultProps = {
@@ -11,17 +10,7 @@ const defaultProps = {
 };
 export const PickerView = memo(p => {
   const props = mergeProps(defaultProps, p);
-  const [innerValue, setInnerValue] = useState(props.value === undefined ? props.defaultValue : props.value);
-  useDebounceEffect(() => {
-    var _a;
-
-    if (props.value === innerValue) return;
-    (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerValue, generateValueExtend(innerValue));
-  }, [innerValue], {
-    wait: 0,
-    leading: false,
-    trailing: true
-  }); // Sync `value` to `innerValue`
+  const [innerValue, setInnerValue] = useState(props.value === undefined ? props.defaultValue : props.value); // Sync `value` to `innerValue`
 
   useEffect(() => {
     if (props.value === undefined) return; // Uncontrolled mode
@@ -40,8 +29,18 @@ export const PickerView = memo(p => {
       window.clearTimeout(timeout);
     };
   }, [props.value, innerValue]);
-  const columns = useColumns(props.columns, innerValue);
-  const generateValueExtend = usePickerValueExtend(columns);
+  const extend = useColumnsExtend(props.columns, innerValue);
+  const columns = extend.columns;
+  useDebounceEffect(() => {
+    var _a;
+
+    if (props.value === innerValue) return;
+    (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerValue, extend);
+  }, [innerValue], {
+    wait: 0,
+    leading: false,
+    trailing: true
+  });
   const handleSelect = useCallback((val, index) => {
     setInnerValue(prev => {
       const next = [...prev];

package/es/utils/with-cache.d.ts

@@ -0,0 +1 @@
+export declare function withCache<T>(generate: () => T): () => T;

package/es/utils/with-cache.js

@@ -0,0 +1,10 @@
+export function withCache(generate) {
+  let cache = null;
+  return () => {
+    if (cache === null) {
+      cache = generate();
+    }
+
+    return cache;
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.6.1",
+  "version": "5.7.0",
   "dependencies": {
     "@floating-ui/dom": "^0.3.1",
     "@react-spring/web": "^9.4.3",