@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.2

package/dist/cjs/packages/griditem/style/style.css

@@ -3,11 +3,11 @@
   flex-direction: column;
   position: relative;
   box-sizing: border-box;
-  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-grid-item-text-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-grid-item-text {
-  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-2, 12px));
+  color: var(--nutui-grid-item-text-color, var(--nutui-color-title, #1a1a1a));
+  font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-s, 12px));
   word-break: break-all;
   margin: var(--nutui-grid-item-text-margin, 8px) 0 0 0;
 }
@@ -28,7 +28,7 @@
   width: 100%;
   padding: var(--nutui-grid-item-content-padding, 16px 8px);
   background: var(--nutui-grid-item-content-bg-color, #ffffff);
-  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border: 0 solid var(--nutui-grid-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-grid-item-content-border {
   border-right-width: 1px;
@@ -63,9 +63,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  background-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border: inherit;
-  border-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  border-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;

package/dist/cjs/packages/hoverbutton/style/hoverbutton.scss

@@ -1,4 +1,8 @@
 .nut-hoverbutton {
+  display: flex;
+  flex-direction: column;
+  gap: $hoverbutton-spacing;
+
   &-container {
     position: fixed;
     right: $hoverbutton-position-right;
@@ -9,10 +13,6 @@
   &-container-rn {
     position: absolute;
   }
-
-  display: flex;
-  flex-direction: column;
-  gap: $hoverbutton-spacing;
 }
 
 [dir='rtl'] .nut-hoverbutton-container,

package/dist/cjs/packages/image/image.js

@@ -50,7 +50,6 @@ var Image = function Image(props) {
         setInnerLoading(false);
         onLoad && onLoad(e);
     };
-    // 图片加载失败
     var handleError = function handleError(e) {
         if (src) {
             setIsError(true);

package/dist/cjs/packages/image/style/style.css

@@ -21,7 +21,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -34,7 +34,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 

package/dist/cjs/packages/imagepreview/imagepreview.d.ts

@@ -1,20 +1,24 @@
 import { FunctionComponent, ReactNode } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export type ImagePreviewCloseIconPosition = 'top-right' | 'top-left' | 'bottom';
-export interface ImagePreviewProps extends BasicComponent {
-    images: Array<{
+export interface ImageOption {
+    src: string;
+    index?: number;
+}
+export interface VideoOption {
+    source: {
         src: string;
-    }>;
-    videos: Array<{
-        source: {
-            src: string;
-            type: string;
-        };
-        options: {
-            muted: boolean;
-            controls: boolean;
-        };
-    }>;
+        type: string;
+    };
+    options: {
+        muted: boolean;
+        controls: boolean;
+    };
+    index?: number;
+}
+export interface ImagePreviewProps extends BasicComponent {
+    images: Array<ImageOption>;
+    videos: Array<VideoOption>;
     visible: boolean;
     autoPlay: boolean;
     value?: number;

package/dist/cjs/packages/imagepreview/imagepreview.js

@@ -19,9 +19,8 @@ var _components = require("@tarojs/components");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
-var _index1 = /*#__PURE__*/ _interop_require_default._(require("../image/index"));
-var _index2 = /*#__PURE__*/ _interop_require_default._(require("../swiper/index"));
-var _index3 = /*#__PURE__*/ _interop_require_default._(require("../swiperitem/index"));
+var _index1 = /*#__PURE__*/ _interop_require_default._(require("../swiper/index"));
+var _index2 = /*#__PURE__*/ _interop_require_default._(require("../swiperitem/index"));
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../utils/use-props-value");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -161,6 +160,7 @@ var ImagePreview = function ImagePreview(props) {
     ]);
     var scaleNow = function scaleNow() {
         if (ref.current) {
+            ;
             ref.current.style.transform = "scale(".concat(store.scale, ")");
         }
     };
@@ -198,13 +198,12 @@ var ImagePreview = function ImagePreview(props) {
             width: '100%'
         },
         onClick: onCloseInner
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)(classPrefix, className),
         style: style,
         ref: ref,
-        onClick: closeOnImg,
         onTouchStart: onTouchStart
-    }, /*#__PURE__*/ _react.default.createElement(_index2.default, {
+    }, /*#__PURE__*/ _react.default.createElement(_index1.default, {
         autoPlay: autoPlay,
         className: "".concat(classPrefix, "-swiper"),
         loop: true,
@@ -221,32 +220,55 @@ var ImagePreview = function ImagePreview(props) {
         },
         defaultValue: innerNo && (innerNo > maxNo ? maxNo - 1 : innerNo - 1),
         indicator: indicator
-    }, (videos && videos.length > 0 ? videos.map(function(item, index) {
-        return /*#__PURE__*/ _react.default.createElement(_index3.default, {
-            key: index,
-            className: "nut-imagepreview-swiper-item"
-        }, /*#__PURE__*/ _react.default.createElement(_components.Video, {
-            src: item.source.src,
-            controls: item.options.controls,
-            autoplay: false,
-            loop: false,
-            muted: item.options.muted
-        }));
-    }) : []).concat(images && images.length > 0 ? images.map(function(item, index) {
-        return /*#__PURE__*/ _react.default.createElement(_index3.default, {
-            key: index,
-            className: "nut-imagepreview-swiper-item"
-        }, _taro.default.getEnv() === 'WEB' ? /*#__PURE__*/ _react.default.createElement(_index1.default, {
-            src: item.src,
-            mode: "aspectFit"
-        }) : /*#__PURE__*/ _react.default.createElement(_index1.default, {
-            src: item.src,
-            mode: "aspectFit",
-            showMenuByLongpress: !!showMenuByLongpress
-        }));
-    }) : []))), pagination ? /*#__PURE__*/ _react.default.createElement("div", {
+    }, (videos !== null && videos !== void 0 ? videos : []).map(function(item) {
+        return {
+            type: 'video',
+            data: item
+        };
+    }).concat((images !== null && images !== void 0 ? images : []).map(function(item) {
+        return {
+            type: 'image',
+            data: item
+        };
+    })).sort(function(a, b) {
+        var _a_data, _b_data;
+        var _a_data_index, _b_data_index;
+        return ((_a_data_index = (_a_data = a.data) === null || _a_data === void 0 ? void 0 : _a_data.index) !== null && _a_data_index !== void 0 ? _a_data_index : 0) - ((_b_data_index = (_b_data = b.data) === null || _b_data === void 0 ? void 0 : _b_data.index) !== null && _b_data_index !== void 0 ? _b_data_index : 0);
+    }).map(function(item, index) {
+        if (item.type === 'video') {
+            var _item_data = item.data, source = _item_data.source, options = _item_data.options;
+            return /*#__PURE__*/ _react.default.createElement(_index2.default, {
+                key: index,
+                className: "nut-imagepreview-swiper-item"
+            }, /*#__PURE__*/ _react.default.createElement(_components.Video, {
+                src: source.src,
+                onClick: closeOnImg,
+                controls: options.controls,
+                autoplay: false,
+                loop: false,
+                muted: options.muted
+            }));
+        }
+        if (item.type === 'image') {
+            var src = item.data.src;
+            return /*#__PURE__*/ _react.default.createElement(_index2.default, {
+                key: index,
+                className: "nut-imagepreview-swiper-item"
+            }, "(", /*#__PURE__*/ _react.default.createElement(_components.Image, (0, _object_spread._)({
+                src: src,
+                mode: "widthFix",
+                onClick: closeOnImg,
+                style: {
+                    width: '100%'
+                }
+            }, _taro.default.getEnv() !== 'WEB' && {
+                showMenuByLongpress: showMenuByLongpress
+            })), ")");
+        }
+        return null;
+    }))), pagination ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-index")
-    }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null, closeIcon !== false ? /*#__PURE__*/ _react.default.createElement("div", {
+    }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null, closeIcon !== false ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-close ").concat(closeIconPosition),
         onClick: onCloseInner
     }, closeIcon === true ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null) : closeIcon) : null);

