@nutui/nutui-react-taro 3.0.0-beta.6 → 3.0.0-beta.8

package/dist/nutui.react.umd.js

@@ -3743,19 +3743,6 @@
     }
     return root2;
   }
-  var passiveSupported = false;
-  if (canUseDom) {
-    try {
-      var opts = Object.defineProperty({}, "passive", {
-        get: function get() {
-          passiveSupported = true;
-        }
-      });
-      window.addEventListener("test-passive-supported", null, opts);
-    } catch (e2) {
-      console.log(e2);
-    }
-  }
   var totalLockCount = 0;
   var BODY_LOCK_CLASS = "nut-overflow-hidden";
   function getScrollableElement(el) {
@@ -3797,9 +3784,7 @@
     };
     var lock = function() {
       document.addEventListener("touchstart", touch.start);
-      document.addEventListener("touchmove", onTouchMove, passiveSupported ? {
-        passive: false
-      } : false);
+      document.addEventListener("touchmove", onTouchMove, false);
       if (!totalLockCount) {
         document.body.classList.add(BODY_LOCK_CLASS);
       }
@@ -4596,32 +4581,113 @@
     });
   };
   SafeArea.displayName = "NutSafeArea";
+  var getIcon = function(icon) {
+    return React.isValidElement(icon) ? React.cloneElement(icon, {
+      // @ts-ignore
+      className: "nut-icon"
+    }) : icon;
+  };
   var defaultProps$1n = _object_spread_props(_object_spread({}, ComponentDefaults), {
+    icon: null,
+    onClick: function(value) {
+    }
+  });
+  var classPrefix$n = "nut-hoverbutton-item";
+  var isHarmony = harmony();
+  var isNative$1 = harmonyAndRn();
+  var HoverButtonItem = function(props) {
+    var _$_object_spread = _object_spread({}, defaultProps$1n, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick, children = _$_object_spread.children;
+    var _useState = _sliced_to_array(React.useState(false), 2), isTouchStart = _useState[0], setTouchStart = _useState[1];
+    React.useMemo(function() {
+      return isNative$1 ? {
+        color: isTouchStart ? "#595959" : "#1A1A1A"
+      } : {};
+    }, [
+      isTouchStart
+    ]);
+    var handleClick = function(event) {
+      onClick && onClick(event);
+    };
+    var handleActiveStart = function(event) {
+      isNative$1 && setTouchStart(true);
+    };
+    var handleActiveEnd = function(event) {
+      isNative$1 && setTouchStart(false);
+    };
+    var renderBody = function() {
+      if (icon && !children) return /* @__PURE__ */ React.createElement(components.View, {
+        className: "".concat(classPrefix$n, "-icon")
+      }, getIcon(icon));
+      if (icon && children) {
+        return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(components.View, {
+          className: classNames(_define_property({}, "".concat(classPrefix$n, "-text-icon"), true))
+        }), getIcon(icon), /* @__PURE__ */ React.createElement(components.View, {
+          className: classNames(_define_property({}, "".concat(classPrefix$n, "-text"), true))
+        }, children));
+      }
+    };
+    var _obj;
+    return /* @__PURE__ */ React.createElement(components.View, {
+      className: classNames([
+        "".concat(classPrefix$n, "-container"),
+        className
+      ], (_obj = {}, _define_property(_obj, "".concat(classPrefix$n, "-container-active"), isNative$1 && isTouchStart), _define_property(_obj, "".concat(classPrefix$n, "-container-harmony"), isHarmony), _define_property(_obj, "".concat(classPrefix$n, "-container-icontext"), icon && children), _obj)),
+      style,
+      onTouchStart: handleActiveStart,
+      onTouchEnd: handleActiveEnd,
+      onTouchCancel: handleActiveEnd,
+      onClick: handleClick
+    }, renderBody());
+  };
+  HoverButtonItem.displayName = "NutHoverButtonItem";
+  var UI_BOTTOM_DISTANCE = 60;
+  var defaultProps$1m = _object_spread({}, ComponentDefaults);
+  var classPrefix$m = "nut-hoverbutton";
+  var HoverButton = function(props) {
+    var _$_object_spread = _object_spread({}, defaultProps$1m, props), children = _$_object_spread.children, zIndex = _$_object_spread.zIndex, tabbarHeight = _$_object_spread.tabbarHeight, className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var rtl = useRtl();
+    var baseStyle = _object_spread({}, style);
+    if (tabbarHeight) {
+      baseStyle.bottom = pxTransform(tabbarHeight + UI_BOTTOM_DISTANCE);
+    }
+    if (typeof zIndex !== "undefined") {
+      baseStyle.zIndex = zIndex;
+    }
+    var _obj;
+    return /* @__PURE__ */ React.createElement(components.View, {
+      className: classNames([
+        "".concat(classPrefix$m, "-container"),
+        className
+      ], (_obj = {}, _define_property(_obj, "".concat(classPrefix$m, "-container-rtl"), rtl), _define_property(_obj, "".concat(classPrefix$m, "-container-rn"), Taro.getEnv() === "RN"), _obj)),
+      style: baseStyle
+    }, /* @__PURE__ */ React.createElement(components.View, {
+      className: classPrefix$m
+    }, children || icon && /* @__PURE__ */ React.createElement(HoverButtonItem, {
+      icon,
+      onClick
+    })), /* @__PURE__ */ React.createElement(SafeArea, {
+      position: "bottom"
+    }));
+  };
+  HoverButton.displayName = "NutHoverButton";
+  HoverButton.Item = HoverButtonItem;
+  var defaultProps$1l = _object_spread_props(_object_spread({}, ComponentDefaults), {
     threshold: 200,
     zIndex: 900,
     duration: 1e3
   });
