npm - @nutui/nutui-react-taro - Versions diffs - 3.0.19-cpp.11 → 3.0.19-cpp.13 - Mend

@@ -15888,38 +15888,51 @@
       if (showNoticeBar === false) {
         return;
       }
-      setTimeout(function() {
+      Taro.nextTick(function() {
         return _async_to_generator(function() {
           var warpRes, contentRes, wrapW, offsetW, canScroll;
           return __generator(this, function(_state) {
-            if (!wrapRef.current || !contentRef.current) {
-              return [
-                2
-              ];
-            }
-            warpRes = wrapRef.current.getBoundingClientRect();
-            contentRes = contentRef.current.getBoundingClientRect();
-            if (!warpRes || !contentRes) return [
-              2
-            ];
-            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("");
+            switch (_state.label) {
+              case 0:
+                if (!wrapRef.current || !contentRef.current) {
+                  return [
+                    2
+                  ];
+                }
+                return [
+                  4,
+                  getRectInMultiPlatform(wrapRef.current, wrapRefId)
+                ];
+              case 1:
+                warpRes = _state.sent();
+                return [
+                  4,
+                  getRectInMultiPlatform(contentRef.current, contentRefId)
+                ];
+              case 2:
+                contentRes = _state.sent();
+                if (!warpRes || !contentRes) return [
+                  2
+                ];
+                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
+                ];
             }
-            return [
-              2
-            ];
           });
         })();
-      }, 0);
+      });
     };
     var handleClick = function(event) {
       click && click(event);
@@ -17357,9 +17370,11 @@
       style: _object_spread({}, styles, contentStyle)
     }, renderIcon(), title && /* @__PURE__ */ React.createElement(components.Text, {
       className: "".concat(classPrefix2, "-title")
-    }, title), content2 && /* @__PURE__ */ React.createElement(components.Text, {
+    }, title), content2 && (td() ? /* @__PURE__ */ React.createElement(components.Text, {
+      className: "".concat(classPrefix2, "-text")
+    }, content2) : /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-text")
-    }, content2)))));
+    }, content2))))));
   };
   function show(selector, options) {
     var path = useCustomEventsPath(selector);

@@ -11,7 +11,7 @@ import { defaultOverlayProps } from "../overlay/overlay";
 import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../hooks/taro/use-custom-event";
 import { usePropsValue } from "../../hooks/use-props-value";
 import { useRtl } from "../configprovider/index";
-import { harmony } from "../../utils/taro/platform";
+import { harmony, td } from "../../utils/taro/platform";
 import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     id: '',
@@ -135,9 +135,11 @@ export var Toast = function(props) {
         style: _object_spread({}, styles, contentStyle)
     }, renderIcon(), title && /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-title")
-    }, title), content && /*#__PURE__*/ React.createElement(Text, {
+    }, title), content && (td() ? /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-text")
-    }, content)))));
+    }, content) : /*#__PURE__*/ React.createElement(View, {
+        className: "".concat(classPrefix, "-text")
+    }, content))))));
 };
 export function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

@@ -18,7 +18,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

@@ -446,8 +446,10 @@
   font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
   color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   line-height: 28px;
+  /* #ifndef dynamic*/
   max-height: initial;
   overflow-y: initial;
+  /* #endif */
 }
 .nut-popover .nut-popover-content-group {
   padding: 0 var(--nutui-popover-padding, 8px);
@@ -680,7 +682,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

@@ -18,7 +18,9 @@
     display: block;
     padding: $tour-content-padding;
     min-width: $tour-content-min-width;
+    /* #ifndef dynamic*/
     box-sizing: content-box;
+    /* #endif */
     &-top {
       display: block;

@@ -18,7 +18,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

@@ -164,7 +164,9 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  /* #ifndef dynamic*/
   position: initial;
+  /* #endif */
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
 }
 .nut-uploader-preview-img-file {

@nutui/nutui-react-taro 3.0.19-cpp.11 → 3.0.19-cpp.13