@arco-design/mobile-react 2.29.3 → 2.29.4

package/dist/index.js

@@ -5247,6 +5247,7 @@
       var touchStartXRef = React.useRef(0);
       var touchStartYRef = React.useRef(0);
       var touchStartTimeRef = React.useRef(0);
+      var touchMovedRef = React.useRef(false);
       var scrollingRef = React.useRef(null);
       var touchStoppedRef = React.useRef(false);
       var changeFromRef = React.useRef('');
@@ -5338,6 +5339,7 @@
         }
 
         touchStartedRef.current = true;
+        touchMovedRef.current = false;
         setCellTrans(false);
         setPaneTrans(false);
         var evt = e.touches[0];
@@ -5365,6 +5367,7 @@
           return;
         }
 
+        touchMovedRef.current = true;
         var evt = e.changedTouches[0];
         var touchMoveX = evt.clientX || 0;
         var touchMoveY = evt.clientY || 0; // bugfix: 兼容safari在右滑返回上一页时clientX为负值的情况，安卓有折叠屏，触点会有超出屏幕(clientX < 0)的情况，因此这里限定ios系统
@@ -5431,7 +5434,7 @@
           cellRef.current && cellRef.current.scrollToCenter();
         }
 
-        if (!touchStartedRef.current || posAdjustingRef.current || scrollingRef.current) {
+        if (!touchStartedRef.current || posAdjustingRef.current || scrollingRef.current || !touchMovedRef.current) {
           return;
         }
 
@@ -5867,13 +5870,15 @@
           blockWhenLoading = _g === void 0 ? true : _g,
           onStatusChange = props.onStatusChange,
           onClick = props.onClick,
-          onEndReached = props.onEndReached;
+          onEndReached = props.onEndReached,
+          _h = props.getDataWhenNoScrollAtFirst,
+          getDataWhenNoScrollAtFirst = _h === void 0 ? false : _h;
       var domRef = React.useRef(null);
       var requestAtFirst = trigger === 'scroll' ? getDataAtFirst : false;
 
-      var _h = React.useState(defaultStatus),
-          innerStatus = _h[0],
-          setInnerStatus = _h[1];
+      var _j = React.useState(defaultStatus),
+          innerStatus = _j[0],
+          setInnerStatus = _j[1];
 
       var lastScrollEndRef = React.useRef(false);
       var nowStatus = status || innerStatus;
@@ -5912,10 +5917,14 @@
         }
       }, [nowStatus]);
       React.useEffect(function () {
-        if (requestAtFirst && !disabled) {
-          if (statusRef.current === 'prepare') {
+        if (requestAtFirst) {
+          if (statusRef.current === 'prepare' && !disabled) {
             triggerGetData('requestAtFirst');
           }
+        } else {
+          if (trigger === 'scroll' && nowStatus === 'prepare' && checkNeedTrigger(0, threshold) && !disabled && getDataWhenNoScrollAtFirst) {
+            triggerGetData('pageEnd');
+          }
         }
       }, [trigger, disabled]);
       var handleContainerScroll = React.useCallback(function () {
@@ -11215,6 +11224,12 @@
         _scrollToIndexWithChange(nowIndex, 0);
       }
 
+      function getCurrentCellValue() {
+        var _a;
+
+        return currentValue || ((_a = data[currentIndex]) === null || _a === void 0 ? void 0 : _a.value);
+      }
+
       function _clearTimer() {
         timeRef.current && clearTimeout(timeRef.current);
         timeRef.current = null;
@@ -11281,7 +11296,8 @@
       React.useImperativeHandle(ref, function () {
         return {
           movingStatus: movingStatusRef.current,
-          scrollToCurrentIndex: scrollToCurrentIndex
+          scrollToCurrentIndex: scrollToCurrentIndex,
+          getCurrentCellValue: getCurrentCellValue
         };
       });
       return !hideEmptyCols || data && data.length ? /*#__PURE__*/React__default["default"].createElement("div", {
@@ -11331,7 +11347,8 @@
       React.useImperativeHandle(ref, function () {
         return {
           getCellMovingStatus: getCellMovingStatus,
-          scrollToCurrentIndex: scrollToCurrentIndex
+          scrollToCurrentIndex: scrollToCurrentIndex,
+          getAllCellsValue: getAllCellsValue
         };
       });
 
@@ -11347,6 +11364,12 @@
         });
       }
 
+      function getAllCellsValue() {
+        return pickerCellsRef.current.map(function (cell) {
+          return cell.getCurrentCellValue();
+        });
+      }
+
       function _onValueChange(value, index, newData) {
         var children = arrayTreeFilter(data, function (item, level) {
           return level <= index && item.value === value[level];
@@ -11452,7 +11475,6 @@
       var wrapperRef = React.useRef(null);
       var domRef = React.useRef(null);
       var barRef = React.useRef(null);
-      var scrollValueRef = useLatestRef(scrollValue);
       var pickerCellsRef = React.useRef([]);
       var cascaderRef = React.useRef(null); // itemStyle height 同时对 selection-bar 生效，这里不单独抛出 selection-bar 的高度设置属性
       // @en The height of itemStyle applies to the selection-bar as well, without separately exposing the height setting property for the selection-bar.
@@ -11494,17 +11516,24 @@
       }, [data]);
 
       var getAllColumnValues = function getAllColumnValues() {
-        return scrollValueRef.current || [];
+        var _a;
+
+        var curValues = cascade ? ((_a = cascaderRef.current) === null || _a === void 0 ? void 0 : _a.getAllCellsValue()) || [] : pickerCellsRef.current.map(function (cell) {
+          return cell.getCurrentCellValue();
+        }); // 移除级联带来的空列值，理论上非首尾列不会有空值
+        // @en Remove empty values from cascader
+
+        return curValues.filter(function (v) {
+          return v;
+        });
       };
 
       function getColumnValue(index) {
-        var _a;
-
         if (index === void 0) {
           index = 0;
         }
 
-        return (_a = scrollValueRef.current) === null || _a === void 0 ? void 0 : _a[index];
+        return getAllColumnValues()[index];
       }
 
       function getCellMovingStatus() {
@@ -11688,10 +11717,7 @@
           gestureOutOfControl = _l === void 0 ? true : _l,
           otherProps = __rest$1(props, ["className", "itemStyle", "cascade", "cols", "rows", "data", "okText", "dismissText", "disabled", "clickable", "hideEmptyCols", "title", "visible", "value", "needBottomOffset", "onDismiss", "onOk", "onChange", "maskClosable", "onHide", "onPickerChange", "touchToStop", "gestureOutOfControl"]);
 
-      var _m = React.useState(value),
-          scrollValue = _m[0],
-          setScrollValue = _m[1];
-
+      var scrollValueRef = useLatestRef(value);
       var domRef = React.useRef(null);
       var pickerViewRef = React.useRef(null);
       React.useImperativeHandle(ref, function () {
@@ -11742,7 +11768,7 @@
         nextTick(function () {
           var _a;
 
-          var val = ((_a = pickerViewRef.current) === null || _a === void 0 ? void 0 : _a.getAllColumnValues()) || scrollValue || [];
+          var val = ((_a = pickerViewRef.current) === null || _a === void 0 ? void 0 : _a.getAllColumnValues()) || scrollValueRef.current || [];
 
           if (onOk) {
             onOk(val);
@@ -11758,9 +11784,6 @@
         });
       };
 
-      React.useEffect(function () {
-        setScrollValue(value);
-      }, [value, setScrollValue]);
       useListenResize(updateLayoutByVisible, [visible]); // 每次visible从false变为true时需要重新设置scrollValue的值为当前value的值（初始值）
 
       function updateLayoutByVisible() {
@@ -17333,7 +17356,7 @@
     var index$h = componentWrapper(ImagePicker, 'ImagePicker');
 
     /*!
-    * @arco-design/transformable v1.0.2
+    * @arco-design/transformable v1.0.1
     * (c) 2022 ludan.kibbon
     */
     function _defineProperty(obj, key, value) {