@nutui/nutui-react-taro 2.3.11 → 2.4.0

package/dist/esm/{picker.taro-csU3SZPF.js → picker.taro-Cmng9GW9.js}

@@ -1,15 +1,16 @@
+import { a as __awaiter, _ as __rest } from "./tslib.es6-BZ8i9Q6l.js";
 import React__default, { useState, useRef, useEffect, useImperativeHandle } from "react";
 import classNames from "classnames";
 import Taro from "@tarojs/taro";
 import { View, PickerView, PickerViewColumn } from "@tarojs/components";
-import { P as Popup } from "./popup.taro-ObEUml4r.js";
-import { u as useTouch } from "./use-touch-BUFdkOSA.js";
-import { g as getRectByTaro } from "./get-rect-by-taro-piSHvCGp.js";
-import { p as passiveSupported } from "./overlay.taro-HsGeVyPh.js";
-import { u as useRefs } from "./use-refs-IdrY0ww3.js";
-import { u as useConfig } from "./configprovider.taro-q5J2gQbi.js";
-import { u as usePropsValue } from "./use-props-value-vKr0R0AX.js";
-import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
+import { P as Popup } from "./popup.taro-Iy_WQZ-m.js";
+import { u as useTouch } from "./use-touch-OfEaR5qi.js";
+import { g as getRectByTaro } from "./get-rect-by-taro-CSN0TGnD.js";
+import { p as passiveSupported } from "./overlay.taro-BaBu-3-F.js";
+import { u as useRefs } from "./use-refs-BeEmziIR.js";
+import { u as useConfig } from "./configprovider.taro-CyU_tvNJ.js";
+import { u as usePropsValue } from "./use-props-value-SH9krhkx.js";
+import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
 const InternalPickerPanel = (props, ref) => {
   const { keyIndex = 0, defaultValue, options = [], threeDimensional = true, duration = 1e3, itemShow = false, chooseItem } = props;
   const touch = useTouch();
@@ -71,7 +72,7 @@ const InternalPickerPanel = (props, ref) => {
     }
   };
   const setChooseValue = (move) => {
-    chooseItem == null ? void 0 : chooseItem(options == null ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
+    chooseItem === null || chooseItem === void 0 ? void 0 : chooseItem(options === null || options === void 0 ? void 0 : options[Math.round(-move / lineSpacing.current)], keyIndex);
   };
   const touchStart = (event) => {
     touch.start(event);
@@ -143,11 +144,11 @@ const InternalPickerPanel = (props, ref) => {
       event.stopPropagation();
     }
   };
-  const getReference = async () => {
-    const refe = await getRectByTaro(listRef == null ? void 0 : listRef.current);
+  const getReference = () => __awaiter(void 0, void 0, void 0, function* () {
+    const refe = yield getRectByTaro(listRef === null || listRef === void 0 ? void 0 : listRef.current);
     lineSpacing.current = refe.height ? refe.height : 36;
     modifyStatus(true);
-  };
+  });
   const touchRollerStyle = () => {
     return {
       transition: `transform ${touchTime}ms cubic-bezier(0.17, 0.89, 0.45, 1)`,
@@ -225,20 +226,10 @@ const InternalPickerPanel = (props, ref) => {
 };
 const PickerPanel = React__default.forwardRef(InternalPickerPanel);
 const PickerPanel$1 = PickerPanel;
-const defaultProps = {
-  ...ComponentDefaults,
-  visible: false,
-  title: "",
-  options: [],
-  value: [],
-  defaultValue: [],
-  threeDimensional: true,
-  closeOnOverlayClick: true,
-  duration: 1e3
-};
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { visible: false, title: "", options: [], value: [], defaultValue: [], threeDimensional: true, closeOnOverlayClick: true, duration: 1e3 });
 const InternalPicker = (props, ref) => {
   const { locale } = useConfig();
-  const { children, visible, title, options = [], closeOnOverlayClick, popupProps = {}, defaultValue = [], className, style, threeDimensional, duration, onConfirm, onCancel, onClose, afterClose, onChange, ...rest } = { ...defaultProps, ...props };
+  const _a = Object.assign(Object.assign({}, defaultProps), props), { children, visible, title, options = [], closeOnOverlayClick, popupProps = {}, defaultValue = [], className, style, threeDimensional, duration, onConfirm, onCancel, onClose, afterClose, onChange } = _a, rest = __rest(_a, ["children", "visible", "title", "options", "closeOnOverlayClick", "popupProps", "defaultValue", "className", "style", "threeDimensional", "duration", "onConfirm", "onCancel", "onClose", "afterClose", "onChange"]);
   const classPrefix = "nut-picker";
   const classes = classNames(classPrefix, className);
   const [selectedValue, setSelectedValue] = usePropsValue({
@@ -246,8 +237,8 @@ const InternalPicker = (props, ref) => {
     defaultValue: [...defaultValue],
     finalValue: [...defaultValue],
     onChange: (val) => {
-      var _a;
-      (_a = props.onConfirm) == null ? void 0 : _a.call(props, setSelectedOptions(), val);
+      var _a2;
+      (_a2 = props.onConfirm) === null || _a2 === void 0 ? void 0 : _a2.call(props, setSelectedOptions(), val);
     }
   });
   const [innerVisible, setInnerVisible] = usePropsValue({
@@ -255,8 +246,8 @@ const InternalPicker = (props, ref) => {
     defaultValue: false,
     finalValue: false,
     onChange: (val) => {
-      var _a;
-      (_a = props.onClose) == null ? void 0 : _a.call(props, setSelectedOptions(), innerValue);
+      var _a2;
+      (_a2 = props.onClose) === null || _a2 === void 0 ? void 0 : _a2.call(props, setSelectedOptions(), innerValue);
     }
   });
   const [innerValue, setInnerValue] = useState(selectedValue);
@@ -362,8 +353,8 @@ const InternalPicker = (props, ref) => {
     const defaultIndexs = [];
     if (innerValue.length > 0) {
       innerValue.forEach((value, index) => {
-        var _a;
-        for (let i = 0; i < ((_a = columnsList == null ? void 0 : columnsList[index]) == null ? void 0 : _a.length); i++) {
+        var _a2;
+        for (let i = 0; i < ((_a2 = columnsList === null || columnsList === void 0 ? void 0 : columnsList[index]) === null || _a2 === void 0 ? void 0 : _a2.length); i++) {
           if (columnsList[index][i].value === value) {
             defaultIndexs.push(i);
             break;
@@ -379,19 +370,19 @@ const InternalPicker = (props, ref) => {
     return defaultIndexs;
   };
   const chooseItem = (columnOptions, columnIndex2) => {
-    var _a, _b;
+    var _a2, _b;
     const values = [];
     const start = columnIndex2;
     if (columnOptions && Object.keys(columnOptions).length) {
       if (values[columnIndex2] !== columnOptions.value) {
         if (columnsType() === "cascade") {
           values[columnIndex2] = columnOptions.value || "";
-          while ((_a = columnOptions == null ? void 0 : columnOptions.children) == null ? void 0 : _a[0]) {
+          while ((_a2 = columnOptions === null || columnOptions === void 0 ? void 0 : columnOptions.children) === null || _a2 === void 0 ? void 0 : _a2[0]) {
             values[columnIndex2 + 1] = columnOptions.children[0].value;
             columnIndex2++;
             columnOptions = columnOptions.children[0];
           }
-          if ((_b = columnOptions == null ? void 0 : columnOptions.children) == null ? void 0 : _b.length) {
+          if ((_b = columnOptions === null || columnOptions === void 0 ? void 0 : columnOptions.children) === null || _b === void 0 ? void 0 : _b.length) {
             values[columnIndex2 + 1] = "";
           }
           const combineResult = [
@@ -434,7 +425,7 @@ const InternalPicker = (props, ref) => {
       { className: `${classPrefix}-control` },
       React__default.createElement("span", { className: `${classPrefix}-cancel-btn`, onClick: (e) => {
         e.stopPropagation();
-        onCancel == null ? void 0 : onCancel();
+        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
         setInnerVisible(false);
       } }, locale.cancel),
       React__default.createElement("div", { className: `${classPrefix}-title` }, title || ""),
@@ -469,23 +460,23 @@ const InternalPicker = (props, ref) => {
     typeof children === "function" && children(selectedValue),
     React__default.createElement(
       Popup,
-      { ...popupProps, visible: innerVisible, position: "bottom", onOverlayClick: () => {
-        var _a;
+      Object.assign({}, popupProps, { visible: innerVisible, position: "bottom", onOverlayClick: () => {
+        var _a2;
         if (closeOnOverlayClick) {
-          (_a = props.onCancel) == null ? void 0 : _a.call(props);
+          (_a2 = props.onCancel) === null || _a2 === void 0 ? void 0 : _a2.call(props);
           setInnerVisible(false);
         }
       }, afterClose: () => {
-        afterClose == null ? void 0 : afterClose(setSelectedOptions(), innerValue, pickerRef);
-      } },
+        afterClose === null || afterClose === void 0 ? void 0 : afterClose(setSelectedOptions(), innerValue, pickerRef);
+      } }),
       React__default.createElement(
         View,
-        { className: classes, style, ...rest, catchMove: true },
+        Object.assign({ className: classes, style }, rest, { catchMove: true }),
         renderTitleBar(),
         typeof children !== "function" && children,
-        React__default.createElement("div", { className: `${classPrefix}-panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList == null ? void 0 : columnsList.map((item, index) => {
-          return React__default.createElement(PickerPanel$1, { ref: setRefs(index), defaultValue: innerValue == null ? void 0 : innerValue[index], options: item, threeDimensional, chooseItem: (value, index2) => chooseItem(value, index2), duration, key: index, keyIndex: index, itemShow: visible });
-        }) : React__default.createElement(PickerView, { ref: pickerRef, value: currentValue, immediateChange: true, onPickStart: pickerStart, onChange: pickerChange, onPickEnd: pickerEnd, indicatorClass: "nut-picker-indicator-taro", className: "nut-picker-view-panel" }, columnsList == null ? void 0 : columnsList.map((columnOptions, index) => {
+        React__default.createElement("div", { className: `${classPrefix}-panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList === null || columnsList === void 0 ? void 0 : columnsList.map((item, index) => {
+          return React__default.createElement(PickerPanel$1, { ref: setRefs(index), defaultValue: innerValue === null || innerValue === void 0 ? void 0 : innerValue[index], options: item, threeDimensional, chooseItem: (value, index2) => chooseItem(value, index2), duration, key: index, keyIndex: index, itemShow: visible });
+        }) : React__default.createElement(PickerView, { ref: pickerRef, value: currentValue, immediateChange: true, onPickStart: pickerStart, onChange: pickerChange, onPickEnd: pickerEnd, indicatorClass: "nut-picker-indicator-taro", className: "nut-picker-view-panel" }, columnsList === null || columnsList === void 0 ? void 0 : columnsList.map((columnOptions, index) => {
           return React__default.createElement(PickerViewColumn, { key: `col${index}` }, columnOptions.map((item, index2) => {
             return React__default.createElement(
               View,

package/dist/esm/{popover.taro-qldQwLPC.js → popover.taro-BsOaXoWp.js}

@@ -1,35 +1,17 @@
+import { _ as __rest, a as __awaiter } from "./tslib.es6-BZ8i9Q6l.js";
 import React__default, { useRef, useState, useEffect } from "react";
 import classNames from "classnames";
 import Taro, { createSelectorQuery } from "@tarojs/taro";
-import { P as Popup } from "./popup.taro-ObEUml4r.js";
-import { a as getRect, g as getRectByTaro } from "./get-rect-by-taro-piSHvCGp.js";
-import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
-const defaultProps = {
-  ...ComponentDefaults,
-  list: [],
-  location: "bottom",
-  visible: false,
-  offset: [0, 12],
-  arrowOffset: 0,
-  targetId: "",
-  className: "",
-  showArrow: true,
-  overlay: false,
-  closeOnOutsideClick: true,
-  closeOnActionClick: true,
-  onClick: () => {
-  },
-  onOpen: () => {
-  },
-  onClose: () => {
-  }
-};
+import { P as Popup } from "./popup.taro-Iy_WQZ-m.js";
+import { a as getRect, g as getRectByTaro } from "./get-rect-by-taro-CSN0TGnD.js";
+import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { list: [], theme: "light", location: "bottom", visible: false, offset: [0, 12], arrowOffset: 0, targetId: "", className: "", showArrow: true, closeOnOutsideClick: true, closeOnActionClick: true, overlay: false, onClick: () => {
+}, onOpen: () => {
+}, onClose: () => {
+} });
 const classPrefix = `nut-popover`;
 const Popover = (props) => {
-  const { children, list, location, visible, offset, targetId, overlay, closeOnOutsideClick, closeOnActionClick, className, showArrow, arrowOffset, style, onClick, onOpen, onClose, onSelect, ...rest } = {
-    ...defaultProps,
-    ...props
-  };
+  const _a = Object.assign(Object.assign({}, defaultProps), props), { children, list, theme, location, visible, offset, arrowOffset, targetId, overlay, closeOnOutsideClick, closeOnActionClick, className, showArrow, style, onClick, onOpen, onClose, onSelect } = _a, rest = __rest(_a, ["children", "list", "theme", "location", "visible", "offset", "arrowOffset", "targetId", "overlay", "closeOnOutsideClick", "closeOnActionClick", "className", "showArrow", "style", "onClick", "onOpen", "onClose", "onSelect"]);
   const popoverRef = useRef(null);
   const popoverContentRef = useRef(null);
   const [showPopup, setShowPopup] = useState(false);
@@ -44,18 +26,18 @@ const Popover = (props) => {
       }, 0);
     }
   }, [visible]);
-  const getContentWidth = async () => {
+  const getContentWidth = () => __awaiter(void 0, void 0, void 0, function* () {
     let rect;
-    createSelectorQuery().selectViewport().scrollOffset(async (res) => {
+    createSelectorQuery().selectViewport().scrollOffset((res) => __awaiter(void 0, void 0, void 0, function* () {
       const distance = res.scrollTop;
       if (targetId) {
         if (Taro.getEnv() === Taro.ENV_TYPE.WEB) {
           rect = getRect(document.querySelector(`#${targetId}`));
         } else {
-          rect = await getRectTaro(targetId);
+          rect = yield getRectTaro(targetId);
         }
       } else {
-        rect = await getRectByTaro(popoverRef.current);
+        rect = yield getRectByTaro(popoverRef.current);
       }
       setRootPosition({
         width: rect.width,
@@ -64,12 +46,12 @@ const Popover = (props) => {
         top: rect.top + distance,
         right: rect.right
       });
-    }).exec();
+    })).exec();
     setTimeout(() => {
       getPopoverContentW();
     }, 300);
-  };
-  const getRectTaro = async (targetId2) => {
+  });
+  const getRectTaro = (targetId2) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise((resolve) => {
       const query = createSelectorQuery();
       query.select(`#${targetId2}`) && query.select(`#${targetId2}`).boundingClientRect();
@@ -77,12 +59,12 @@ const Popover = (props) => {
         resolve(res[0]);
       });
     });
-  };
-  const getPopoverContentW = async () => {
-    const rectContent = await getRectByTaro(popoverContentRef.current);
+  });
+  const getPopoverContentW = () => __awaiter(void 0, void 0, void 0, function* () {
+    const rectContent = yield getRectByTaro(popoverContentRef.current);
     setElWidth(rectContent.width);
     setElHeight(rectContent.height);
-  };
+  });
   const clickAway = () => {
     if (closeOnOutsideClick) {
       props.onClick && props.onClick();
@@ -90,7 +72,8 @@ const Popover = (props) => {
     }
   };
   const classes = classNames({
-    [`${classPrefix}`]: true
+    [`${classPrefix}`]: true,
+    [`${classPrefix}-${theme}`]: theme === "dark"
   }, className);
   const popoverArrow = () => {
     const prefixCls = "nut-popover-arrow";
@@ -194,11 +177,12 @@ const Popover = (props) => {
     React__default.Fragment,
     null,
     !targetId && React__default.createElement("div", { className: "nut-popover-wrapper", ref: popoverRef, onClick: () => {
-      props.onClick && props.onClick();
+      var _a2;
+      (_a2 = props === null || props === void 0 ? void 0 : props.onClick) === null || _a2 === void 0 ? void 0 : _a2.call(props);
       if (!visible) {
-        onOpen && onOpen();
+        onOpen === null || onOpen === void 0 ? void 0 : onOpen();
       } else {
-        onClose && onClose();
+        onClose === null || onClose === void 0 ? void 0 : onClose();
       }
     }, style }, Array.isArray(children) ? children[0] : children),
     React__default.createElement(
@@ -206,7 +190,7 @@ const Popover = (props) => {
       { className: classes, style: getRootPosition() },
       React__default.createElement(
         Popup,
-        { className: `nut-popover-content nut-popover-content-${location}`, position: "default", overlay, visible: showPopup, ...rest },
+        Object.assign({ className: `nut-popover-content nut-popover-content-${location}`, position: "default", overlay, visible: showPopup }, rest),
         React__default.createElement(
           "div",
           { className: "nut-popover-content-group", ref: popoverContentRef },
@@ -222,8 +206,8 @@ const Popover = (props) => {
               item.icon ? React__default.createElement("div", { className: "nut-popover-menu-item-icon" }, item.icon) : null,
               React__default.createElement("div", { className: "nut-popover-menu-item-name" }, item.name),
               item.action && item.action.icon ? React__default.createElement("div", { className: "nut-popover-menu-item-action-icon", onClick: (e) => {
-                var _a, _b;
-                return (_b = (_a = item.action) == null ? void 0 : _a.onClick) == null ? void 0 : _b.call(_a, e);
+                var _a2, _b;
+                return (_b = (_a2 = item.action) === null || _a2 === void 0 ? void 0 : _a2.onClick) === null || _b === void 0 ? void 0 : _b.call(_a2, e);
               } }, item.action.icon) : null
             );
           })

package/dist/esm/{popup.taro-ObEUml4r.js → popup.taro-Iy_WQZ-m.js}

@@ -4,32 +4,14 @@ import { CSSTransition } from "react-transition-group";
 import classNames from "classnames";
 import { Close } from "@nutui/icons-react-taro";
 import { View } from "@tarojs/components";
-import { d as defaultOverlayProps, u as useLockScrollTaro, O as Overlay } from "./overlay.taro-HsGeVyPh.js";
-import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
-const defaultProps = {
-  ...ComponentDefaults,
-  position: "center",
-  transition: "",
-  overlayStyle: {},
-  overlayClassName: "",
-  closeable: false,
-  closeIconPosition: "top-right",
-  closeIcon: "close",
-  destroyOnClose: false,
-  portal: null,
-  overlay: true,
-  round: false,
-  onOpen: () => {
-  },
-  onClose: () => {
-  },
-  onOverlayClick: (e) => true,
-  onCloseIconClick: (e) => true,
-  ...defaultOverlayProps
-};
+import { d as defaultOverlayProps, u as useLockScrollTaro, O as Overlay } from "./overlay.taro-BaBu-3-F.js";
+import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
+const defaultProps = Object.assign(Object.assign(Object.assign({}, ComponentDefaults), { position: "center", transition: "", overlayStyle: {}, overlayClassName: "", closeable: false, closeIconPosition: "top-right", closeIcon: "close", destroyOnClose: false, portal: null, overlay: true, round: false, onOpen: () => {
+}, onClose: () => {
+}, onOverlayClick: (e) => true, onCloseIconClick: (e) => true }), defaultOverlayProps);
 const _zIndex = 1100;
 const Popup = (props) => {
-  const { children, visible, overlay, closeOnOverlayClick, overlayStyle, overlayClassName, zIndex, lockScroll, duration, closeable, closeIconPosition, closeIcon, left, title, description, style, transition, round, position, className, destroyOnClose, portal, onOpen, onClose, onOverlayClick, onCloseIconClick, afterShow, afterClose, onClick } = { ...defaultProps, ...props };
+  const { children, visible, overlay, closeOnOverlayClick, overlayStyle, overlayClassName, zIndex, lockScroll, duration, closeable, closeIconPosition, closeIcon, left, title, description, style, transition, round, position, className, destroyOnClose, portal, onOpen, onClose, onOverlayClick, onCloseIconClick, afterShow, afterClose, onClick } = Object.assign(Object.assign({}, defaultProps), props);
   let innerIndex = zIndex || _zIndex;
   const [index, setIndex] = useState(innerIndex);
   const [innerVisible, setInnerVisible] = useState(visible);
@@ -40,14 +22,8 @@ const Popup = (props) => {
   const baseStyle = {
     zIndex: index
   };
-  const overlayStyles = {
-    ...overlayStyle,
-    "--nutui-overlay-zIndex": index
-  };
-  const popStyles = {
-    ...style,
-    ...baseStyle
-  };
+  const overlayStyles = Object.assign(Object.assign({}, overlayStyle), { "--nutui-overlay-zIndex": index });
+  const popStyles = Object.assign(Object.assign({}, style), baseStyle);
   const popClassName = classNames({
     [`${classPrefix}`]: true,
     [`${classPrefix}-round`]: round || position === "bottom",

package/dist/esm/{price.taro-Z1zR8YWV.js → price.taro-UVRHPHRD.js}

@@ -1,20 +1,9 @@
+import { _ as __rest } from "./tslib.es6-BZ8i9Q6l.js";
 import React__default from "react";
-import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
-const defaultProps = {
-  ...ComponentDefaults,
-  price: 0,
-  symbol: "¥",
-  digits: 2,
-  thousands: false,
-  position: "before",
-  size: "large",
-  line: false
-};
+import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { price: 0, symbol: "¥", digits: 2, thousands: false, position: "before", size: "large", line: false });
 const Price = (props) => {
-  const { price, symbol, digits, thousands, position, size, line, className, style, ...rest } = {
-    ...defaultProps,
-    ...props
-  };
+  const _a = Object.assign(Object.assign({}, defaultProps), props), { price, symbol, digits, thousands, position, size, line, className, style } = _a, rest = __rest(_a, ["price", "symbol", "digits", "thousands", "position", "size", "line", "className", "style"]);
   const classPrefix = "nut-price";
   const replaceSpecialChar = (url) => {
     url = url.replace(/"/g, '"');
@@ -65,7 +54,7 @@ const Price = (props) => {
   };
   return React__default.createElement(
     "div",
-    { className: `${classPrefix} ${line ? `${classPrefix}-line` : ""} ${className}`, style, ...rest },
+    Object.assign({ className: `${classPrefix} ${line ? `${classPrefix}-line` : ""} ${className}`, style }, rest),
     symbol && position === "before" ? renderSymbol() : null,
     React__default.createElement("div", { className: `${classPrefix}-integer ${classPrefix}-integer-${size}` }, formatThousands(price)),
     digits !== 0 ? React__default.createElement("div", { className: `${classPrefix}-decimal ${classPrefix}-decimal-${size}` }, ".") : null,

package/dist/esm/{progress.taro-pStvlrbA.js → progress.taro-BOHykt7X.js}

@@ -1,18 +1,12 @@
+import { _ as __rest } from "./tslib.es6-BZ8i9Q6l.js";
 import React__default, { useState, useEffect } from "react";
 import classNames from "classnames";
-import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
-const defaultProps = {
-  ...ComponentDefaults,
-  percent: 0,
-  showText: false,
-  animated: false,
-  delay: 0
-};
+import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
+import { a as useRtl } from "./configprovider.taro-CyU_tvNJ.js";
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { percent: 0, showText: false, animated: false, delay: 0 });
 const Progress = (props) => {
-  const { className, style, percent, background, color, strokeWidth, showText, animated, children, delay, ...rest } = {
-    ...defaultProps,
-    ...props
-  };
+  const rtl = useRtl();
+  const _a = Object.assign(Object.assign({}, defaultProps), props), { className, style, percent, background, color, strokeWidth, showText, animated, children, delay } = _a, rest = __rest(_a, ["className", "style", "percent", "background", "color", "strokeWidth", "showText", "animated", "children", "delay"]);
   const classPrefix = "nut-progress";
   const classesInner = classNames({
     [`${classPrefix}-inner`]: true,
@@ -44,11 +38,11 @@ const Progress = (props) => {
   }, []);
   return React__default.createElement(
     "div",
-    { className: classNames(classPrefix, className), style, ...rest },
+    Object.assign({ className: classNames(classPrefix, className), style }, rest),
     React__default.createElement(
       "div",
       { className: `${classPrefix}-outer`, style: stylesOuter },
-      React__default.createElement("div", { className: classesInner, style: stylesInner }, showText && React__default.createElement("div", { className: `${classPrefix}-text`, style: { left: `${displayPercent}%` } }, children || React__default.createElement(
+      React__default.createElement("div", { className: classesInner, style: stylesInner }, showText && React__default.createElement("div", { className: `${classPrefix}-text`, style: rtl ? { right: `${displayPercent}%` } : { left: `${displayPercent}%` } }, children || React__default.createElement(
         "div",
         { className: `${classPrefix}-text-inner`, style: {
           background: color

package/dist/esm/{pulltorefresh.taro-2jER8Mat.js → pulltorefresh.taro-BJdQj5sL.js}

@@ -1,10 +1,11 @@
+import { a as __awaiter } from "./tslib.es6-BZ8i9Q6l.js";
 import React__default, { useRef, useState } from "react";
 import { View } from "@tarojs/components";
 import { Loading, More } from "@nutui/icons-react-taro";
 import Taro from "@tarojs/taro";
-import { u as useConfig } from "./configprovider.taro-q5J2gQbi.js";
-import { u as useTouch } from "./use-touch-BUFdkOSA.js";
-import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
+import { u as useConfig } from "./configprovider.taro-CyU_tvNJ.js";
+import { u as useTouch } from "./use-touch-OfEaR5qi.js";
+import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
 function bound(position, min, max) {
   let ret = position;
   if (min !== void 0) {
@@ -28,34 +29,18 @@ function rubberbandIfOutOfBounds(position, min, max, dimension, constant = 0.15)
   return position;
 }
 const sleep = (time) => new Promise((resolve) => setTimeout(resolve, time));
-const defaultProps = {
-  ...ComponentDefaults,
-  pullingText: "",
-  canReleaseText: "",
-  refreshingText: "",
-  completeText: "",
-  completeDelay: 500,
-  disabled: false,
-  headHeight: 50,
-  threshold: 60,
-  scrollTop: 0,
-  onRefresh: () => {
-  }
-};
+const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { pullingText: "", canReleaseText: "", refreshingText: "", completeText: "", completeDelay: 500, disabled: false, headHeight: 50, threshold: 60, scrollTop: 0, onRefresh: () => {
+} });
 const PullToRefresh = (p) => {
   const classPrefix = "nut-pulltorefresh";
   const { locale } = useConfig();
   const touch = useTouch();
-  const props = {
-    ...defaultProps,
-    ...p,
-    ...{
-      pullingText: p.pullingText || locale.pullToRefresh.pullingText,
-      canReleaseText: p.canReleaseText || locale.pullToRefresh.canReleaseText,
-      refreshingText: p.refreshingText || locale.pullToRefresh.refreshingText,
-      completeText: p.completeText || locale.pullToRefresh.completeText
-    }
-  };
+  const props = Object.assign(Object.assign(Object.assign({}, defaultProps), p), {
+    pullingText: p.pullingText || locale.pullToRefresh.pullingText,
+    canReleaseText: p.canReleaseText || locale.pullToRefresh.canReleaseText,
+    refreshingText: p.refreshingText || locale.pullToRefresh.refreshingText,
+    completeText: p.completeText || locale.pullToRefresh.completeText
+  });
   const headHeight = props.headHeight;
   const threshold = props.threshold;
   const pullingRef = useRef(false);
@@ -72,14 +57,14 @@ const PullToRefresh = (p) => {
   const renderStatusIcon = () => {
     var _a;
     if (props.renderIcon) {
-      return (_a = props.renderIcon) == null ? void 0 : _a.call(props, status);
+      return (_a = props.renderIcon) === null || _a === void 0 ? void 0 : _a.call(props, status);
     }
     return renderIcons(status);
   };
   const renderStatusText = () => {
     var _a;
     if (props.renderText) {
-      return (_a = props.renderText) == null ? void 0 : _a.call(props, status);
+      return (_a = props.renderText) === null || _a === void 0 ? void 0 : _a.call(props, status);
     }
     if (status === "pulling")
       return props.pullingText;
@@ -107,22 +92,24 @@ const PullToRefresh = (p) => {
       setStatus(height > threshold ? "canRelease" : "pulling");
     }
   };
-  async function doRefresh() {
-    setHeight(headHeight);
-    setStatus("refreshing");
-    try {
-      await props.onRefresh();
-      setStatus("complete");
-    } catch (e) {
+  function doRefresh() {
+    return __awaiter(this, void 0, void 0, function* () {
+      setHeight(headHeight);
+      setStatus("refreshing");
+      try {
+        yield props.onRefresh();
+        setStatus("complete");
+      } catch (e) {
+        setHeight(0);
+        setStatus("pulling");
+        throw e;
+      }
+      if (props.completeDelay > 0) {
+        yield sleep(props.completeDelay);
+      }
       setHeight(0);
       setStatus("pulling");
-      throw e;
-    }
-    if (props.completeDelay > 0) {
-      await sleep(props.completeDelay);
-    }
-    setHeight(0);
-    setStatus("pulling");
+    });
   }
   const handleTouchEnd = () => {
     pullingRef.current = false;
@@ -134,10 +121,7 @@ const PullToRefresh = (p) => {
     }
   };
   const isAndroidWeApp = Taro.getSystemInfoSync().platform === "android" && Taro.getEnv() === "WEAPP";
-  const springStyles = {
-    height: `${height}px`,
-    ...!pullingRef.current || isAndroidWeApp ? { transition: "height .3s ease" } : {}
-  };
+  const springStyles = Object.assign({ height: `${height}px` }, !pullingRef.current || isAndroidWeApp ? { transition: "height .3s ease" } : {});
   return React__default.createElement(
     View,
     { className: `${classPrefix} ${props.className}`, style: props.style, onTouchStart: handleTouchStart, onTouchMove: handleTouchMove, onTouchEnd: handleTouchEnd },