@nutui/nutui-react-taro 2.6.18 → 2.6.19

package/dist/nutui.react.umd.js

@@ -2,7 +2,7 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("@tarojs/taro"), require("@tarojs/components"), require("react-dom")) : typeof define === "function" && define.amd ? define(["exports", "react", "@tarojs/taro", "@tarojs/components", "react-dom"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory((global2.nutui = global2.nutui || {}, global2.nutui.react = {}), global2.React, global2.Taro, global2.components, global2.ReactDOM));
 })(this, function(exports2, React, Taro, components, ReactDOM) {
   "use strict";/*!
-* @nutui/nutui-react-taro v2.6.18 Fri Sep 13 2024 10:21:29 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.19 Fri Sep 13 2024 15:42:35 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -280,7 +280,7 @@
     style: {}
   };
   const prefixCls$2 = "nut-button";
-  const defaultProps$1v = {
+  const defaultProps$1u = {
     ...ComponentDefaults,
     color: "",
     type: "default",
@@ -315,7 +315,7 @@
         onClick,
         ...rest
       } = {
-        ...defaultProps$1v,
+        ...defaultProps$1u,
         ...props
       };
       const getStyle = React.useCallback(() => {
@@ -382,7 +382,7 @@
   );
   Button.displayName = "NutButton";
   const CellGroupContext = React.createContext(null);
-  const defaultProps$1u = {
+  const defaultProps$1t = {
     ...ComponentDefaults,
     title: "",
     description: "",
@@ -391,7 +391,7 @@
   const classPrefix$r = "nut-cell-group";
   const CellGroup = (props) => {
     const { children, className, title, description, divider, ...rest } = {
-      ...defaultProps$1u,
+      ...defaultProps$1t,
       ...props
     };
     return /* @__PURE__ */ React.createElement("div", { className: classNames(classPrefix$r, className), ...rest }, title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$r}-title` }, title) : null, description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$r}-description` }, description) : null, /* @__PURE__ */ React.createElement(
@@ -403,7 +403,7 @@
     ));
   };
   CellGroup.displayName = "NutCellGroup";
-  const defaultProps$1t = {
+  const defaultProps$1s = {
     ...ComponentDefaults,
     title: null,
     description: null,
@@ -430,7 +430,7 @@
       clickable,
       ...rest
     } = {
-      ...defaultProps$1t,
+      ...defaultProps$1s,
       ...props
     };
     const handleClick = (event) => {
@@ -1605,7 +1605,7 @@
   const pxCheck = (value) => {
     return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
   };
-  const defaultProps$1s = {
+  const defaultProps$1r = {
     src: "",
     error: true,
     loading: true
@@ -1624,7 +1624,7 @@
       onLoad,
       onError,
       ...rest
-    } = { ...defaultProps$1s, ...props };
+    } = { ...defaultProps$1r, ...props };
     const [innerLoading, setInnerLoading] = React.useState(true);
     const [isError, setIsError] = React.useState(false);
     const handleLoad = (e2) => {
@@ -3616,7 +3616,7 @@
     const onHandleClosed = (e2) => {
       afterClose && afterClose();
     };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement(
       CSSTransition,
       {
         nodeRef,
@@ -3639,11 +3639,11 @@
         },
         children
       )
-    ));
+    );
   };
   Overlay.displayName = "NutOverlay";
   const DataContext$1 = React.createContext({});
-  const defaultProps$1r = {
+  const defaultProps$1q = {
     ...ComponentDefaults,
     span: "24",
     offset: "0",
@@ -3651,7 +3651,7 @@
   };
   const Col = (props) => {
     const { className, style, span, offset, children, onClick } = {
-      ...defaultProps$1r,
+      ...defaultProps$1q,
       ...props
     };
     const [colName, setColName] = React.useState("");
@@ -3684,7 +3684,7 @@
     );
   };
   Col.displayName = "NutCol";
