@nutui/nutui-react-taro 1.5.1 → 2.0.0-alpha.1

package/dist/esm/{picker.taro-9ad1b7c5.js → picker.taro-5028afcb.js}

@@ -1,11 +1,10 @@
 import React__default, { useState, useRef, useEffect, useImperativeHandle } from 'react';
-import Taro from '@tarojs/taro';
-import { View, PickerView, PickerViewColumn } from '@tarojs/components';
-import { P as Popup } from './popup.taro-01676bff.js';
-import { u as useTouch } from './useTouch-db24bb5c.js';
-import { g as getRectByTaro } from './useClientRect-1f8ed1fe.js';
+import { View } from '@tarojs/components';
+import { P as Popup } from './popup.taro-020bf791.js';
+import { u as useTouch } from './use-touch-db24bb5c.js';
+import { g as getRectByTaro } from './use-client-rect-1f8ed1fe.js';
 import { p as passiveSupported } from './supports-passive-c85ef996.js';
-import { u as useConfig } from './configprovider.taro-8d71eb49.js';
+import { u as useConfig } from './configprovider.taro-c8c54556.js';
 import { c as cn } from './bem-350c1702.js';
 
 const InternalPickerSlot = (props, ref) => {
@@ -18,13 +17,14 @@ const InternalPickerSlot = (props, ref) => {
     const INERTIA_TIME = 300;
     const INERTIA_DISTANCE = 15;
     const [currIndex, setCurrIndex] = useState(1);
+    // let lineSpacing = 36
     const lineSpacing = useRef(36);
     const [touchTime, setTouchTime] = useState(0);
     const [touchDeg, setTouchDeg] = useState('0deg');
     const rotation = 20;
     const moving = useRef(false);
     let timer;
-    const listRef = useRef(null);
+    const listbox = useRef(null);
     const rollerRef = useRef(null);
     const pickerSlotRef = useRef(null);
     const [startTime, setStartTime] = useState(0);
@@ -164,7 +164,7 @@ const InternalPickerSlot = (props, ref) => {
         }
     };
     const getReference = async () => {
-        const refe = await getRectByTaro(listRef?.current);
+        const refe = await getRectByTaro(listbox?.current);
         lineSpacing.current = refe.height ? refe.height : 36;
         modifyStatus(true);
     };
@@ -219,7 +219,7 @@ const InternalPickerSlot = (props, ref) => {
                         React__default.createElement(React__default.Fragment, null, item.text ? item.text : item)));
                 })),
         React__default.createElement("div", { className: "nut-picker-mask" }),
-        React__default.createElement("div", { className: "nut-picker-indicator", ref: listRef })));
+        React__default.createElement("div", { className: "nut-picker-indicator", ref: listbox })));
 };
 const PickerSlot = React__default.forwardRef(InternalPickerSlot);
 