-  var isNative$2 = harmonyAndRn();
   var BackTop = function(props) {
-    var rtl = useRtl();
-    var _$_object_spread = _object_spread({}, defaultProps$1n, props), children = _$_object_spread.children, threshold = _$_object_spread.threshold, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, duration = _$_object_spread.duration, style = _$_object_spread.style, scrollRes = _$_object_spread.scrollRes, onClick = _$_object_spread.onClick;
+    var _$_object_spread = _object_spread({}, defaultProps$1l, props), children = _$_object_spread.children, threshold = _$_object_spread.threshold, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, duration = _$_object_spread.duration, icon = _$_object_spread.icon, style = _$_object_spread.style, scrollRes = _$_object_spread.scrollRes, onClick = _$_object_spread.onClick;
     var classPrefix2 = "nut-backtop";
     var _useState = _sliced_to_array(React.useState(false), 2), backTop = _useState[0], setBackTop = _useState[1];
-    var _useState1 = _sliced_to_array(React.useState(false), 2), isTouchStart = _useState1[0], setTouchStart = _useState1[1];
     var _obj;
-    var cls = classNames(classPrefix2, (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-show"), backTop), _define_property(_obj, "".concat(classPrefix2, "-show-active"), isNative$2 && isTouchStart), _define_property(_obj, "".concat(classPrefix2, "-rn"), rn()), _obj), className);
+    var cls = classNames(classPrefix2, (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-show"), backTop), _define_property(_obj, "".concat(classPrefix2, "-rn"), rn()), _obj), className);
     var systemInfo = React.useRef({});
     React.useEffect(function() {
       Taro.getSystemInfo().then(function(res) {
         systemInfo.current = res;
       });
     }, []);
-    var handleActiveStart = React.useCallback(function() {
-      isNative$2 && setTouchStart(true);
-    }, []);
-    var handleActiveEnd = React.useCallback(function() {
-      isNative$2 && setTouchStart(false);
-    }, []);
     var onScroll = React.useCallback(function(res) {
       var scrollTop = res.scrollTop;
       setBackTop(scrollTop >= threshold);
@@ -4646,29 +4712,21 @@
       duration,
       onClick
     ]);
-    var styles = React.useMemo(function() {
-      var _obj2;
-      return Object.keys(style || {}).length !== 0 ? _object_spread({
-        zIndex
-      }, style) : (_obj2 = {}, _define_property(_obj2, rtl ? "left" : "right", pxTransform(10)), _define_property(_obj2, "bottom", pxTransform(20)), _define_property(_obj2, "zIndex", zIndex), _obj2);
-    }, [
-      rtl,
-      style,
-      zIndex
-    ]);
-    return /* @__PURE__ */ React.createElement(components.View, {
+    return /* @__PURE__ */ React.createElement(HoverButton, {
       className: cls,
-      style: styles,
+      style: _object_spread({
+        zIndex
+      }, style),
+      icon: !children && (icon || /* @__PURE__ */ React.createElement(c, null)),
       onClick: function(e2) {
         goTop(e2);
-      },
-      onTouchStart: handleActiveStart,
-      onTouchEnd: handleActiveEnd,
-      onTouchCancel: handleActiveEnd
-    }, children || /* @__PURE__ */ React.createElement(c, {
-      size: 19,
-      className: "nut-backtop-main"
-    }));
+      }
+    }, children && /* @__PURE__ */ React.createElement(components.View, {
+      className: "nut-hoverbutton-item-container",
+      onClick: function(e2) {
+        goTop(e2);
+      }
+    }, children));
   };
   BackTop.displayName = "NutBackTop";
   function _array_without_holes(arr) {
@@ -4702,7 +4760,7 @@
     return idRef.current;
   }
   var elevatorContext = /* @__PURE__ */ React.createContext({});
-  var defaultProps$1m = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$1k = _object_spread_props(_object_spread({}, ComponentDefaults), {
     height: "200px",
     floorKey: "title",
     list: [],
@@ -4713,7 +4771,7 @@
     className: "weapp-elevator"
   });
   var Elevator = function(props) {
-    var _ref = _object_spread({}, defaultProps$1m, props), height = _ref.height, floorKey = _ref.floorKey, list = _ref.list, sticky = _ref.sticky, spaceHeight = _ref.spaceHeight;
+    var _ref = _object_spread({}, defaultProps$1k, props), height = _ref.height, floorKey = _ref.floorKey, list = _ref.list, sticky = _ref.sticky, spaceHeight = _ref.spaceHeight;
     _ref.titleHeight;
     var showKeys = _ref.showKeys, className = _ref.className, style = _ref.style, onItemClick = _ref.onItemClick, onIndexClick = _ref.onIndexClick, children = _ref.children, rest = _object_without_properties(_ref, [
       "height",
@@ -4796,7 +4854,7 @@
       var firstTouch = e2.touches[0];
       touchState.current.y2 = firstTouch.pageY;
       var delta = (touchState.current.y2 - touchState.current.y1) / spaceHeight || 0;
-      var cacheIndex = state.current.anchorIndex + Math.floor(delta);
+      var cacheIndex = state.current.anchorIndex + Math.round(delta);
       setCodeIndex(cacheIndex);
       scrollTo(cacheIndex);
     };
@@ -4850,6 +4908,14 @@
         }
       }
     };
+    var getWrapStyle = React.useMemo(function() {
+      var calcHeight = Number.isNaN(+height) ? height : "".concat(height, "px");
+      return {
+        height: harmony() ? Number(height) : calcHeight
+      };
+    }, [
+      height
+    ]);
     React.useEffect(function() {
       if (listview.current) {
         Taro.nextTick(function() {
@@ -4865,9 +4931,7 @@
       style
     }, rest), /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-list"),
-      style: {
-        height: Number.isNaN(+height) ? height : "".concat(height, "px")
-      }
+      style: getWrapStyle
     }, /* @__PURE__ */ React.createElement(components.ScrollView, {
       scrollTop,
       scrollY: true,
@@ -4903,17 +4967,7 @@
     }, list[codeIndex][floorKey]) : null, /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-bars")
     }, /* @__PURE__ */ React.createElement(components.View, {
-      className: "".concat(classPrefix2, "-bars-inner"),
-      onTouchStart: function(event) {
-        return touchStart(event);
-      },
-      onTouchMove: function(event) {
-        return touchMove(event);
-      },
-      onTouchEnd: touchEnd,
-      style: {
-        touchAction: "pan-y"
-      }
+      className: "".concat(classPrefix2, "-bars-inner")
     }, list.map(function(item, index) {
       var _obj2;
       return /* @__PURE__ */ React.createElement(components.View, {
@@ -4922,17 +4976,27 @@
         key: index,
         onClick: function() {
           return handleClickIndex(item[floorKey]);
+        },
+        onTouchStart: function(event) {
+          return touchStart(event);
+        },
+        onTouchMove: function(event) {
+          return touchMove(event);
+        },
+        onTouchEnd: touchEnd,
+        style: {
+          touchAction: "pan-y"
         }
       }, item[floorKey]);
     })))) : null, sticky && scrollY > 0 ? /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-list-fixed")
-    }, /* @__PURE__ */ React.createElement("span", {
+    }, /* @__PURE__ */ React.createElement(components.Text, {
       className: "".concat(classPrefix2, "-list-fixed-title")
     }, list[codeIndex][floorKey])) : null);
   };
   Elevator.displayName = "NutElevator";
   Elevator.Context = elevatorContext;