-  const defaultProps$1q = {
+  const defaultProps$1p = {
     ...ComponentDefaults,
     contentPosition: "center",
     direction: "horizontal"
@@ -3692,7 +3692,7 @@
   const classPrefix$o = `nut-divider`;
   const Divider = (props) => {
     const { children, contentPosition, style, className, direction, ...rest } = {
-      ...defaultProps$1q,
+      ...defaultProps$1p,
       ...props
     };
     const classes = direction === "horizontal" ? classNames({
@@ -3713,7 +3713,7 @@
     }
   };
   const GridContext = React.createContext(gridContext);
-  const defaultProps$1p = {
+  const defaultProps$1o = {
     text: "",
     columns: 4,
     gap: 0,
@@ -3739,7 +3739,7 @@
       onClick,
       ...rest
     } = {
-      ...defaultProps$1p,
+      ...defaultProps$1o,
       ...props
     };
     const classPrefix2 = "nut-grid-item";
@@ -3798,7 +3798,7 @@
     );
   };
   GridItem.displayName = "NutGridItem";
-  const defaultProps$1o = {
+  const defaultProps$1n = {
     columns: 4,
     gap: 0,
     center: true,
@@ -3819,7 +3819,7 @@
       className,
       onClick,
       ...rest
-    } = { ...defaultProps$1o, ...props };
+    } = { ...defaultProps$1n, ...props };
     const childrenDom = React.Children.toArray(children);
     const classPrefix2 = "nut-grid";
     const rootClass = () => {
@@ -3855,9 +3855,7 @@
   };
   Grid.displayName = "NutGrid";
   Grid.Item = GridItem;
-  const defaultProps$1n = {};
-  const Layout = (props) => {
-    ({ ...defaultProps$1n, ...props });
+  const Layout = () => {
     return /* @__PURE__ */ React.createElement("div", { className: "nut-layout" }, "Layout");
   };
   Layout.displayName = "NutLayout";
@@ -4782,6 +4780,7 @@
       return /* @__PURE__ */ React.createElement(
         CSSTransition,
         {
+          nodeRef: refObject,
           classNames: transitionName,
           mountOnEnter: true,
           unmountOnExit: destroyOnClose,
@@ -4805,7 +4804,7 @@
       );
     };
     const renderNode = () => {
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(
         Overlay,
         {
           style: overlayStyles,
@@ -4816,7 +4815,7 @@
           duration,
           onClick: onHandleClickOverlay
         }
-      ), renderPop()) : /* @__PURE__ */ React.createElement(React.Fragment, null, renderPop()));
+      ) : null, /* @__PURE__ */ React.createElement(React.Fragment, null, renderPop()));
     };
     React.useEffect(() => {
       visible && open2();
@@ -5777,6 +5776,9 @@
     React.useEffect(() => {
       initData();
     }, [options, format2]);
+    React.useEffect(() => {
+      syncValue();
+    }, [value]);
     const initData = async () => {
       state.lazyLoadMap.clear();
       if (format2 && Object.keys(format2).length > 0) {
@@ -7073,7 +7075,7 @@
     const renderFooter = () => {
       return /* @__PURE__ */ React.createElement("div", { className: "nut-calendar-footer" }, children, /* @__PURE__ */ React.createElement("div", { className: "calendar-confirm-btn", onClick: confirm }, confirmText || locale.confirm));
     };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: classes, style }, renderHeader(), renderContent(), popup && !autoBackfill ? renderFooter() : ""));
+    return /* @__PURE__ */ React.createElement("div", { className: classes, style }, renderHeader(), renderContent(), popup && !autoBackfill ? renderFooter() : "");
   });
   CalendarItem.displayName = "NutCalendarItem";
   const defaultProps$12 = {
@@ -8782,7 +8784,7 @@
         catchMove: true,
         ...rest
       },
-      pickerOptions.length && /* @__PURE__ */ React.createElement(
+      pickerOptions.length > 0 && /* @__PURE__ */ React.createElement(
         Picker,
         {
           ...pickerProps,
@@ -10696,7 +10698,7 @@
           [`${classPrefix$h}-icon-disabled`]: shadowValue === min || disabled
         })
       }
