@nutui/nutui-react-taro 3.0.19-cpp.4 → 3.0.19-cpp.6

package/dist/es/packages/noticebar/noticebar.js

@@ -36,7 +36,7 @@ export var NoticeBar = function(props) {
     var classPrefix = 'nut-noticebar';
     var wrapRef = useRef(null);
     var contentRef = useRef(null);
-    var _useState = _sliced_to_array(useState(true), 2), showNoticeBar = _useState[0], SetShowNoticeBar = _useState[1];
+    var _useState = _sliced_to_array(useState(true), 2), showNoticeBar = _useState[0], setShowNoticeBar = _useState[1];
     var scrollList = useRef([]);
     var _useState1 = _sliced_to_array(useState(0), 2), wrapWidth = _useState1[0], SetWrapWidth = _useState1[1];
     var _useState2 = _sliced_to_array(useState(true), 2), firstRound = _useState2[0], SetFirstRound = _useState2[1];
@@ -144,6 +144,9 @@ export var NoticeBar = function(props) {
                             ];
                         case 2:
                             contentRes = _state.sent();
+                            if (!warpRes || !contentRes) return [
+                                2
+                            ];
                             wrapW = warpRes.width;
                             offsetW = contentRes.width;
                             canScroll = align === 'left' && scrollable == null ? offsetW > wrapW : scrollable;
@@ -168,12 +171,6 @@ export var NoticeBar = function(props) {
         click && click(event);
         onClick && onClick(event);
     };
-    var onClickIcon = function(event) {
-        event.stopPropagation();
-        SetShowNoticeBar(!closeable);
-        close && close(event);
-        onClose && onClose(event);
-    };
     var onAnimationEnd = function() {
         SetFirstRound(false);
         setTimeout(function() {
@@ -196,13 +193,16 @@ export var NoticeBar = function(props) {
             SetAnimate(false);
         }, time);
     };
-    // 点击滚动单元
-    var handleClickIcon = function(event) {
+    var handleClickIcon = useCallback(function(event) {
         event.stopPropagation();
-        SetShowNoticeBar(!closeable);
+        setShowNoticeBar(!closeable);
         close && close(event);
         onClose && onClose(event);
-    };
+    }, [
+        close,
+        onClose,
+        closeable
+    ]);
     var isEllipsis = function() {
         if (isCanScroll == null && align === 'left') {
             return wrap;
@@ -350,10 +350,12 @@ export var NoticeBar = function(props) {
     };
     // 无缝滚动第一个元素位移控制
     var itemStyle = function(index) {
-        var style = {};
+        var style = {
+            width: '100%'
+        };
         if (height) {
             style.height = "".concat(height, "px");
-            style.lineHeight = "".concat(height, "px");
+        // style.lineHeight = `${height}px`
         }
         var offset = childOffset[index];
         if (offset) {
@@ -422,74 +424,77 @@ export var NoticeBar = function(props) {
         container.current = ref;
         setIsContainerReady(true);
     }, []);
-    return (
-        /*#__PURE__*/ React.createElement(View, {
-            className: cls,
-            style: style
-        }, showNoticeBar && direction === 'horizontal' ? /*#__PURE__*/ React.createElement(View, {
-            className: noticebarClass,
-            style: barStyle,
-            onClick: handleClick
-        }, leftIcon ? /*#__PURE__*/ React.createElement(View, {
+    var renderLeftIcon = useCallback(function() {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, leftIcon ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-noticebar-box-left-icon"
-        }, leftIcon) : null, /*#__PURE__*/ React.createElement(View, {
-            ref: wrapRef,
-            className: "nut-noticebar-box-wrap"
-        }, /*#__PURE__*/ React.createElement(View, {
-            ref: contentRef,
-            className: "nut-noticebar-box-wrap-content ".concat(animationClass, " ").concat(isEllipsis() ? 'nut-ellipsis' : ''),
-            style: contentStyle,
-            onAnimationEnd: onAnimationEnd
-        }, children, content)), right ? /*#__PURE__*/ React.createElement(View, {
+        }, leftIcon) : null);
+    }, [
+        leftIcon
+    ]);
+    var renderRight = useCallback(function() {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, right ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-noticebar-box-right"
-        }, right) : null, closeable || rightIcon ? /*#__PURE__*/ React.createElement(View, {
+        }, right) : null);
+    }, [
+        right
+    ]);
+    var renderRightIcon = useCallback(function() {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, rightIcon || closeable ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-noticebar-box-right-icon",
-            onClick: onClickIcon
+            onClick: handleClickIcon
         }, rightIcon || /*#__PURE__*/ React.createElement(Close, {
             size: 12
-        })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ React.createElement(View, {
-            className: "nut-noticebar-vertical",
-            style: barStyle,
-            ref: containerRefCallback,
-            onClick: handleClick
-        }, leftIcon ? /*#__PURE__*/ React.createElement(View, {
-            className: "nut-noticebar-box-left-icon"
-        }, leftIcon) : null, children ? /*#__PURE__*/ React.createElement(View, {
-            className: "nut-noticebar-box-wrap",
-            ref: innerRef
-        }, scrollList.current.map(function(item, index) {
-            return /*#__PURE__*/ React.createElement(View, {
-                style: itemStyle(index),
-                key: index,
-                onClick: function(e) {
-                    handleItemClick(e, item);
-                }
-            }, item);
-        })) : /*#__PURE__*/ React.createElement(View, {
-            className: "nut-noticebar-box-horseLamp-list",
-            style: horseLampStyle
-        }, scrollList.current.map(function(item, index) {
-            return (
-                // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-                /*#__PURE__*/ (React.createElement(View, {
-                    className: "nut-noticebar-box-horseLamp-list-item",
-                    style: {
-                        height: height
-                    },
-                    key: index,
-                    onClick: function(e) {
-                        handleItemClick(e, item);
-                    }
-                }, item))
-            );
-        })), /*#__PURE__*/ React.createElement(View, {
-            className: "nut-noticebar-box-right-icon",
+        })) : null);
+    }, [
+        rightIcon,
+        closeable,
+        handleClickIcon
+    ]);
+    return /*#__PURE__*/ React.createElement(View, {
+        className: cls,
+        style: style
+    }, showNoticeBar && direction === 'horizontal' ? /*#__PURE__*/ React.createElement(View, {
+        className: noticebarClass,
+        style: barStyle,
+        onClick: handleClick
+    }, renderLeftIcon(), /*#__PURE__*/ React.createElement(View, {
+        ref: wrapRef,
+        className: "nut-noticebar-box-wrap"
+    }, /*#__PURE__*/ React.createElement(View, {
+        ref: contentRef,
+        className: "nut-noticebar-box-wrap-content ".concat(animationClass, " ").concat(isEllipsis() ? 'nut-ellipsis' : ''),
+        style: contentStyle,
+        onAnimationEnd: onAnimationEnd
+    }, children, content)), renderRight(), renderRightIcon()) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ React.createElement(View, {
+        className: "nut-noticebar-vertical",
+        style: barStyle,
+        ref: containerRefCallback,
+        onClick: handleClick
+    }, renderLeftIcon(), children ? /*#__PURE__*/ React.createElement(View, {
+        className: "nut-noticebar-box-wrap",
+        ref: innerRef
+    }, scrollList.current.map(function(item, index) {
+        return /*#__PURE__*/ React.createElement(View, {
+            style: itemStyle(index),
+            key: index,
             onClick: function(e) {
-                handleClickIcon(e);
+                handleItemClick(e, item);
             }
-        }, rightIcon || (closeable ? /*#__PURE__*/ React.createElement(Close, {
-            size: 12
-        }) : null))) : null)
-    );
+        }, item);
+    })) : /*#__PURE__*/ React.createElement(View, {
+        className: "nut-noticebar-box-horseLamp-list",
+        style: horseLampStyle
+    }, scrollList.current.map(function(item, index) {
+        return /*#__PURE__*/ React.createElement(View, {
+            className: "nut-noticebar-box-horseLamp-list-item",
+            style: {
+                height: height
+            },
+            key: index,
+            onClick: function(e) {
+                handleItemClick(e, item);
+            }
+        }, item);
+    })), renderRight(), renderRightIcon()) : null);
 };
 NoticeBar.displayName = 'NutNoticeBar';