-  var defaultProps$1l = _object_spread_props(_object_spread({}, ComponentDefaults), {
+  var defaultProps$1j = _object_spread_props(_object_spread({}, ComponentDefaults), {
     activeText: "",
     inactiveText: "",
     type: "right",
@@ -4943,7 +5007,7 @@
   });
   var FixedNav = function(props) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps$1l, props), className = _ref.className, overlay = _ref.overlay, visible = _ref.visible, list = _ref.list, activeText = _ref.activeText, inactiveText = _ref.inactiveText, position = _ref.position, onChange = _ref.onChange, onSelect = _ref.onSelect, type2 = _ref.type, children = _ref.children, style = _ref.style, content = _ref.content, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$1j, props), className = _ref.className, overlay = _ref.overlay, visible = _ref.visible, list = _ref.list, activeText = _ref.activeText, inactiveText = _ref.inactiveText, position = _ref.position, onChange = _ref.onChange, onSelect = _ref.onSelect, type2 = _ref.type, children = _ref.children, style = _ref.style, content = _ref.content, rest = _object_without_properties(_ref, [
       "className",
       "overlay",
       "visible",
@@ -5011,96 +5075,6 @@
     }, visible ? activeText || locale.fixednav.activeText : inactiveText || locale.fixednav.inactiveText))));
   };
   FixedNav.displayName = "NutFixedNav";