-    )), /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+    )), /* @__PURE__ */ React.createElement(
       "input",
       {
         className: "nut-number-input",
@@ -10710,7 +10712,7 @@
         onBlur: handleBlur,
         onFocus: handleFocus
       }
-    )), /* @__PURE__ */ React.createElement("div", { className: "nut-input-add", onClick: handlePlus }, /* @__PURE__ */ React.createElement(
+    ), /* @__PURE__ */ React.createElement("div", { className: "nut-input-add", onClick: handlePlus }, /* @__PURE__ */ React.createElement(
       t,
       {
         className: classNames("nut-inputnumber-icon icon-plus", {
@@ -10765,6 +10767,7 @@
         onChange == null ? void 0 : onChange(option);
       }
     });
+    const cssRef = React.useRef(null);
     React.useEffect(() => {
       setShowPopup(show2);
     }, [show2]);
@@ -10888,6 +10891,7 @@
       /* @__PURE__ */ React.createElement(
         CSSTransition,
         {
+          nodeRef: cssRef,
           in: showPopup,
           timeout: 100,
           classNames: direction === "down" ? "nut-menu-container-down" : "nut-menu-container-up"
@@ -13333,6 +13337,19 @@
   };
   const Uploader = React.forwardRef(InternalUploader);
   Uploader.displayName = "NutUploader";
+  function mergeProps(...items) {
+    const ret = {};
+    items.forEach((item) => {
+      if (item) {
+        Object.keys(item).forEach((key) => {
+          if (item[key] !== void 0) {
+            ret[key] = item[key];
+          }
+        });
+      }
+    });
+    return ret;
+  }
   const defaultProps$G = {
     ...ComponentDefaults,
     visible: false,
@@ -13359,7 +13376,7 @@
       className,
       style,
       ...rest
-    } = { ...defaultProps$G, ...props };
+    } = mergeProps(defaultProps$G, props);
     const classPrefix2 = "nut-actionsheet";
     const cancelActionSheet = () => {
       onCancel && onCancel();
@@ -13551,7 +13568,7 @@
         beforeClose
       },
       setParams
-    } = useParams({ ...defaultProps$F, ...props });
+    } = useParams(mergeProps(defaultProps$F, props));
     useCustomEvent(
       id,
       ({ status, options }) => {
@@ -13676,7 +13693,6 @@
     const path = useCustomEventsPath(selector);
     customEvents.trigger(path, { status: false });
   }
-  BaseDialog.defaultProps = defaultProps$F;
   BaseDialog.displayName = "NutDialog";
   BaseDialog.open = open$1;
   BaseDialog.close = close$1;
@@ -14499,12 +14515,13 @@
       duration,
       onClose,
       onClick
-    } = { ...defaultProps$z, ...props };
+    } = mergeProps(defaultProps$z, props);
     useCustomEvent(id, (status) => {
       status ? show2() : hide2();
     });
     let timer;
     const [showNotify, setShowNotify] = React.useState(false);
+    const cssRef = React.useRef(null);
     React.useEffect(() => {
       if (visible) {
         show2();
@@ -14543,6 +14560,7 @@
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       CSSTransition,
       {
+        nodeRef: cssRef,
         in: showNotify,
         timeout: 300,
         classNames: "fade",
@@ -14570,7 +14588,6 @@
     const path = useCustomEventsPath(selector);
     customEvents.trigger(path, false);
   }
-  Notify.defaultProps = defaultProps$z;
   Notify.displayName = "NutNotify";
   Notify.open = open;
   Notify.close = close;
@@ -15460,7 +15477,7 @@
         wordBreak
       },
       setParams
-    } = useParams({ ...defaultProps$s, ...props });
+    } = useParams(mergeProps(defaultProps$s, props));
     const timer = React.useRef(-1);
     const [innerVisible, setInnerVisible] = usePropsValue({
       value: visible,
@@ -15568,7 +15585,6 @@
     const path = useCustomEventsPath(selector);
     customEvents.trigger(path, { status: false });
   }
-  Toast.defaultProps = defaultProps$s;
   Toast.displayName = "NutToast";
   Toast.show = show;
   Toast.hide = hide;
@@ -15623,10 +15639,7 @@
       thousands,
       style,
       ...reset
-    } = {
-      ...defaultProps$q,
-      ...props
-    };
+    } = mergeProps(defaultProps$q, props);
     const classPrefix2 = "nut-countup";
     const countupRef = React.useRef(null);
     const timerRef = React.useRef(0);
@@ -15698,7 +15711,6 @@
       );
     })));
   };
-  CountUp.defaultProps = defaultProps$q;
   CountUp.displayName = "NutCountUp";
   const defaultProps$p = {};
   const _AnimatingNumbers = class _AnimatingNumbers extends React.Component {
@@ -15850,14 +15862,14 @@
       }
     };
     const renderIcon = () => {
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-icon` }, /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-icon` }, /* @__PURE__ */ React.createElement(
         "div",
         {
           className: `${classPrefix2}-icon-box} ${playing ? `${classPrefix2}-icon-play}` : `${classPrefix2}-icon-stop}`}`,
           onClick: handleStatusChange
         },
         /* @__PURE__ */ React.createElement(L, { className: playing ? "nut-icon-loading" : "" })
-      )));
+      ));
     };
     const renderProgerss = () => {
       return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-progress` }, /* @__PURE__ */ React.createElement("div", { className: "time" }, currentDuration), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-progress-bar-wrapper` }, /* @__PURE__ */ React.createElement(
@@ -16776,7 +16788,7 @@
         ) : null,
         ((_c = ellipsis.current) == null ? void 0 : _c.tailing) && symbol,
         (_d = ellipsis.current) == null ? void 0 : _d.tailing
