@nutui/nutui-react-taro 3.0.18-cpp.beta.1 → 3.0.19-beta.1

package/dist/cjs/packages/menuitem/style-jrkf/menuitem.scss

@@ -27,7 +27,12 @@
     }
 
     .nut-icon {
+      /* #ifdef dynamic*/
+      display: flex;
+      /* #endif */
+      /* #ifndef dynamic*/
       display: inline-flex;
+      /* #endif */
       align-items: center;
       margin-right: $menu-item-icon-margin;
       flex-shrink: 0;
@@ -54,14 +59,14 @@
 
 .nut-menu-placeholder-element {
   position: fixed;
-  top: -$menu-bar-line-height;
+  top: calc(-1 * var(--menu-bar-line-height));
   left: 0;
   right: 0;
   z-index: $menu-bar-opened-z-index;
   background-color: transparent;
 
   &.up {
-    bottom: -$menu-bar-line-height;
+    bottom: calc(-1 * var(--menu-bar-line-height));
   }
 }
 

package/dist/cjs/packages/menuitem/style-jrkf/style.css

@@ -27,7 +27,12 @@
   color: var(--nutui-menu-item-active-color, var(--nutui-color-primary, #ff6666));
 }
 .nut-menu-container-item .nut-icon {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   margin-right: var(--nutui-menu-item-icon-margin, 8px);
   flex-shrink: 0;
@@ -49,14 +54,14 @@
 
 .nut-menu-placeholder-element {
   position: fixed;
-  top: -var(--nutui-menu-bar-line-height, 48px);
+  top: calc(-1 * var(--menu-bar-line-height));
   left: 0;
   right: 0;
   z-index: var(--nutui-menu-bar-opened-z-index, 1000);
   background-color: transparent;
 }
 .nut-menu-placeholder-element.up {
-  bottom: -var(--nutui-menu-bar-line-height, 48px);
+  bottom: calc(-1 * var(--menu-bar-line-height));
 }
 
 .nut-menu-container-down-enter {

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

@@ -28,8 +28,10 @@
   }
 
   &-safe-area-inset-top {
+    /* #ifndef dynamic*/
     padding-top: constant(safe-area-inset-top);
     padding-top: env(safe-area-inset-top);
+    /* #endif */
   }
 
   &-title-wrapper {

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

@@ -30,8 +30,10 @@
   width: 100%;
 }
 .nut-navbar-safe-area-inset-top {
+  /* #ifndef dynamic*/
   padding-top: constant(safe-area-inset-top);
   padding-top: env(safe-area-inset-top);
+  /* #endif */
 }
 .nut-navbar-title-wrapper {
   justify-content: space-between;

package/dist/cjs/packages/navbar/style/style.harmony.css

@@ -30,8 +30,10 @@
   width: 100%;
 }
 .nut-navbar-safe-area-inset-top {
+  /* #ifndef dynamic*/
   padding-top: constant(safe-area-inset-top);
   padding-top: env(safe-area-inset-top);
+  /* #endif */
 }
 .nut-navbar-title-wrapper {
   justify-content: space-between;

package/dist/cjs/packages/navbar/style-jmapp/navbar.scss

@@ -28,8 +28,10 @@
   }
 
   &-safe-area-inset-top {
+    /* #ifndef dynamic*/
     padding-top: constant(safe-area-inset-top);
     padding-top: env(safe-area-inset-top);
+    /* #endif */
   }
 
   &-title-wrapper {

package/dist/cjs/packages/navbar/style-jmapp/style.css

@@ -30,8 +30,10 @@
   width: 100%;
 }
 .nut-navbar-safe-area-inset-top {
+  /* #ifndef dynamic*/
   padding-top: constant(safe-area-inset-top);
   padding-top: env(safe-area-inset-top);
+  /* #endif */
 }
 .nut-navbar-title-wrapper {
   justify-content: space-between;

package/dist/cjs/packages/navbar/style-jrkf/navbar.scss

@@ -28,8 +28,10 @@
   }
 
   &-safe-area-inset-top {
+    /* #ifndef dynamic*/
     padding-top: constant(safe-area-inset-top);
     padding-top: env(safe-area-inset-top);
+    /* #endif */
   }
 
   &-title-wrapper {

package/dist/cjs/packages/navbar/style-jrkf/style.css

@@ -30,8 +30,10 @@
   width: 100%;
 }
 .nut-navbar-safe-area-inset-top {
+  /* #ifndef dynamic*/
   padding-top: constant(safe-area-inset-top);
   padding-top: env(safe-area-inset-top);
+  /* #endif */
 }
 .nut-navbar-title-wrapper {
   justify-content: space-between;

package/dist/cjs/packages/noticebar/noticebar.js

@@ -18,9 +18,11 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
 var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
+var _taro = require("@tarojs/taro");
 var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _useuuid = require("../../hooks/use-uuid");
 var _getrect = require("../../utils/taro/get-rect");
 var _typings = require("../../utils/typings");
 var _index = require("../configprovider/index");
@@ -48,7 +50,10 @@ var NoticeBar = function NoticeBar(props) {
     var classPrefix = 'nut-noticebar';
     var wrapRef = (0, _react.useRef)(null);
     var contentRef = (0, _react.useRef)(null);
-    var _useState = (0, _sliced_to_array._)((0, _react.useState)(true), 2), showNoticeBar = _useState[0], SetShowNoticeBar = _useState[1];
+    var uid = (0, _useuuid.useUuid)();
+    var wrapRefId = "wrap-ref-".concat(uid);
+    var contentRefId = "content-ref-".concat(uid);
+    var _useState = (0, _sliced_to_array._)((0, _react.useState)(true), 2), showNoticeBar = _useState[0], setShowNoticeBar = _useState[1];
     var scrollList = (0, _react.useRef)([]);
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(0), 2), wrapWidth = _useState1[0], SetWrapWidth = _useState1[1];
     var _useState2 = (0, _sliced_to_array._)((0, _react.useState)(true), 2), firstRound = _useState2[0], SetFirstRound = _useState2[1];
@@ -108,7 +113,7 @@ var NoticeBar = function NoticeBar(props) {
                 startRollEasy();
             }
         } else {
-            initScrollWrap(content);
+            initScrollWrap();
         }
         return function() {
             // 销毁事件
@@ -118,7 +123,7 @@ var NoticeBar = function NoticeBar(props) {
         childs
     ]);
     (0, _react.useEffect)(function() {
-        initScrollWrap(content);
+        initScrollWrap();
     }, [
         content
     ]);
@@ -129,61 +134,60 @@ var NoticeBar = function NoticeBar(props) {
     }, [
         list
     ]);
-    var initScrollWrap = function initScrollWrap(value) {
+    var initScrollWrap = function initScrollWrap() {
         if (showNoticeBar === false) {
             return;
         }
-        setTimeout(/*#__PURE__*/ (0, _async_to_generator._)(function() {
-            var warpRes, contentRes, wrapW, offsetW, canScroll;
-            return (0, _ts_generator._)(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        if (!wrapRef.current || !contentRef.current) {
+        (0, _taro.nextTick)(function() {
+            return (0, _async_to_generator._)(function() {
+                var warpRes, contentRes, wrapW, offsetW, canScroll;
+                return (0, _ts_generator._)(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            if (!wrapRef.current || !contentRef.current) {
+                                return [
+                                    2
+                                ];
+                            }
                             return [
+                                4,
+                                (0, _getrect.getRectInMultiPlatform)(wrapRef.current, wrapRefId)
+                            ];
+                        case 1:
+                            warpRes = _state.sent();
+                            return [
+                                4,
+                                (0, _getrect.getRectInMultiPlatform)(contentRef.current, contentRefId)
+                            ];
+                        case 2:
+                            contentRes = _state.sent();
+                            if (!warpRes || !contentRes) return [
                                 2
                             ];
-                        }
-                        return [
-                            4,
-                            (0, _getrect.getRectInMultiPlatform)(wrapRef.current)
-                        ];
-                    case 1:
-                        warpRes = _state.sent();
-                        return [
-                            4,
-                            (0, _getrect.getRectInMultiPlatform)(contentRef.current)
-                        ];
-                    case 2:
-                        contentRes = _state.sent();
-                        wrapW = warpRes.width;
-                        offsetW = contentRes.width;
-                        canScroll = align === 'left' && scrollable == null ? offsetW > wrapW : scrollable;
-                        SetIsCanScroll(canScroll);
-                        if (canScroll) {
-                            SetWrapWidth(wrapW);
-                            SetOffsetW(offsetW);
-                            SetAnimationDuration(offsetW / speed);
-                            SetAnimationClass('play');
-                        } else {
-                            SetAnimationClass('');
-                        }
-                        return [
-                            2
-                        ];
-                }
-            });
-        }), 0);
+                            wrapW = warpRes.width;
+                            offsetW = contentRes.width;
+                            canScroll = align === 'left' && scrollable == null ? offsetW > wrapW : scrollable;
+                            SetIsCanScroll(canScroll);
+                            if (canScroll) {
+                                SetWrapWidth(wrapW);
+                                SetOffsetW(offsetW);
+                                SetAnimationDuration(offsetW / speed);
+                                SetAnimationClass('play');
+                            } else {
+                                SetAnimationClass('');
+                            }
+                            return [
+                                2
+                            ];
+                    }
+                });
+            })();
+        });
     };
     var handleClick = function handleClick(event) {
         click && click(event);
         onClick && onClick(event);
     };
