@nutui/nutui-react-taro 3.0.9 → 3.0.10

package/dist/es/utils/get-rect.js

@@ -25,7 +25,7 @@ export function isWindow(val) {
         };
     }
     if (element && element.getBoundingClientRect) {
-        console.log(element, element.getBoundingClientRect());
+        // console.log(element, element.getBoundingClientRect())
         return element.getBoundingClientRect();
     }
     return {

package/dist/es/utils/supports-passive.js

@@ -9,6 +9,6 @@ if (canUseDom) {
         });
         window.addEventListener('test-passive-supported', null, opts);
     } catch (e) {
-        console.log(e);
+        console.log('supported passive error', e);
     }
 }

package/dist/nutui.react.umd.js

@@ -3223,7 +3223,7 @@
       });
       window.addEventListener("test-passive-supported", null, opts);
     } catch (e) {
-      console.log(e);
+      console.log("supported passive error", e);
     }
   }
   var totalLockCount = 0;
@@ -3885,7 +3885,6 @@
       };
     }
     if (element && element.getBoundingClientRect) {
-      console.log(element, element.getBoundingClientRect());
       return element.getBoundingClientRect();
     }
     return {
@@ -5265,7 +5264,7 @@
     var scrollIntoView = function(index2) {
       requestAniFrame$1(function() {
         Promise.all([
-          getRect2("#nut-tabs-titles-".concat(name2 || uuid, " .nut-tabs-list")),
+          getRect2("#nut-tabs-titles-".concat(name2 || uuid)),
           getAllRect("#nut-tabs-titles-".concat(name2 || uuid, " .nut-tabs-titles-item"))
         ]).then(function(param) {
           var _param = _sliced_to_array(param, 2), navRect = _param[0], titleRects = _param[1];
@@ -5273,15 +5272,21 @@
           if (!titleRect) return;
           var to = 0;
           if (direction === "vertical") {
+            var totalHeight = titleRects.reduce(function(sum2, curr) {
+              return sum2 + curr.height;
+            }, 0);
             var top = titleRects.slice(0, index2).reduce(function(prev, curr) {
               return prev + curr.height;
             }, 0);
-            to = top - (navRect.height - titleRect.height) / 2;
+            to = Math.min(Math.max(0, top - (navRect.height - titleRect.height) / 2), totalHeight - navRect.height);
           } else {
+            var totalWidth = titleRects.reduce(function(sum2, curr) {
+              return sum2 + curr.width;
+            }, 0);
             var left2 = titleRects.slice(0, index2).reduce(function(prev, curr) {
               return prev + curr.width;
             }, 0);
-            to = left2 - (navRect.width - titleRect.width) / 2;
+            to = Math.min(Math.max(0, left2 - (navRect.width - titleRect.width) / 2), totalWidth - navRect.width);
           }
           scrollDirection(to, direction);
           Taro.nextTick(function() {
@@ -8549,10 +8554,11 @@
     }, threeDimensional && options.map(function(item, index2) {
       var _item_value;
       var _obj;
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, isGetLineSpacing ? /* @__PURE__ */ React.createElement(components.View, {
-        className: classNames("".concat(classPrefix2, "-item"), (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-item-hidden"), isItemHidden(index2 + 1)), _define_property(_obj, "".concat(classPrefix2, "-item-active"), index2 + 1 === currentIndex), _obj)),
-        style: rollerStyle(index2),
+      return /* @__PURE__ */ React.createElement(React.Fragment, {
         key: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : index2
+      }, isGetLineSpacing ? /* @__PURE__ */ React.createElement(components.View, {
+        className: classNames("".concat(classPrefix2, "-item"), (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-item-hidden"), isItemHidden(index2 + 1)), _define_property(_obj, "".concat(classPrefix2, "-item-active"), index2 + 1 === currentIndex), _obj)),
+        style: rollerStyle(index2)
       }, renderLabel(item)) : null);
     }), !threeDimensional && options.map(function(item, index2) {
       var _item_value;
@@ -8652,7 +8658,7 @@
     ]);
     var handleSelect = React.useCallback(function(option, index2) {
       var newValue = option === null || option === void 0 ? void 0 : option.value;
-      if (!newValue || innerValue[index2] === newValue) return;
+      if (isEmpty(newValue) || innerValue[index2] === newValue) return;
       changeIndex.current = index2;
       if (columnsType === "multiple") {
         setInnerValue(function(prev) {
@@ -12165,13 +12171,13 @@
       }
       if (checkedStatement) {
         return /* @__PURE__ */ React.isValidElement(activeIcon) ? /* @__PURE__ */ React.cloneElement(activeIcon, _object_spread_props(_object_spread({}, activeIcon.props), {
-          className: classNames(color())
+          className: classNames(activeIcon.props.className, color())
         })) : /* @__PURE__ */ React.createElement(IconSVG$u, {
           className: classNames(color())
         });
       }
       return /* @__PURE__ */ React.isValidElement(icon) ? /* @__PURE__ */ React.cloneElement(icon, _object_spread_props(_object_spread({}, icon.props), {
-        className: classNames(color())
+        className: classNames(icon.props.className, color())
       })) : /* @__PURE__ */ React.createElement(IconSVG$s, {
         className: classNames(color())
       });
@@ -13437,10 +13443,13 @@
     disabled: false,
     activeText: "",
     inactiveText: "",
-    loadingIcon: /* @__PURE__ */ React.createElement(IconSVG$h, null)
+    loadingIcon: /* @__PURE__ */ React.createElement(IconSVG$h, null),
+    loading: void 0,
+    onLoadingChange: function(loading) {
+    }
   });
   var Switch = function(props) {
-    var _ref = _object_spread({}, defaultProps$M, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$M, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, propLoading = _ref.loading, onLoadingChange = _ref.onLoadingChange, rest = _object_without_properties(_ref, [
       "checked",
       "defaultChecked",
       "disabled",
@@ -13449,7 +13458,9 @@
       "loadingIcon",
       "className",
       "style",
-      "onChange"
+      "onChange",
+      "loading",
+      "onLoadingChange"
     ]);
     var classPrefix2 = "nut-switch";
     var rtl = useRtl();
@@ -13457,12 +13468,20 @@
       value: checked,
       defaultValue: defaultChecked
     }), 2), value2 = _usePropsValue[0], setValue = _usePropsValue[1];
+    var _useState = _sliced_to_array(React.useState(false), 2), internalLoading = _useState[0], setInternalLoading = _useState[1];
+    var loading = propLoading !== void 0 ? propLoading : internalLoading;
+    var setLoading = function(val2) {
+      if (propLoading !== void 0) {
+        onLoadingChange(val2);
+      } else {
+        setInternalLoading(val2);
+      }
+    };
     React.useEffect(function() {
-      changing && setChanging(false);
+      loading && setLoading(false);
     }, [
       value2
     ]);
-    var _useState = _sliced_to_array(React.useState(false), 2), changing = _useState[0], setChanging = _useState[1];
     var classes = function() {
       var _obj2;
       return classNames([
@@ -13476,14 +13495,15 @@
         return __generator(this, function(_state) {
           switch (_state.label) {
             case 0:
-              if (disabled || changing) return [
+              if (disabled || loading) return [
                 2
               ];
               if (!onChange) return [
                 3,
                 4
               ];
-              setChanging(true);
+              loadingIcon && setLoading(true);
+              onChange(!value2);
               _state.label = 1;
             case 1:
               _state.trys.push([
@@ -13504,7 +13524,7 @@
               ];
             case 3:
               _state.sent();
-              setChanging(false);
+              setLoading(false);
               return [
                 3,
                 4
@@ -13536,7 +13556,7 @@
         ],
         (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-button-open-rtl"), rtl && value2), _define_property(_obj, "".concat(classPrefix2, "-button-close-rtl"), rtl && !value2), _obj)
       ])
-    }, changing && loadingIcon ? /* @__PURE__ */ React.createElement(React.Fragment, null, loadingIcon) : /* @__PURE__ */ React.createElement(React.Fragment, null, !value2 && !activeText && /* @__PURE__ */ React.createElement(components.View, {
+    }, loading && loadingIcon ? /* @__PURE__ */ React.createElement(React.Fragment, null, loadingIcon) : /* @__PURE__ */ React.createElement(React.Fragment, null, !value2 && !activeText && /* @__PURE__ */ React.createElement(components.View, {
       className: "".concat(classPrefix2, "-close-line")
     }))), activeText && /* @__PURE__ */ React.createElement(components.View, {
       className: classNames("".concat(classPrefix2, "-label"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix2, "-label-open"), value2), _define_property(_obj1, "".concat(classPrefix2, "-label-close"), !value2), _define_property(_obj1, "".concat(classPrefix2, "-label-open-rtl"), rtl && value2), _define_property(_obj1, "".concat(classPrefix2, "-label-close-rtl"), rtl && !value2), _define_property(_obj1, "".concat(classPrefix2, "-label-close-disabled"), disabled && !value2), _obj1))
@@ -13944,7 +13964,7 @@
   });
   var InternalUploader = function(props, ref) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps$J, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, accept = _ref.accept;
+    var _ref = _object_spread({}, defaultProps$J, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, listUploadRender = _ref.listUploadRender, accept = _ref.accept;
     _ref.name;
     var camera = _ref.camera, defaultValue = _ref.defaultValue, value2 = _ref.value, previewType = _ref.previewType;
     _ref.fit;
@@ -13953,6 +13973,7 @@
       "uploadIcon",
       "deleteIcon",
       "uploadLabel",
+      "listUploadRender",
       "accept",
       "name",
       "camera",
@@ -14333,9 +14354,10 @@
       onFileItemClick === null || onFileItemClick === void 0 ? void 0 : onFileItemClick(file, index2);
     };
     var renderListUploader = function() {
-      return previewType === "list" && /* @__PURE__ */ React.createElement(components.View, {
+      if (previewType !== "list") return null;
+      return /* @__PURE__ */ React.createElement(components.View, {
         className: "nut-uploader-slot"
-      }, /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Button, {
+      }, listUploadRender || /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Button, {
         size: "small",
         type: "primary"
       }, locale.uploader.list), Number(maxCount) > fileList.length && /* @__PURE__ */ React.createElement(Button, {
@@ -40018,27 +40040,36 @@
   };
   var classPrefix$2 = "nut-video";
   var Video = function(props) {
-    var _mergeProps = mergeProps(defaultProps$8, props), source = _mergeProps.source, options = _mergeProps.options, className = _mergeProps.className, style = _mergeProps.style, onPlay = _mergeProps.onPlay, onPause = _mergeProps.onPause, onPlayEnd = _mergeProps.onPlayEnd, restProps = _object_without_properties(_mergeProps, [
+    var _props_options;
+    var _mergeProps = mergeProps(defaultProps$8, props), source = _mergeProps.source, options = _mergeProps.options, className = _mergeProps.className, style = _mergeProps.style, src = _mergeProps.src, muted = _mergeProps.muted, loop = _mergeProps.loop, poster = _mergeProps.poster, controls = _mergeProps.controls, autoplay = _mergeProps.autoplay, onPlay = _mergeProps.onPlay, onPause = _mergeProps.onPause, onPlayEnd = _mergeProps.onPlayEnd, restProps = _object_without_properties(_mergeProps, [
       "source",
       "options",
       "className",
       "style",
+      "src",
+      "muted",
+      "loop",
+      "poster",
+      "controls",
+      "autoplay",
       "onPlay",
       "onPause",
       "onPlayEnd"
     ]);
     var classes = classNames(classPrefix$2, className);
+    var _props_options_controls, _ref;
+    var effectiveControls = (_ref = (_props_options_controls = (_props_options = props.options) === null || _props_options === void 0 ? void 0 : _props_options.controls) !== null && _props_options_controls !== void 0 ? _props_options_controls : controls) !== null && _ref !== void 0 ? _ref : options.controls;
     return /* @__PURE__ */ React.createElement(components.View, {
       className: classes,
       style
     }, /* @__PURE__ */ React.createElement(components.Video, _object_spread({
       className: "".concat(classPrefix$2, "-player"),
-      muted: options.muted,
-      autoplay: options.autoplay,
-      loop: options.loop,
-      poster: options.poster,
-      controls: options.controls,
-      src: source.src,
+      muted: options.muted || muted,
+      autoplay: options.autoplay || autoplay,
+      loop: options.loop || loop,
+      poster: options.poster || poster,
+      controls: effectiveControls,
+      src: source.src || src,
       onPlay,
       onPause,
       onEnded: onPlayEnd