package/dist/cjs/packages/imagepreview/style/style.css

@@ -12,7 +12,7 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -25,9 +25,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -63,17 +60,23 @@
 }
 
 .nut-popup {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   min-height: 26%;
   max-height: 100%;
   overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
+  color: var(--nutui-color-title, #1a1a1a);
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
@@ -85,26 +88,30 @@
   left: var(--nutui-popup-title-padding, 16px);
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: var(--nutui-font-weight-bold, 600);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  color: var(--nutui-color-text-help, #888b94);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-right {
-  position: absolute !important;
+  position: absolute;
   z-index: 1;
   cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
+  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
+  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
   display: flex;
   justify-content: center;
   align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #888b94);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,7 +132,9 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  /* #ifndef rn */
   transform: translate(-50%, -50%);
+  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px);
@@ -137,6 +146,9 @@
   bottom: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 300px;
+  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -144,6 +156,10 @@
 .nut-popup-right {
   top: 0;
   right: 0;
+  /* #ifdef rn */
+  width: 100px;
+  height: 100%;
+  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
@@ -151,6 +167,10 @@
 .nut-popup-left {
   top: 0;
   left: 0;
+  /* #ifdef rn */
+  width: 100px;
+  height: 100%;
+  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
   border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
@@ -159,6 +179,9 @@
   top: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 100px;
+  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
   border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
@@ -227,16 +250,22 @@
 }
 @keyframes popup-slide-top-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
+    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
+  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
+  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -248,16 +277,22 @@
 }
 @keyframes popup-slide-right-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
+    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
+    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
+  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
+  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -269,16 +304,22 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
+    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
+  /* #ifndef rn */
   transform: translate(0, 0);
+  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -290,12 +331,16 @@
 }
 @keyframes popup-slide-left-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
+    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -313,7 +358,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -349,7 +394,9 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
+  /* #ifndef rn */
   transform: translate(50%, -50%);
+  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -376,7 +423,7 @@
   width: var(--nutui-indicator-dot-size, 4px);
   height: var(--nutui-indicator-dot-size, 4px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   margin: 0 var(--nutui-indicator-dot-margin, 2px);
 }
 .nut-indicator-dot:first-child {
@@ -534,7 +581,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -547,7 +594,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 

package/dist/cjs/packages/indicator/style/style.css

@@ -12,7 +12,7 @@
   width: var(--nutui-indicator-dot-size, 4px);
   height: var(--nutui-indicator-dot-size, 4px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   margin: 0 var(--nutui-indicator-dot-margin, 2px);
 }
 .nut-indicator-dot:first-child {

package/dist/cjs/packages/infiniteloading/infiniteloading.d.ts

@@ -1,7 +1,8 @@
 import React, { FunctionComponent, ReactNode } from 'react';
+import { ScrollViewProps } from '@tarojs/components';
 import { BasicComponent } from "../../utils/typings";
 import { InfiniteLoadingType } from './types';
-export interface InfiniteLoadingProps extends BasicComponent {
+export interface InfiniteLoadingProps extends BasicComponent, Omit<ScrollViewProps, 'style' | 'type' | 'onScroll'> {
     type: InfiniteLoadingType;
     hasMore: boolean;
     threshold: number;

package/dist/cjs/packages/infiniteloading/infiniteloading.js

@@ -13,6 +13,7 @@ var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcar
 var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
@@ -21,6 +22,7 @@ var _components = require("@tarojs/components");
 var _taro = require("@tarojs/taro");
 var _configprovider = require("../configprovider/configprovider");
 var _typings = require("../../utils/typings");
+var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     type: 'default',
     hasMore: true,
@@ -30,8 +32,31 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var classPrefix = "nut-infiniteloading";
 var InfiniteLoading = function InfiniteLoading(props) {
+    var getBottomTipsText = function getBottomTipsText() {
+        if (isInfiniting) {
+            return loadingText || locale.infiniteloading.loadText;
+        }
+        if (!hasMore) {
+            return loadMoreText || locale.infiniteloading.loadMoreText;
+        }
+        return null;
+    };
     var locale = (0, _configprovider.useConfig)().locale;
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, type = _$_object_spread.type, hasMore = _$_object_spread.hasMore, threshold = _$_object_spread.threshold, target = _$_object_spread.target, pullRefresh = _$_object_spread.pullRefresh, pullingText = _$_object_spread.pullingText, loadingText = _$_object_spread.loadingText, loadMoreText = _$_object_spread.loadMoreText, className = _$_object_spread.className, onRefresh = _$_object_spread.onRefresh, onLoadMore = _$_object_spread.onLoadMore, onScroll = _$_object_spread.onScroll;
+    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, type = _ref.type, hasMore = _ref.hasMore, threshold = _ref.threshold, target = _ref.target, pullRefresh = _ref.pullRefresh, pullingText = _ref.pullingText, loadingText = _ref.loadingText, loadMoreText = _ref.loadMoreText, className = _ref.className, onRefresh = _ref.onRefresh, onLoadMore = _ref.onLoadMore, onScroll = _ref.onScroll, rest = (0, _object_without_properties._)(_ref, [
+        "children",
+        "type",
+        "hasMore",
+        "threshold",
+        "target",
+        "pullRefresh",
+        "pullingText",
+        "loadingText",
+        "loadMoreText",
+        "className",
+        "onRefresh",
+        "onLoadMore",
+        "onScroll"
+    ]);
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isInfiniting = _useState[0], setIsInfiniting = _useState[1];
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(0), 2), topDisScoll = _useState1[0], setTopDisScoll = _useState1[1];
     var refreshTop = (0, _react.useRef)(null);
@@ -44,12 +69,16 @@ var InfiniteLoading = function InfiniteLoading(props) {
     var classes = (0, _classnames.default)(classPrefix, className, "".concat(classPrefix, "-").concat(type));
     (0, _react.useEffect)(function() {
         refreshMaxH.current = threshold;
-        setTimeout(function() {
+        var timer = setTimeout(function() {
             getScrollHeight();
         }, 200);
+        return function() {
+            return clearTimeout(timer);
+        };
     }, [
         hasMore,
-        isInfiniting
+        isInfiniting,
+        threshold
     ]);
     /** 获取需要滚动的距离 */ var getScrollHeight = function getScrollHeight() {
         var parentElement = getParentElement('scroller');
@@ -60,7 +89,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
     };
     var getStyle = function getStyle() {
         return {
-            height: topDisScoll < 0 ? "0px" : "".concat(topDisScoll, "px"),
+            height: topDisScoll < 0 ? (0, _pxtransform.default)(0) : (0, _pxtransform.default)(topDisScoll),
             transition: "height 0.2s cubic-bezier(0.25,0.1,0.25,1)"
         };
     };
@@ -84,7 +113,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
         }
         onScroll && onScroll(e.target.scrollTop);
     };
-    var lower = function() {
+    var lower = /*#__PURE__*/ function() {
         var _ref = (0, _async_to_generator._)(function() {
             return (0, _ts_generator._)(this, function(_state) {
                 switch(_state.label){
@@ -134,7 +163,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
             isTouching.current = false;
         }
     };
-    var touchEnd = function() {
+    var touchEnd = /*#__PURE__*/ function() {
         var _ref = (0, _async_to_generator._)(function() {
             return (0, _ts_generator._)(this, function(_state) {
                 switch(_state.label){
@@ -170,7 +199,7 @@ var InfiniteLoading = function InfiniteLoading(props) {
             return _ref.apply(this, arguments);
         };
     }();
-    return /*#__PURE__*/ _react.default.createElement(_components.ScrollView, {
+    return /*#__PURE__*/ _react.default.createElement(_components.ScrollView, (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
         className: classes,
         scrollY: true,
         id: "scroller",
@@ -183,20 +212,18 @@ var InfiniteLoading = function InfiniteLoading(props) {
         onTouchStart: touchStart,
         onTouchMove: touchMove,
         onTouchEnd: touchEnd
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-top",
         ref: refreshTop,
         style: getStyle()
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-top-tips"
-    }, pullingText || locale.infiniteloading.pullRefreshText)), /*#__PURE__*/ _react.default.createElement("div", {
+    }, pullingText || locale.infiniteloading.pullRefreshText)), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-container"
-    }, children), /*#__PURE__*/ _react.default.createElement("div", {
+    }, children), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-bottom"
-    }, isInfiniting ? /*#__PURE__*/ _react.default.createElement("div", {
-        className: "nut-infinite-bottom-tips"
-    }, loadingText || locale.infiniteloading.loadText) : !hasMore && /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-infinite-bottom-tips"
-    }, loadMoreText || locale.infiniteloading.loadMoreText)));
+    }, getBottomTipsText())));
 };
 InfiniteLoading.displayName = 'NutInfiniteLoading';

package/dist/cjs/packages/infiniteloading/style/infiniteloading.scss

@@ -8,7 +8,7 @@
     justify-content: center;
     width: 100%;
     overflow: hidden;
-    font-size: $font-size-small;
+    font-size: $font-size-s;
     color: $infiniteloading-color;
 
     &-tips {
@@ -33,7 +33,7 @@
     justify-content: center;
     width: 100%;
     padding-top: 6px;
-    font-size: $font-size-small;
+    font-size: $font-size-s;
     color: $infiniteloading-color;
     text-align: center;