-    var onClickIcon = function onClickIcon(event) {
-        event.stopPropagation();
-        SetShowNoticeBar(!closeable);
-        close && close(event);
-        onClose && onClose(event);
-    };
     var onAnimationEnd = function onAnimationEnd() {
         SetFirstRound(false);
         setTimeout(function() {
@@ -206,13 +210,16 @@ var NoticeBar = function NoticeBar(props) {
             SetAnimate(false);
         }, time);
     };
-    // 点击滚动单元
-    var handleClickIcon = function handleClickIcon(event) {
+    var handleClickIcon = (0, _react.useCallback)(function(event) {
         event.stopPropagation();
-        SetShowNoticeBar(!closeable);
+        setShowNoticeBar(!closeable);
         close && close(event);
         onClose && onClose(event);
-    };
+    }, [
+        close,
+        onClose,
+        closeable
+    ]);
     var isEllipsis = function isEllipsis() {
         if (isCanScroll == null && align === 'left') {
             return wrap;
@@ -237,36 +244,38 @@ var NoticeBar = function NoticeBar(props) {
     var init = function init() {
         var activeIndex = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
         if (!(container === null || container === void 0 ? void 0 : container.current)) return;
-        setTimeout(/*#__PURE__*/ (0, _async_to_generator._)(function() {
-            var rects, _active, _height, targetOffset;
-            return (0, _ts_generator._)(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        return [
-                            4,
-                            (0, _getrect.getRectInMultiPlatform)(container === null || container === void 0 ? void 0 : container.current)
-                        ];
-                    case 1:
-                        rects = _state.sent();
-                        _active = Math.max(Math.min(childCount - 1, activeIndex), 0);
-                        _height = rects === null || rects === void 0 ? void 0 : rects.height;
-                        trackSize = childCount * Number(_height);
-                        targetOffset = getOffset(_active);
-                        activeRef.current = _active;
-                        setRect(rects);
-                        setOffset(targetOffset);
-                        setChildOffset(new Array(childCount).fill(0));
-                        // 关闭动画并立即设置样式
-                        swiperRef.current.moving = true;
-                        setStyle(targetOffset, rects);
-                        swiperRef.current.moving = false;
-                        setReady(true);
-                        return [
-                            2
-                        ];
-                }
-            });
-        }), 0);
+        setTimeout(function() {
+            return (0, _async_to_generator._)(function() {
+                var rects, _active, _height, targetOffset;
+                return (0, _ts_generator._)(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                (0, _getrect.getRectInMultiPlatform)(container === null || container === void 0 ? void 0 : container.current)
+                            ];
+                        case 1:
+                            rects = _state.sent();
+                            _active = Math.max(Math.min(childCount - 1, activeIndex), 0);
+                            _height = rects === null || rects === void 0 ? void 0 : rects.height;
+                            trackSize = childCount * Number(_height);
+                            targetOffset = getOffset(_active);
+                            activeRef.current = _active;
+                            setRect(rects);
+                            setOffset(targetOffset);
+                            setChildOffset(new Array(childCount).fill(0));
+                            // 关闭动画并立即设置样式
+                            swiperRef.current.moving = true;
+                            setStyle(targetOffset, rects);
+                            swiperRef.current.moving = false;
+                            setReady(true);
+                            return [
+                                2
+                            ];
+                    }
+                });
+            })();
+        }, 0);
     };
     (0, _react.useEffect)(function() {
         if (ready) {
@@ -358,10 +367,12 @@ var NoticeBar = function NoticeBar(props) {
     };
     // 无缝滚动第一个元素位移控制
     var itemStyle = function itemStyle(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) {
@@ -430,6 +441,32 @@ var NoticeBar = function NoticeBar(props) {
         container.current = ref;
         setIsContainerReady(true);
     }, []);
+    var renderLeftIcon = (0, _react.useCallback)(function() {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, leftIcon ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "nut-noticebar-box-left-icon"
+        }, leftIcon) : null);
+    }, [
+        leftIcon
+    ]);
+    var renderRight = (0, _react.useCallback)(function() {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, right ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "nut-noticebar-box-right"
+        }, right) : null);
+    }, [
+        right
+    ]);
+    var renderRightIcon = (0, _react.useCallback)(function() {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, rightIcon || closeable ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "nut-noticebar-box-right-icon",
+            onClick: handleClickIcon
+        }, rightIcon || /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, {
+            size: 12
+        })) : null);
+    }, [
+        rightIcon,
+        closeable,
+        handleClickIcon
+    ]);
     return /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: cls,
         style: style