-  var getIcon = function(icon) {
-    return React.isValidElement(icon) ? React.cloneElement(icon, {
-      // @ts-ignore
-      className: "nut-icon"
-    }) : icon;
-  };
-  var defaultProps$1k = _object_spread_props(_object_spread({}, ComponentDefaults), {
-    icon: null,
-    onClick: function(value) {
-    }
-  });
-  var classPrefix$n = "nut-hoverbutton-item";
-  var isHarmony = harmony();
-  var isNative$1 = harmonyAndRn();
-  var HoverButtonItem = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$1k, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick, children = _$_object_spread.children;
-    var _useState = _sliced_to_array(React.useState(false), 2), isTouchStart = _useState[0], setTouchStart = _useState[1];
-    React.useMemo(function() {
-      return isNative$1 ? {
-        color: isTouchStart ? "#595959" : "#1A1A1A"
-      } : {};
-    }, [
-      isTouchStart
-    ]);
-    var handleClick = function(event) {
-      onClick && onClick(event);
-    };
-    var handleActiveStart = function(event) {
-      isNative$1 && setTouchStart(true);
-    };
-    var handleActiveEnd = function(event) {
-      isNative$1 && setTouchStart(false);
-    };
-    var renderBody = function() {
-      if (icon && !children) return /* @__PURE__ */ React.createElement(components.View, {
-        className: "".concat(classPrefix$n, "-icon")
-      }, getIcon(icon));
-      if (icon && children) {
-        return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(components.View, {
-          className: classNames(_define_property({}, "".concat(classPrefix$n, "-text-icon"), true))
-        }), getIcon(icon), /* @__PURE__ */ React.createElement(components.View, {
-          className: classNames(_define_property({}, "".concat(classPrefix$n, "-text"), true))
-        }, children));
-      }
-    };
-    var _obj;
-    return /* @__PURE__ */ React.createElement(components.View, {
-      className: classNames([
-        "".concat(classPrefix$n, "-container"),
-        className
-      ], (_obj = {}, _define_property(_obj, "".concat(classPrefix$n, "-container-active"), isNative$1 && isTouchStart), _define_property(_obj, "".concat(classPrefix$n, "-container-harmony"), isHarmony), _define_property(_obj, "".concat(classPrefix$n, "-container-icontext"), icon && children), _obj)),
-      style,
-      onTouchStart: handleActiveStart,
-      onTouchEnd: handleActiveEnd,
-      onTouchCancel: handleActiveEnd,
-      onClick: handleClick
-    }, renderBody());
-  };
-  HoverButtonItem.displayName = "NutHoverButtonItem";
-  var UI_BOTTOM_DISTANCE = 60;
-  var defaultProps$1j = _object_spread({}, ComponentDefaults);
-  var classPrefix$m = "nut-hoverbutton";
-  var HoverButton = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps$1j, props), children = _$_object_spread.children, zIndex = _$_object_spread.zIndex, tabbarHeight = _$_object_spread.tabbarHeight, className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
-    var rtl = useRtl();
-    var baseStyle = _object_spread({}, style);
-    if (tabbarHeight) {
-      baseStyle.bottom = pxTransform(tabbarHeight + UI_BOTTOM_DISTANCE);
-    }
-    if (typeof zIndex !== "undefined") {
-      baseStyle.zIndex = zIndex;
-    }
-    var _obj;
-    return /* @__PURE__ */ React.createElement(components.View, {
-      className: classNames([
-        "".concat(classPrefix$m, "-container"),
-        className
-      ], (_obj = {}, _define_property(_obj, "".concat(classPrefix$m, "-container-rtl"), rtl), _define_property(_obj, "".concat(classPrefix$m, "-container-rn"), Taro.getEnv() === "RN"), _obj)),
-      style: baseStyle
-    }, /* @__PURE__ */ React.createElement(components.View, {
-      className: classPrefix$m
-    }, children || icon && /* @__PURE__ */ React.createElement(HoverButtonItem, {
-      icon,
-      onClick
-    })), /* @__PURE__ */ React.createElement(SafeArea, {
-      position: "bottom"
-    }));
-  };
-  HoverButton.displayName = "NutHoverButton";
-  HoverButton.Item = HoverButtonItem;
   var defaultProps$1i = _object_spread_props(_object_spread({}, ComponentDefaults), {
     left: "",
     right: "",
@@ -5614,10 +5588,10 @@
     value: "",
     dot: false,
     max: 99,
-    top: "4",
-    right: "8",
-    color: "",
-    fill: "solid"
+    top: 0,
+    right: 0,
+    fill: "solid",
+    size: "large"
   });
   var Badge = function(props) {
     var content = function content2() {
@@ -5638,14 +5612,14 @@
     };
     var _this;
     var rtl = useRtl();
-    var _$_object_spread = _object_spread({}, defaultProps$1e, props), className = _$_object_spread.className, style = _$_object_spread.style, value = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right2 = _$_object_spread.right, color = _$_object_spread.color, fill = _$_object_spread.fill;
+    var _$_object_spread = _object_spread({}, defaultProps$1e, props), className = _$_object_spread.className, style = _$_object_spread.style, value = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right2 = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size;
     var classPrefix2 = "nut-badge";
     var isHarmony2 = harmony();
     var classes = classNames(classPrefix2, className);
     var badgeRef = React.useRef(null);
     var _useState = _sliced_to_array(React.useState({}), 2), contentStyle = _useState[0], setContentStyle = _useState[1];
     var _obj;
-    var contentClasses = classNames("".concat(classPrefix2, "-content"), (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix2, "-one"), typeof content() === "string" && ((_this = "".concat(content())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix2, "-dot"), dot), _define_property(_obj, "".concat(classPrefix2, "-").concat(fill), fill === "outline"), _obj));
+    var contentClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-sup"), isNumber() || isString() || dot), _define_property(_obj, "".concat(classPrefix2, "-number"), isNumber()), _define_property(_obj, "".concat(classPrefix2, "-one"), typeof content() === "string" && ((_this = "".concat(content())) === null || _this === void 0 ? void 0 : _this.length) === 1), _define_property(_obj, "".concat(classPrefix2, "-dot"), dot), _define_property(_obj, "".concat(classPrefix2, "-dot-").concat(size), dot), _define_property(_obj, "".concat(classPrefix2, "-").concat(fill), fill === "outline"), _define_property(_obj, "".concat(classPrefix2, "-content"), children), _obj));
     React.useEffect(function() {
       if (badgeRef.current) {
         getPositionStyle();
@@ -5653,59 +5627,22 @@
     }, []);
     var getPositionStyle = /* @__PURE__ */ function() {
       var _ref = _async_to_generator(function() {
-        var style2, reacts, dir;
+        var style2, dir;
         return __generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              style2 = {};
-              style2.top = pxTransform(-Number(top) || 0);
-              if (!rn()) return [
-                3,
-                2
-              ];
-              return [
-                4,
-                getRectByTaro(badgeRef.current)
-              ];
-            case 1:
-              reacts = _state.sent();
-              style2.left = (reacts === null || reacts === void 0 ? void 0 : reacts.width) && (reacts === null || reacts === void 0 ? void 0 : reacts.width) > Number(right2) ? pxTransform(reacts.width - Number(right2)) : 0;
-              return [
-                3,
-                3
-              ];
-            case 2:
-              dir = rtl ? "left" : "right";
-              style2[dir] = isHarmony2 ? pxTransform(Number(right2)) : "".concat(Number(right2) || parseFloat(String(right2)) || 0, "px");
-              _state.label = 3;
-            case 3:
-              setContentStyle(style2);
-              return [
-                2
-              ];
-          }
+          style2 = {};
+          style2.top = pxTransform(Number(top) || 0);
+          dir = rtl ? "left" : "right";
+          style2[dir] = isHarmony2 ? pxTransform(Number(right2)) : "".concat(Number(right2) || 0, "px");
+          setContentStyle(style2);
+          return [
+            2
+          ];
         });
       });
       return function getPositionStyle2() {
         return _ref.apply(this, arguments);
       };
     }();