-      ) : null, exceeded && expanded ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+      ) : null, exceeded && expanded ? /* @__PURE__ */ React.createElement(
         components.View,
         {
           style: {
@@ -16795,7 +16807,7 @@
           },
           collapseText
         ) : null
-      )) : null)
+      ) : null)
     ), /* @__PURE__ */ React.createElement(
       components.View,
       {
@@ -17380,7 +17392,7 @@
         onClick: (e2) => handleSelectPage(currentPage + 1)
       },
       next || locale.pagination.next
-    )), mode === "lite" && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-lite` }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-lite-active` }, 2), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-lite-default` }, 8))));
+    )), mode === "lite" && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-lite` }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-lite-active` }, 2), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-lite-default` }, 8)));
   };
   Pagination.displayName = "NutPagination";
   const defaultProps$e = {
@@ -19395,7 +19407,7 @@
     };
     const ToolBar = () => {
       const actions = [cancel, reset, rotate, confirm];
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix}-popup-toolbar-flex` }, actions.map((action, index) => /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix}-popup-toolbar-flex` }, actions.map((action, index) => /* @__PURE__ */ React.createElement(
         "div",
         {
           key: index,
@@ -19403,11 +19415,11 @@
           onClick: (_e) => action()
         },
         toolbar[index]
-      ))));
+      )));
     };
     const CropperPopup = () => {
       const { canvasId } = canvasAll;
-      return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ React.createElement(
         "div",
         {
           className: `${classPrefix}-popup`,
@@ -19434,7 +19446,7 @@
           /* @__PURE__ */ React.createElement("div", { className: "highlight", style: highlightStyle })
         ),
         /* @__PURE__ */ React.createElement("div", { className: toolbarPositionCls }, /* @__PURE__ */ React.createElement(ToolBar, null))
-      ));
+      );
     };
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: cls, ...rest, style }, children, /* @__PURE__ */ React.createElement("div", { className: "nut-avatar-cropper-edit-text", onClick: chooseImage }, editText)), CropperPopup());
   };

package/dist/packages/elevator/elevator.scss

@@ -99,13 +99,12 @@
       &-item {
         display: block;
         padding: $elevator-bars-inner-item-padding;
+        cursor: pointer;
 
         &-active {
           font-weight: $font-weight-bold;
           color: $elevator-bars-active-color;
         }
-
-        cursor: pointer;
       }
     }
   }

package/dist/packages/popover/popover.scss

@@ -162,11 +162,11 @@
     }
 
     &-top-end {
+      right: 0;
       .nut-popover-arrow-top-end {
         right: 16px;
         transform: translateX(0%);
       }
-      right: 0;
     }
 
     &-top-start {
@@ -186,12 +186,12 @@
     }
 
     &-bottom-end {
+      right: 0;
+
       .nut-popover-arrow-bottom-end {
         right: 16px;
         transform: translateX(0%);
       }
-
-      right: 0;
     }
 
     &-bottom-start {

package/dist/packages/tabs/tabs.scss

@@ -423,10 +423,10 @@
 }
 
 .nut-tabs-content {
+  display: flex;
+  box-sizing: border-box;
+
   &-wrap {
     overflow: hidden;
   }
-
-  display: flex;
-  box-sizing: border-box;
 }

package/dist/packages/uploader/uploader.scss

@@ -195,6 +195,7 @@
           width: 90%;
           font-size: 12px;
           color: $color-text;
+          @include moreline-ellipsis();
 
           &.error {
             color: red !important;
@@ -207,8 +208,6 @@
           .nut-icon-Link {
             flex-shrink: 0;
           }
-
-          @include moreline-ellipsis();
         }
       }
     }

package/dist/types/utils/merge-props.d.ts

@@ -1,5 +1,9 @@
-export declare function mergeProps<T, U>(defaultProps: T, props: U): {
-    [Key in Extract<keyof T, keyof U>]: U[Key];
-} & {
-    [Key in Exclude<keyof U, keyof T>]?: U[Key];
-};
+export declare function mergeProps<A, B>(a: A, b: B): B & A;
+export declare function mergeProps<A, B, C>(a: A, b: B, c: C): C & B & A;
+export declare function mergeProps<A, B, C, D>(a: A, b: B, c: C, d: D): D & C & B & A;
+/**
+ * Merge props and return the first non-undefined value.
+ * The later has higher priority. e.g. (10, 1, 5) => 5 wins.
+ * This is useful with legacy props that have been deprecated.
+ */
+export declare function mergeProp<T, DefaultT extends T = T>(defaultProp: DefaultT, ...propList: T[]): T | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "2.6.18",
+  "version": "2.6.19",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/esm/nutui-react.es.js",