@@ -237,7 +237,7 @@ function useRefs() {
 
 const InternalPicker = (props, ref) => {
     const { locale } = useConfig();
-    const { isVisible, title, listData = [], defaultValueData, onConfirm, onClose, onCloseUpdate, onChange, className, style, threeDimensional, swipeDuration, ...rest } = props;
+    const { visible, title, listData = [], defaultValueData, onConfirm, onClose, onCloseUpdate, onChange, className, style, threeDimensional, swipeDuration, ...rest } = props;
     const [chooseValueData, setchooseValueData] = useState([]); // 选择的数据的 value 值, 每一条数据的 value 值
     const [columnIndex, setcolumnIndex] = useState(0); // 选中列
     const pickerRef = useRef(null);
@@ -245,82 +245,52 @@ const InternalPicker = (props, ref) => {
     const [columnsList, setColumnsList] = useState([]); // 格式化后每一列的数据
     const b = cn('picker');
     const isConfirmEvent = useRef(false);
-    // 级联数据格式化
-    const formatCascade = (columns, values) => {
-        const formatted = [];
-        let cursor = {
-            text: '',
-            value: '',
-            children: columns,
-        };
-        let columnIndex = 0;
-        while (cursor && cursor.children) {
-            const options = cursor.children;
-            const value = values[columnIndex];
-            let index = options.findIndex((columnItem) => columnItem.value === value);
-            if (index === -1)
-                index = 0;
-            cursor = cursor.children[index];
-            columnIndex++;
-            formatted.push(options);
-        }
-        return formatted;
-    };
-    // 每一列的类型
-    const columnsType = () => {
-        const firstColumn = listData[0];
-        if (firstColumn) {
-            if (Array.isArray(firstColumn)) {
-                return 'multiple';
-            }
-            if ('children' in firstColumn) {
-                return 'cascade';
-            }
-        }
-        return 'single';
-    };
-    // 传入的数据格式化
-    const normalListData = () => {
-        const type = columnsType();
-        switch (type) {
-            case 'multiple':
-                return listData;
-            case 'cascade':
-                // 级联数据处理
-                return formatCascade(listData, chooseValueData);
-            default:
-                return [listData];
-        }
-    };
-    const init = () => {
-        // const data: (string | number)[] = []
-        const normalData = normalListData();
-        setColumnsList(normalData);
-        // normalData.length > 0 &&
-        //   normalData.map((item) => {
-        //     item[0] && data.push(item[0].value)
-        //     return item
-        //   })
-        // 为何要重置呢？
-        // if (!defaultValueData && chooseValueData.length === 0) {
-        //   setchooseValueData([...data])
-        // }
-    };
-    // 列表格式修改
-    useEffect(() => {
-        init();
-    }, [listData]);
     // 默认值修改
     useEffect(() => {
         if (defaultValueData &&
             defaultValueData.length !== 0 &&
-            defaultValueData.toString() !== chooseValueData.toString() &&
-            !currentValue.length) {
+            defaultValueData.toString() !== chooseValueData.toString()) {
             const data = [...defaultValueData];
             setchooseValueData(data);
             setColumnsList(normalListData());
         }
     }, [defaultValueData]);
+    // 选中值进行修改
+    useEffect(() => {
+        onChange && onChange(columnIndex, chooseValueData, selectedOptions());
+        if (isConfirmEvent.current) {
+            isConfirmEvent.current = false;
+            onConfirm && onConfirm(chooseValueData, selectedOptions());
+        }
+    }, [chooseValueData]);
+    // 列表格式修改
+    useEffect(() => {
+        init();
+    }, [listData]);
+    const closeActionSheet = () => {
+        onClose && onClose(chooseValueData, selectedOptions());
+        onCloseUpdate &&
+            onCloseUpdate(chooseValueData, selectedOptions(), pickerRef);
+    };
+    // 点击确定
+    const confirm = () => {
+        let movings = false;
+        refs.forEach((_ref) => {
+            if (_ref.moving)
+                movings = true;
+            _ref.stopMomentum();
+        });
+        if (movings) {
+            isConfirmEvent.current = true;
+        }
+        else {
+            onConfirm && onConfirm(chooseValueData, selectedOptions());
+        }
+        onClose && onClose(chooseValueData, selectedOptions());
+        setTimeout(() => {
+            isConfirmEvent.current = false;
+        }, 0);
+    };
     const selectedOptions = () => {
         const optins = [];
         columnsList.map((column, index) => {
@@ -336,20 +306,6 @@ const InternalPicker = (props, ref) => {
         });
         return optins;
     };
-    // 选中值进行修改
-    useEffect(() => {
-        Taro.getEnv() !== 'WEB' && setCurrentValue(defaultValuesConvert());
-        onChange && onChange(columnIndex, chooseValueData, selectedOptions());
-        if (isConfirmEvent.current) {
-            isConfirmEvent.current = false;
-            onConfirm && onConfirm(chooseValueData, selectedOptions());
-        }
-    }, [chooseValueData]);
-    const closeActionSheet = () => {
-        onClose && onClose(chooseValueData, selectedOptions());
-        onCloseUpdate &&
-            onCloseUpdate(chooseValueData, selectedOptions(), pickerRef);
-    };
     // 选择每一列的数据
     const chooseItem = (option, columnIndex) => {
         if (option && Object.keys(option).length) {
@@ -364,7 +320,8 @@ const InternalPicker = (props, ref) => {
                         chooseValueData[index + 1] = cursor.children[0].value;
                         setchooseValueData([...chooseValueData]);
                         index++;
-                        cursor = cursor.children[0];
+                        const cc = cursor.children[0];
+                        cursor = cc;
                     }
                     // 当前改变列的下一列 children 值为空
                     if (cursor && cursor.children) {
@@ -386,24 +343,65 @@ const InternalPicker = (props, ref) => {
             }
         }
     };
-    // 点击确定
-    const confirm = () => {
-        let movings = false;
-        refs.forEach((_ref) => {
-            if (_ref.moving)
-                movings = true;
-            _ref.stopMomentum();
-        });
-        if (movings) {
-            isConfirmEvent.current = true;
+    // 传入的数据格式化
+    const normalListData = () => {
+        const type = columnsType();
+        switch (type) {
+            case 'multiple':
+                return listData;
+            case 'cascade':
+                // 级联数据处理
+                return formatCascade(listData, chooseValueData);
+            default:
+                return [listData];
         }
-        else {
-            onConfirm && onConfirm(chooseValueData, selectedOptions());
+    };
+    // 每一列的类型
+    const columnsType = () => {
+        const firstColumn = listData[0];
+        if (firstColumn) {
+            if (Array.isArray(firstColumn)) {
+                return 'multiple';
+            }
+            if ('children' in firstColumn) {
+                return 'cascade';
+            }
+        }
+        return 'single';
+    };
+    // 级联数据格式化
+    const formatCascade = (columns, defaultValues) => {
+        const formatted = [];
+        let cursor = {
+            text: '',
+            value: '',
+            children: columns,
+        };
+        let columnIndex = 0;
+        while (cursor && cursor.children) {
+            const options = cursor.children;
+            const value = defaultValues[columnIndex];
+            let index = options.findIndex((columnItem) => columnItem.value === value);
+            if (index === -1)
+                index = 0;
+            cursor = cursor.children[index];
+            columnIndex++;
+            formatted.push(options);
+        }
+        return formatted;
+    };
+    const init = () => {
+        const data = [];
+        const normalData = normalListData();
+        setColumnsList(normalData);
+        normalData.length > 0 &&
+            normalData.map((item) => {
+                item[0] && data.push(item[0].value);
+                return item;
+            });
+        if (!defaultValueData && chooseValueData.length === 0) {
+            setchooseValueData([...data]);
         }
-        onClose && onClose(chooseValueData, selectedOptions());
-        setTimeout(() => {
-            isConfirmEvent.current = false;
-        }, 0);
     };
     const renderToolbar = () => {
         return (React__default.createElement("div", { className: b('control') },
@@ -411,62 +409,14 @@ const InternalPicker = (props, ref) => {
             React__default.createElement("div", { className: b('title') }, title || ''),
             React__default.createElement("span", { className: b('confirm-btn'), onClick: confirm }, locale.confirm)));
     };
-    const [currentValue, setCurrentValue] = useState([]);
-    const [pickingStatus, setPickingStatus] = useState(false);
-    const defaultValuesConvert = () => {
-        const defaultIndexs = [];
-        if (chooseValueData.length > 0) {
-            chooseValueData.forEach((value, index) => {
-                for (let i = 0; i < columnsList[index].length; i++) {
-                    if (columnsList[index][i].value === value) {
-                        defaultIndexs.push(i);
-                        break;
-                    }
-                }
-            });
-        }
-        else if (columnsList && columnsList.length > 0) {
-            columnsList.forEach((item) => {
-                defaultIndexs.push(0);
-                item.length > 0 && chooseValueData.push(item[0].value);
-            });
-        }
-        return defaultIndexs;
-    };
-    const pickerStart = () => {
-        setPickingStatus(true);
-    };
-    const pickerEnd = () => {
-        setPickingStatus(false);
-    };
-    const pickerChange = (data) => {
-        const prevDefaultValue = currentValue;
-        let changeIndex = 0;
-        console.log('chage', data);
-        // 判断变化的是第几个
-        const list = data.detail.value;
-        for (let i = 0, len = list.length; i < len; i++) {
-            if (prevDefaultValue[i] !== list[i]) {
-                changeIndex = i;
-                break;
-            }
-        }
-        // 选择的是哪个 option
-        chooseItem(columnsList[changeIndex][data.detail.value[changeIndex]], changeIndex);
-    };
-    return (React__default.createElement(Popup, { visible: isVisible, position: "bottom", onClose: () => {
+    return (React__default.createElement(Popup, { visible: visible, position: "bottom", onClose: () => {
             closeActionSheet();
         } },
         React__default.createElement(View, { className: `${b()} ${className || ''}`, style: style, ...rest, catchMove: true },
             renderToolbar(),
-            React__default.createElement("div", { className: b('panel'), ref: pickerRef }, Taro.getEnv() === 'WEB' ? (columnsList?.map((item, index) => {
-                return (React__default.createElement(PickerSlot, { ref: setRefs(index), defaultValue: chooseValueData?.[index], listData: item, threeDimensional: threeDimensional, chooseItem: (value, index) => chooseItem(value, index), swipeDuration: swipeDuration, key: index, keyIndex: index, itemShow: isVisible }));
-            })) : (React__default.createElement(PickerView, { ref: pickerRef, value: currentValue, immediateChange: true, onPickStart: pickerStart, onChange: pickerChange, onPickEnd: pickerEnd, className: "picker-view-panel" }, columnsList?.map((column, index) => {
-                return (React__default.createElement(PickerViewColumn, { key: `col${index}` }, column.map((item, index) => {
-                    return (React__default.createElement(View, { key: item.value || index, className: "nut-picker-roller-item-title" },
-                        React__default.createElement(React__default.Fragment, null, item.text || item)));
-                })));
-            })))))));
+            React__default.createElement("div", { className: b('panel'), ref: pickerRef }, columnsList?.map((item, index) => {
+                return (React__default.createElement(PickerSlot, { ref: setRefs(index), defaultValue: chooseValueData?.[index], listData: item, threeDimensional: threeDimensional, chooseItem: (value, index) => chooseItem(value, index), swipeDuration: swipeDuration, key: index, keyIndex: index, itemShow: visible }));
+            })))));
 };
 const Picker = React__default.forwardRef(InternalPicker);
 

package/dist/esm/{popover.taro-ad5e76ea.js → popover.taro-2a57eae4.js}

@@ -1,8 +1,7 @@
 import React__default, { useRef, useState, useEffect } from 'react';
-import { I as Icon } from './icon.taro-296a1bec.js';
-import { O as Overlay } from './overlay.taro-21e87fb1.js';
-import { g as getRectByTaro } from './useClientRect-1f8ed1fe.js';
-import { C as ComponentDefaults } from './typings-b9828dba.js';
+import { O as Overlay } from './overlay.taro-ad0d4775.js';
+import { g as getRectByTaro } from './use-client-rect-1f8ed1fe.js';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 /**
  * 过滤ref
@@ -66,7 +65,7 @@ const defaultProps = {
     onChoose: (item, index) => { },
 };
 const Popover = (props) => {
-    const { children, list, theme, location, visible, offset, className, style, onClick, onChoose, iconClassPrefix, iconFontClassName, ...reset } = {
+    const { children, list, theme, location, visible, offset, className, style, onClick, onChoose, ...reset } = {
         ...defaultProps,
         ...props,
     };
@@ -139,16 +138,14 @@ const Popover = (props) => {
                     visible ? (React__default.createElement("div", { className: `${popoverContent}`, style: getStyle() },
                         React__default.createElement("div", { className: `${popoverArrow}` }),
                         Array.isArray(children) ? children[1] : '',
-                        React__default.createElement("div", null,
-                            ' ',
-                            list.map((item, i) => {
-                                return (React__default.createElement("div", { key: item.name, className: `popover-menu-item ${item.disabled ? 'disabled' : ''}`, onClick: () => {
-                                        handleChoose(item, i);
-                                    } },
-                                    item.icon ? (React__default.createElement(Icon, { classPrefix: iconClassPrefix, fontClassName: iconFontClassName, className: "popover-menu-item-img", name: item.icon })) : (''),
-                                    React__default.createElement("div", { className: "popover-menu-item-name" }, item.name)));
-                            })))) : null))),
-        visible ? (React__default.createElement(Overlay, { visible: visible, onClick: (e) => handleClick(e), style: { background: 'transparent' } })) : ('')));
+                        React__default.createElement("div", null, list.map((item, i) => {
+                            return (React__default.createElement("div", { key: item.name, className: `popover-menu-item ${item.disabled ? 'disabled' : ''}`, onClick: () => {
+                                    handleChoose(item, i);
+                                } },
+                                item.icon ? item.icon : null,
+                                React__default.createElement("div", { className: "popover-menu-item-name" }, item.name)));
+                        })))) : null))),
+        visible ? (React__default.createElement(Overlay, { visible: visible, onClick: (e) => handleClick(e), style: { background: 'transparent' } })) : null));
 };
 Popover.defaultProps = defaultProps;
 Popover.displayName = 'NutPopover';

package/dist/esm/{popup.taro-01676bff.js → popup.taro-020bf791.js}

@@ -2,41 +2,38 @@ import React__default, { useState, useEffect } from 'react';
 import { createPortal } from 'react-dom';
 import { CSSTransition } from 'react-transition-group';
 import classNames from 'classnames';
-import { d as defaultOverlayProps, O as Overlay } from './overlay.taro-21e87fb1.js';
-import { I as Icon } from './icon.taro-296a1bec.js';
-import { c as cn } from './bem-350c1702.js';
-import { C as ComponentDefaults } from './typings-b9828dba.js';
+import { Close } from '@nutui/icons-react-taro';
+import { View } from '@tarojs/components';
+import { d as defaultOverlayProps, O as Overlay } from './overlay.taro-ad0d4775.js';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 const defaultProps = {
     ...ComponentDefaults,
     position: 'center',
     transition: '',
-    style: {},
-    popClass: '',
+    overlayStyle: {},
+    overlayClassName: '',
     closeable: false,
     closeIconPosition: 'top-right',
     closeIcon: 'close',
-    closeIconSize: '12px',
-    destroyOnClose: true,
-    teleport: null,
+    destroyOnClose: false,
+    portal: null,
     overlay: true,
     round: false,
     onOpen: () => { },
     onClose: () => { },
-    onOpened: (e) => { },
-    onClosed: (e) => { },
-    onClickOverlay: (e) => { },
-    onClickCloseIcon: (e) => { },
+    onClickOverlay: (e) => true,
+    onClickCloseIcon: (e) => true,
     ...defaultOverlayProps,
 };
 let _zIndex = 2000;
 const Popup = (props) => {
-    const { children, visible, overlay, closeOnClickOverlay, overlayStyle, overlayClass, zIndex, lockScroll, duration, closeable, closeIconPosition, closeIcon, style, transition, round, position, popClass, className, destroyOnClose, teleport, onOpen, onClose, onClickOverlay, onClickCloseIcon, onOpened, onClosed, onClick, iconClassPrefix, iconFontClassName, closeIconSize, } = props;
+    const { children, visible, overlay, closeOnOverlayClick, overlayStyle, overlayClassName, zIndex, lockScroll, duration, closeable, closeIconPosition, closeIcon, style, transition, round, position, className, destroyOnClose, portal, onOpen, onClose, onClickOverlay, onClickCloseIcon, afterShow, afterClose, onClick, } = props;
     const [index, setIndex] = useState(zIndex || _zIndex);
     const [innerVisible, setInnerVisible] = useState(visible);
     const [showChildren, setShowChildren] = useState(true);
     const [transitionName, setTransitionName] = useState('');
-    const b = cn('popup');
+    const classPrefix = 'nut-popup';
     const baseStyle = {
         zIndex: index,
         animationDuration: `${duration}s`,
@@ -49,15 +46,15 @@ const Popup = (props) => {
         ...style,
         ...baseStyle,
     };
-    const classes = classNames({
+    const popClassName = classNames({
         round,
-        [`nut-popup-${position}`]: true,
-        [`${popClass}`]: true,
+        [`${classPrefix}`]: true,
+        [`${classPrefix}-${position}`]: true,
         [`${className || ''}`]: true,
-    }, b(''));
+    });
     const closeClasses = classNames({
-        'nut-popup__close-icon': true,
-        [`nut-popup__close-icon--${closeIconPosition}`]: true,
+        [`${classPrefix}__close-icon`]: true,
+        [`${classPrefix}__close-icon--${closeIconPosition}`]: true,
     });
     const open = () => {
         if (!innerVisible) {
@@ -75,29 +72,29 @@ const Popup = (props) => {
             if (destroyOnClose) {
                 setTimeout(() => {
                     setShowChildren(false);
-                    onClose && onClose();
                 }, Number(duration) * 1000);
             }
+            onClose && onClose();
         }
     };
     const onHandleClickOverlay = (e) => {
-        if (closeOnClickOverlay) {
-            onClickOverlay && onClickOverlay(e);
-            close();
+        if (closeOnOverlayClick) {
+            const closed = onClickOverlay && onClickOverlay(e);
+            closed && close();
         }
     };
     const onHandleClick = (e) => {
         onClick && onClick(e);
     };
     const onHandleClickCloseIcon = (e) => {
-        onClickCloseIcon && onClickCloseIcon(e);
-        close();
+        const closed = onClickCloseIcon && onClickCloseIcon(e);
+        closed && close();
     };
     const onHandleOpened = (e) => {
-        onOpened && onOpened(e);
+        afterShow && afterShow();
     };
     const onHandleClosed = (e) => {
-        onClosed && onClosed(e);
+        afterClose && afterClose();
     };
     const resolveContainer = (getContainer) => {
         const container = typeof getContainer === 'function' ? getContainer() : getContainer;
@@ -110,16 +107,21 @@ const Popup = (props) => {
         }
         return node;
     };
+    const renderIcon = () => {
+        if (closeable) {
+            return (React__default.createElement(View, { className: closeClasses, onClick: onHandleClickCloseIcon }, React__default.isValidElement(closeIcon) ? (closeIcon) : (React__default.createElement(Close, { width: 12, height: 12 }))));
+        }
+        return null;
+    };
     const renderPop = () => {
         return (React__default.createElement(CSSTransition, { classNames: transitionName, unmountOnExit: true, timeout: 500, in: innerVisible, onEntered: onHandleOpened, onExited: onHandleClosed },
-            React__default.createElement("div", { style: popStyles, className: classes, onClick: onHandleClick },
+            React__default.createElement(View, { style: popStyles, className: popClassName, onClick: onHandleClick },
                 showChildren ? children : '',
-                closeable ? (React__default.createElement("div", { className: closeClasses, onClick: onHandleClickCloseIcon },
-                    React__default.createElement(Icon, { classPrefix: iconClassPrefix, fontClassName: iconFontClassName, name: closeIcon, size: closeIconSize }))) : (''))));
+                renderIcon())));
     };
     const renderNode = () => {
         return (React__default.createElement(React__default.Fragment, null, overlay ? (React__default.createElement(React__default.Fragment, null,
-            React__default.createElement(Overlay, { style: overlayStyles, overlayClass: overlayClass, visible: innerVisible, closeOnClickOverlay: closeOnClickOverlay, zIndex: zIndex, lockScroll: lockScroll, duration: duration, onClick: onHandleClickOverlay }),
+            React__default.createElement(Overlay, { style: overlayStyles, className: overlayClassName, visible: innerVisible, closeOnOverlayClick: closeOnOverlayClick, zIndex: zIndex, lockScroll: lockScroll, duration: duration, onClick: onHandleClickOverlay }),
             renderPop())) : (React__default.createElement(React__default.Fragment, null, renderPop()))));
     };
     useEffect(() => {
@@ -127,9 +129,9 @@ const Popup = (props) => {
         !visible && close();
     }, [visible]);
     useEffect(() => {
-        setTransitionName(transition || `nut-popup-slide-${position}`);
-    }, [position]);
-    return React__default.createElement(React__default.Fragment, null, renderToContainer(teleport, renderNode()));
+        setTransitionName(transition || `${classPrefix}-slide-${position}`);
+    }, [position, transition]);
+    return React__default.createElement(React__default.Fragment, null, renderToContainer(portal, renderNode()));
 };
 Popup.defaultProps = defaultProps;
 Popup.displayName = 'NutPopup';

package/dist/esm/{progress.taro-f0ce38e9.js → progress.taro-24392ef3.js}

@@ -1,8 +1,8 @@
 import React__default from 'react';
 import classNames from 'classnames';
-import { I as Icon } from './icon.taro-296a1bec.js';
+import { Checked } from '@nutui/icons-react-taro';
 import { c as cn } from './bem-350c1702.js';
-import { C as ComponentDefaults } from './typings-b9828dba.js';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 
 const defaultProps = {
     ...ComponentDefaults,
@@ -20,13 +20,11 @@ const defaultProps = {
     textBackground: 'linear-gradient(135deg, #fa2c19 0%, #fa6419 100%)',
     textType: 'text',
     status: false,
-    iconName: 'checked',
-    iconColor: '#439422',
-    iconSize: '16px',
+    icon: null,
     children: undefined,
 };
 const Progress = (props) => {
-    const { className, style, isShowPercentage, percentage, fillColor, strokeColor, strokeWidth, size, textColor, textWidth, showText, textInside, textBackground, textType, status, iconName, iconColor, iconSize, children, iconClassPrefix, iconFontClassName, ...rest } = {
+    const { className, style, isShowPercentage, percentage, fillColor, strokeColor, strokeWidth, size, textColor, textWidth, showText, textInside, textBackground, textType, status, icon, children, ...rest } = {
         ...defaultProps,
         ...props,
     };
@@ -82,7 +80,7 @@ const Progress = (props) => {
             textType === 'text' && (React__default.createElement("span", { className: classesTextInner, style: { color: textColor } },
                 percentage,
                 isShowPercentage ? '%' : '')),
-            textType === 'icon' && (React__default.createElement(Icon, { classPrefix: iconClassPrefix, fontClassName: iconFontClassName, size: iconSize, name: iconName, color: iconColor }))))));
+            textType === 'icon' && (React__default.createElement(React__default.Fragment, null, icon || React__default.createElement(Checked, { width: 16, height: 16, color: "#439422" })))))));
 };
 Progress.defaultProps = defaultProps;
 Progress.displayName = 'NutProgress';

package/dist/esm/{pulltorefresh.taro-a294f656.js → pulltorefresh.taro-d5fcfcb0.js}

@@ -1,7 +1,7 @@
 import React__default, { useState, useRef, useEffect } from 'react';
 import { useDrag } from '@use-gesture/react';
 import { useSpring, animated } from '@react-spring/web';
-import { u as useConfig } from './configprovider.taro-8d71eb49.js';
+import { u as useConfig } from './configprovider.taro-c8c54556.js';
 import { g as getScrollParent } from './get-scroll-parent-b4a07e65.js';
 import { p as passiveSupported } from './supports-passive-c85ef996.js';
 

package/dist/esm/{radio.taro-a6eff96c.js → radio.taro-51e10152.js}

@@ -1,6 +1,6 @@
 import React__default, { useState, useEffect, useCallback, useContext } from 'react';
-import { I as Icon } from './icon.taro-296a1bec.js';
-import { C as ComponentDefaults } from './typings-b9828dba.js';
+import { CheckChecked, CheckNormal } from '@nutui/icons-react-taro';
+import { C as ComponentDefaults } from './typings-d8491423.js';
 import { c as cn } from './bem-350c1702.js';
 
 const radioContext = {
@@ -100,8 +100,8 @@ const defaultProps = {
     shape: 'round',
     value: '',
     textPosition: 'right',
-    iconName: 'check-normal',
-    iconActiveName: 'check-checked',
+    icon: null,
+    checkedIcon: null,
     iconSize: 18,
     onChange: (e) => { },
 };
@@ -110,7 +110,7 @@ const Radio = (props) => {
         ...defaultProps,
         ...props,
     };
-    const { className, disabled, checked, shape, textPosition, value, iconName, iconActiveName, iconSize, onChange, iconClassPrefix, iconFontClassName, ...rest } = props;
+    const { className, disabled, checked, shape, textPosition, value, icon, checkedIcon, iconSize, onChange, ...rest } = props;
     const componentName = 'nut-radio';
     const [checkedStatement, setCheckedStatement] = useState(checked);
     const [valueStatement, setValueStatement] = useState(value);
@@ -139,8 +139,17 @@ const Radio = (props) => {
         return 'nut-radio__icon--unchecked';
     };
     const renderIcon = () => {
-        const { iconName, iconSize, iconActiveName } = props;
-        return (React__default.createElement(Icon, { classPrefix: iconClassPrefix, fontClassName: iconFontClassName, name: !disabledStatement && checkedStatement ? iconActiveName : iconName, size: iconSize, className: color() }));
+        const { icon, iconSize, checkedIcon } = props;
+        if (!disabledStatement && checkedStatement) {
+            return React__default.isValidElement(checkedIcon) ? (React__default.cloneElement(checkedIcon, {
+                ...checkedIcon.props,
+                className: color(),
+            })) : (React__default.createElement(CheckChecked, { size: iconSize, className: color() }));
+        }
+        return React__default.isValidElement(icon) ? (React__default.cloneElement(icon, {
+            ...icon.props,
+            className: color(),
+        })) : (React__default.createElement(CheckNormal, { size: iconSize, className: color() }));
     };
     const reverseState = textPosition === 'left';
     const renderRadioItem = () => {