@nutui/nutui-react-taro 2.0.15 → 2.0.16

package/dist/nutui.react.es.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.15 Wed Aug 30 2023 14:10:49 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.16 Wed Sep 06 2023 15:51:52 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -2003,6 +2003,7 @@ const Button = React__default.forwardRef(
   }
 );
 Button.displayName = "NutButton";
+const CellGroupContext = createContext(null);
 const defaultProps$1t = {
   ...ComponentDefaults,
   title: "",
@@ -2020,7 +2021,7 @@ const CellGroup = (props) => {
     {
       className: `${classPrefix$p}__wrap ${divider ? `${classPrefix$p}__wrap--divider` : ""}`
     },
-    children
+    /* @__PURE__ */ React__default.createElement(CellGroupContext.Provider, { value: { divider } }, children)
   ));
 };
 CellGroup.defaultProps = defaultProps$1t;
@@ -2037,6 +2038,7 @@ const defaultProps$1s = {
 };
 const classPrefix$o = "nut-cell";
 const Cell = (props) => {
+  const ctx = useContext(CellGroupContext);
   const {
     children,
     onClick,
@@ -2078,7 +2080,8 @@ const Cell = (props) => {
         style: styles
       },
       extra
-    ) : null, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix$o}__divider` }))
+    ) : null),
+    (ctx == null ? void 0 : ctx.divider) ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix$o}__divider` }) : null
   );
 };
 Cell.defaultProps = defaultProps$1s;
