@arco-design/mobile-react 2.29.1 → 2.29.2

package/esm/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/esm/load-more/index.js

@@ -1,8 +1,8 @@
 import React, { useRef, forwardRef, useImperativeHandle, useEffect, useCallback, useState } from 'react';
 import lodashThrottle from 'lodash.throttle';
-import { getScrollContainerAttribute, getValidScrollContainer, defaultLocale } from '@arco-design/mobile-utils';
+import { getScrollContainerAttribute, getValidScrollContainer, defaultLocale, cls } from '@arco-design/mobile-utils';
 import { ContextLayout } from '../context-provider';
-import { useUpdateEffect } from '../_helpers';
+import { useLatestRef, useUpdateEffect } from '../_helpers';
 
 /**
  * 上拉加载组件，支持`scroll`和`click`两种触发加载方式，支持滚动监听。支持受控与不受控两种形式。<br>如果引入组件后发现仅触发了初始的`getData`，请确认是否在`getData`方法内没有调用`callback`移除 loading 状态，且未设置`blockWhenLoading`属性为 false。
@@ -16,6 +16,7 @@ var LoadMore = /*#__PURE__*/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,
@@ -50,11 +51,16 @@ var LoadMore = /*#__PURE__*/forwardRef(function (props, ref) {
   var lastScrollEndRef = useRef(false);
   var nowStatus = status || innerStatus;
   var statusRef = useRef(nowStatus);
+  var disabledRef = useLatestRef(disabled);
   var changeStatus = useCallback(function (st, scene) {
     setInnerStatus(st);
     onStatusChange && onStatusChange(st, scene);
   }, [onStatusChange]);
   var triggerGetData = useCallback(function (scene) {
+    if (disabledRef.current) {
+      return;
+    }
+
     if (blockWhenLoading && statusRef.current === 'loading') {
       return;
     }
@@ -79,12 +85,12 @@ var LoadMore = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [nowStatus]);
   useEffect(function () {
-    if (requestAtFirst) {
+    if (requestAtFirst && !disabled) {
       if (statusRef.current === 'prepare') {
         triggerGetData('requestAtFirst');
       }
     }
-  }, [trigger]);
+  }, [trigger, disabled]);
   var handleContainerScroll = useCallback(function () {
     var scrollTop = getScrollContainerAttribute('scrollTop', getScrollContainer);
 
@@ -105,7 +111,7 @@ var LoadMore = /*#__PURE__*/forwardRef(function (props, ref) {
     var binded = null;
     var scrollFunc = throttle ? lodashThrottle(handleContainerScroll, throttle) : handleContainerScroll;
 
-    if (trigger === 'scroll') {
+    if (trigger === 'scroll' && !disabled) {
       var container = getValidScrollContainer(getScrollContainer);
 
       if (container) {
@@ -119,7 +125,7 @@ var LoadMore = /*#__PURE__*/forwardRef(function (props, ref) {
         binded.removeEventListener('scroll', scrollFunc);
       }
     };
-  }, [trigger, getScrollContainer, handleContainerScroll, throttle]);
+  }, [trigger, disabled, getScrollContainer, handleContainerScroll, throttle]);
   useImperativeHandle(ref, function () {
     return {
       dom: domRef.current,
@@ -172,11 +178,13 @@ var LoadMore = /*#__PURE__*/forwardRef(function (props, ref) {
   }
 
   return /*#__PURE__*/React.createElement(ContextLayout, null, function (_ref) {
+    var _cls;
+
     var prefixCls = _ref.prefixCls,
         _ref$locale = _ref.locale,
         locale = _ref$locale === void 0 ? defaultLocale : _ref$locale;
     return /*#__PURE__*/React.createElement("div", {
-      className: prefixCls + "-load-more status-" + nowStatus + " " + className,
+      className: cls(prefixCls + "-load-more status-" + nowStatus, className, (_cls = {}, _cls[prefixCls + "-load-more-disabled"] = disabled, _cls)),
       ref: domRef,
       style: style,
       onClick: handleClick

package/esm/tabs/tab-cell.js

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

package/esm/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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arco-design/mobile-react",
-    "version": "2.29.1",
+    "version": "2.29.2",
     "description": "",
     "main": "cjs/index.js",
     "module": "esm/index.js",
@@ -15,7 +15,7 @@
     "author": "taoyiyue@bytedance.com",
     "license": "ISC",
     "dependencies": {
-        "@arco-design/mobile-utils": "2.16.4",
+        "@arco-design/mobile-utils": "2.16.5",
         "@arco-design/transformable": "^1.0.0",
         "lodash.throttle": "^4.1.1",
         "resize-observer-polyfill": "^1.5.1"
@@ -49,5 +49,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "4feb5984a8951d9d65662c069b2e2c3a61c81014"
+    "gitHead": "4a5d755078afe28a84d559c9c71a8eec4eab497e"
 }

package/umd/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/umd/load-more/index.js

@@ -36,6 +36,7 @@
     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,
@@ -70,11 +71,16 @@
     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;
       }
@@ -99,12 +105,12 @@
       }
     }, [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);
 
@@ -125,7 +131,7 @@
       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) {
@@ -139,7 +145,7 @@
           binded.removeEventListener('scroll', scrollFunc);
         }
       };
-    }, [trigger, getScrollContainer, handleContainerScroll, throttle]);
+    }, [trigger, disabled, getScrollContainer, handleContainerScroll, throttle]);
     (0, _react.useImperativeHandle)(ref, function () {
       return {
         dom: domRef.current,
@@ -192,11 +198,13 @@
     }
 
     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/umd/tabs/tab-cell.js

@@ -382,7 +382,8 @@
         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/umd/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