@nutui/nutui-react-taro 2.0.15 → 2.0.16

package/dist/nutui.react.umd.js

@@ -8,7 +8,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.
 */
@@ -2019,6 +2019,7 @@ var __publicField = (obj, key, value) => {
     }
   );
   Button.displayName = "NutButton";
+  const CellGroupContext = React.createContext(null);
   const defaultProps$1t = {
     ...ComponentDefaults,
     title: "",
@@ -2036,7 +2037,7 @@ var __publicField = (obj, key, value) => {
       {
         className: `${classPrefix$p}__wrap ${divider ? `${classPrefix$p}__wrap--divider` : ""}`
       },
-      children
+      /* @__PURE__ */ React.createElement(CellGroupContext.Provider, { value: { divider } }, children)
     ));
   };
   CellGroup.defaultProps = defaultProps$1t;
@@ -2053,6 +2054,7 @@ var __publicField = (obj, key, value) => {
   };
   const classPrefix$o = "nut-cell";
   const Cell = (props) => {
+    const ctx = React.useContext(CellGroupContext);
     const {
       children,
       onClick,
@@ -2094,7 +2096,8 @@ var __publicField = (obj, key, value) => {
           style: styles
         },
         extra
-      ) : null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$o}__divider` }))
+      ) : null),
+      (ctx == null ? void 0 : ctx.divider) ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$o}__divider` }) : null
     );
   };
   Cell.defaultProps = defaultProps$1s;
@@ -7032,6 +7035,7 @@ var __publicField = (obj, key, value) => {
     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);
@@ -11001,6 +11005,83 @@ var __publicField = (obj, key, value) => {
     }
     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.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.useRef(false);
+      setInitialValues(initialValues, !mountRef.current);
+      if (!mountRef.current) {
+        mountRef.current = true;
+      }
+      return /* @__PURE__ */ React.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.createElement(Cell.Group, { divider }, /* @__PURE__ */ React.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React.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.forwardRef(
@@ -11010,7 +11091,7 @@ var __publicField = (obj, key, value) => {
       }
     ).$$typeof === component.type.$$typeof;
   }
