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

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

@@ -94,6 +94,7 @@
     color: #ffffff;
     text-align: $toast-inner-text-align;
     line-height: 20px;
+    height: auto;
   }
 
   &-title {

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

@@ -83,6 +83,7 @@
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
   line-height: 20px;
+  height: auto;
 }
 .nut-toast-title {
   color: #ffffff;

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

@@ -94,6 +94,7 @@
     color: #ffffff;
     text-align: $toast-inner-text-align;
     line-height: 20px;
+    height: auto;
   }
 
   &-title {

package/dist/es/packages/toast/toast.js

@@ -135,7 +135,7 @@ 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 && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-text")
     }, content)))));
 };

package/dist/nutui.react.umd.js

@@ -17095,94 +17095,9 @@
     var uid = useUuid();
     var leftId = "swipe-left-".concat(uid);
     var rightId = "swipe-right-".concat(uid);
-    Taro.useReady(function() {
-      var getWidth = /* @__PURE__ */ function() {
-        var _ref = _async_to_generator(function() {
-          var leftRect, rightRect;
-          return __generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                if (!leftWrapper.current) return [
-                  3,
-                  2
-                ];
-                return [
-                  4,
-                  getRectInMultiPlatform(leftWrapper.current, leftId)
-                ];
-              case 1:
-                leftRect = _state.sent();
-                leftRect && setActionWidth(function(v) {
-                  return _object_spread_props(_object_spread({}, v), {
-                    left: leftRect.width
-                  });
-                });
-                _state.label = 2;
-              case 2:
-                if (!rightWrapper.current) return [
-                  3,
-                  4
-                ];
-                return [
-                  4,
-                  getRectInMultiPlatform(rightWrapper.current, rightId)
-                ];
-              case 3:
-                rightRect = _state.sent();
-                rightRect && setActionWidth(function(v) {
-                  return _object_spread_props(_object_spread({}, v), {
-                    right: rightRect.width
-                  });
-                });
-                _state.label = 4;
-              case 4:
-                return [
-                  2
-                ];
-            }
-          });
-        });
-        return function getWidth2() {
-          return _ref.apply(this, arguments);
-        };
-      }();
-      Taro.nextTick(function() {
-        return getWidth();
-      });
-    });
-    var _$_object_spread = _object_spread({}, defaultProps$w, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
-    var root2 = React.useRef();
-    var opened = React.useRef(false);
-    var lockClick = React.useRef(false);
-    var startOffset = React.useRef(0);
-    var _useState = _sliced_to_array(React.useState({
-      offset: 0,
-      dragging: false
-    }), 2), state = _useState[0], setState = _useState[1];
-    var _useRefState = _sliced_to_array(useRefState({
-      left: 0,
-      right: 0
-    }), 2), actionWidth = _useRefState[0], updateState = _useRefState[1];
-    var setActionWidth = function(fn) {
-      var res = fn();
-      if (res.left !== void 0) {
-        updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
-          left: res.left
-        }));
-      }
-      if (res.right !== void 0) {
-        updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
-          right: res.right
-        }));
-      }
-    };
-    var wrapperStyle = {
-      transform: "translate(".concat(state.offset).concat(!harmony() ? "px" : "", ", 0)"),
-      transitionDuration: state.dragging ? "0s" : ".6s"
-    };
-    var onTouchStart = /* @__PURE__ */ function() {
-      var _ref = _async_to_generator(function(event) {
-        var leftRect, rightRect, _props_onTouchStart;
+    var getWidth = /* @__PURE__ */ function() {
+      var _ref = _async_to_generator(function() {
+        var leftRect, rightRect;
         return __generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -17220,46 +17135,100 @@
               });
               _state.label = 4;
             case 4:
-              if (!props.disabled) {
-                startOffset.current = state.offset;
-                touch.start(event);
-                (_props_onTouchStart = props.onTouchStart) === null || _props_onTouchStart === void 0 ? void 0 : _props_onTouchStart.call(props, event);
-              }
               return [
                 2
               ];
           }
         });
       });