@@ -437,31 +474,22 @@ var NoticeBar = function NoticeBar(props) {
         className: noticebarClass,
         style: barStyle,
         onClick: handleClick
-    }, leftIcon ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-noticebar-box-left-icon"
-    }, leftIcon) : null, /*#__PURE__*/ _react.default.createElement(_components.View, {
+    }, renderLeftIcon(), /*#__PURE__*/ _react.default.createElement(_components.View, {
         ref: wrapRef,
-        className: "nut-noticebar-box-wrap"
+        className: "nut-noticebar-box-wrap",
+        id: wrapRefId
     }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         ref: contentRef,
+        id: contentRefId,
         className: "nut-noticebar-box-wrap-content ".concat(animationClass, " ").concat(isEllipsis() ? 'nut-ellipsis' : ''),
         style: contentStyle,
         onAnimationEnd: onAnimationEnd
-    }, children, content)), right ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-noticebar-box-right"
-    }, right) : null, closeable || rightIcon ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-noticebar-box-right-icon",
-        onClick: onClickIcon
-    }, rightIcon || /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, {
-        size: 12
-    })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+    }, children, content)), renderRight(), renderRightIcon()) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-noticebar-vertical",
         style: barStyle,
         ref: containerRefCallback,
         onClick: handleClick
-    }, leftIcon ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-noticebar-box-left-icon"
-    }, leftIcon) : null, children ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+    }, renderLeftIcon(), children ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-noticebar-box-wrap",
         ref: innerRef
     }, scrollList.current.map(function(item, index) {
@@ -476,8 +504,7 @@ var NoticeBar = function NoticeBar(props) {
         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__*/ /*#__PURE__*/ _react.default.createElement(_components.View, {
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "nut-noticebar-box-horseLamp-list-item",
             style: {
                 height: height
@@ -486,14 +513,7 @@ var NoticeBar = function NoticeBar(props) {
             onClick: function onClick(e) {
                 handleItemClick(e, item);
             }
-        }, item));
-    })), /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-noticebar-box-right-icon",
-        onClick: function onClick(e) {
-            handleClickIcon(e);
-        }
-    }, rightIcon || (closeable ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, {
-        size: 12
-    }) : null))) : null);
+        }, item);
+    })), renderRight(), renderRightIcon()) : null);
 };
 NoticeBar.displayName = 'NutNoticeBar';

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