-  const defaultProps$Y = {
+  const defaultProps$X = {
     ...ComponentDefaults,
     required: false,
     name: "",
@@ -11077,7 +11158,7 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "renderLayout", (childNode) => {
         var _a, _b;
         const { label, name, required: required2, 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) => {
@@ -11127,83 +11208,11 @@ var __publicField = (obj, key, value) => {
       return /* @__PURE__ */ React.createElement(React.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.useRef(false);
-    setInitialValues(initialValues, !mountRef.current);
-    if (!mountRef.current) {
-      mountRef.current = true;
-    }
-    return /* @__PURE__ */ React.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.createElement(Cell.Group, null, /* @__PURE__ */ React.createElement(Context.Provider, { value: formInstance }, children), footer ? /* @__PURE__ */ React.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) {
@@ -14056,21 +14065,30 @@ var __publicField = (obj, key, value) => {
     const handleClick = (e) => {
       onClick && onClick(e);
     };
-    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__outer`, onClick: (e) => handleClick(e) }, /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.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.createElement("div", { className: `${classPrefix2}__content` }, /* @__PURE__ */ React.createElement(React.Fragment, null, children)),
-      renderFooter()
-    ));
+      /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: classPrefix2,
+          style: { display: visible ? "flex" : "none" }
+        },
+        renderHeader(),
+        /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__content` }, /* @__PURE__ */ React.createElement(React.Fragment, null, children)),
+        renderFooter()
+      )
+    );
   };
   Content.displayName = "NutContent";
   const customEvents = new Taro.Events();
   function useCustomEventsPath(selector) {
     var _a;
+    selector = selector || "";
     const path = (_a = Taro.getCurrentInstance().router) == null ? void 0 : _a.path;
     return path ? `${path}__${selector}` : selector;
   }
@@ -14130,6 +14148,8 @@ var __publicField = (obj, key, value) => {
     const {
       params: {
         id,
+        className,
+        style,
         visible,
         footer,
         title,
@@ -14237,6 +14257,8 @@ var __publicField = (obj, key, value) => {
         /* @__PURE__ */ React.createElement(
           Content,
           {
+            className,
+            style,
             title,
             footer: renderFooter(),
             footerDirection,
@@ -15432,6 +15454,7 @@ var __publicField = (obj, key, value) => {
     };
     const handleTouchStart = (e) => {
       touch.start(e);
+      pullingRef.current = true;
     };
     const handleTouchMove = (e) => {
       if (props.scrollTop > 0) {
@@ -15440,16 +15463,17 @@ var __publicField = (obj, key, value) => {
       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);
@@ -15843,7 +15867,6 @@ var __publicField = (obj, key, value) => {
         return /* @__PURE__ */ React.createElement(
           "div",
           {
-            id: "left",
             ref: side === "left" ? leftWrapper : rightWrapper,
             className: `${classPrefix2}__${side}`,
             onClick: (e) => handleOperate(e, side)
@@ -15882,14 +15905,15 @@ var __publicField = (obj, key, value) => {
       };
     }, []);
     return /* @__PURE__ */ React.createElement(
-      "div",
+      components.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.createElement("div", { className: `${classPrefix2}__wrapper`, style: wrapperStyle }, renderActionContent("left"), children, renderActionContent("right"))
     );
@@ -19271,7 +19295,7 @@ var __publicField = (obj, key, value) => {
   exports2.Ellipsis = Ellipsis;
   exports2.Empty = Empty;
   exports2.FixedNav = FixedNav;
-  exports2.Form = Form;
+  exports2.Form = InnerForm;
   exports2.FormItem = FormItem;
   exports2.Grid = Grid;
   exports2.GridItem = GridItem;

package/dist/style.mjs

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.0.15 Wed Aug 30 2023 14:11:14 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.16 Wed Sep 06 2023 15:52:14 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/types/packages/cellgroup/context.d.ts

@@ -0,0 +1,4 @@
+declare const CellGroupContext: import("react").Context<{
+    divider: boolean;
+} | null>;
+export default CellGroupContext;

package/dist/types/packages/dialog/config.d.ts

@@ -1,10 +1,11 @@
 import { ReactNode, ForwardRefExoticComponent, PropsWithChildren } from 'react';
 import type { MouseEvent } from 'react';
+import { BasicComponent } from '../../utils/typings';
 export type DialogConfigType = {
     prefixCls?: string;
     simple?: boolean;
 };
-export interface BasicDialogProps {
+export interface BasicDialogProps extends BasicComponent {
     visible?: boolean;
     title?: ReactNode;
     content?: ReactNode;

package/dist/types/packages/dialog/content.taro.d.ts

@@ -1,6 +1,7 @@
 import { FunctionComponent, ReactNode, HTMLAttributes } from 'react';
 import { ITouchEvent } from '@tarojs/components';
-interface ContentProps {
+import { BasicComponent } from '../../utils/typings';
+interface ContentProps extends BasicComponent {
     visible: boolean;
     title: ReactNode;
     footer: ReactNode;

package/dist/types/packages/form/form.taro.d.ts

@@ -1,7 +1,6 @@
-import React, { FunctionComponent, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 import { BasicComponent } from '../../utils/typings';
-import { useForm } from './useform.taro';
-import { FormItem } from '../formitem/formitem.taro';
+import { FormInstance } from '../../packages/form/types';
 export interface FormProps extends BasicComponent {
     /**
     * 表单底部区域，一般放置确认和重置按钮
@@ -23,6 +22,7 @@ export interface FormProps extends BasicComponent {
     * @default -
     */
     form: any
+    divider: boolean;
     /**
     * 表单项 label 的位置
     * @default 'left'\
@@ -44,8 +44,4 @@ export interface FormProps extends BasicComponent {
     */
     onFinishFailed: (values: any, errorFields: any) => void
 }
-export declare const Form: FunctionComponent<Partial<FormProps> & React.HTMLAttributes<HTMLFormElement>> & {
-    Item: typeof FormItem;
-} & {
-    useForm: typeof useForm;
-};
+export declare const Form: React.ForwardRefExoticComponent<Partial<FormProps> & React.RefAttributes<FormInstance<any>>>;

package/dist/types/packages/form/index.taro.d.ts

@@ -1,3 +1,12 @@
-import { Form } from './form.taro';
+import React from 'react';
+import { FormProps } from './form.taro';
+import { FormItem } from '../formitem/formitem.taro';
+import { FormInstance } from './types';
+import { useForm } from '../../packages/form/useform.taro';
 export type { FormItemRuleWithoutValidator, StoreValue, NamePath, FormInstance, FieldEntity, } from './types';
-export default Form;
+type CompoundedComponent = React.ForwardRefExoticComponent<Partial<FormProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'> & React.RefAttributes<FormInstance>> & {
+    Item: typeof FormItem;
+    useForm: typeof useForm;
+};
+declare const InnerForm: CompoundedComponent;
+export default InnerForm;

package/dist/types/packages/form/types.d.ts

@@ -17,6 +17,7 @@ export interface Store {
 export interface FormInstance<Values = any> {
     registerField: (entity: FieldEntity) => () => void;
     getFieldValue: (name: NamePath) => StoreValue;
+    setInitialValues: (values: any, init: boolean) => void;
     setFieldsValue: (value: any) => void;
     resetFields: (fields?: NamePath[]) => void;
     submit: () => void;

package/dist/types/packages/swipe/swipe.taro.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import type { TouchEvent, MouseEvent } from 'react';
+import type { MouseEvent } from 'react';
+import { BaseEventOrig } from '@tarojs/components/types/common';
 import { BasicComponent } from '../../utils/typings';
 export type SwipeSide = 'left' | 'right';
 export interface SwipeInstance {
@@ -57,16 +58,16 @@ export interface SwipeProps extends BasicComponent {
     * onTouchStart
     * @default -
     */
-    onTouchStart?: (event: TouchEvent<HTMLDivElement>) => void
+    onTouchStart?: (event: BaseEventOrig<HTMLDivElement>) => void
     /**
     * onTouchEnd
     * @default -
     */
-    onTouchEnd?: (event: TouchEvent<HTMLDivElement>) => void
+    onTouchEnd?: (event: BaseEventOrig<HTMLDivElement>) => void
     /**
     * onTouchMove
     * @default -
     */
-    onTouchMove?: (event: TouchEvent<HTMLDivElement>) => void
+    onTouchMove?: (event: BaseEventOrig<HTMLDivElement>) => void
 }
 export declare const Swipe: React.ForwardRefExoticComponent<Partial<SwipeProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onTouchStart" | "onTouchMove" | "onTouchEnd"> & React.RefAttributes<SwipeInstance>>;

package/dist/types/utils/use-custom-event.d.ts

@@ -1,5 +1,5 @@
 export declare const customEvents: TaroGeneral.Events;
-export declare function useCustomEventsPath(selector: string): string;
+export declare function useCustomEventsPath(selector?: string): string;
 export declare function useCustomEvent(selector: string, cb: any): (<T = any>(args: T) => void)[];
 export declare function useParams<T = any>(args: T): {
     params: T;

package/package.json

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

package/dist/esm/cell.taro-0a9f80bc.js

@@ -1,50 +0,0 @@
-import React__default from "react";
-import classNames from "classnames";
-import { C as ComponentDefaults } from "./typings-11d83a22.js";
-import { C as CellGroup } from "./cellgroup.taro-d2fad5e7.js";
-const defaultProps = {
-  ...ComponentDefaults,
-  title: null,
-  description: null,
-  extra: null,
-  radius: "6px",
-  align: "flex-start",
-  onClick: (event) => {
-  }
-};
-const classPrefix = "nut-cell";
-const Cell = (props) => {
-  const { children, onClick, title, description, extra, radius, align, className, style, ...rest } = {
-    ...defaultProps,
-    ...props
-  };
-  const handleClick = (event) => {
-    onClick(event);
-  };
-  const baseStyle = {
-    ...style,
-    borderRadius: Number.isNaN(Number(radius)) ? String(radius) : `${radius}px`,
-    alignItems: align
-  };
-  const styles = title || description ? {} : {
-    flex: 1
-  };
-  return React__default.createElement("div", { className: classNames(classPrefix, className), onClick: (event) => handleClick(event), style: baseStyle, ...rest }, children || React__default.createElement(
-    React__default.Fragment,
-    null,
-    title || description ? React__default.createElement(
-      "div",
-      { className: `${classPrefix}__left` },
-      title ? React__default.createElement("div", { className: `${classPrefix}__title` }, title) : null,
-      description ? React__default.createElement("div", { className: `${classPrefix}__description` }, description) : null
-    ) : null,
-    extra ? React__default.createElement("div", { className: `${classPrefix}__extra`, style: styles }, extra) : null,
-    React__default.createElement("div", { className: `${classPrefix}__divider` })
-  ));
-};
-Cell.defaultProps = defaultProps;
-Cell.displayName = "NutCell";
-Cell.Group = CellGroup;
-export {
-  Cell as C
-};