@@ -7016,6 +7019,7 @@ class Tree {
   constructor(nodes, config2) {
     __publicField(this, "nodes");
     __publicField(this, "config");
+    // eslint-disable-next-line class-methods-use-this
     __publicField(this, "isLeaf", (node, lazy) => {
       const { leaf, children } = node;
       const hasChildren = Array.isArray(children) && Boolean(children.length);
@@ -10985,6 +10989,83 @@ const useForm = (form) => {
   }
   return [formRef.current];
 };
+const defaultProps$Y = {
+  ...ComponentDefaults,
+  labelPosition: "right",
+  starPosition: "left",
+  divider: false,
+  onFinish: (values) => {
+  },
+  onFinishFailed: (values, errorFields) => {
+  }
+};
+const PositionInfo = {
+  top: "form-layout-top",
+  left: "form-layout-left",
+  right: "form-layout-right"
+};
+const Form = React__default.forwardRef(
+  (props, ref) => {
+    const classPrefix2 = "nut-form";
+    const {
+      className,
+      style,
+      footer,
+      children,
+      initialValues,
+      divider,
+      onFinish,
+      onFinishFailed,
+      labelPosition,
+      starPosition,
+      form
+    } = {
+      ...defaultProps$Y,
+      ...props
+    };
+    let formInstance;
+    if (form !== void 0) {
+      formInstance = form;
+    } else {
+      [formInstance] = useForm();
+    }
+    formInstance.starPosition = starPosition;
+    const { setCallback, submit, resetFields, setInitialValues } = formInstance;
+    setCallback({
+      onFinish,
+      onFinishFailed
+    });
+    const mountRef = React__default.useRef(false);
+    setInitialValues(initialValues, !mountRef.current);
+    if (!mountRef.current) {
+      mountRef.current = true;
+    }
+    return /* @__PURE__ */ React__default.createElement(
+      "form",
+      {
+        className: classNames(
+          classPrefix2,
+          className,
+          PositionInfo[labelPosition]
+        ),
+        style,
+        onSubmit: (e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          submit();
+        },
+        onReset: (e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          resetFields();
+        }
+      },
+      /* @__PURE__ */ React__default.createElement(Cell.Group, { divider }, /* @__PURE__ */ React__default.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React__default.createElement(Cell, null, footer) : null)
+    );
+  }
+);
+Form.defaultProps = defaultProps$Y;
+Form.displayName = "NutForm";
 function isForwardRefComponent(component) {
   return component.type && component.type.$$typeof && // eslint-disable-next-line react/display-name
   React__default.forwardRef(
@@ -10994,7 +11075,7 @@ function isForwardRefComponent(component) {
     }
   ).$$typeof === component.type.$$typeof;
 }
-const defaultProps$Y = {
+const defaultProps$X = {
   ...ComponentDefaults,
   required: false,
   name: "",
@@ -11061,7 +11142,7 @@ class FormItem extends React__default.Component {
     __publicField(this, "renderLayout", (childNode) => {
       var _a, _b;
       const { label, name, required: required4, className, style, errorMessageAlign } = {
-        ...defaultProps$Y,
+        ...defaultProps$X,
         ...this.props
       };
       const item = ((_a = this.context.errors) == null ? void 0 : _a.length) > 0 && ((_b = this.context.errors) == null ? void 0 : _b.filter((item2) => {
@@ -11111,83 +11192,11 @@ class FormItem extends React__default.Component {
     return /* @__PURE__ */ React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, this.renderLayout(returnChildNode));
   }
 }
-__publicField(FormItem, "defaultProps", defaultProps$Y);
+__publicField(FormItem, "defaultProps", defaultProps$X);
 __publicField(FormItem, "contextType", Context);
-const defaultProps$X = {
-  ...ComponentDefaults,
-  labelPosition: "right",
-  starPosition: "left",
-  onFinish: (values) => {
-  },
-  onFinishFailed: (values, errorFields) => {
-  }
-};
-const PositionInfo = {
-  top: "form-layout-top",
-  left: "form-layout-left",
-  right: "form-layout-right"
-};
-const Form = (props) => {
-  const classPrefix2 = "nut-form";
-  const {
-    className,
-    style,
-    footer,
-    children,
-    initialValues,
-    onFinish,
-    onFinishFailed,
-    labelPosition,
-    starPosition,
-    form
-  } = {
-    ...defaultProps$X,
-    ...props
-  };
-  let formInstance;
-  if (form !== void 0) {
-    formInstance = form;
-  } else {
-    [formInstance] = useForm();
-  }
-  formInstance.starPosition = starPosition;
-  const { setCallback, submit, resetFields, setInitialValues } = formInstance;
-  setCallback({
-    onFinish,
-    onFinishFailed
-  });
-  const mountRef = React__default.useRef(false);
-  setInitialValues(initialValues, !mountRef.current);
-  if (!mountRef.current) {
-    mountRef.current = true;
-  }
-  return /* @__PURE__ */ React__default.createElement(
-    "form",
-    {
-      className: classNames(
-        classPrefix2,
-        className,
-        PositionInfo[labelPosition]
-      ),
-      style,
-      onSubmit: (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        submit();
-      },
-      onReset: (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        resetFields();
-      }
-    },
-    /* @__PURE__ */ React__default.createElement(Cell.Group, null, /* @__PURE__ */ React__default.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React__default.createElement(Cell, null, footer) : null)
-  );
-};
-Form.defaultProps = defaultProps$X;
-Form.displayName = "NutForm";
-Form.Item = FormItem;
-Form.useForm = useForm;
+const InnerForm = Form;
+InnerForm.Item = FormItem;
+InnerForm.useForm = useForm;
 function trimExtraChar(value, char, regExp) {
   const index = value.indexOf(char);
   if (index === -1) {
@@ -14040,21 +14049,30 @@ const Content = (props) => {
   const handleClick = (e) => {
     onClick && onClick(e);
   };
-  return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__outer`, onClick: (e) => handleClick(e) }, /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement(
     "div",
     {
-      className: classPrefix2,
-      style: { display: visible ? "flex" : "none" }
+      className: classNames(`${classPrefix2}__outer`, props.className),
+      style: props.style,
+      onClick: (e) => handleClick(e)
     },
-    renderHeader(),
-    /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__content` }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children)),
-    renderFooter()
-  ));
+    /* @__PURE__ */ React__default.createElement(
+      "div",
+      {
+        className: classPrefix2,
+        style: { display: visible ? "flex" : "none" }
+      },
+      renderHeader(),
+      /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__content` }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children)),
+      renderFooter()
+    )
+  );
 };
 Content.displayName = "NutContent";
 const customEvents = new Events();
 function useCustomEventsPath(selector) {
   var _a;
+  selector = selector || "";
   const path = (_a = getCurrentInstance().router) == null ? void 0 : _a.path;
   return path ? `${path}__${selector}` : selector;
 }
@@ -14114,6 +14132,8 @@ const BaseDialog = (props) => {
   const {
     params: {
       id,
+      className,
+      style,
       visible,
       footer,
       title,
@@ -14221,6 +14241,8 @@ const BaseDialog = (props) => {
       /* @__PURE__ */ React__default.createElement(
         Content,
         {
+          className,
+          style,
           title,
           footer: renderFooter(),
           footerDirection,
@@ -15416,6 +15438,7 @@ const PullToRefresh = (p) => {
   };
   const handleTouchStart = (e) => {
     touch.start(e);
+    pullingRef.current = true;
   };
   const handleTouchMove = (e) => {
     if (props.scrollTop > 0) {
@@ -15424,16 +15447,17 @@ const PullToRefresh = (p) => {
     if (status === "refreshing" || status === "complete")
       return;
     touch.move(e);
-    if (touch.isVertical()) {
-      pullingRef.current = true;
-      setHeight(
-        Math.max(
-          rubberbandIfOutOfBounds(touch.deltaY, 0, 0, headHeight * 5, 0.5),
-          0
-        )
-      );
-      setStatus(height > threshold ? "canRelease" : "pulling");
+    if (e.cancelable) {
+      e.preventDefault();
     }
+    e.stopPropagation();
+    setHeight(
+      Math.max(
+        rubberbandIfOutOfBounds(touch.deltaY, 0, 0, headHeight * 5, 0.5),
+        0
+      )
+    );
+    setStatus(height > threshold ? "canRelease" : "pulling");
   };
   async function doRefresh() {
     setHeight(headHeight);
@@ -15827,7 +15851,6 @@ const Swipe = forwardRef((props, instanceRef) => {
       return /* @__PURE__ */ React__default.createElement(
         "div",
         {
-          id: "left",
           ref: side === "left" ? leftWrapper : rightWrapper,
           className: `${classPrefix2}__${side}`,
           onClick: (e) => handleOperate(e, side)
@@ -15866,14 +15889,15 @@ const Swipe = forwardRef((props, instanceRef) => {
     };
   }, []);
   return /* @__PURE__ */ React__default.createElement(
-    "div",
+    View,
     {
       ref: root2,
       className: classNames(classPrefix2, className),
       onTouchStart: (e) => onTouchStart(e),
       onTouchMove: (e) => onTouchMove(e),
       onTouchEnd: (e) => onTouchEnd(e),
-      style
+      style,
+      catchMove: true
     },
     /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}__wrapper`, style: wrapperStyle }, renderActionContent("left"), children, renderActionContent("right"))
   );
@@ -19256,7 +19280,7 @@ export {
   Ellipsis,
   Empty,
   FixedNav,
-  Form,
+  InnerForm as Form,
   FormItem,
   Grid,
   GridItem,