@arco-design/mobile-react 2.21.2 → 2.22.0

package/umd/tabs/tab-cell.js

@@ -1,16 +1,16 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "@babel/runtime/helpers/extends", "react", "@arco-design/mobile-utils", "../_helpers"], factory);
+    define(["exports", "@babel/runtime/helpers/extends", "react", "@arco-design/mobile-utils", "../_helpers", "./tab-cell-underline"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("@babel/runtime/helpers/extends"), require("react"), require("@arco-design/mobile-utils"), require("../_helpers"));
+    factory(exports, require("@babel/runtime/helpers/extends"), require("react"), require("@arco-design/mobile-utils"), require("../_helpers"), require("./tab-cell-underline"));
   } else {
     var mod = {
       exports: {}
     };
-    factory(mod.exports, global._extends, global.react, global.mobileUtils, global._helpers);
+    factory(mod.exports, global._extends, global.react, global.mobileUtils, global._helpers, global.tabCellUnderline);
     global.tabCell = mod.exports;
   }
-})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _extends2, _react, _mobileUtils, _helpers) {
+})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _extends2, _react, _mobileUtils, _helpers, _tabCellUnderline) {
   "use strict";
 
   var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -19,6 +19,7 @@
   _exports.default = void 0;
   _extends2 = _interopRequireDefault(_extends2);
   _react = _interopRequireWildcard(_react);
+  _tabCellUnderline = _interopRequireDefault(_tabCellUnderline);
 
   function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -69,46 +70,33 @@
         renderTabBarInner = props.renderTabBarInner,
         tabBarStyle = props.tabBarStyle,
         tabBarClass = props.tabBarClass,
-        translateZ = props.translateZ;
+        translateZ = props.translateZ,
+        tabBarStopPropagation = props.tabBarStopPropagation;
     var prefix = prefixCls + "-tab-cell";
     var domRef = (0, _react.useRef)(null);
-    var lineRef = (0, _react.useRef)(null);
-    var timeRef = (0, _react.useRef)(0);
+    var underlineRef = (0, _react.useRef)(null);
     var allCellRectRef = (0, _react.useRef)([]);
 
-    var _useState = (0, _react.useState)({}),
-        underlineStyle = _useState[0],
-        setUnderlineStyle = _useState[1];
+    var _useState = (0, _react.useState)(false),
+        showLine = _useState[0],
+        setShowLine = _useState[1];
 
-    var _useRefState = (0, _helpers.useRefState)(false),
-        caterpillar = _useRefState[0],
-        caterpillarRef = _useRefState[1],
-        setCaterpillar = _useRefState[2];
+    var _useState2 = (0, _react.useState)(false),
+        hasOverflow = _useState2[0],
+        setHasOverflow = _useState2[1];
 
-    var _useState2 = (0, _react.useState)(0),
-        caterpillarDelay = _useState2[0],
-        setCaterpillarDelay = _useState2[1];
-
-    var _useState3 = (0, _react.useState)(false),
-        hasOverflow = _useState3[0],
-        setHasOverflow = _useState3[1];
-
-    var _useState4 = (0, _react.useState)(function () {
+    var _useState3 = (0, _react.useState)(function () {
       return tabs.length < overflowThreshold ? tabBarArrange : 'start';
     }),
-        originArrange = _useState4[0],
-        setOriginArrange = _useState4[1]; // 默认tab小于overflowThreshold个时不开启加载前隐藏，大于overflowThreshold个时开启
+        originArrange = _useState3[0],
+        setOriginArrange = _useState3[1]; // 默认tab小于overflowThreshold个时不开启加载前隐藏，大于overflowThreshold个时开启
 
 
-    var _useState5 = (0, _react.useState)(function () {
+    var _useState4 = (0, _react.useState)(function () {
       return hideTabBarBeforeMounted === void 0 ? tabs.length < overflowThreshold || activeIndex === 0 : !hideTabBarBeforeMounted;
     }),
-        showTab = _useState5[0],
-        setShowTab = _useState5[1];
-
-    var _useState6 = (0, _react.useState)(false),
-        showLine = _useState6[0],
-        setShowLine = _useState6[1];
+        showTab = _useState4[0],
+        setShowTab = _useState4[1];
 
     var isVertical = tabDirection === 'vertical';
     var isLine = (type || '').indexOf('line') !== -1;
@@ -122,42 +110,7 @@
     var cellGutter = isCard ? void 0 : tabBarGutter;
     var hasDivider = tabBarHasDivider === void 0 ? isLine : tabBarHasDivider;
     var wrapSize = isVertical ? wrapWidth : wrapHeight;
-    var translateZStr = translateZ ? ' translateZ(0)' : '';
     var system = (0, _helpers.useSystem)();
-    var maxScaleWithDefault = caterpillarMaxScale || 2;
-    var animationKey = (0, _react.useMemo)(function () {
-      if (!showUnderline || !useCaterpillar) {
-        return '';
-      }
-
-      if (caterpillarProperty === 'size') {
-        return "tabsCaterpillar" + (isVertical ? 'W' : 'H') + maxScaleWithDefault;
-      }
-
-      if (caterpillarMaxScale) {
-        return "tabsCaterpillar" + (isVertical ? 'X' : 'Y') + caterpillarMaxScale;
-      }
-
-      return '';
-    }, [showUnderline, useCaterpillar, isVertical, caterpillarMaxScale, caterpillarProperty]);
-    (0, _react.useEffect)(function () {
-      if (!animationKey) {
-        return;
-      }
-
-      var dir = isVertical ? 'X' : 'Y';
-
-      if (caterpillarProperty === 'size') {
-        var attr = isVertical ? 'width' : 'height';
-        (0, _mobileUtils.addCssKeyframes)(animationKey, "{\n                    0% {\n                        " + attr + ": 100%;\n                    }\n                    50% {\n                        " + attr + ": " + 100 * maxScaleWithDefault + "%;\n                    }\n                    100% {\n                        " + attr + ": 100%;\n                    }\n                }");
-        return;
-      }
-
-      (0, _mobileUtils.addCssKeyframes)(animationKey, "{\n                0% {\n                    transform: scale" + dir + "(1)" + translateZStr + ";\n                    -webkit-transform: scale" + dir + "(1)" + translateZStr + ";\n                }\n                50% {\n                    transform: scale" + dir + "(" + caterpillarMaxScale + ")" + translateZStr + ";\n                    -webkit-transform: scale" + dir + "(" + caterpillarMaxScale + ")" + translateZStr + ";\n                }\n                100% {\n                    transform: scale" + dir + "(1)" + translateZStr + ";\n                    -webkit-transform: scale" + dir + "(1)" + translateZStr + ";\n                }\n            }");
-      return function () {
-        (0, _mobileUtils.removeCssStyleDom)(animationKey);
-      };
-    }, [animationKey]);
     (0, _react.useEffect)(function () {
       (0, _mobileUtils.nextTick)(function () {
         setCellOverflow(); // dom出来之后originArrange置空，交由tabBarArrange控制
@@ -170,12 +123,11 @@
         setShowLine(true);
       });
     }, [domRef.current, wrapSize, tabs]);
-    (0, _react.useEffect)(function () {
-      resetUnderlineStyle();
-    }, [useCaterpillar, caterpillar, cellTrans, duration, tabDirection, wrapWidth, wrapHeight, distance, animationKey, caterpillarDelay]);
     (0, _react.useEffect)(function () {
       (0, _mobileUtils.nextTick)(function () {
-        resetUnderlineStyle();
+        var _underlineRef$current;
+
+        (_underlineRef$current = underlineRef.current) == null ? void 0 : _underlineRef$current.resetUnderlineStyle();
       });
     }, [activeIndex, tabs, getCellPadding('left'), getCellPadding('right'), tabBarGutter, tabDirection]);
     (0, _react.useImperativeHandle)(ref, function () {
@@ -184,10 +136,18 @@
         scrollTo: scrollTo,
         scrollToCenter: scrollToCenter,
         hasOverflow: hasOverflow,
-        setCaterpillarAnimate: setCaterpillarAnimate,
-        resetUnderlineStyle: resetUnderlineStyle
+        setCaterpillarAnimate: function setCaterpillarAnimate(ratio) {
+          var _underlineRef$current2;
+
+          return (_underlineRef$current2 = underlineRef.current) == null ? void 0 : _underlineRef$current2.setCaterpillarAnimate(ratio);
+        },
+        resetUnderlineStyle: function resetUnderlineStyle() {
+          var _underlineRef$current3;
+
+          return (_underlineRef$current3 = underlineRef.current) == null ? void 0 : _underlineRef$current3.resetUnderlineStyle();
+        }
       };
-    }, [scrollToCenter, scrollTo, hasOverflow, setCaterpillarAnimate, resetUnderlineStyle]);
+    }, [scrollToCenter, scrollTo, hasOverflow]);
     (0, _react.useEffect)(function () {
       if (wrapSize && tabBarScrollChance !== 'none') {
         setTimeout(function () {
@@ -203,28 +163,18 @@
         return e.stopPropagation();
       };
 
-      if (isVertical && hasOverflow && domRef.current) {
+      if (isVertical && hasOverflow && domRef.current && tabBarStopPropagation) {
         domRef.current.addEventListener('touchstart', stopFunc);
         domRef.current.addEventListener('touchmove', stopFunc);
       }
 
       return function () {
-        if (isVertical && hasOverflow && domRef.current) {
+        if (isVertical && hasOverflow && domRef.current && tabBarStopPropagation) {
           domRef.current.removeEventListener('touchstart', stopFunc);
           domRef.current.removeEventListener('touchmove', stopFunc);
         }
       };
     }, [hasOverflow]);
-    (0, _react.useEffect)(function () {
-      if (jumpingDis && useCaterpillar && system !== 'ios') {
-        var movedRatio = wrapWidth ? jumpingDis / wrapWidth : 0;
-        setCaterpillarAnimate(movedRatio);
-      }
-    }, [jumpingDis]);
-
-    function resetUnderlineStyle() {
-      setUnderlineStyle(getUnderlineStyle());
-    }
 
     function setCellOverflow() {
       var overflow = false;
@@ -292,69 +242,6 @@
       }
     }
 
-    function getUnderlineStyle() {
-      var transStyle = {};
-
-      if (useCaterpillar) {
-        transStyle.animationDuration = duration + "ms";
-      }
-
-      if (caterpillarRef.current && animationKey) {
-        transStyle.animationName = animationKey;
-      }
-
-      if (caterpillarDelay) {
-        transStyle.animationDelay = "-" + caterpillarDelay + "ms";
-      }
-
-      var lineStyle = getLineStyle();
-      return {
-        outer: (0, _helpers.getStyleWithVendor)((0, _extends2.default)({
-          transitionDuration: cellTrans ? duration + "ms" : '0ms'
-        }, lineStyle.outer || {})),
-        inner: (0, _helpers.getStyleWithVendor)((0, _extends2.default)({}, transStyle, lineStyle.inner || {}))
-      };
-    }
-
-    function getLineStyle() {
-      var _ref;
-
-      if (!lineRef.current || !domRef.current) {
-        return {};
-      }
-
-      var currentLeft = getLineLeft(activeIndex);
-      var descIndex = getDescIndex();
-      var descLeft = getLineLeft(descIndex);
-      var moveRatio = wrapWidth ? distance / wrapWidth : 0;
-      var leftOffset = moveRatio * (currentLeft - descLeft);
-      var direc = isVertical ? 'X' : 'Y';
-      var transStyle = useCaterpillar && !jumpingDis ? caterpillarProperty === 'size' ? (_ref = {}, _ref[isVertical ? 'width' : 'height'] = 100 * getLineScale(moveRatio) + "%", _ref.willChange = 'width', _ref) : {
-        transform: "scale" + direc + "(" + getLineScale(moveRatio) + ")"
-      } : {};
-      var outerSize = isVertical ? {
-        width: underlineSize,
-        height: underlineThick
-      } : {
-        height: underlineSize,
-        width: underlineThick
-      };
-      return {
-        outer: (0, _extends2.default)({
-          transform: "translate" + direc + "(" + (distance > 0 ? currentLeft - leftOffset : currentLeft + leftOffset) + "px)" + translateZStr
-        }, outerSize),
-        inner: (0, _extends2.default)({}, transStyle)
-      };
-    }
-
-    function getLineLeft(index) {
-      var _lineRef$current, _lineRef$current2;
-
-      var offsetSize = isVertical ? (_lineRef$current = lineRef.current) == null ? void 0 : _lineRef$current.offsetWidth : (_lineRef$current2 = lineRef.current) == null ? void 0 : _lineRef$current2.offsetHeight;
-      var lineWidth = offsetSize || 0;
-      return getTabCenterLeft(index) - lineWidth / 2;
-    }
-
     function getTabCenterLeft(index) {
       var currentTab = allCellRectRef.current[index] || {};
       var currentTabWidth = (isVertical ? currentTab.width : currentTab.height) || 0;
@@ -362,48 +249,6 @@
       return currentTabLeft + currentTabWidth / 2;
     }
 
-    function getLineScale(ratio) {
-      var absRatio = Math.abs(ratio);
-      return absRatio > 0.5 ? (1 - absRatio) * 2 * (maxScaleWithDefault - 1) + 1 : absRatio * 2 * (maxScaleWithDefault - 1) + 1;
-    }
-
-    function getDescIndex() {
-      if (distance > 0) {
-        return activeIndex - 1;
-      }
-
-      if (distance < 0) {
-        return activeIndex + 1;
-      }
-
-      return activeIndex;
-    }
-
-    function setCaterpillarAnimate(movedRatio) {
-      if (movedRatio === void 0) {
-        movedRatio = 0;
-      }
-
-      if (!duration) {
-        return;
-      }
-
-      var movedTime = (duration || 0) * Math.abs(movedRatio);
-      setCaterpillarDelay(movedTime);
-      (0, _mobileUtils.nextTick)(function () {
-        setCaterpillar(true);
-      });
-
-      if (timeRef.current) {
-        clearTimeout(timeRef.current);
-      }
-
-      timeRef.current = window.setTimeout(function () {
-        setCaterpillar(false);
-        setCaterpillarDelay(0);
-      }, (duration || 0) - movedTime + 20);
-    }
-
     function getCellPadding(pType) {
       if (typeof cellPadding === 'object') {
         return cellPadding[pType];
@@ -444,20 +289,30 @@
         return null;
       }
 
-      return renderUnderline ? renderUnderline(underlineStyle, showLine, lineRef) : /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _mobileUtils.cls)(prefix + "-underline", {
-          show: showLine
-        }),
-        ref: lineRef,
-        style: underlineStyle.outer
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _mobileUtils.cls)(prefix + "-underline-inner", {
-          caterpillar: caterpillar,
-          'custom-animate': animationKey,
-          'caterpillar-moving': caterpillar || useCaterpillar && distance
-        }, tabDirection),
-        style: (0, _extends2.default)({}, underlineStyle.inner || {}, underlineInnerStyle || {})
-      }));
+      var lineProps = {
+        prefix: prefix,
+        showLine: showLine,
+        useCaterpillar: useCaterpillar,
+        distance: distance,
+        tabDirection: tabDirection,
+        underlineInnerStyle: underlineInnerStyle,
+        cellTrans: cellTrans,
+        duration: duration,
+        activeIndex: activeIndex,
+        wrapWidth: wrapWidth,
+        wrapHeight: wrapHeight,
+        jumpingDis: jumpingDis,
+        caterpillarMaxScale: caterpillarMaxScale,
+        caterpillarProperty: caterpillarProperty,
+        translateZ: translateZ,
+        underlineSize: underlineSize,
+        underlineThick: underlineThick,
+        renderUnderline: renderUnderline
+      };
+      return /*#__PURE__*/_react.default.createElement(_tabCellUnderline.default, (0, _extends2.default)({
+        ref: underlineRef,
+        getTabCenterLeft: getTabCenterLeft
+      }, lineProps));
     }
 
     var cellInner = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tabs.map(function (tab, index) {

package/umd/tabs/tab-pane.d.ts

@@ -1,40 +1,4 @@
-import React, { ReactNodeArray } from 'react';
-import { TabsProps } from '.';
-export interface TabPaneProps extends Pick<TabsProps, 'duration' | 'transitionDuration' | 'lazyloadCount' | 'hideContentStyle' | 'renderHideContent' | 'mode' | 'tabPaneClass' | 'tabPaneStyle' | 'tabPaneExtra' | 'getScrollContainer' | 'scrollThrottle' | 'scrollOffset' | 'goLastWhenScrollBottom' | 'scrollVertical' | 'translateZ' | 'fullScreen' | 'autoHeight' | 'onScroll'> {
-    prefixCls?: string;
-    panes: ReactNodeArray;
-    activeIndex: number;
-    activeIndexRef: React.MutableRefObject<number>;
-    tabDirection: 'horizontal' | 'vertical';
-    distance: number;
-    wrapWidth: number;
-    wrapHeight: number;
-    handlePaneTouchEnd: (e: any) => void;
-    paneTrans: boolean;
-    swipeable: boolean;
-    changeIndex: (newIndex: number, from?: string) => void;
-}
-export interface TabPaneRef {
-    /**
-     * 外层元素 DOM
-     * @en Outer element DOM
-     */
-    dom: HTMLDivElement | null;
-    /**
-     * 获取当前 transitionDuration
-     * @en Get the current transitionDuration
-     */
-    getTransition: () => number;
-    /**
-     * 滚动到指定 Tab，仅滚动监听模式下可用
-     * @en Scroll to the specified Tab, only available in scroll monitor mode
-     */
-    scrollToIndex: (index: number, rightNow?: boolean) => void;
-    /**
-     * autoHeight=true时，更新当前tabpane高度
-     * @en Update the current tabpane height, which takes effect when autoHeight=true
-     */
-    setCurrentHeight: () => void;
-}
+import React from 'react';
+import { TabPaneProps, TabPaneRef } from './type';
 declare const TabPane: React.ForwardRefExoticComponent<TabPaneProps & React.RefAttributes<TabPaneRef>>;
 export default TabPane;