@nutui/nutui-react-taro 2.0.12 → 2.0.14

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.12 Fri Aug 11 2023 10:38:48 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.14 Fri Aug 18 2023 14:58:43 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -11033,7 +11033,7 @@ var __publicField = (obj, key, value) => {
         }
         const controlled = {
           ...children.props,
-          [this.props.valuePropName || "value"]: getFieldValue(name) || this.props.initialValue,
+          [this.props.valuePropName || "value"]: getFieldValue(name) === void 0 ? this.props.initialValue : getFieldValue(name),
           [this.props.trigger || "onChange"]: (...args) => {
             const originOnChange = children.props[this.props.trigger || "onChange"];
             if (originOnChange) {
@@ -11669,18 +11669,18 @@ var __publicField = (obj, key, value) => {
       closeOnClickAway,
       children,
       activeColor,
-      show,
+      show: show2,
       parent,
       index
     } = {
       ...defaultProps$U,
       ...props
     };
-    const [showPopup, setShowPopup] = React.useState(show);
+    const [showPopup, setShowPopup] = React.useState(show2);
     const [innerValue, setValue] = React.useState(value);
     React.useEffect(() => {
-      setShowPopup(show);
-    }, [show]);
+      setShowPopup(show2);
+    }, [show2]);
     React.useEffect(() => {
       getParentOffset();
     }, [showPopup]);
@@ -14068,63 +14068,49 @@ var __publicField = (obj, key, value) => {
     ));
   };
   Content.displayName = "NutContent";
