@arco-design/mobile-react 2.29.1 → 2.29.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.29.2](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.29.1...@arco-design/mobile-react@2.29.2) (2023-08-28)
+
+
+### Bug Fixes
+
+* `LoadMore` support the prop "disabled" ([b1881b2](https://github.com/arco-design/arco-design-mobile/commit/b1881b2821debb3b94c66285d712e8f7522e6be7))
+* `Tabs` the prop "tabBarFixed" supports passing in specific fixed values ([ae3158f](https://github.com/arco-design/arco-design-mobile/commit/ae3158f7f7d5d1eebca8921d6d4802aa53b31fbe))
+
+
+
+
+
 ## [2.29.1](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.29.0...@arco-design/mobile-react@2.29.1) (2023-08-21)
 
 

package/README.en-US.md

@@ -59,8 +59,8 @@ React & ReactDOM: **<a href="https://reactjs.org/docs/cdn-links.html" target="_b
 React Transition Group: **<a href="https://reactcommunity.org/react-transition-group/" target="_blank">Click here</a>**
 
 ```
-<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.0/dist/style.min.css">
-<script src="https://unpkg.com/@arco-design/mobile-react@2.29.0/dist/index.min.js"></script>
+<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.1/dist/style.min.css">
+<script src="https://unpkg.com/@arco-design/mobile-react@2.29.1/dist/index.min.js"></script>
 ```
 
 ## Full import

package/README.md

@@ -59,8 +59,8 @@ React & ReactDOM： **<a href="https://reactjs.org/docs/cdn-links.html" target="
 React Transition Group： **<a href="https://reactcommunity.org/react-transition-group/" target="_blank">戳这里获取</a>**
 
 ```
-<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.0/dist/style.min.css">
-<script src="https://unpkg.com/@arco-design/mobile-react@2.29.0/dist/index.min.js"></script>
+<link ref="stylesheet" href="https://unpkg.com/@arco-design/mobile-react@2.29.1/dist/style.min.css">
+<script src="https://unpkg.com/@arco-design/mobile-react@2.29.1/dist/index.min.js"></script>
 ```
 
 ## 引入全部

package/cjs/load-more/index.d.ts

@@ -11,6 +11,11 @@ export interface LoadMoreProps {
      * @en Custom classname
      */
     className?: string;
+    /**
+     * 是否禁用加载能力
+     * @en Whether to disable the loading capability
+     */
+    disabled?: boolean;
     /**
      * 组件加载但尚未启用状态下的内容
      * @en Content when the component is loaded but not yet enabled

package/cjs/load-more/index.js

@@ -31,6 +31,7 @@ var LoadMore = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$className = props.className,
       className = _props$className === void 0 ? '' : _props$className,
       style = props.style,
+      disabled = props.disabled,
       beforeReadyArea = props.beforeReadyArea,
       loadingArea = props.loadingArea,
       noMoreArea = props.noMoreArea,
@@ -65,11 +66,16 @@ var LoadMore = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var lastScrollEndRef = (0, _react.useRef)(false);
   var nowStatus = status || innerStatus;
   var statusRef = (0, _react.useRef)(nowStatus);
+  var disabledRef = (0, _helpers.useLatestRef)(disabled);
   var changeStatus = (0, _react.useCallback)(function (st, scene) {
     setInnerStatus(st);
     onStatusChange && onStatusChange(st, scene);
   }, [onStatusChange]);
   var triggerGetData = (0, _react.useCallback)(function (scene) {
+    if (disabledRef.current) {
+      return;
+    }
+
     if (blockWhenLoading && statusRef.current === 'loading') {
       return;
     }
@@ -94,12 +100,12 @@ var LoadMore = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, [nowStatus]);
   (0, _react.useEffect)(function () {
-    if (requestAtFirst) {
+    if (requestAtFirst && !disabled) {
       if (statusRef.current === 'prepare') {
         triggerGetData('requestAtFirst');
       }
     }
-  }, [trigger]);
+  }, [trigger, disabled]);
   var handleContainerScroll = (0, _react.useCallback)(function () {
     var scrollTop = (0, _mobileUtils.getScrollContainerAttribute)('scrollTop', getScrollContainer);
 
@@ -120,7 +126,7 @@ var LoadMore = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var binded = null;
     var scrollFunc = throttle ? (0, _lodash.default)(handleContainerScroll, throttle) : handleContainerScroll;
 
-    if (trigger === 'scroll') {
+    if (trigger === 'scroll' && !disabled) {
       var container = (0, _mobileUtils.getValidScrollContainer)(getScrollContainer);
 
       if (container) {
@@ -134,7 +140,7 @@ var LoadMore = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         binded.removeEventListener('scroll', scrollFunc);
       }
     };
-  }, [trigger, getScrollContainer, handleContainerScroll, throttle]);
+  }, [trigger, disabled, getScrollContainer, handleContainerScroll, throttle]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       dom: domRef.current,
@@ -187,11 +193,13 @@ var LoadMore = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }
 
   return /*#__PURE__*/_react.default.createElement(_contextProvider.ContextLayout, null, function (_ref) {
+    var _cls;
+
     var prefixCls = _ref.prefixCls,
         _ref$locale = _ref.locale,
         locale = _ref$locale === void 0 ? _mobileUtils.defaultLocale : _ref$locale;
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: prefixCls + "-load-more status-" + nowStatus + " " + className,
+      className: (0, _mobileUtils.cls)(prefixCls + "-load-more status-" + nowStatus, className, (_cls = {}, _cls[prefixCls + "-load-more-disabled"] = disabled, _cls)),
       ref: domRef,
       style: style,
       onClick: handleClick

package/cjs/tabs/tab-cell.js

@@ -378,7 +378,8 @@ var TabCell = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       fixed: tabBarFixed
     }, {
       'has-divider': hasDivider
-    })
+    }),
+    style: typeof tabBarFixed === 'object' ? tabBarFixed : {}
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _mobileUtils.cls)(prefix + "-container", tabDirection, "pos-" + tabBarPosition, "arrange-" + (originArrange || tabBarArrange), "type-" + type, {
       overflow: hasOverflow

package/cjs/tabs/type.d.ts

@@ -1,4 +1,4 @@
-import { ReactNode, ReactNodeArray } from 'react';
+import { CSSProperties, ReactNode, ReactNodeArray } from 'react';
 export declare type TabData = string | {
     title: ReactNode;
     [x: string]: any;
@@ -71,10 +71,10 @@ export interface TabsProps {
      */
     tabBarScroll?: boolean;
     /**
-     * TabBar是否顶部固定
-     * @en Whether the TabBar is fixed on the top
+     * TabBar是否顶部/底部固定（含 placeholder），可传入具体固定的值
+     * @en Whether the TabBar is fixed on the top or bottom (including placeholder), a specific fixed value can be passed in
      */
-    tabBarFixed?: boolean;
+    tabBarFixed?: boolean | Pick<CSSProperties, 'top' | 'bottom'>;
     /**
      * tabBar额外渲染内容
      * @en TabBar extra render content

package/dist/index.js

@@ -4307,7 +4307,8 @@
           fixed: tabBarFixed
         }, {
           'has-divider': hasDivider
-        })
+        }),
+        style: typeof tabBarFixed === 'object' ? tabBarFixed : {}
       }, /*#__PURE__*/React__default["default"].createElement("div", {
         className: cls(prefix + "-container", tabDirection, "pos-" + tabBarPosition, "arrange-" + (originArrange || tabBarArrange), "type-" + type, {
           overflow: hasOverflow
@@ -5842,6 +5843,7 @@
       var _a = props.className,
           className = _a === void 0 ? '' : _a,
           style = props.style,
+          disabled = props.disabled,
           beforeReadyArea = props.beforeReadyArea,
           loadingArea = props.loadingArea,
           noMoreArea = props.noMoreArea,
@@ -5876,11 +5878,16 @@
       var lastScrollEndRef = React.useRef(false);
       var nowStatus = status || innerStatus;
       var statusRef = React.useRef(nowStatus);
+      var disabledRef = useLatestRef(disabled);
       var changeStatus = React.useCallback(function (st, scene) {
         setInnerStatus(st);
         onStatusChange && onStatusChange(st, scene);
       }, [onStatusChange]);
       var triggerGetData = React.useCallback(function (scene) {
+        if (disabledRef.current) {
+          return;
+        }
+
         if (blockWhenLoading && statusRef.current === 'loading') {
           return;
         }
@@ -5905,12 +5912,12 @@
         }
       }, [nowStatus]);
       React.useEffect(function () {
-        if (requestAtFirst) {
+        if (requestAtFirst && !disabled) {
           if (statusRef.current === 'prepare') {
             triggerGetData('requestAtFirst');
           }
         }
-      }, [trigger]);
+      }, [trigger, disabled]);
       var handleContainerScroll = React.useCallback(function () {
         var scrollTop = getScrollContainerAttribute('scrollTop', getScrollContainer);
 
@@ -5931,7 +5938,7 @@
         var binded = null;
         var scrollFunc = throttle ? lodash_throttle(handleContainerScroll, throttle) : handleContainerScroll;
 
-        if (trigger === 'scroll') {
+        if (trigger === 'scroll' && !disabled) {
           var container = getValidScrollContainer(getScrollContainer);
 
           if (container) {
@@ -5945,7 +5952,7 @@
             binded.removeEventListener('scroll', scrollFunc);
           }
         };
-      }, [trigger, getScrollContainer, handleContainerScroll, throttle]);
+      }, [trigger, disabled, getScrollContainer, handleContainerScroll, throttle]);
       React.useImperativeHandle(ref, function () {
         return {
           dom: domRef.current,
@@ -5998,11 +6005,13 @@
       }
 
       return /*#__PURE__*/React__default["default"].createElement(ContextLayout, null, function (_a) {
+        var _b;
+
         var prefixCls = _a.prefixCls,
-            _b = _a.locale,
-            locale = _b === void 0 ? defaultLocale : _b;
+            _c = _a.locale,
+            locale = _c === void 0 ? defaultLocale : _c;
         return /*#__PURE__*/React__default["default"].createElement("div", {
-          className: prefixCls + "-load-more status-" + nowStatus + " " + className,
+          className: cls(prefixCls + "-load-more status-" + nowStatus, className, (_b = {}, _b[prefixCls + "-load-more-disabled"] = disabled, _b)),
           ref: domRef,
           style: style,
           onClick: handleClick