@nutui/nutui-react-taro 3.0.9 → 3.0.10-beta.1

package/CHANGELOG.md

@@ -1,17 +1,16 @@
 # v3.0.9
-`2025-04-18`
-
 
-* :sparkles: feat(form): 增加 taro components 属性的支持,抽象类型 (#3182)
-* :sparkles: feat(input): 增加 taro components 属性的支持 (#3181)
-* :sparkles: feat(button): 兼容 taro components (#3188)
-* :bug: fix(image): update image props tsType (#3178)
-* 🪵 refactor: 打包组件不同主题的 css 文件 (#3189)
-* 🪵 refactor(loading): 移除内置的 lottie，可通过 icon 属性加载 lottie (#3184)
-* 📖 docs(audio): 修订audio taro 端文档,不再支持taro多端 (#3187)
-* 🏡 chore: update taro version (#3186)
-* 🏡 chore: 调整 utils 和 hooks 的导出方式 (#3162)
+`2025-04-18`
 
+- :sparkles: feat(form): 增加 taro components 属性的支持,抽象类型 (#3182)
+- :sparkles: feat(input): 增加 taro components 属性的支持 (#3181)
+- :sparkles: feat(button): 兼容 taro components (#3188)
+- :bug: fix(image): update image props tsType (#3178)
+- 🪵 refactor: 打包组件不同主题的 css 文件 (#3189)
+- 🪵 refactor(loading): 移除内置的 lottie，可通过 icon 属性加载 lottie (#3184)
+- 📖 docs(audio): 修订audio taro 端文档,不再支持taro多端 (#3187)
+- 🏡 chore: update taro version (#3186)
+- 🏡 chore: 调整 utils 和 hooks 的导出方式 (#3162)
 
 # v3.0.8
 

package/dist/cjs/packages/pickerview/pickerroller.js

@@ -239,10 +239,11 @@ var InternalPickerRoller = function InternalPickerRoller(props, ref) {
     }, threeDimensional && options.map(function(item, index) {
         var _item_value;
         var _obj;
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, isGetLineSpacing ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: (0, _classnames.default)("".concat(classPrefix, "-item"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-item-hidden"), isItemHidden(index + 1)), (0, _define_property._)(_obj, "".concat(classPrefix, "-item-active"), index + 1 === currentIndex), _obj)),
-            style: rollerStyle(index),
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, {
             key: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : index
+        }, isGetLineSpacing ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: (0, _classnames.default)("".concat(classPrefix, "-item"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-item-hidden"), isItemHidden(index + 1)), (0, _define_property._)(_obj, "".concat(classPrefix, "-item-active"), index + 1 === currentIndex), _obj)),
+            style: rollerStyle(index)
         }, renderLabel(item)) : null);
     }), !threeDimensional && options.map(function(item, index) {
         var _item_value;

package/dist/cjs/packages/pickerview/pickerview.js

@@ -21,6 +21,7 @@ var _reactfastcompare = /*#__PURE__*/ _interop_require_default._(require("react-
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../hooks/use-props-value");
 var _pickerroller = /*#__PURE__*/ _interop_require_default._(require("./pickerroller"));
+var _isempty = require("../../utils/is-empty");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     options: [],
     defaultValue: [],
@@ -117,7 +118,7 @@ var InternalPickerView = function InternalPickerView(props, ref) {
     ]);
     var handleSelect = (0, _react.useCallback)(function(option, index) {
         var newValue = option === null || option === void 0 ? void 0 : option.value;
-        if (!newValue || innerValue[index] === newValue) return;
+        if ((0, _isempty.isEmpty)(newValue) || innerValue[index] === newValue) return;
         changeIndex.current = index;
         if (columnsType === 'multiple') {
             setInnerValue(function(prev) {

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

@@ -84,13 +84,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(_iconsreacttaro.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(_iconsreacttaro.CheckNormal, {
             className: (0, _classnames.default)(color())
         });

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

@@ -28,10 +28,12 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     disabled: false,
     activeText: '',
     inactiveText: '',
-    loadingIcon: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading1, null)
+    loadingIcon: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.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",
@@ -40,7 +42,9 @@ var Switch = function Switch(props) {
         "loadingIcon",
         "className",
         "style",
-        "onChange"
+        "onChange",
+        "loading",
+        "onLoadingChange"
     ]);
     var classPrefix = 'nut-switch';
     var rtl = (0, _index.useRtl)();
@@ -48,12 +52,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)([
@@ -68,14 +80,15 @@ 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);
+                        onChange(!value);
                         _state.label = 1;
                     case 1:
                         _state.trys.push([
@@ -96,7 +109,7 @@ var Switch = function Switch(props) {
                         ];
                     case 3:
                         e = _state.sent();
-                        setChanging(false);
+                        setLoading(false);
                         return [
                             3,
                             4
@@ -128,7 +141,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(_components.View, {
+    }, 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(_components.View, {
         className: "".concat(classPrefix, "-close-line")
     }))), activeText && /*#__PURE__*/ _react.default.createElement(_components.View, {
         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/tabs/tabs.js

@@ -126,7 +126,7 @@ var Tabs = function Tabs(props) {
     var scrollIntoView = function scrollIntoView(index) {
         (0, _raf.default)(function() {
             Promise.all([
-                getRect("#nut-tabs-titles-".concat(name || uuid, " .nut-tabs-list")),
+                getRect("#nut-tabs-titles-".concat(name || uuid)),
                 getAllRect("#nut-tabs-titles-".concat(name || uuid, " .nut-tabs-titles-item"))
             ]).then(function(param) {
                 var _param = (0, _sliced_to_array._)(param, 2), navRect = _param[0], titleRects = _param[1];
@@ -134,15 +134,21 @@ var Tabs = function Tabs(props) {
                 if (!titleRect) return;
                 var to = 0;
                 if (direction === 'vertical') {
+                    var totalHeight = titleRects.reduce(function(sum, curr) {
+                        return sum + curr.height;
+                    }, 0);
                     var top = titleRects.slice(0, index).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(sum, curr) {
+                        return sum + curr.width;
+                    }, 0);
                     var left = titleRects.slice(0, index).reduce(function(prev, curr) {
                         return prev + curr.width;
                     }, 0);
-                    to = left - (navRect.width - titleRect.width) / 2;
+                    to = Math.min(Math.max(0, left - (navRect.width - titleRect.width) / 2), totalWidth - navRect.width);
                 }
                 scrollDirection(to, direction);
                 (0, _taro.nextTick)(function() {

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

@@ -69,11 +69,12 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var InternalUploader = function InternalUploader(props, ref) {
     var locale = (0, _index1.useConfig)().locale;
-    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, accept = _ref.accept, name = _ref.name, camera = _ref.camera, defaultValue = _ref.defaultValue, value = _ref.value, previewType = _ref.previewType, fit = _ref.fit, disabled = _ref.disabled, multiple = _ref.multiple, previewUrl = _ref.previewUrl, preview = _ref.preview, deletable = _ref.deletable, maxCount = _ref.maxCount, maxFileSize = _ref.maxFileSize, mediaType = _ref.mediaType, className = _ref.className, autoUpload = _ref.autoUpload, sizeType = _ref.sizeType, sourceType = _ref.sourceType, maxDuration = _ref.maxDuration, onDelete = _ref.onDelete, onChange = _ref.onChange, onFileItemClick = _ref.onFileItemClick, onOversize = _ref.onOversize, onOverCount = _ref.onOverCount, beforeUpload = _ref.beforeUpload, upload = _ref.upload, beforeDelete = _ref.beforeDelete, onUploadQueueChange = _ref.onUploadQueueChange, restProps = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, listUploadRender = _ref.listUploadRender, accept = _ref.accept, name = _ref.name, camera = _ref.camera, defaultValue = _ref.defaultValue, value = _ref.value, previewType = _ref.previewType, fit = _ref.fit, disabled = _ref.disabled, multiple = _ref.multiple, previewUrl = _ref.previewUrl, preview = _ref.preview, deletable = _ref.deletable, maxCount = _ref.maxCount, maxFileSize = _ref.maxFileSize, mediaType = _ref.mediaType, className = _ref.className, autoUpload = _ref.autoUpload, sizeType = _ref.sizeType, sourceType = _ref.sourceType, maxDuration = _ref.maxDuration, onDelete = _ref.onDelete, onChange = _ref.onChange, onFileItemClick = _ref.onFileItemClick, onOversize = _ref.onOversize, onOverCount = _ref.onOverCount, beforeUpload = _ref.beforeUpload, upload = _ref.upload, beforeDelete = _ref.beforeDelete, onUploadQueueChange = _ref.onUploadQueueChange, restProps = (0, _object_without_properties._)(_ref, [
         "children",
         "uploadIcon",
         "deleteIcon",
         "uploadLabel",
+        "listUploadRender",
         "accept",
         "name",
         "camera",
@@ -451,9 +452,10 @@ var InternalUploader = function InternalUploader(props, ref) {
         onFileItemClick === null || onFileItemClick === void 0 ? void 0 : onFileItemClick(file, index);
     };
     var renderListUploader = function renderListUploader() {
-        return previewType === 'list' && /*#__PURE__*/ _react.default.createElement(_components.View, {
+        if (previewType !== 'list') return null;
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: "nut-uploader-slot"
-        }, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_index.default, {
+        }, listUploadRender || /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_index.default, {
             size: "small",
             type: "primary"
         }, locale.uploader.list), Number(maxCount) > fileList.length && /*#__PURE__*/ _react.default.createElement(_index.default, {

package/dist/cjs/packages/video/video.d.ts

@@ -1,3 +1,4 @@
 import { FunctionComponent } from 'react';
+import { VideoProps } from '@tarojs/components';
 import { TaroVideoProps } from "../../types";
-export declare const Video: FunctionComponent<Partial<TaroVideoProps>>;
+export declare const Video: FunctionComponent<Partial<TaroVideoProps & VideoProps>>;

package/dist/cjs/packages/video/video.js

@@ -29,29 +29,38 @@ var defaultProps = {
         loop: false
     }
 };
-var classPrefix = "nut-video";
+var classPrefix = 'nut-video';
 var Video = function Video(props) {
-    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, props), source = _mergeProps.source, options = _mergeProps.options, className = _mergeProps.className, style = _mergeProps.style, onPlay = _mergeProps.onPlay, onPause = _mergeProps.onPause, onPlayEnd = _mergeProps.onPlayEnd, restProps = (0, _object_without_properties._)(_mergeProps, [
+    var _props_options;
+    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, 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 = (0, _object_without_properties._)(_mergeProps, [
         "source",
         "options",
         "className",
         "style",
+        "src",
+        "muted",
+        "loop",
+        "poster",
+        "controls",
+        "autoplay",
         "onPlay",
         "onPause",
         "onPlayEnd"
     ]);
     var classes = (0, _classnames.default)(classPrefix, 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.default.createElement(_components.View, {
         className: classes,
         style: style
     }, /*#__PURE__*/ _react.default.createElement(_components.Video, (0, _object_spread._)({
         className: "".concat(classPrefix, "-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: onPlay,
         onPause: onPause,
         onEnded: onPlayEnd

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/pickerview/pickerroller.js

@@ -227,10 +227,11 @@ var InternalPickerRoller = function(props, ref) {
     }, threeDimensional && options.map(function(item, index) {
         var _item_value;
         var _obj;
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, isGetLineSpacing ? /*#__PURE__*/ React.createElement(View, {
-            className: classNames("".concat(classPrefix, "-item"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-item-hidden"), isItemHidden(index + 1)), _define_property(_obj, "".concat(classPrefix, "-item-active"), index + 1 === currentIndex), _obj)),
-            style: rollerStyle(index),
+        return /*#__PURE__*/ React.createElement(React.Fragment, {
             key: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : index
+        }, isGetLineSpacing ? /*#__PURE__*/ React.createElement(View, {
+            className: classNames("".concat(classPrefix, "-item"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-item-hidden"), isItemHidden(index + 1)), _define_property(_obj, "".concat(classPrefix, "-item-active"), index + 1 === currentIndex), _obj)),
+            style: rollerStyle(index)
         }, renderLabel(item)) : null);
     }), !threeDimensional && options.map(function(item, index) {
         var _item_value;

package/dist/es/packages/pickerview/pickerview.js

@@ -9,6 +9,7 @@ import isEqual from "react-fast-compare";
 import { ComponentDefaults } from "../../utils/typings";
 import { usePropsValue } from "../../hooks/use-props-value";
 import PickerRoller from "./pickerroller";
+import { isEmpty } from "../../utils/is-empty";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     options: [],
     defaultValue: [],
@@ -105,7 +106,7 @@ var InternalPickerView = function(props, ref) {
     ]);
     var handleSelect = useCallback(function(option, index) {
         var newValue = option === null || option === void 0 ? void 0 : option.value;
-        if (!newValue || innerValue[index] === newValue) return;
+        if (isEmpty(newValue) || innerValue[index] === newValue) return;
         changeIndex.current = index;
         if (columnsType === 'multiple') {
             setInnerValue(function(prev) {

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

@@ -72,13 +72,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

@@ -16,10 +16,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",
@@ -28,7 +30,9 @@ export var Switch = function(props) {
         "loadingIcon",
         "className",
         "style",
-        "onChange"
+        "onChange",
+        "loading",
+        "onLoadingChange"
     ]);
     var classPrefix = 'nut-switch';
     var rtl = useRtl();
@@ -36,12 +40,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([
@@ -56,14 +68,15 @@ 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);
+                        onChange(!value);
                         _state.label = 1;
                     case 1:
                         _state.trys.push([
@@ -84,7 +97,7 @@ export var Switch = function(props) {
                         ];
                     case 3:
                         e = _state.sent();
-                        setChanging(false);
+                        setLoading(false);
                         return [
                             3,
                             4
@@ -116,7 +129,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(View, {
+    }, loading && loadingIcon ? /*#__PURE__*/ React.createElement(React.Fragment, null, loadingIcon) : /*#__PURE__*/ React.createElement(React.Fragment, null, !value && !activeText && /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-close-line")
     }))), activeText && /*#__PURE__*/ React.createElement(View, {
         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/tabs/tabs.js

@@ -114,7 +114,7 @@ export var Tabs = function(props) {
     var scrollIntoView = function(index) {
         raf(function() {
             Promise.all([
-                getRect("#nut-tabs-titles-".concat(name || uuid, " .nut-tabs-list")),
+                getRect("#nut-tabs-titles-".concat(name || uuid)),
                 getAllRect("#nut-tabs-titles-".concat(name || uuid, " .nut-tabs-titles-item"))
             ]).then(function(param) {
                 var _param = _sliced_to_array(param, 2), navRect = _param[0], titleRects = _param[1];
@@ -122,15 +122,21 @@ export var Tabs = function(props) {
                 if (!titleRect) return;
                 var to = 0;
                 if (direction === 'vertical') {
+                    var totalHeight = titleRects.reduce(function(sum, curr) {
+                        return sum + curr.height;
+                    }, 0);
                     var top = titleRects.slice(0, index).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(sum, curr) {
+                        return sum + curr.width;
+                    }, 0);
                     var left = titleRects.slice(0, index).reduce(function(prev, curr) {
                         return prev + curr.width;
                     }, 0);
-                    to = left - (navRect.width - titleRect.width) / 2;
+                    to = Math.min(Math.max(0, left - (navRect.width - titleRect.width) / 2), totalWidth - navRect.width);
                 }
                 scrollDirection(to, direction);
                 nextTick(function() {

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

@@ -57,11 +57,12 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 var InternalUploader = function(props, ref) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, accept = _ref.accept, name = _ref.name, camera = _ref.camera, defaultValue = _ref.defaultValue, value = _ref.value, previewType = _ref.previewType, fit = _ref.fit, disabled = _ref.disabled, multiple = _ref.multiple, previewUrl = _ref.previewUrl, preview = _ref.preview, deletable = _ref.deletable, maxCount = _ref.maxCount, maxFileSize = _ref.maxFileSize, mediaType = _ref.mediaType, className = _ref.className, autoUpload = _ref.autoUpload, sizeType = _ref.sizeType, sourceType = _ref.sourceType, maxDuration = _ref.maxDuration, onDelete = _ref.onDelete, onChange = _ref.onChange, onFileItemClick = _ref.onFileItemClick, onOversize = _ref.onOversize, onOverCount = _ref.onOverCount, beforeUpload = _ref.beforeUpload, upload = _ref.upload, beforeDelete = _ref.beforeDelete, onUploadQueueChange = _ref.onUploadQueueChange, restProps = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, listUploadRender = _ref.listUploadRender, accept = _ref.accept, name = _ref.name, camera = _ref.camera, defaultValue = _ref.defaultValue, value = _ref.value, previewType = _ref.previewType, fit = _ref.fit, disabled = _ref.disabled, multiple = _ref.multiple, previewUrl = _ref.previewUrl, preview = _ref.preview, deletable = _ref.deletable, maxCount = _ref.maxCount, maxFileSize = _ref.maxFileSize, mediaType = _ref.mediaType, className = _ref.className, autoUpload = _ref.autoUpload, sizeType = _ref.sizeType, sourceType = _ref.sourceType, maxDuration = _ref.maxDuration, onDelete = _ref.onDelete, onChange = _ref.onChange, onFileItemClick = _ref.onFileItemClick, onOversize = _ref.onOversize, onOverCount = _ref.onOverCount, beforeUpload = _ref.beforeUpload, upload = _ref.upload, beforeDelete = _ref.beforeDelete, onUploadQueueChange = _ref.onUploadQueueChange, restProps = _object_without_properties(_ref, [
         "children",
         "uploadIcon",
         "deleteIcon",
         "uploadLabel",
+        "listUploadRender",
         "accept",
         "name",
         "camera",
@@ -439,9 +440,10 @@ var InternalUploader = function(props, ref) {
         onFileItemClick === null || onFileItemClick === void 0 ? void 0 : onFileItemClick(file, index);
     };
     var renderListUploader = function() {
-        return previewType === 'list' && /*#__PURE__*/ React.createElement(View, {
+        if (previewType !== 'list') return null;
+        return /*#__PURE__*/ React.createElement(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, {

package/dist/es/packages/video/video.d.ts

@@ -1,3 +1,4 @@
 import { FunctionComponent } from 'react';
+import { VideoProps } from '@tarojs/components';
 import { TaroVideoProps } from "../../types";
-export declare const Video: FunctionComponent<Partial<TaroVideoProps>>;
+export declare const Video: FunctionComponent<Partial<TaroVideoProps & VideoProps>>;

package/dist/es/packages/video/video.js

@@ -18,29 +18,38 @@ var defaultProps = {
         loop: false
     }
 };
-var classPrefix = "nut-video";
+var classPrefix = 'nut-video';
 export var Video = function(props) {
-    var _mergeProps = mergeProps(defaultProps, 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, 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, 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(View, {
         className: classes,
         style: style
     }, /*#__PURE__*/ React.createElement(VideoTaro, _object_spread({
         className: "".concat(classPrefix, "-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: onPlay,
         onPause: onPause,
         onEnded: onPlayEnd

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);
     }
 }