package/dist/es/packages/tabs/style/style.css

@@ -50,7 +50,6 @@
   flex: 1 0 auto;
   padding: 0 var(--nutui-tabs-titles-gap, 12px);
   height: var(--nutui-tabs-titles-height, 44px);
-  line-height: var(--nutui-tabs-titles-height, 44px);
   min-width: var(--nutui-tabs-titles-item-min-width, 50px);
   font-size: var(--nutui-tabs-titles-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-tabs-titles-item-color, var(--nutui-color-title, #1a1a1a));

package/dist/es/packages/tabs/style/style.harmony.css

@@ -65,7 +65,6 @@
   flex: 1 0 auto;
   padding: 0 var(--nutui-tabs-titles-gap, 12px);
   height: var(--nutui-tabs-titles-height, 44px);
-  line-height: var(--nutui-tabs-titles-height, 44px);
   min-width: var(--nutui-tabs-titles-item-min-width, 50px);
   font-size: var(--nutui-tabs-titles-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-tabs-titles-item-color, var(--nutui-color-title, #1a1a1a));

package/dist/es/packages/tabs/style/tabs.scss

@@ -52,7 +52,7 @@
     flex: 1 0 auto;
     padding: 0 $tabs-titles-gap;
     height: $tabs-titles-height;
-    line-height: $tabs-titles-height;
+    // line-height: $tabs-titles-height;
     min-width: $tabs-titles-item-min-width;
     font-size: $tabs-titles-font-size;
     color: $tabs-titles-item-color;

package/dist/es/packages/tabs/style-jmapp/style.css

@@ -50,7 +50,6 @@
   flex: 1 0 auto;
   padding: 0 var(--nutui-tabs-titles-gap, 12px);
   height: var(--nutui-tabs-titles-height, 32px);
-  line-height: var(--nutui-tabs-titles-height, 32px);
   min-width: var(--nutui-tabs-titles-item-min-width, 50px);
   font-size: var(--nutui-tabs-titles-font-size, var(--nutui-font-text));
   color: var(--nutui-tabs-titles-item-color, var(--nutui-color-title));

package/dist/es/packages/tabs/style-jmapp/tabs.scss

@@ -52,7 +52,7 @@
     flex: 1 0 auto;
     padding: 0 $tabs-titles-gap;
     height: $tabs-titles-height;
-    line-height: $tabs-titles-height;
+    // line-height: $tabs-titles-height;
     min-width: $tabs-titles-item-min-width;
     font-size: $tabs-titles-font-size;
     color: $tabs-titles-item-color;

package/dist/es/packages/tabs/style-jrkf/style.css

@@ -50,7 +50,6 @@
   flex: 1 0 auto;
   padding: 0 var(--nutui-tabs-titles-gap, 12px);
   height: var(--nutui-tabs-titles-height, 32px);
-  line-height: var(--nutui-tabs-titles-height, 32px);
   min-width: var(--nutui-tabs-titles-item-min-width, 50px);
   font-size: var(--nutui-tabs-titles-font-size, var(--nutui-font-text));
   color: var(--nutui-tabs-titles-item-color, var(--nutui-color-title));

package/dist/es/packages/tabs/style-jrkf/tabs.scss

@@ -52,7 +52,7 @@
     flex: 1 0 auto;
     padding: 0 $tabs-titles-gap;
     height: $tabs-titles-height;
-    line-height: $tabs-titles-height;
+    // line-height: $tabs-titles-height;
     min-width: $tabs-titles-item-min-width;
     font-size: $tabs-titles-font-size;
     color: $tabs-titles-item-color;

package/dist/es/packages/textarea/style/style.css

@@ -22,7 +22,6 @@
 .nut-textarea-limit {
   text-align: right;
   font-size: var(--nutui-font-size-base, 14px);
-  line-height: var(--nutui-font-size-base, 14px);
   margin-top: var(--nutui-spacing-base, 8px);
   color: var(--nutui-color-text-help, #888b94);
 }

package/dist/es/packages/textarea/style/style.harmony.css

@@ -22,7 +22,6 @@
 .nut-textarea-limit {
   text-align: right;
   font-size: var(--nutui-font-size-base, 14px);
-  line-height: var(--nutui-font-size-base, 14px);
   margin-top: var(--nutui-spacing-base, 8px);
   color: var(--nutui-color-text-help, #888b94);
 }

package/dist/es/packages/textarea/style/textarea.scss

@@ -20,7 +20,7 @@
   &-limit {
     text-align: right;
     font-size: $font-size-base;
-    line-height: $font-size-base;
+    // line-height: $font-size-base;
     margin-top: $spacing-base;
     color: $color-text-help;
     &-disabled {

package/dist/es/packages/textarea/style-jmapp/style.css

@@ -22,7 +22,6 @@
 .nut-textarea-limit {
   text-align: right;
   font-size: var(--nutui-font-text);
-  line-height: var(--nutui-font-text);
   margin-top: var(--nutui-spacing-base);
   color: var(--nutui-color-text-help);
 }

package/dist/es/packages/textarea/style-jmapp/textarea.scss

@@ -20,7 +20,7 @@
   &-limit {
     text-align: right;
     font-size: $font-size-base;
-    line-height: $font-size-base;
+    // line-height: $font-size-base;
     margin-top: $spacing-base;
     color: $color-text-help;
     &-disabled {

package/dist/es/packages/textarea/style-jrkf/style.css

@@ -22,7 +22,6 @@
 .nut-textarea-limit {
   text-align: right;
   font-size: var(--nutui-font-text);
-  line-height: var(--nutui-font-text);
   margin-top: var(--nutui-spacing-base);
   color: var(--nutui-color-text-help);
 }

package/dist/es/packages/textarea/style-jrkf/textarea.scss

@@ -20,7 +20,7 @@
   &-limit {
     text-align: right;
     font-size: $font-size-base;
-    line-height: $font-size-base;
+    // line-height: $font-size-base;
     margin-top: $spacing-base;
     color: $color-text-help;
     &-disabled {

package/dist/nutui.react.umd.js

@@ -15803,7 +15803,7 @@
     var classPrefix2 = "nut-noticebar";
     var wrapRef = React.useRef(null);
     var contentRef = React.useRef(null);
-    var _useState = _sliced_to_array(React.useState(true), 2), showNoticeBar = _useState[0], SetShowNoticeBar = _useState[1];
+    var _useState = _sliced_to_array(React.useState(true), 2), showNoticeBar = _useState[0], setShowNoticeBar = _useState[1];
     var scrollList = React.useRef([]);
     var _useState1 = _sliced_to_array(React.useState(0), 2), wrapWidth = _useState1[0], SetWrapWidth = _useState1[1];
     var _useState2 = _sliced_to_array(React.useState(true), 2), firstRound = _useState2[0], SetFirstRound = _useState2[1];
@@ -15908,6 +15908,9 @@
                 ];
               case 2:
                 contentRes = _state.sent();
+                if (!warpRes || !contentRes) return [
+                  2
+                ];
                 wrapW = warpRes.width;
                 offsetW = contentRes.width;
                 canScroll = align === "left" && scrollable == null ? offsetW > wrapW : scrollable;
@@ -15932,12 +15935,6 @@
       click && click(event);
       onClick && onClick(event);
     };
-    var onClickIcon = function(event) {
-      event.stopPropagation();
-      SetShowNoticeBar(!closeable);
-      close2 && close2(event);
-      onClose && onClose(event);
-    };
     var onAnimationEnd = function() {
       SetFirstRound(false);
       setTimeout(function() {
@@ -15960,12 +15957,16 @@
         SetAnimate(false);
       }, time2);
     };
-    var handleClickIcon = function(event) {
+    var handleClickIcon = React.useCallback(function(event) {
       event.stopPropagation();
-      SetShowNoticeBar(!closeable);
+      setShowNoticeBar(!closeable);
       close2 && close2(event);
       onClose && onClose(event);
-    };
+    }, [
+      close2,
+      onClose,
+      closeable
+    ]);
     var isEllipsis = function() {
       if (isCanScroll == null && align === "left") {
         return wrap;
@@ -16104,10 +16105,11 @@
       target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
     };
     var itemStyle = function(index2) {
-      var style2 = {};
+      var style2 = {
+        width: "100%"
+      };
       if (height2) {
         style2.height = "".concat(height2, "px");
-        style2.lineHeight = "".concat(height2, "px");
       }
       var offset2 = childOffset[index2];
       if (offset2) {
@@ -16171,6 +16173,32 @@
       container.current = ref;
       setIsContainerReady(true);
     }, []);
+    var renderLeftIcon = React.useCallback(function() {
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, leftIcon ? /* @__PURE__ */ React.createElement(components.View, {
+        className: "nut-noticebar-box-left-icon"
+      }, leftIcon) : null);
+    }, [
+      leftIcon
+    ]);
+    var renderRight = React.useCallback(function() {
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, right2 ? /* @__PURE__ */ React.createElement(components.View, {
+        className: "nut-noticebar-box-right"
+      }, right2) : null);
+    }, [
+      right2
+    ]);
+    var renderRightIcon = React.useCallback(function() {
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, rightIcon || closeable ? /* @__PURE__ */ React.createElement(components.View, {
+        className: "nut-noticebar-box-right-icon",
+        onClick: handleClickIcon
+      }, rightIcon || /* @__PURE__ */ React.createElement(IconSVG$p, {
+        size: 12
+      })) : null);
+    }, [
+      rightIcon,
+      closeable,
+      handleClickIcon
+    ]);
     return /* @__PURE__ */ React.createElement(components.View, {
       className: cls,
       style
@@ -16178,9 +16206,7 @@
       className: noticebarClass,
       style: barStyle,
       onClick: handleClick
-    }, leftIcon ? /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-noticebar-box-left-icon"
-    }, leftIcon) : null, /* @__PURE__ */ React.createElement(components.View, {
+    }, renderLeftIcon(), /* @__PURE__ */ React.createElement(components.View, {
       ref: wrapRef,
       className: "nut-noticebar-box-wrap"
     }, /* @__PURE__ */ React.createElement(components.View, {
@@ -16188,21 +16214,12 @@
       className: "nut-noticebar-box-wrap-content ".concat(animationClass, " ").concat(isEllipsis() ? "nut-ellipsis" : ""),
       style: contentStyle,
       onAnimationEnd
-    }, children, content2)), right2 ? /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-noticebar-box-right"
-    }, right2) : null, closeable || rightIcon ? /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-noticebar-box-right-icon",
-      onClick: onClickIcon
-    }, rightIcon || /* @__PURE__ */ React.createElement(IconSVG$p, {
-      size: 12
-    })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /* @__PURE__ */ React.createElement(components.View, {
+    }, children, content2)), renderRight(), renderRightIcon()) : null, showNoticeBar && hasVerticalContent && isVertical ? /* @__PURE__ */ React.createElement(components.View, {
       className: "nut-noticebar-vertical",
       style: barStyle,
       ref: containerRefCallback,
       onClick: handleClick
-    }, leftIcon ? /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-noticebar-box-left-icon"
-    }, leftIcon) : null, children ? /* @__PURE__ */ React.createElement(components.View, {
+    }, renderLeftIcon(), children ? /* @__PURE__ */ React.createElement(components.View, {
       className: "nut-noticebar-box-wrap",
       ref: innerRef
     }, scrollList.current.map(function(item, index2) {
@@ -16217,27 +16234,17 @@
       className: "nut-noticebar-box-horseLamp-list",
       style: horseLampStyle
     }, scrollList.current.map(function(item, index2) {
-      return (
-        // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-        /* @__PURE__ */ React.createElement(components.View, {
-          className: "nut-noticebar-box-horseLamp-list-item",
-          style: {
-            height: height2
-          },
-          key: index2,
-          onClick: function(e) {
-            handleItemClick(e, item);
-          }
-        }, item)
-      );
-    })), /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-noticebar-box-right-icon",
-      onClick: function(e) {
-        handleClickIcon(e);
-      }
-    }, rightIcon || (closeable ? /* @__PURE__ */ React.createElement(IconSVG$p, {
-      size: 12
-    }) : null))) : null);
+      return /* @__PURE__ */ React.createElement(components.View, {
+        className: "nut-noticebar-box-horseLamp-list-item",
+        style: {
+          height: height2
+        },
+        key: index2,
+        onClick: function(e) {
+          handleItemClick(e, item);
+        }
+      }, item);
+    })), renderRight(), renderRightIcon()) : null);
   };
   NoticeBar.displayName = "NutNoticeBar";
   var defaultProps$B = _object_spread_props(_object_spread({}, ComponentDefaults), {