-    var getStyle = function() {
-      var style2 = {};
-      if (color) {
-        if (fill === "outline") {
-          style2.color = color;
-          isHarmony2 ? style2.backgroundColor = "#fff" : style2.background = "#fff";
-          if (!(color === null || color === void 0 ? void 0 : color.includes("gradient"))) {
-            style2.borderColor = color;
-          }
-        } else {
-          style2.color = "#fff";
-          isHarmony2 ? style2.backgroundColor = color : style2.background = color;
-        }
-      }
-      return style2;
-    };
     var _obj1;
     return /* @__PURE__ */ React.createElement(components.View, {
       className: classes,
@@ -5716,7 +5653,7 @@
       style: contentStyle
     }, value), children, !isIcon() && /* @__PURE__ */ React.createElement(components.View, {
       className: contentClasses,
-      style: _object_spread({}, contentStyle, getStyle())
+      style: contentStyle
     }, content()));
   };
   Badge.displayName = "NutBadge";
@@ -5892,7 +5829,6 @@
       onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = React.useRef([]);
-    var navRef = React.useRef(null);
     var getTitles = function() {
       var titles2 = [];
       React.Children.forEach(children, function(child, idx) {
@@ -5929,7 +5865,7 @@
     ]);
     var classes = classNames(classPrefix$l, "".concat(classPrefix$l, "-").concat(direction), className);
     var _obj;
-    var classesTitle = classNames("".concat(classPrefix$l, "-titles"), (_obj = {}, _define_property(_obj, "".concat(classPrefix$l, "-titles-").concat(activeType), activeType), _define_property(_obj, "".concat(classPrefix$l, "-titles-scrollable"), true), _define_property(_obj, "".concat(classPrefix$l, "-titles-").concat(align), align), _obj));
+    var classesTitle = classNames("".concat(classPrefix$l, "-titles"), (_obj = {}, _define_property(_obj, "".concat(classPrefix$l, "-titles-").concat(activeType), activeType), _define_property(_obj, "".concat(classPrefix$l, "-titles-").concat(align), align), _obj));
     var tabsActiveStyle = {
       color: activeType === "smile" ? activeColor : "",
       background: activeType === "line" ? activeColor : ""
@@ -6042,8 +5978,7 @@
       className: classesTitle,
       style: _object_spread({}, tabStyle)
     }, /* @__PURE__ */ React.createElement(components.View, {
-      className: "nut-tabs-list",
-      ref: navRef
+      className: "nut-tabs-list"
     }, !!title && typeof title === "function" ? title() : titles.current.map(function(item, index) {
       var _obj2;
       return /* @__PURE__ */ React.createElement(components.View, {
@@ -8706,6 +8641,7 @@
   CheckboxGroup.displayName = "NutCheckboxGroup";
   var InnerCheckbox = Checkbox;
   InnerCheckbox.Group = CheckboxGroup;
+  const InnerCheckbox$1 = InnerCheckbox;
   var InternalPickerPanel = function(props, ref) {
     var _props_keyIndex = props.keyIndex, keyIndex = _props_keyIndex === void 0 ? 0 : _props_keyIndex, defaultValue = props.defaultValue, _props_options = props.options, options = _props_options === void 0 ? [] : _props_options, _props_threeDimensional = props.threeDimensional, threeDimensional = _props_threeDimensional === void 0 ? true : _props_threeDimensional, _props_duration = props.duration, duration = _props_duration === void 0 ? 1e3 : _props_duration, _props_itemShow = props.itemShow, itemShow = _props_itemShow === void 0 ? false : _props_itemShow, chooseItem = props.chooseItem;
     var touch = useTouch();
@@ -8899,10 +8835,7 @@
       };
     });
     React.useEffect(function() {
-      var eventOptions = passiveSupported ? {
-        passive: false,
-        once: true
-      } : false;
+      var eventOptions = false;
       var element = pickerPanelRef.current;
       element.addEventListener("touchstart", touchStart, eventOptions);
       element.addEventListener("touchmove", touchMove, eventOptions);
@@ -11243,6 +11176,7 @@
   var InnerForm = Form;
   InnerForm.Item = FormItem;
   InnerForm.useForm = useForm;
+  const InnerForm$1 = InnerForm;
   function trimExtraChar(value, char, regExp) {
     var index = value.indexOf(char);
     if (index === -1) {
@@ -11491,7 +11425,6 @@
     ]);
     var isRnAndHarmony = harmonyAndRn();
     var isRn2 = rn();
-    harmony();
     var classes = classNames(classPrefix$i, className);
     var _useState = _sliced_to_array(React.useState(false), 2), focused = _useState[0], setFocused = _useState[1];
     var inputRef = React.useRef(null);
@@ -12016,6 +11949,22 @@
   };
   Menu.displayName = "NutMenu";
   Menu.Item = MenuItem;
+  function mergeProps() {
+    for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
+      items[_key] = arguments[_key];
+    }
+    var ret = {};
+    items.forEach(function(item) {
+      if (item) {
+        Object.keys(item).forEach(function(key) {
+          if (item[key] !== void 0) {
+            ret[key] = item[key];
+          }
+        });
+      }
+    });
+    return ret;
+  }
   var defaultProps$U = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,
     rightActions: "",
@@ -12027,7 +11976,7 @@
   });
   var NumberKeyboard = function(props) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps$U, props), title = _ref.title, rightActions = _ref.rightActions, confirmText = _ref.confirmText, visible = _ref.visible, type2 = _ref.type, custom = _ref.custom, random = _ref.random, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onDelete = _ref.onDelete, onClose = _ref.onClose, onConfirm = _ref.onConfirm, rest = _object_without_properties(_ref, [
+    var _mergeProps = mergeProps(defaultProps$U, props), title = _mergeProps.title, rightActions = _mergeProps.rightActions, confirmText = _mergeProps.confirmText, visible = _mergeProps.visible, type2 = _mergeProps.type, custom = _mergeProps.custom, random = _mergeProps.random, style = _mergeProps.style, className = _mergeProps.className, onChange = _mergeProps.onChange, onDelete = _mergeProps.onDelete, onClose = _mergeProps.onClose, onConfirm = _mergeProps.onConfirm, rest = _object_without_properties(_mergeProps, [
       "title",
       "rightActions",
       "confirmText",
@@ -12095,8 +12044,8 @@
       var style2 = {
         background: "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAnCAYAAABJ0cukAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozOUNBQTQ0MkY3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozOUNBQTQ0M0Y3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjM5Q0FBNDQwRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjM5Q0FBNDQxRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T12ahwAABClJREFUeNrUWVtIFFEY3pkdrbaCiAINK81VW3d2102pjKLtoXoJrNAswoeEXoyilx7sJXvIh6CHAoMg6yEfSpdECIqE0jCMbMm9qCVYUmR5S8huXmZO39nWOI7mzsy6uzqgM/vvzNnv+y/n/84ZjhBiWMwHF+kA+fn5y0ZHRzNwuTomgDnui9/vfzMvBJxWa7bE87W4tMbY8S8MhNz0BQLVugnY7fZdGORZPNNHJmSPUSf47QD/PN75z3NcpqD1IVEU8wC+dZojDIajyMu6WAG322zBmQf/7LzGnHeAdRtjmuAIKYoleMWxQnUEHA6HVZLldsb0m3oehdQQzzQSVILPJLIcYEw/4HkK/kG86yAsAZvNtgng3059hte/Gf56/uFCaGR8mIJdj3m2hzGNGAkpRM4vCPBzErBYLMko2A//DIQMoQ0WtgcCjWFnCVGswEzxCecqLc0y9Nyww2ariYhAbm7umgRB6GNM/QTgfT7fEzWD4t7dOK0D4TKAcrtcLkENeNx/gUoSpOnx4Gc9BHJyclZNjI8PMqY+judp2jSr1iuENDPi5fDX4WG32WxeogL81NGRIEk3NBNAh10uS9IIY/oIbxR6vd4WLXmJAq9Ayl1kTAUmk8mNyJrUgDfK8hFPV9dnTQSCHiLkO/Ndb8jzrXqKawYJQg4gsu6srKyV4cC/7ujo1CqneRSPxNh74PligPdE3PYVIDHuY6PRWCxPTp7VC35KSvwjwBpwdPP4gXYc86ZdZnr6Pf7S9HqexUs9z0qBLprz8wn+PzWRFknaKGsgjwlvCdLGH42GQ0lg+dqkMP+Enj+lF/yMWYgnJD1qEhhphOWgS2E2yQZDJWa/lEgIvGIa0D2HKJZGA7yiBgaZqO9AermdFstGXQR8fn+BootW4wfPRBE8zXmXoia2SYLgpsJRVwqBBJ2N+pnueRVhPR8l8MGCnaWw8wDCDSWQoasGQCKJnpjGcwkkKqMBfo7ZyQklQCOxWVcRg4QDXmhkSJRjsGvRAD8HCTuNhNPpXKtLzHn9/n0orBqm052GvL2lcfepTMs8PwsJqyRJRbrlNFpBCUBcYWaKE2h4tampqUtV6pP60HNtapuUksTY2NidiLcWUQPnMOhlxvQoITGxxOPxDIVdR2dnb/V2dr7Umn50/Q31261JC4UhUQYSVUxdtPCCUAK10RuvZeQ0LRQ2tD7fddxdyuT3TijJehATF/yinqmJ2wB+jCGRA11TH9xiXAwEQpG4i0gcZHLPjHSqF0Vx76IgEIpEA9a7+3H5K2RK4jnuPvTToXgR0LW9Htpap71iAzPVNsUIMH0XMdXkfLrfD9BdanifksiKW/5w3Emj3mcHBgb6kpKTn6KYzfBCehzg10H6lHPzMdIWq9U8znEpsXE6N4rTO9TjSGgPanG/pfwjwABn1PZcM5XI0AAAAABJRU5ErkJggg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLTkwMjA5MzIyMjIxMzkzMzc2NzAwNjg0MC0tDQo=') no-repeat center",
         backgroundSize: "100% 100%",
-        width: "28px",
-        height: "24px"
+        width: 28,
+        height: 24
       };
       return /* @__PURE__ */ React.createElement(components.View, {
         style: style2
@@ -12130,7 +12079,7 @@
         switch (item2.type) {
           case "num":
           case "custom":
-            return /* @__PURE__ */ React.createElement(components.View, null, item2.id);
+            return /* @__PURE__ */ React.createElement(React.Fragment, null, item2.id);
           case "delete":
             return /* @__PURE__ */ React.createElement(DeleteIcon, null);
           case "close":
@@ -12181,7 +12130,7 @@
       className: "".concat(classPrefix2, "-header")
     }, /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-header-title")
-    }, title), type2 === "default" && /* @__PURE__ */ React.createElement("span", {
+    }, title), type2 === "default" && /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-header-close"),
       onClick: onConfirm
     }, rightActions || locale.done)), /* @__PURE__ */ React.createElement(components.View, {
@@ -12221,7 +12170,7 @@
     onChange: function(checked) {
     }
   });
-  var Radio = function(props) {
+  var Radio$1 = function(props) {
     var classPrefix2 = "nut-radio";
     var _ref = _object_spread({}, defaultProps$T, props), children = _ref.children, className = _ref.className, style = _ref.style, checked = _ref.checked, defaultChecked = _ref.defaultChecked, shape = _ref.shape, value = _ref.value;
     _ref.icon;
@@ -12316,7 +12265,7 @@
       onClick: handleClick
     }, renderRadioItem());
   };
-  Radio.displayName = "NutRadio";
+  Radio$1.displayName = "NutRadio";
   var defaultProps$S = {
     labelPosition: "right",
     onChange: function(value) {
@@ -12356,7 +12305,7 @@
           "disabled",
           "onChange"
         ]);
-        return /* @__PURE__ */ React.createElement(InnerRadio, _object_spread_props(_object_spread({}, rest2), {
+        return /* @__PURE__ */ React.createElement(Radio, _object_spread_props(_object_spread({}, rest2), {
           key: value === null || value === void 0 ? void 0 : value.toString(),
           children: label,
           value,
@@ -12389,8 +12338,9 @@
     }, rest), (options === null || options === void 0 ? void 0 : options.length) ? renderOptionsChildren() : children));
   });
   RadioGroup.displayName = "NutRadioGroup";
-  var InnerRadio = Radio;
+  var InnerRadio = Radio$1;
   InnerRadio.Group = RadioGroup;
+  const Radio = InnerRadio;
   var defaultProps$R = _object_spread_props(_object_spread({}, ComponentDefaults), {
     range: false,
     min: 0,
@@ -14616,22 +14566,6 @@
   };
   var Uploader = /* @__PURE__ */ React.forwardRef(InternalUploader);
   Uploader.displayName = "NutUploader";
-  function mergeProps() {
-    for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
-      items[_key] = arguments[_key];
-    }
-    var ret = {};
-    items.forEach(function(item) {
-      if (item) {
-        Object.keys(item).forEach(function(key) {
-          if (item[key] !== void 0) {
-            ret[key] = item[key];
-          }
-        });
-      }
-    });
-    return ret;
-  }
   var defaultProps$I = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,
     description: "",
@@ -18130,7 +18064,7 @@
       var _obj;
       return /* @__PURE__ */ React.createElement(React.Fragment, null, format2.includes(formatUnit) ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(components.View, {
         className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-number"), type2 === "default"), _define_property(_obj, "".concat(classPrefix2, "-number-primary"), type2 === "primary"), _define_property(_obj, "".concat(classPrefix2, "-number-text"), type2 === "text"), _obj))
-      }, unit ? padZero(time2) : time2), unit ? /* @__PURE__ */ React.createElement(components.View, {
+      }, unit && unit !== "DD" ? padZero(time2) : time2), unit ? /* @__PURE__ */ React.createElement(components.View, {
         className: "".concat(classPrefix2, "-unit")
       }, getUnit(unit)) : null) : null);
     };