@@ -36,11 +36,15 @@
       justify-content: center;
 
       .nut-noticebar-box-wrap {
+        /* #ifndef dynamic*/
         flex: initial;
+        /* #endif */
 
         .nut-noticebar-box-wrap-content {
           position: relative;
+          /* #ifndef dynamic*/
           display: initial;
+          /* #endif */
         }
       }
     }
@@ -51,6 +55,9 @@
       min-width: $noticebar-left-icon-width;
       margin-right: $noticebar-icon-gap;
       background-size: 100% 100%;
+      .nut-icon {
+        color: $noticebar-color;
+      }
     }
 
     &-right-icon {
@@ -63,12 +70,14 @@
       .nut-icon {
         width: 12px;
         height: 12px;
+        color: $noticebar-color;
       }
     }
 
     &-wrap {
       display: flex;
       flex: 1;
+      align-items: center;
       height: $noticebar-line-height;
       line-height: $noticebar-line-height;
       overflow: hidden;
@@ -77,6 +86,7 @@
       .nut-noticebar-box-wrap-content {
         position: absolute;
         white-space: nowrap;
+        color: $noticebar-color;
 
         &.nut-ellipsis {
           max-width: 100%;

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

@@ -32,11 +32,15 @@
   justify-content: center;
 }
 .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap {
+  /* #ifndef dynamic*/
   flex: initial;
+  /* #endif */
 }
 .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
   position: relative;
+  /* #ifndef dynamic*/
   display: initial;
+  /* #endif */
 }
 .nut-noticebar .nut-noticebar-box-left-icon {
   display: flex;
@@ -45,6 +49,9 @@
   margin-right: var(--nutui-noticebar-icon-gap, 4px);
   background-size: 100% 100%;
 }
+.nut-noticebar .nut-noticebar-box-left-icon .nut-icon {
+  color: var(--nutui-noticebar-color, #d9500b);
+}
 .nut-noticebar .nut-noticebar-box-right-icon {
   display: flex;
   align-items: center;
@@ -55,10 +62,12 @@
 .nut-noticebar .nut-noticebar-box-right-icon .nut-icon {
   width: 12px;
   height: 12px;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap {
   display: flex;
   flex: 1;
+  align-items: center;
   height: var(--nutui-noticebar-line-height, 24px);
   line-height: var(--nutui-noticebar-line-height, 24px);
   overflow: hidden;
@@ -67,6 +76,7 @@
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
   position: absolute;
   white-space: nowrap;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content.nut-ellipsis {
   max-width: 100%;

package/dist/cjs/packages/noticebar/style/style.harmony.css

@@ -32,11 +32,15 @@
   justify-content: center;
 }
 .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap {
+  /* #ifndef dynamic*/
   flex: initial;
+  /* #endif */
 }
 .nut-noticebar .nut-noticebar-box-center .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
   position: relative;
+  /* #ifndef dynamic*/
   display: initial;
+  /* #endif */
 }
 .nut-noticebar .nut-noticebar-box-left-icon {
   display: flex;
@@ -45,6 +49,9 @@
   margin-right: var(--nutui-noticebar-icon-gap, 4px);
   background-size: 100% 100%;
 }
+.nut-noticebar .nut-noticebar-box-left-icon .nut-icon {
+  color: var(--nutui-noticebar-color, #d9500b);
+}
 .nut-noticebar .nut-noticebar-box-right-icon {
   display: flex;
   align-items: center;
@@ -55,10 +62,12 @@
 .nut-noticebar .nut-noticebar-box-right-icon .nut-icon {
   width: 12px;
   height: 12px;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap {
   display: flex;
   flex: 1;
+  align-items: center;
   height: var(--nutui-noticebar-line-height, 24px);
   line-height: var(--nutui-noticebar-line-height, 24px);
   overflow: hidden;
@@ -67,6 +76,7 @@
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content {
   position: absolute;
   white-space: nowrap;
+  color: var(--nutui-noticebar-color, #d9500b);
 }
 .nut-noticebar .nut-noticebar-box-wrap .nut-noticebar-box-wrap-content.nut-ellipsis {
   max-width: 100%;