+      return function getWidth2() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    Taro.useReady(function() {
+      Taro.nextTick(function() {
+        return getWidth();
+      });
+    });
+    var _$_object_spread = _object_spread({}, defaultProps$w, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
+    var root2 = React.useRef();
+    var opened = React.useRef(false);
+    var lockClick = React.useRef(false);
+    var startOffset = React.useRef(0);
+    var _useState = _sliced_to_array(React.useState({
+      offset: 0,
+      dragging: false
+    }), 2), state = _useState[0], setState = _useState[1];
+    var _useRefState = _sliced_to_array(useRefState({
+      left: 0,
+      right: 0
+    }), 2), actionWidth = _useRefState[0], updateState = _useRefState[1];
+    var setActionWidth = function(fn) {
+      var res = fn();
+      if (res.left !== void 0) {
+        updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
+          left: res.left
+        }));
+      }
+      if (res.right !== void 0) {
+        updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
+          right: res.right
+        }));
+      }
+    };
+    var wrapperStyle = React.useMemo(function() {
+      return {
+        transform: "translate(".concat(state.offset, "px, 0)"),
+        transitionDuration: state.dragging ? "0.01s" : ".6s"
+      };
+    }, [
+      state.offset,
+      state.dragging
+    ]);
+    var onTouchStart = /* @__PURE__ */ function() {
+      var _ref = _async_to_generator(function(event) {
+        var _props_onTouchStart;
+        return __generator(this, function(_state) {
+          if (!props.disabled) {
+            getWidth();
+            startOffset.current = state.offset;
+            touch.start(event);
+            (_props_onTouchStart = props.onTouchStart) === null || _props_onTouchStart === void 0 ? void 0 : _props_onTouchStart.call(props, event);
+          }
+          return [
+            2
+          ];
+        });
+      });
       return function onTouchStart2(event) {
         return _ref.apply(this, arguments);
       };
     }();
     var onTouchMove = function(event) {
       var _props_onTouchMove;
-      if (props.disabled) {
-        return;
-      }
+      if (props.disabled) return;
       touch.move(event);
       (_props_onTouchMove = props.onTouchMove) === null || _props_onTouchMove === void 0 ? void 0 : _props_onTouchMove.call(props, event);
       if (touch.isHorizontal()) {
         lockClick.current = true;
-        var newState = _object_spread_props(_object_spread({}, state), {
-          dragging: true
-        });
         var isEdge = !opened || touch.deltaX.current * startOffset.current < 0;
         if (isEdge) {
           preventDefault(event);
         }
-        newState.offset = rangeCalculation(touch.deltaX.current + startOffset.current, -actionWidth.current.right || 0, actionWidth.current.left || 0);
-        setState(newState);
+        var offset = rangeCalculation(touch.deltaX.current + startOffset.current, -actionWidth.current.right || 0, actionWidth.current.left || 0);
+        setState(function(prevState) {
+          return _object_spread_props(_object_spread({}, prevState), {
+            dragging: true,
+            offset: Number(offset) || 0
+          });
+        });
       }
     };
     var onTouchEnd = function(event) {
       if (state.dragging) {
         var _props_onTouchEnd;
-        setState(function(v) {
-          return _object_spread_props(_object_spread({}, v), {
+        setState(function(prevState) {
+          return _object_spread_props(_object_spread({}, prevState), {
             dragging: false
           });
         });
@@ -17290,13 +17259,13 @@
         name: name2,
         position: side
       });
-      setState(function(v) {
-        return _object_spread_props(_object_spread({}, v), {
+      setState(function(prevState) {
+        return _object_spread_props(_object_spread({}, prevState), {
           offset: Number(offset) || 0
         });
       });
     };
-    var close2 = function(position2) {
+    var close2 = React.useCallback(function(position2) {
       if (opened.current) {
         var _props_onClose;
         opened.current = false;
@@ -17305,12 +17274,14 @@
           position: position2 || "left"
         });
       }
-      setState(function(v) {
-        return _object_spread_props(_object_spread({}, v), {
+      setState(function(prevState) {
+        return _object_spread_props(_object_spread({}, prevState), {
           offset: 0
         });
       });
-    };
+    }, [
+      props
+    ]);
     var rangeCalculation = function(num, min, max) {
       return Math.min(Math.max(Number(num), Number(min)), Number(max));
     };
@@ -17347,8 +17318,8 @@
       };
     });
     React.useEffect(function() {
-      if (harmony()) return;
       var handler = function(event) {
+        console.log("~~hanyu handler---- window", event);
         var targets = [
           root2
         ];
@@ -17364,7 +17335,9 @@
       return function() {
         document.removeEventListener("touchstart", handler);
       };
-    }, []);
+    }, [
+      close2
+    ]);
     return /* @__PURE__ */ React.createElement(components.View, {
       ref: root2,
       className: classNames(classPrefix2, className),
@@ -17507,7 +17480,7 @@
       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 && /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-text")
     }, content2)))));
   };