@nutui/nutui-react 3.0.10-beta.0 → 3.0.10

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# v3.0.10
+`2025-04-25`
+
+
+* 🏡 chore: 更新壳工程分支 (#3200)
+* 🏡 chore: release: v3.0.10-beta.0
+* 🏡 chore: update publich path
+* 📖 docs: jmapp 不判断环境，直接打开 (#3193)
+* :sparkles: feat(switch): loading 态受控 (#3149)
+* :sparkles: feat(uploader): add listUploadRender prop for custom list mode upload… (#3198)
+* :sparkles: feat(video): 兼容taro Component属性 (#3185)
+* :sparkles: feat(radio): 支持自定义icon的classname (#3196)
+* :bug: fix(tabs): 修复滚动计算问题，优化定位逻辑 (#3183)
+* :bug: fix: 删掉无用console (#3197)
+* :bug: fix: 兼容选中值为0的情况 (#3192)
+
+
 # v3.0.9
 
 `2025-04-18`

package/dist/cjs/packages/radio/radio.js

@@ -86,13 +86,13 @@ var Radio = function Radio(props) {
         }
         if (checkedStatement) {
             return /*#__PURE__*/ _react.default.isValidElement(activeIcon) ? /*#__PURE__*/ _react.default.cloneElement(activeIcon, (0, _object_spread_props._)((0, _object_spread._)({}, activeIcon.props), {
-                className: (0, _classnames.default)(color())
+                className: (0, _classnames.default)(activeIcon.props.className, color())
             })) : /*#__PURE__*/ _react.default.createElement(_iconsreact.CheckChecked, {
                 className: (0, _classnames.default)(color())
             });
         }
         return /*#__PURE__*/ _react.default.isValidElement(icon) ? /*#__PURE__*/ _react.default.cloneElement(icon, (0, _object_spread_props._)((0, _object_spread._)({}, icon.props), {
-            className: (0, _classnames.default)(color())
+            className: (0, _classnames.default)(icon.props.className, color())
         })) : /*#__PURE__*/ _react.default.createElement(_iconsreact.CheckNormal, {
             className: (0, _classnames.default)(color())
         });

package/dist/cjs/packages/switch/switch.js

@@ -27,10 +27,12 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     disabled: false,
     activeText: '',
     inactiveText: '',
-    loadingIcon: /*#__PURE__*/ _react.default.createElement(_iconsreact.Loading1, null)
+    loadingIcon: /*#__PURE__*/ _react.default.createElement(_iconsreact.Loading1, null),
+    loading: undefined,
+    onLoadingChange: function onLoadingChange(loading) {}
 });
 var Switch = function Switch(props) {
-    var _ref = (0, _object_spread._)({}, defaultProps, 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 = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, 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 = (0, _object_without_properties._)(_ref, [
         "checked",
         "defaultChecked",
         "disabled",
@@ -39,7 +41,9 @@ var Switch = function Switch(props) {
         "loadingIcon",
         "className",
         "style",
-        "onChange"
+        "onChange",
+        "loading",
+        "onLoadingChange"
     ]);
     var classPrefix = 'nut-switch';
     var rtl = (0, _configprovider.useRtl)();
@@ -47,12 +51,20 @@ var Switch = function Switch(props) {
         value: checked,
         defaultValue: defaultChecked
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
+    var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), internalLoading = _useState[0], setInternalLoading = _useState[1];
+    var loading = propLoading !== undefined ? propLoading : internalLoading;
+    var setLoading = function setLoading(val) {
+        if (propLoading !== undefined) {
+            onLoadingChange(val);
+        } else {
+            setInternalLoading(val);
+        }
+    };
     (0, _react.useEffect)(function() {
-        changing && setChanging(false);
+        loading && setLoading(false);
     }, [
         value
     ]);
-    var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), changing = _useState[0], setChanging = _useState[1];
     var classes = function classes() {
         var _obj;
         return (0, _classnames.default)([
@@ -67,14 +79,14 @@ var Switch = function Switch(props) {
             return (0, _ts_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);
                         _state.label = 1;
                     case 1:
                         _state.trys.push([
@@ -95,7 +107,7 @@ var Switch = function Switch(props) {
                         ];
                     case 3:
                         e = _state.sent();
-                        setChanging(false);
+                        setLoading(false);
                         return [
                             3,
                             4
@@ -127,7 +139,7 @@ var Switch = function Switch(props) {
             ],
             (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-button-open-rtl"), rtl && value), (0, _define_property._)(_obj, "".concat(classPrefix, "-button-close-rtl"), rtl && !value), _obj)
         ])
-    }, changing && loadingIcon ? /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, loadingIcon) : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !value && !activeText && /*#__PURE__*/ _react.default.createElement("div", {
+    }, loading && loadingIcon ? /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, loadingIcon) : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !value && !activeText && /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-close-line")
     }))), activeText && /*#__PURE__*/ _react.default.createElement("div", {
         className: (0, _classnames.default)("".concat(classPrefix, "-label"), (_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open"), value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close"), !value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close-rtl"), rtl && !value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close-disabled"), disabled && !value), _obj1))

package/dist/cjs/packages/uploader/uploader.js

@@ -56,7 +56,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 var InternalUploader = function InternalUploader(props, ref) {
     var locale = (0, _configprovider.useConfig)().locale;
     var fileListRef = (0, _react.useRef)([]);
-    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, props), children = _mergeProps.children, uploadIcon = _mergeProps.uploadIcon, deleteIcon = _mergeProps.deleteIcon, uploadLabel = _mergeProps.uploadLabel, name = _mergeProps.name, accept = _mergeProps.accept, defaultValue = _mergeProps.defaultValue, value = _mergeProps.value, previewType = _mergeProps.previewType, fit = _mergeProps.fit, disabled = _mergeProps.disabled, multiple = _mergeProps.multiple, previewUrl = _mergeProps.previewUrl, preview = _mergeProps.preview, deletable = _mergeProps.deletable, maxCount = _mergeProps.maxCount, capture = _mergeProps.capture, maxFileSize = _mergeProps.maxFileSize, className = _mergeProps.className, autoUpload = _mergeProps.autoUpload, clearInput = _mergeProps.clearInput, upload = _mergeProps.upload, onDelete = _mergeProps.onDelete, onChange = _mergeProps.onChange, onFileItemClick = _mergeProps.onFileItemClick, onOversize = _mergeProps.onOversize, onOverCount = _mergeProps.onOverCount, beforeUpload = _mergeProps.beforeUpload, beforeDelete = _mergeProps.beforeDelete, onUploadQueueChange = _mergeProps.onUploadQueueChange, restProps = (0, _object_without_properties._)(_mergeProps, [
+    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, props), children = _mergeProps.children, uploadIcon = _mergeProps.uploadIcon, deleteIcon = _mergeProps.deleteIcon, uploadLabel = _mergeProps.uploadLabel, name = _mergeProps.name, accept = _mergeProps.accept, defaultValue = _mergeProps.defaultValue, value = _mergeProps.value, previewType = _mergeProps.previewType, fit = _mergeProps.fit, disabled = _mergeProps.disabled, multiple = _mergeProps.multiple, previewUrl = _mergeProps.previewUrl, preview = _mergeProps.preview, deletable = _mergeProps.deletable, maxCount = _mergeProps.maxCount, capture = _mergeProps.capture, maxFileSize = _mergeProps.maxFileSize, className = _mergeProps.className, autoUpload = _mergeProps.autoUpload, clearInput = _mergeProps.clearInput, upload = _mergeProps.upload, onDelete = _mergeProps.onDelete, onChange = _mergeProps.onChange, onFileItemClick = _mergeProps.onFileItemClick, onOversize = _mergeProps.onOversize, onOverCount = _mergeProps.onOverCount, beforeUpload = _mergeProps.beforeUpload, beforeDelete = _mergeProps.beforeDelete, onUploadQueueChange = _mergeProps.onUploadQueueChange, listUploadRender = _mergeProps.listUploadRender, restProps = (0, _object_without_properties._)(_mergeProps, [
         "children",
         "uploadIcon",
         "deleteIcon",
@@ -86,7 +86,8 @@ var InternalUploader = function InternalUploader(props, ref) {
         "onOverCount",
         "beforeUpload",
         "beforeDelete",
-        "onUploadQueueChange"
+        "onUploadQueueChange",
+        "listUploadRender"
     ]);
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
         value: value,
@@ -377,9 +378,10 @@ var InternalUploader = function InternalUploader(props, ref) {
         }));
     };
     var renderListUploader = function renderListUploader() {
-        return previewType === 'list' && /*#__PURE__*/ _react.default.createElement("div", {
+        if (previewType !== 'list') return null;
+        return /*#__PURE__*/ _react.default.createElement("div", {
             className: "nut-uploader-slot"
-        }, /*#__PURE__*/ _react.default.createElement(_button.default, {
+        }, listUploadRender || /*#__PURE__*/ _react.default.createElement(_button.default, {
             size: "small",
             type: "primary"
         }, locale.uploader.list), Number(maxCount) > fileList.length && /*#__PURE__*/ _react.default.createElement("input", {

package/dist/cjs/types/spec/switch/base.d.ts

@@ -7,5 +7,7 @@ export interface BaseSwitch extends BaseProps {
     activeText: ReactNode;
     inactiveText: ReactNode;
     loadingIcon: ReactNode;
+    loading: boolean | undefined;
+    onLoadingChange: (loading: boolean) => void;
     onChange: (val: boolean) => void;
 }

package/dist/cjs/types/spec/uploader/base.d.ts

@@ -28,6 +28,7 @@ export interface BaseUploader extends BaseProps {
     uploadIcon?: React.ReactNode;
     deleteIcon?: React.ReactNode;
     uploadLabel?: React.ReactNode;
+    listUploadRender?: React.ReactNode;
     name: string;
     accept: string;
     disabled: boolean;

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

@@ -38,7 +38,7 @@ var getRect = function getRect(elementRef) {
         };
     }
     if (element && element.getBoundingClientRect) {
-        console.log(element, element.getBoundingClientRect());
+        // console.log(element, element.getBoundingClientRect())
         return element.getBoundingClientRect();
     }
     return {

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

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

package/dist/es/packages/radio/radio.js

@@ -74,13 +74,13 @@ export var Radio = function(props) {
         }
         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(CheckChecked, {
                 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(CheckNormal, {
             className: classNames(color())
         });

package/dist/es/packages/switch/switch.js

@@ -15,10 +15,12 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     disabled: false,
     activeText: '',
     inactiveText: '',
-    loadingIcon: /*#__PURE__*/ React.createElement(Loading1, null)
+    loadingIcon: /*#__PURE__*/ React.createElement(Loading1, null),
+    loading: undefined,
+    onLoadingChange: function(loading) {}
 });
 export var Switch = function(props) {
-    var _ref = _object_spread({}, defaultProps, 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, 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",
@@ -27,7 +29,9 @@ export var Switch = function(props) {
         "loadingIcon",
         "className",
         "style",
-        "onChange"
+        "onChange",
+        "loading",
+        "onLoadingChange"
     ]);
     var classPrefix = 'nut-switch';
     var rtl = useRtl();
@@ -35,12 +39,20 @@ export var Switch = function(props) {
         value: checked,
         defaultValue: defaultChecked
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
+    var _useState = _sliced_to_array(useState(false), 2), internalLoading = _useState[0], setInternalLoading = _useState[1];
+    var loading = propLoading !== undefined ? propLoading : internalLoading;
+    var setLoading = function(val) {
+        if (propLoading !== undefined) {
+            onLoadingChange(val);
+        } else {
+            setInternalLoading(val);
+        }
+    };
     useEffect(function() {
-        changing && setChanging(false);
+        loading && setLoading(false);
     }, [
         value
     ]);
-    var _useState = _sliced_to_array(useState(false), 2), changing = _useState[0], setChanging = _useState[1];
     var classes = function() {
         var _obj;
         return classNames([
@@ -55,14 +67,14 @@ export var Switch = function(props) {
             return _ts_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);
                         _state.label = 1;
                     case 1:
                         _state.trys.push([
@@ -83,7 +95,7 @@ export var Switch = function(props) {
                         ];
                     case 3:
                         e = _state.sent();
-                        setChanging(false);
+                        setLoading(false);
                         return [
                             3,
                             4
@@ -115,7 +127,7 @@ export var Switch = function(props) {
             ],
             (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-button-open-rtl"), rtl && value), _define_property(_obj, "".concat(classPrefix, "-button-close-rtl"), rtl && !value), _obj)
         ])
-    }, changing && loadingIcon ? /*#__PURE__*/ React.createElement(React.Fragment, null, loadingIcon) : /*#__PURE__*/ React.createElement(React.Fragment, null, !value && !activeText && /*#__PURE__*/ React.createElement("div", {
+    }, loading && loadingIcon ? /*#__PURE__*/ React.createElement(React.Fragment, null, loadingIcon) : /*#__PURE__*/ React.createElement(React.Fragment, null, !value && !activeText && /*#__PURE__*/ React.createElement("div", {
         className: "".concat(classPrefix, "-close-line")
     }))), activeText && /*#__PURE__*/ React.createElement("div", {
         className: classNames("".concat(classPrefix, "-label"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-label-open"), value), _define_property(_obj1, "".concat(classPrefix, "-label-close"), !value), _define_property(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), _define_property(_obj1, "".concat(classPrefix, "-label-close-rtl"), rtl && !value), _define_property(_obj1, "".concat(classPrefix, "-label-close-disabled"), disabled && !value), _obj1))

package/dist/es/packages/uploader/uploader.js

@@ -44,7 +44,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 var InternalUploader = function(props, ref) {
     var locale = useConfig().locale;
     var fileListRef = useRef([]);
-    var _mergeProps = mergeProps(defaultProps, props), children = _mergeProps.children, uploadIcon = _mergeProps.uploadIcon, deleteIcon = _mergeProps.deleteIcon, uploadLabel = _mergeProps.uploadLabel, name = _mergeProps.name, accept = _mergeProps.accept, defaultValue = _mergeProps.defaultValue, value = _mergeProps.value, previewType = _mergeProps.previewType, fit = _mergeProps.fit, disabled = _mergeProps.disabled, multiple = _mergeProps.multiple, previewUrl = _mergeProps.previewUrl, preview = _mergeProps.preview, deletable = _mergeProps.deletable, maxCount = _mergeProps.maxCount, capture = _mergeProps.capture, maxFileSize = _mergeProps.maxFileSize, className = _mergeProps.className, autoUpload = _mergeProps.autoUpload, clearInput = _mergeProps.clearInput, upload = _mergeProps.upload, onDelete = _mergeProps.onDelete, onChange = _mergeProps.onChange, onFileItemClick = _mergeProps.onFileItemClick, onOversize = _mergeProps.onOversize, onOverCount = _mergeProps.onOverCount, beforeUpload = _mergeProps.beforeUpload, beforeDelete = _mergeProps.beforeDelete, onUploadQueueChange = _mergeProps.onUploadQueueChange, restProps = _object_without_properties(_mergeProps, [
+    var _mergeProps = mergeProps(defaultProps, props), children = _mergeProps.children, uploadIcon = _mergeProps.uploadIcon, deleteIcon = _mergeProps.deleteIcon, uploadLabel = _mergeProps.uploadLabel, name = _mergeProps.name, accept = _mergeProps.accept, defaultValue = _mergeProps.defaultValue, value = _mergeProps.value, previewType = _mergeProps.previewType, fit = _mergeProps.fit, disabled = _mergeProps.disabled, multiple = _mergeProps.multiple, previewUrl = _mergeProps.previewUrl, preview = _mergeProps.preview, deletable = _mergeProps.deletable, maxCount = _mergeProps.maxCount, capture = _mergeProps.capture, maxFileSize = _mergeProps.maxFileSize, className = _mergeProps.className, autoUpload = _mergeProps.autoUpload, clearInput = _mergeProps.clearInput, upload = _mergeProps.upload, onDelete = _mergeProps.onDelete, onChange = _mergeProps.onChange, onFileItemClick = _mergeProps.onFileItemClick, onOversize = _mergeProps.onOversize, onOverCount = _mergeProps.onOverCount, beforeUpload = _mergeProps.beforeUpload, beforeDelete = _mergeProps.beforeDelete, onUploadQueueChange = _mergeProps.onUploadQueueChange, listUploadRender = _mergeProps.listUploadRender, restProps = _object_without_properties(_mergeProps, [
         "children",
         "uploadIcon",
         "deleteIcon",
@@ -74,7 +74,8 @@ var InternalUploader = function(props, ref) {
         "onOverCount",
         "beforeUpload",
         "beforeDelete",
-        "onUploadQueueChange"
+        "onUploadQueueChange",
+        "listUploadRender"
     ]);
     var _usePropsValue = _sliced_to_array(usePropsValue({
         value: value,
@@ -365,9 +366,10 @@ var InternalUploader = function(props, ref) {
         }));
     };
     var renderListUploader = function() {
-        return previewType === 'list' && /*#__PURE__*/ React.createElement("div", {
+        if (previewType !== 'list') return null;
+        return /*#__PURE__*/ React.createElement("div", {
             className: "nut-uploader-slot"
-        }, /*#__PURE__*/ React.createElement(Button, {
+        }, listUploadRender || /*#__PURE__*/ React.createElement(Button, {
             size: "small",
             type: "primary"
         }, locale.uploader.list), Number(maxCount) > fileList.length && /*#__PURE__*/ React.createElement("input", {

package/dist/es/types/spec/switch/base.d.ts

@@ -22,10 +22,18 @@ export interface BaseSwitch extends BaseProps {
     */
     inactiveText: ReactNode
     /**
-    * 受控 loading 态图标
+    * 控制加载状态的图标，传入空值时禁用 loading 态
     */
     loadingIcon: ReactNode
     /**
+    * loading 态，受控
+    */
+    loading: boolean | undefined
+    /**
+    * 切换 loading 态时触发
+    */
+    onLoadingChange: (loading: boolean) => void
+    /**
     * 切换开关时触发
     */
     onChange: (val: boolean) => void

package/dist/es/types/spec/uploader/base.d.ts

@@ -59,6 +59,10 @@ export interface BaseUploader extends BaseProps {
     */
     uploadLabel?: React.ReactNode
     /**
+    * 自定义列表模式的上传区域
+    */
+    listUploadRender?: React.ReactNode
+    /**
     * input 标签 name 的名称，发到后台的文件参数名
     */
     name: string

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

@@ -2195,7 +2195,6 @@ Check the top-level render call using <` + t + ">.");
       };
     }
     if (element && element.getBoundingClientRect) {
-      console.log(element, element.getBoundingClientRect());
       return element.getBoundingClientRect();
     }
     return {
@@ -2674,7 +2673,7 @@ Check the top-level render call using <` + t + ">.");
       });
       window.addEventListener("test-passive-supported", null, opts);
     } catch (e2) {
-      console.log(e2);
+      console.log("supported passive error", e2);
     }
   }
   function toArray$1(value2) {
@@ -17547,13 +17546,13 @@ Please add \`${key2}Action\` when creating your handler.`);
       }
       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(c$2, {
           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(n$8, {
         className: classNames(color())
       });
@@ -18747,10 +18746,13 @@ Please add \`${key2}Action\` when creating your handler.`);
     disabled: false,
     activeText: "",
     inactiveText: "",
-    loadingIcon: /* @__PURE__ */ React.createElement(d$3, null)
+    loadingIcon: /* @__PURE__ */ React.createElement(d$3, 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",
@@ -18759,7 +18761,9 @@ Please add \`${key2}Action\` when creating your handler.`);
       "loadingIcon",
       "className",
       "style",
-      "onChange"
+      "onChange",
+      "loading",
+      "onLoadingChange"
     ]);
     var classPrefix2 = "nut-switch";
     var rtl = useRtl();
@@ -18767,12 +18771,20 @@ Please add \`${key2}Action\` when creating your handler.`);
       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([
@@ -18786,14 +18798,14 @@ Please add \`${key2}Action\` when creating your handler.`);
         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);
               _state.label = 1;
             case 1:
               _state.trys.push([
@@ -18814,7 +18826,7 @@ Please add \`${key2}Action\` when creating your handler.`);
               ];
             case 3:
               _state.sent();
-              setChanging(false);
+              setLoading(false);
               return [
                 3,
                 4
@@ -18846,7 +18858,7 @@ Please add \`${key2}Action\` when creating your handler.`);
         ],
         (_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("div", {
+    }, loading && loadingIcon ? /* @__PURE__ */ React.createElement(React.Fragment, null, loadingIcon) : /* @__PURE__ */ React.createElement(React.Fragment, null, !value2 && !activeText && /* @__PURE__ */ React.createElement("div", {
       className: "".concat(classPrefix2, "-close-line")
     }))), activeText && /* @__PURE__ */ React.createElement("div", {
       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))
@@ -19184,7 +19196,7 @@ Please add \`${key2}Action\` when creating your handler.`);
     var fileListRef = React.useRef([]);
     var _mergeProps = mergeProps(defaultProps$J, props), children = _mergeProps.children, uploadIcon = _mergeProps.uploadIcon, deleteIcon = _mergeProps.deleteIcon, uploadLabel = _mergeProps.uploadLabel, name2 = _mergeProps.name, accept = _mergeProps.accept, defaultValue = _mergeProps.defaultValue, value2 = _mergeProps.value, previewType = _mergeProps.previewType;
     _mergeProps.fit;
-    var disabled = _mergeProps.disabled, multiple = _mergeProps.multiple, previewUrl = _mergeProps.previewUrl, preview = _mergeProps.preview, deletable = _mergeProps.deletable, maxCount = _mergeProps.maxCount, capture = _mergeProps.capture, maxFileSize = _mergeProps.maxFileSize, className = _mergeProps.className, autoUpload = _mergeProps.autoUpload, clearInput = _mergeProps.clearInput, upload = _mergeProps.upload, onDelete = _mergeProps.onDelete, onChange = _mergeProps.onChange, onFileItemClick = _mergeProps.onFileItemClick, onOversize = _mergeProps.onOversize, onOverCount = _mergeProps.onOverCount, beforeUpload = _mergeProps.beforeUpload, beforeDelete = _mergeProps.beforeDelete, onUploadQueueChange = _mergeProps.onUploadQueueChange, restProps = _object_without_properties(_mergeProps, [
+    var disabled = _mergeProps.disabled, multiple = _mergeProps.multiple, previewUrl = _mergeProps.previewUrl, preview = _mergeProps.preview, deletable = _mergeProps.deletable, maxCount = _mergeProps.maxCount, capture = _mergeProps.capture, maxFileSize = _mergeProps.maxFileSize, className = _mergeProps.className, autoUpload = _mergeProps.autoUpload, clearInput = _mergeProps.clearInput, upload = _mergeProps.upload, onDelete = _mergeProps.onDelete, onChange = _mergeProps.onChange, onFileItemClick = _mergeProps.onFileItemClick, onOversize = _mergeProps.onOversize, onOverCount = _mergeProps.onOverCount, beforeUpload = _mergeProps.beforeUpload, beforeDelete = _mergeProps.beforeDelete, onUploadQueueChange = _mergeProps.onUploadQueueChange, listUploadRender = _mergeProps.listUploadRender, restProps = _object_without_properties(_mergeProps, [
       "children",
       "uploadIcon",
       "deleteIcon",
@@ -19214,7 +19226,8 @@ Please add \`${key2}Action\` when creating your handler.`);
       "onOverCount",
       "beforeUpload",
       "beforeDelete",
-      "onUploadQueueChange"
+      "onUploadQueueChange",
+      "listUploadRender"
     ]);
     var _usePropsValue = _sliced_to_array(usePropsValue({
       value: value2,
@@ -19505,9 +19518,10 @@ Please add \`${key2}Action\` when creating your handler.`);
       }));
     };
     var renderListUploader = function() {
-      return previewType === "list" && /* @__PURE__ */ React.createElement("div", {
+      if (previewType !== "list") return null;
+      return /* @__PURE__ */ React.createElement("div", {
         className: "nut-uploader-slot"
-      }, /* @__PURE__ */ React.createElement(Button, {
+      }, listUploadRender || /* @__PURE__ */ React.createElement(Button, {
         size: "small",
         type: "primary"
       }, locale.uploader.list), Number(maxCount) > fileList.length && /* @__PURE__ */ React.createElement("input", {