@arco-design/mobile-react 2.25.4 → 2.27.0

package/esm/picker-view/components/multi-picker.js

@@ -1,56 +1,63 @@
 import React from 'react';
 export default function MultiPicker(props) {
   var prefixCls = props.prefixCls,
-    onValueChange = props.onValueChange,
-    onPickerChange = props.onPickerChange,
-    children = props.children,
-    itemHeight = props.itemHeight,
-    selectedValue = props.selectedValue,
-    data = props.data;
-  function getValue() {
-    if (selectedValue && selectedValue.length) {
-      return selectedValue;
-    }
-    if (data) {
-      return data.map(function (item) {
-        return item && item[0] && item[0].value;
-      });
-    }
-    if (!children) {
-      return [];
-    }
-    return React.Children.map(children, function (child) {
-      var childrenArray = React.Children.toArray(child.children || child.props.children);
-      return childrenArray && childrenArray[0] && childrenArray[0].props.value;
+      onValueChange = props.onValueChange,
+      children = props.children,
+      itemHeight = props.itemHeight,
+      selectedValue = props.selectedValue,
+      data = props.data;
+
+  function getCurrentData() {
+    return (data || []).map(function (item, itemIndex) {
+      var curSelected = selectedValue == null ? void 0 : selectedValue[itemIndex];
+      var cur = curSelected ? (item || []).find(function (i) {
+        return i.value === curSelected;
+      }) : undefined;
+      return cur || (item == null ? void 0 : item[0]);
     });
   }
-  function onChange(index, value, callback) {
-    var newValue = getValue().concat();
+
+  function onChange(_ref) {
+    var index = _ref.index,
+        value = _ref.value,
+        changedData = _ref.changedData,
+        callback = _ref.callback;
+    var newData = getCurrentData().concat();
+    newData[index] = changedData;
+    var newValue = newData.map(function (d) {
+      return d == null ? void 0 : d.value;
+    });
     newValue[index] = value;
+
     if (callback) {
-      callback(newValue, index);
+      callback(newValue, index, newData);
     }
   }
-  function _onValueChange(value, index) {
-    onChange(index, value, onValueChange);
-  }
-  function _onScrollChange(value, index) {
-    onChange(index, value, onPickerChange);
+
+  function _onValueChange(value, index, changedData) {
+    onChange({
+      index: index,
+      value: value,
+      callback: onValueChange,
+      changedData: changedData
+    });
   }
+
   function renderChild() {
-    var value = getValue();
+    var curData = getCurrentData();
+    var value = curData.map(function (d) {
+      return d == null ? void 0 : d.value;
+    });
     return React.Children.map(children, function (col, index) {
       return /*#__PURE__*/React.cloneElement(col, {
-        onScrollChange: function onScrollChange(val) {
-          return _onScrollChange(val, index);
-        },
-        onValueChange: function onValueChange(val) {
-          return _onValueChange(val, index);
+        onValueChange: function onValueChange(val, changedData) {
+          return _onValueChange(val, index, changedData);
         },
         selectedValue: value[index]
       });
     });
   }
+
   return /*#__PURE__*/React.createElement("div", {
     className: prefixCls + "-multi",
     style: {

package/esm/picker-view/components/picker-cell.d.ts

@@ -8,7 +8,7 @@ export interface PickerCellProps {
     itemHeight: number;
     wrapperHeight: number;
     selectedValue?: ValueType;
-    onValueChange?: (value: ValueType) => void;
+    onValueChange?: (value: ValueType, data: PickerData) => void;
     disabled: boolean;
     hideEmptyCols?: boolean;
     /**

package/esm/picker-view/components/picker-cell.js

@@ -4,37 +4,43 @@ import { cls } from '@arco-design/mobile-utils';
 import { getStyleWithVendor, useMountedState, useRefState } from '../../_helpers';
 var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
   var prefixCls = props.prefixCls,
-    style = props.style,
-    data = props.data,
-    clickable = props.clickable,
-    itemHeight = props.itemHeight,
-    wrapperHeight = props.wrapperHeight,
-    selectedValue = props.selectedValue,
-    onValueChange = props.onValueChange,
-    disabled = props.disabled,
-    hideEmptyCols = props.hideEmptyCols,
-    _props$rows = props.rows,
-    rows = _props$rows === void 0 ? 5 : _props$rows,
-    _props$touchToStop = props.touchToStop,
-    touchToStop = _props$touchToStop === void 0 ? false : _props$touchToStop;
+      style = props.style,
+      data = props.data,
+      clickable = props.clickable,
+      itemHeight = props.itemHeight,
+      wrapperHeight = props.wrapperHeight,
+      selectedValue = props.selectedValue,
+      onValueChange = props.onValueChange,
+      disabled = props.disabled,
+      hideEmptyCols = props.hideEmptyCols,
+      _props$rows = props.rows,
+      rows = _props$rows === void 0 ? 5 : _props$rows,
+      _props$touchToStop = props.touchToStop,
+      touchToStop = _props$touchToStop === void 0 ? false : _props$touchToStop;
+
   var _useMountedState = useMountedState(''),
-    transitionDuration = _useMountedState[0],
-    setTransitionDuration = _useMountedState[1];
+      transitionDuration = _useMountedState[0],
+      setTransitionDuration = _useMountedState[1];
+
   var _useState = useState(''),
-    bezier = _useState[0],
-    setBezier = _useState[1];
+      bezier = _useState[0],
+      setBezier = _useState[1];
+
   var _useMountedState2 = useMountedState(0),
-    currentIndex = _useMountedState2[0],
-    setCurrentIndex = _useMountedState2[1];
+      currentIndex = _useMountedState2[0],
+      setCurrentIndex = _useMountedState2[1];
+
   var _useMountedState3 = useMountedState(selectedValue),
-    currentValue = _useMountedState3[0],
-    setCurrentValue = _useMountedState3[1];
-  // 是否开始touch
+      currentValue = _useMountedState3[0],
+      setCurrentValue = _useMountedState3[1]; // 是否开始touch
   // @en whether to start touch
+
+
   var _useRefState = useRefState(0),
-    transformY = _useRefState[0],
-    transformYRef = _useRefState[1],
-    setTransformY = _useRefState[2];
+      transformY = _useRefState[0],
+      transformYRef = _useRefState[1],
+      setTransformY = _useRefState[2];
+
   var lastTransformYRef = useRef(0);
   var touchStartTimeRef = useRef(0);
   var latestCallbackTimer = useRef(0);
@@ -59,66 +65,78 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
       paddingTop: (rowCount - 1) / 2 * itemHeight + "px"
     }));
   }, [transitionDuration, transformY, bezier, itemHeight, rowCount]);
+
   function _scrollingComplete(nowItemIndex) {
     // index有改变时再抛出
     // @en Throws again when index changes
     if (currentIndex !== nowItemIndex) {
-      setCurrentIndex(nowItemIndex);
-      var newValue = data[nowItemIndex] && data[nowItemIndex].value;
+      setCurrentIndex(Math.max(nowItemIndex, 0));
+      var newData = data[nowItemIndex];
+      var newValue = newData == null ? void 0 : newData.value;
+
       if (newValue !== currentValue) {
-        // if (!('selectedValue' in props)) {
-        //     setCurrentValue(newValue);
-        // }
         setCurrentValue(newValue);
+
         if (onValueChange) {
-          onValueChange(newValue);
+          onValueChange(newValue, newData);
         }
       }
     }
   }
+
   function _scrollTo(transY, transDuration, callback) {
     if (transDuration === void 0) {
       transDuration = 0;
     }
+
     if (callback === void 0) {
       callback = function callback() {};
     }
+
     setTransitionDuration(transDuration ? transDuration + "ms" : '');
-    setTransformY(transY);
-    // 处理连续滑动的情况：
+    setTransformY(transY); // 处理连续滑动的情况：
     // @en handle the case of continuous sliding:
     // 如果上一次callback还未执行，先cancel掉上一次回调，只执行最近的一次回调
     // @en If the last callback has not been executed, cancel the last callback first, and only execute the latest callback
+
     if (latestCallbackTimer.current) {
       clearTimeout(latestCallbackTimer.current);
     }
+
     latestCallbackTimer.current = window.setTimeout(function () {
       movingStatusRef.current = 'normal';
       setTransitionDuration('');
       callback();
     }, transDuration);
   }
+
   function _scrollToIndex(itemIndex, transDuration, callback) {
     if (transDuration === void 0) {
       transDuration = 0;
     }
+
     if (callback === void 0) {
       callback = function callback() {};
     }
+
     _scrollTo(-1 * itemIndex * itemHeight, transDuration, callback);
   }
+
   function _scrollToIndexWithChange(itemIndex, transDuration) {
     if (transDuration === void 0) {
       transDuration = 0;
     }
+
     _scrollToIndex(itemIndex, transDuration, function () {
       _scrollingComplete(itemIndex);
     });
   }
+
   var _handleColumnTouchStart = useCallback(function (e) {
     if (disabled) {
       return;
     }
+
     isTouchMoveRef.current = false;
     movingStatusRef.current = 'moving';
     var x = e.touches[0].screenX;
@@ -130,38 +148,44 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
     touchStartYRef.current = y;
     lastTransformYRef.current = transformYRef.current;
   }, [disabled]);
+
   var _handleColumnTouchMove = useCallback(function (e) {
     if (disabled || !touchingRef.current) {
       return;
     }
+
     isTouchMoveRef.current = true;
     var lastTransformY = lastTransformYRef.current;
     var touchMoveX = e.touches[0].screenX;
     var touchMoveY = e.touches[0].screenY;
     var distanceX = touchMoveX - touchStartXRef.current;
     var distance = touchMoveY - touchStartYRef.current;
+
     if (touchingXRef.current === null) {
       touchingXRef.current = Math.abs(distanceX) > Math.abs(distance);
     }
+
     if (touchingXRef.current) {
       return;
     }
+
     e.cancelable && e.preventDefault();
     var newPos = lastTransformY + distance;
-    var maxPos = -1 * (data.length - 1) * itemHeight;
-    // 当滚动到上边界或下边界时增加阻尼效果
+    var maxPos = -1 * (data.length - 1) * itemHeight; // 当滚动到上边界或下边界时增加阻尼效果
     // @en Add damping effect when scrolling to the upper or lower border
+
     setTransformY(lastTransformY >= 0 && distance > 0 || lastTransformY <= maxPos && distance < 0 ? lastTransformY + distance / 4 : newPos);
   }, [data.length, disabled, itemHeight]);
+
   function _handleScrollEnd() {
     var maxIndex = data.length - 1;
-    var nowIndex = Math.max(0, Math.min(maxIndex, Math.round(-1 * transformY / itemHeight)));
-    // 滚动（包括加动量的滚动）完成之后定位到最近的一个index上
+    var nowIndex = Math.max(0, Math.min(maxIndex, Math.round(-1 * transformY / itemHeight))); // 滚动（包括加动量的滚动）完成之后定位到最近的一个index上
     // @en After scrolling (including scrolling with momentum) is completed, it is positioned on the nearest index
+
     _scrollToIndexWithChange(nowIndex, 200);
-  }
+  } // Reference: https://juejin.im/post/6844904185121488910
+
 
-  // Reference: https://juejin.im/post/6844904185121488910
   function momentum(current, start, duration, minY, maxY) {
     var durationMap = {
       noBounce: 2000,
@@ -173,23 +197,24 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
       weekBounce: 'cubic-bezier(.25, .46, .45, .94)',
       strongBounce: 'cubic-bezier(.25, .46, .45, .94)'
     };
-    var type = 'noBounce';
-    // 惯性滑动加速度
+    var type = 'noBounce'; // 惯性滑动加速度
     // @en inertial sliding acceleration
-    var deceleration = 0.003;
-    // 回弹阻力
+
+    var deceleration = 0.003; // 回弹阻力
     // @en rebound resistance
-    var bounceRate = 5;
-    // 强弱回弹的分割值
+
+    var bounceRate = 5; // 强弱回弹的分割值
     // @en Split value of strong and weak rebound
-    var bounceThreshold = 300;
-    // 回弹的最大限度
+
+    var bounceThreshold = 300; // 回弹的最大限度
     // @en maximum rebound
+
     var maxOverflowY = wrapperHeight / 6;
     var overflowY;
     var distance = current - start;
     var speed = 2 * Math.abs(distance) / duration;
     var destination = current + speed / deceleration * (distance < 0 ? -1 : 1);
+
     if (destination < minY) {
       overflowY = minY - destination;
       type = overflowY > bounceThreshold ? 'strongBounce' : 'weekBounce';
@@ -199,31 +224,37 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
       type = overflowY > bounceThreshold ? 'strongBounce' : 'weekBounce';
       destination = Math.min(maxY + maxOverflowY, maxY + overflowY / bounceRate);
     }
+
     return {
       destination: destination,
       duration: durationMap[type],
       bezier: bezierMap[type]
     };
   }
+
   function _handleColumnTouchEnd() {
     _clearTimer();
+
     movingStatusRef.current = 'normal';
     var lastTransformY = lastTransformYRef.current;
+
     if (!isTouchMoveRef.current || transformY === lastTransformY) {
       return;
     }
+
     touchingRef.current = false;
     var endTime = Date.now();
     var scrollerHeight = (data.length + rowCount - 1) * itemHeight;
     var duration = endTime - touchStartTimeRef.current;
-    var absDistY = Math.abs(transformY - lastTransformY);
-    // 计算动量，保证滚动顺畅，条件：手势时间小于300ms && 移动距离绝对值大于30时
+    var absDistY = Math.abs(transformY - lastTransformY); // 计算动量，保证滚动顺畅，条件：手势时间小于300ms && 移动距离绝对值大于30时
     // @en Calculate the momentum to ensure smooth scrolling, condition: the gesture time is less than 300ms && the absolute value of the moving distance is greater than 30
+
     if (duration < 300 && absDistY > 30) {
       var momentumY = momentum(transformY, lastTransformY, duration, wrapperHeight - scrollerHeight, 0);
       var newItemIndex = Math.max(0, Math.min(data.length - 1, Math.round(-1 * momentumY.destination / itemHeight)));
       setBezier(momentumY.bezier);
       movingStatusRef.current = 'scrolling';
+
       _scrollToIndex(newItemIndex, momentumY.duration, function () {
         _scrollingComplete(newItemIndex);
       });
@@ -231,27 +262,32 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
       _handleScrollEnd();
     }
   }
+
   function scrollToCurrentIndex() {
     if (!wrapRef.current) {
       return;
     }
+
     var curStyle = window.getComputedStyle(wrapRef.current);
     var transformMatrix = curStyle.transform || curStyle.webkitTransform || '';
     var transY = Number(transformMatrix.replace(/matrix\((.*?)\)/, '$1').split(/,\s*/).slice(-1)[0]) || 0;
     var maxIndex = data.length - 1;
-    var nowIndex = Math.max(0, Math.min(maxIndex, Math.round(-1 * transY / itemHeight)));
-    // 滚动（包括加动量的滚动）完成之后定位到最近的一个index上
+    var nowIndex = Math.max(0, Math.min(maxIndex, Math.round(-1 * transY / itemHeight))); // 滚动（包括加动量的滚动）完成之后定位到最近的一个index上
     // @en After scrolling (including scrolling with momentum) is completed, it is positioned on the nearest index
+
     _scrollToIndexWithChange(nowIndex, 0);
   }
+
   function _clearTimer() {
     timeRef.current && clearTimeout(timeRef.current);
     timeRef.current = null;
   }
+
   function _handleItemTouchStart() {
     if (touchToStop === false) {
       return;
     }
+
     isTouchStopped.current = false;
     timeRef.current = window.setTimeout(function () {
       if (!isTouchMoveRef.current) {
@@ -260,17 +296,21 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     }, touchToStop === true ? 100 : touchToStop);
   }
+
   function _handleItemClick(itemIndex) {
     if (!clickable || disabled || touchToStop !== false && isTouchStopped.current) {
       return;
     }
+
     _scrollToIndexWithChange(itemIndex, 200);
   }
+
   useEffect(function () {
     if (wrapRef.current) {
       wrapRef.current.addEventListener('touchstart', _handleColumnTouchStart);
       wrapRef.current.addEventListener('touchmove', _handleColumnTouchMove);
     }
+
     return function () {
       if (wrapRef.current) {
         wrapRef.current.removeEventListener('touchstart', _handleColumnTouchStart);
@@ -283,7 +323,8 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
       var curIndex = data.findIndex(function (item) {
         return item.value === selectedValue;
       });
-      setCurrentIndex(curIndex);
+      setCurrentIndex(Math.max(curIndex, 0));
+
       if (curIndex >= 0) {
         _scrollToIndexWithChange(curIndex);
       }
@@ -307,6 +348,7 @@ var PickerCell = /*#__PURE__*/forwardRef(function (props, ref) {
     "aria-disabled": disabled
   }, data.map(function (item, index) {
     var _cls;
+
     var dis = Math.abs(index - currentIndex);
     return /*#__PURE__*/React.createElement("div", {
       "aria-label": index === currentIndex ? "" + item.value : '',

package/esm/picker-view/index.d.ts

@@ -25,7 +25,7 @@ export interface PickerViewRef {
      * 获取第 n 列的值
      * @en Get the value of the nth column
      */
-    getColumnValue: (index: number) => ValueType;
+    getColumnValue: (index: number) => ValueType | undefined;
     /**
      * 手动更新元素布局
      * @en Manually update the element layout