-  const defaultDialogProps = {
-    ...ComponentDefaults,
-    overlay: true,
-    overlayStyle: {},
-    overlayClassName: "",
-    onCancel: () => {
-    },
-    onClose: () => {
-    },
-    onOverlayClick: (e) => true,
-    ...defaultOverlayProps
-  };
-  const DialogWrap = (props) => {
-    const {
-      visible,
-      overlay,
-      overlayStyle,
-      overlayClassName,
-      closeOnOverlayClick,
-      lockScroll,
-      onClose,
-      onCancel,
-      onOverlayClick
-    } = props;
-    const onHandleClickOverlay = (e) => {
-      console.log("onClose?.()", closeOnOverlayClick);
-      if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
-        const closed = onOverlayClick && onOverlayClick(e);
-        closed && (onClose == null ? void 0 : onClose());
-        closed && (onCancel == null ? void 0 : onCancel());
-      }
+  const customEvents = new Taro.Events();
+  function useCustomEventsPath(selector) {
+    var _a;
+    const path = (_a = Taro.getCurrentInstance().router) == null ? void 0 : _a.path;
+    return path ? `${path}__${selector}` : selector;
+  }
+  function useCustomEvent(selector, cb) {
+    const path = useCustomEventsPath(selector);
+    React.useEffect(() => {
+      customEvents.on(path, cb);
+      return () => {
+        customEvents.off(path);
+      };
+    }, []);
+    const trigger = (args) => {
+      customEvents.trigger(path, args);
     };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(
-      Overlay,
-      {
-        style: overlayStyle,
-        className: overlayClassName,
-        visible: true,
-        closeOnOverlayClick,
-        lockScroll,
-        onClick: onHandleClickOverlay
-      }
-    ) : null, /* @__PURE__ */ React.createElement(
-      CSSTransition$1,
-      {
-        in: visible,
-        timeout: 300,
-        classNames: "fadeDialog",
-        unmountOnExit: true,
-        appear: true
-      },
-      /* @__PURE__ */ React.createElement(Content, { ...props, visible })
-    ));
-  };
-  DialogWrap.defaultProps = defaultDialogProps;
-  DialogWrap.displayName = "NutDialogWrap";
+    const off = () => {
+      customEvents.off(path);
+    };
+    return [trigger, off];
+  }
+  function useParams(args) {
+    const forceUpdate = useForceUpdate();
+    const stateRef = React.useRef(args);
+    const currentRef = React.useRef();
+    const previousRef = React.useRef();
+    if (!isequal(currentRef.current, args)) {
+      previousRef.current = currentRef.current;
+      currentRef.current = args;
+      stateRef.current = args;
+    }
+    const setParams = (args2) => {
+      stateRef.current = { ...stateRef.current, ...args2 };
+      forceUpdate();
+    };
+    const params = stateRef.current;
+    return { params, setParams };
+  }
   const defaultProps$F = {
+    title: "",
+    content: "",
+    footer: "",
     confirmText: "",
     cancelText: "",
     overlay: true,
@@ -14135,92 +14121,143 @@ var __publicField = (obj, key, value) => {
     footerDirection: "horizontal",
     lockScroll: true,
     beforeCancel: () => true,
-    beforeClose: () => true
+    beforeClose: () => true,
+    onOverlayClick: () => void 0
   };
-  const BaseDialog = React.forwardRef(
-    (props, ref) => {
-      const { locale } = useConfig$1();
-      const {
+  const BaseDialog = (props) => {
+    const classPrefix2 = "nut-dialog";
+    const { locale } = useConfig$1();
+    const {
+      params: {
+        id,
         visible,
         footer,
+        title,
+        footerDirection,
         hideConfirmButton,
         hideCancelButton,
         lockScroll,
         disableConfirmButton,
         closeOnOverlayClick,
+        onOverlayClick,
         confirmText,
         cancelText,
+        overlay,
         onClose,
         onCancel,
         onConfirm,
         beforeCancel,
-        beforeClose,
-        ...restProps
-      } = props;
-      const classPrefix2 = "nut-dialog";
-      const renderFooter = () => {
-        if (footer === null)
-          return "";
-        const handleCancel = (e) => {
-          e.stopPropagation();
-          if (!(beforeCancel == null ? void 0 : beforeCancel()))
-            return;
-          if (!(beforeClose == null ? void 0 : beforeClose()))
-            return;
-          onClose == null ? void 0 : onClose();
-          onCancel == null ? void 0 : onCancel();
-        };
-        const handleOk = (e) => {
-          e.stopPropagation();
-          onClose == null ? void 0 : onClose();
-          onConfirm == null ? void 0 : onConfirm(e);
-        };
-        return footer || /* @__PURE__ */ React.createElement(React.Fragment, null, !hideCancelButton && /* @__PURE__ */ React.createElement(
-          Button,
-          {
-            size: "small",
-            fill: "outline",
-            type: "primary",
-            className: `${classPrefix2}__footer-cancel`,
-            onClick: (e) => handleCancel(e)
-          },
-          cancelText || locale.cancel
-        ), !hideConfirmButton && /* @__PURE__ */ React.createElement(
-          Button,
-          {
-            size: "small",
-            type: "primary",
-            className: classNames(`${classPrefix2}__footer-ok`, {
-              disabled: disableConfirmButton
-            }),
-            disabled: disableConfirmButton,
-            onClick: (e) => handleOk(e)
-          },
-          confirmText || locale.confirm
-        ));
+        beforeClose
+      },
+      setParams
+    } = useParams({ ...defaultProps$F, ...props });
+    useCustomEvent(
+      id,
+      ({ status, options }) => {
+        if (status) {
+          setParams({ ...options, visible: true });
+        } else {
+          setParams({ ...options, visible: false });
+        }
+      }
+    );
+    const renderFooter = () => {
+      if (footer === null)
+        return "";
+      const handleCancel = (e) => {
+        e.stopPropagation();
+        if (!(beforeCancel == null ? void 0 : beforeCancel()))
+          return;
+        if (!(beforeClose == null ? void 0 : beforeClose()))
+          return;
+        onClose == null ? void 0 : onClose();
+        onCancel == null ? void 0 : onCancel();
       };
-      return /* @__PURE__ */ React.createElement(
-        components.View,
+      const handleOk = (e) => {
+        e.stopPropagation();
+        onClose == null ? void 0 : onClose();
+        onConfirm == null ? void 0 : onConfirm(e);
+      };
+      return footer || /* @__PURE__ */ React.createElement(React.Fragment, null, !hideCancelButton && /* @__PURE__ */ React.createElement(
+        Button,
         {
-          style: { display: visible ? "block" : "none" },
-          catchMove: lockScroll
+          size: "small",
+          fill: "outline",
+          type: "primary",
+          className: `${classPrefix2}__footer-cancel`,
+          onClick: (e) => handleCancel(e)
+        },
+        cancelText || locale.cancel
+      ), !hideConfirmButton && /* @__PURE__ */ React.createElement(
+        Button,
+        {
+          size: "small",
+          type: "primary",
+          className: classNames(`${classPrefix2}__footer-ok`, {
+            disabled: disableConfirmButton
+          }),
+          disabled: disableConfirmButton,
+          onClick: (e) => handleOk(e)
+        },
+        confirmText || locale.confirm
+      ));
+    };
+    const onHandleClickOverlay = (e) => {
+      console.log("onClose?.()", closeOnOverlayClick);
+      if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
+        const closed = onOverlayClick && onOverlayClick();
+        closed && (onClose == null ? void 0 : onClose());
+        closed && (onCancel == null ? void 0 : onCancel());
+      }
+    };
+    console.log("props", props, visible);
+    return /* @__PURE__ */ React.createElement(
+      components.View,
+      {
+        style: { display: visible ? "block" : "none" },
+        catchMove: lockScroll
+      },
+      /* @__PURE__ */ React.createElement(React.Fragment, null, overlay ? /* @__PURE__ */ React.createElement(
+        Overlay,
+        {
+          visible: true,
+          closeOnOverlayClick,
+          lockScroll,
+          onClick: onHandleClickOverlay
+        }
+      ) : null, /* @__PURE__ */ React.createElement(
+        CSSTransition$1,
+        {
+          in: visible,
+          timeout: 300,
+          classNames: "fadeDialog",
+          unmountOnExit: true,
+          appear: true
         },
         /* @__PURE__ */ React.createElement(
-          DialogWrap,
+          Content,
           {
-            ...props,
-            visible,
-            lockScroll,
+            title,
             footer: renderFooter(),
-            onClose,
-            onCancel
+            footerDirection,
+            visible
           }
         )
-      );
-    }
-  );
+      ))
+    );
+  };
+  function open$1(selector, options) {
+    const path = useCustomEventsPath(selector);
+    customEvents.trigger(path, { status: true, options });
+  }
+  function close$1(selector) {
+    const path = useCustomEventsPath(selector);
+    customEvents.trigger(path, { status: false });
+  }
   BaseDialog.defaultProps = defaultProps$F;
   BaseDialog.displayName = "NutDialog";
+  BaseDialog.open = open$1;
+  BaseDialog.close = close$1;
   const defaultProps$E = {
     ...ComponentDefaults,
     attract: false,
@@ -14958,28 +14995,6 @@ var __publicField = (obj, key, value) => {
   };
   NoticeBar.defaultProps = defaultProps$A;
   NoticeBar.displayName = "NutNoticeBar";
-  const customEvents = new Taro.Events();
-  function useCustomEventsPath(selector) {
-    var _a;
-    const path = (_a = Taro.getCurrentInstance().router) == null ? void 0 : _a.path;
-    return path ? `${path}__${selector}` : selector;
-  }
-  function useCustomEvent(selector, cb) {
-    const path = useCustomEventsPath(selector);
-    React.useEffect(() => {
-      customEvents.on(path, cb);
-      return () => {
-        customEvents.off(path);
-      };
-    }, []);
-    const trigger = (args) => {
-      customEvents.trigger(path, args);
-    };
-    const off = () => {
-      customEvents.off(path);
-    };
-    return [trigger, off];
-  }
   const defaultProps$z = {
     ...ComponentDefaults,
     id: "",
@@ -15008,26 +15023,26 @@ var __publicField = (obj, key, value) => {
       onClick
     } = { ...defaultProps$z, ...props };
     useCustomEvent(id, (status) => {
-      status ? show() : hide();
+      status ? show2() : hide2();
     });
     let timer;
     const [showNotify, setShowNotify] = React.useState(false);
     React.useEffect(() => {
       if (visible) {
-        show();
+        show2();
       } else {
-        hide();
+        hide2();
       }
     }, [visible]);
     const clickHandle = () => {
       onClick();
     };
-    const show = () => {
+    const show2 = () => {
       setShowNotify(true);
       clearTimer();
       if (duration) {
         timer = window.setTimeout(() => {
-          hide();
+          hide2();
         }, duration);
       }
     };
@@ -15037,7 +15052,7 @@ var __publicField = (obj, key, value) => {
         timer = null;
       }
     };
-    const hide = () => {
+    const hide2 = () => {
       setShowNotify(false);
       onClose();
     };
@@ -15905,57 +15920,69 @@ var __publicField = (obj, key, value) => {
   const classPrefix$8 = "nut-toast";
   const Toast = (props) => {
     const {
-      children,
-      id,
-      position,
-      contentStyle,
-      icon,
-      iconSize,
-      msg,
-      duration,
-      type: type2,
-      title,
-      closeOnOverlayClick,
-      lockScroll,
-      contentClassName,
-      size,
-      visible,
-      className,
-      style,
-      onClose,
-      ...rest
-    } = { ...defaultProps$s, ...props };
+      params: {
+        id,
+        position,
+        contentStyle,
+        icon,
+        iconSize,
+        msg,
+        duration,
+        type: type2,
+        title,
+        closeOnOverlayClick,
+        lockScroll,
+        contentClassName,
+        size,
+        visible,
+        className,
+        style,
+        onClose
+      },
+      setParams
+    } = useParams({ ...defaultProps$s, ...props });
     let timer;
     const [openState, SetOpenState] = React.useState(false);
     React.useEffect(() => {
       if (visible) {
-        SetOpenState(true);
-        show();
+        show2();
       } else {
-        hide();
+        hide2();
       }
     }, [visible]);
+    useCustomEvent(
+      id,
+      ({ status, options }) => {
+        if (status) {
+          setParams(options);
+          show2();
+        } else {
+          hide2();
+        }
+      }
+    );
     const clearTimer = () => {
       if (timer) {
         clearTimeout(timer);
         timer = null;
       }
     };
-    const hide = () => {
+    const hide2 = () => {
       SetOpenState(false);
-      onClose();
+      onClose == null ? void 0 : onClose();
     };
-    const show = () => {
+    const show2 = () => {
       clearTimer();
+      SetOpenState(true);
       if (duration) {
         timer = window.setTimeout(() => {
-          hide();
+          hide2();
         }, duration * 1e3);
       }
     };
     const clickCover = () => {
       if (closeOnOverlayClick) {
-        hide();
+        hide2();
       }
     };
     const hasIcon = () => {
@@ -16003,8 +16030,18 @@ var __publicField = (obj, key, value) => {
       ))
     ) : null);
   };
+  function show(selector, options) {
+    const path = useCustomEventsPath(selector);
+    customEvents.trigger(path, { status: true, options });
+  }
+  function hide(selector) {
+    const path = useCustomEventsPath(selector);
+    customEvents.trigger(path, { status: false });
+  }
   Toast.defaultProps = defaultProps$s;
   Toast.displayName = "NutToast";
+  Toast.show = show;
+  Toast.hide = hide;
   const defaultProps$r = {
     ...ComponentDefaults,
     type: "shake",

package/dist/packages/skeleton/skeleton.scss

@@ -20,10 +20,6 @@
       background: $skeleton-background;
       margin-top: 10px;
       border-radius: $skeleton-line-border-radius;
-
-      &:last-child {
-        width: 70%;
-      }
     }
 
     &-line {
@@ -36,6 +32,9 @@
         height: $skeleton-line-height;
         background: $skeleton-background;
       }
+      .nut-skeleton__block:last-child {
+        width: 70%;
+      }
     }
   }