@@ -18520,7 +18454,7 @@
     style: {}
   };
   var classPrefix$4 = "nut-swiper";
-  var Swiper = /* @__PURE__ */ React.forwardRef(function(props, ref) {
+  var Swiper$1 = /* @__PURE__ */ React.forwardRef(function(props, ref) {
     var _ref = _object_spread({}, defaultProps$i, props), width = _ref.width, height = _ref.height, className = _ref.className, children = _ref.children, indicator = _ref.indicator, loop = _ref.loop, autoPlay = _ref.autoPlay;
     _ref.duration;
     var direction = _ref.direction, defaultValue = _ref.defaultValue;
@@ -18632,7 +18566,7 @@
       }, child);
     }))), renderIndicator());
   });
-  Swiper.displayName = "NutSwiper";
+  Swiper$1.displayName = "NutSwiper";
   var SwiperItem = function(props) {
     var children = props.children;
     _object_without_properties(props, [
@@ -18641,8 +18575,9 @@
     return /* @__PURE__ */ React.createElement(React.Fragment, null, children);
   };
   SwiperItem.displayName = "NutSwiperItem";
-  var InnerSwiper = Swiper;
+  var InnerSwiper = Swiper$1;
   InnerSwiper.Item = SwiperItem;
+  const Swiper = InnerSwiper;
   var defaultProps$h = _object_spread_props(_object_spread({}, ComponentDefaults), {
     images: [],
     videos: [],
@@ -18810,7 +18745,7 @@
       style,
       ref,
       onTouchStart
-    }, /* @__PURE__ */ React.createElement(InnerSwiper, {
+    }, /* @__PURE__ */ React.createElement(Swiper, {
       autoPlay,
       className: "".concat(classPrefix2, "-swiper"),
       loop: true,
@@ -21236,7 +21171,7 @@
   exports2.Cascader = Cascader;
   exports2.Cell = Cell;
   exports2.CellGroup = CellGroup;
-  exports2.Checkbox = InnerCheckbox;
+  exports2.Checkbox = InnerCheckbox$1;
   exports2.CheckboxGroup = CheckboxGroup;
   exports2.CircleProgress = CircleProgress;
   exports2.Col = Col;
@@ -21252,7 +21187,7 @@
   exports2.Ellipsis = Ellipsis;
   exports2.Empty = Empty;
   exports2.FixedNav = FixedNav;
-  exports2.Form = InnerForm;
+  exports2.Form = InnerForm$1;
   exports2.FormItem = FormItem;
   exports2.Grid = Grid;
   exports2.GridItem = GridItem;
@@ -21280,7 +21215,7 @@
   exports2.Price = Price;
   exports2.Progress = Progress;
   exports2.PullToRefresh = PullToRefresh;
-  exports2.Radio = InnerRadio;
+  exports2.Radio = Radio;
   exports2.RadioGroup = RadioGroup;
   exports2.Range = Range;
   exports2.Rate = Rate;
@@ -21300,7 +21235,7 @@
   exports2.Sticky = Sticky;
   exports2.SubSideNavBar = SubSideNavBar;
   exports2.Swipe = Swipe;
-  exports2.Swiper = InnerSwiper;
+  exports2.Swiper = Swiper;
   exports2.SwiperItem = SwiperItem;
   exports2.Switch = Switch;
   exports2.TabPane = TabPane;