@nutui/nutui-react 2.0.15-beta.0 → 2.0.16

package/dist/nutui.react.umd.js

@@ -9,7 +9,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react v2.0.15 Wed Aug 30 2023 14:04:32 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v2.0.16 Wed Sep 06 2023 15:53:25 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -2541,6 +2541,7 @@ Check the top-level render call using <` + t + ">.");
     }
   );
   Button.displayName = "NutButton";
+  const CellGroupContext = React.createContext(null);
   const defaultProps$1r = {
     ...ComponentDefaults,
     title: "",
@@ -2558,7 +2559,7 @@ Check the top-level render call using <` + t + ">.");
       {
         className: `${classPrefix$p}__wrap ${divider ? `${classPrefix$p}__wrap--divider` : ""}`
       },
-      children
+      /* @__PURE__ */ React.createElement(CellGroupContext.Provider, { value: { divider } }, children)
     ));
   };
   CellGroup.defaultProps = defaultProps$1r;
@@ -2575,6 +2576,7 @@ Check the top-level render call using <` + t + ">.");
   };
   const classPrefix$o = "nut-cell";
   const Cell = (props) => {
+    const ctx2 = React.useContext(CellGroupContext);
     const {
       children,
       onClick,
@@ -2616,7 +2618,8 @@ Check the top-level render call using <` + t + ">.");
           style: styles
         },
         extra
-      ) : null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$o}__divider` }))
+      ) : null),
+      (ctx2 == null ? void 0 : ctx2.divider) ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$o}__divider` }) : null
     );
   };
   Cell.defaultProps = defaultProps$1q;
@@ -5689,6 +5692,7 @@ Check the top-level render call using <` + t + ">.");
     };
     const [innerVisible, setInnerVisible] = React.useState(visible);
     const classPrefix2 = `nut-overlay`;
+    const nodeRef = React.useRef(null);
     React.useEffect(() => {
       if (visible) {
         setInnerVisible(true);
@@ -5727,6 +5731,7 @@ Check the top-level render call using <` + t + ">.");
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       CSSTransition$1,
       {
+        nodeRef,
         classNames: `${classPrefix2}-slide`,
         unmountOnExit: true,
         timeout: duration,
@@ -5734,7 +5739,17 @@ Check the top-level render call using <` + t + ">.");
         onEntered: onHandleOpened,
         onExited: onHandleClosed
       },
-      /* @__PURE__ */ React.createElement("div", { className: classes, style: styles, ...rest, onClick: handleClick2 }, children)
+      /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          ref: nodeRef,
+          className: classes,
+          style: styles,
+          ...rest,
+          onClick: handleClick2
+        },
+        children
+      )
     ));
   };
   Overlay.defaultProps = defaultOverlayProps;
@@ -11881,6 +11896,7 @@ Please add \`${key}Action\` when creating your handler.`);
       afterClose,
       onClick
     } = { ...defaultProps$1c, ...props };
+    const nodeRef = React.useRef(null);
     const [index, setIndex] = React.useState(zIndex || _zIndex);
     const [innerVisible, setInnerVisible] = React.useState(visible);
     const [showChildren, setShowChildren] = React.useState(true);
@@ -11972,6 +11988,7 @@ Please add \`${key}Action\` when creating your handler.`);
       return /* @__PURE__ */ React.createElement(
         CSSTransition$1,
         {
+          nodeRef,
           classNames: transitionName,
           unmountOnExit: true,
           timeout: duration,
@@ -11979,7 +11996,18 @@ Please add \`${key}Action\` when creating your handler.`);
           onEntered: onHandleOpened,
           onExited: onHandleClosed
         },
-        /* @__PURE__ */ React.createElement("div", { style: popStyles, className: popClassName, onClick: onHandleClick }, renderTitle(), renderIcon(), showChildren ? children : "")
+        /* @__PURE__ */ React.createElement(
+          "div",
+          {
+            ref: nodeRef,
+            style: popStyles,
+            className: popClassName,
+            onClick: onHandleClick
+          },
+          renderTitle(),
+          renderIcon(),
+          showChildren ? children : ""
+        )
       );
     };
     const renderNode = () => {
@@ -12642,6 +12670,7 @@ Please add \`${key}Action\` when creating your handler.`);
     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);
@@ -16530,6 +16559,84 @@ Please add \`${key}Action\` when creating your handler.`);
     }
     return [formRef.current];
   };
+  const defaultProps$W = {
+    ...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$W,
+        ...props
+      };
+      let formInstance;
+      if (form !== void 0) {
+        formInstance = form;
+      } else {
+        [formInstance] = useForm();
+      }
+      React.useImperativeHandle(ref, () => formInstance);
+      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$W;
+  Form.displayName = "NutForm";
   function isForwardRefComponent(component) {
     return component.type && component.type.$$typeof && // eslint-disable-next-line react/display-name
     React.forwardRef(
@@ -16539,7 +16646,7 @@ Please add \`${key}Action\` when creating your handler.`);
       }
     ).$$typeof === component.type.$$typeof;
   }
-  const defaultProps$W = {
+  const defaultProps$V = {
     ...ComponentDefaults,
     required: false,
     name: "",
@@ -16607,7 +16714,7 @@ Please add \`${key}Action\` when creating your handler.`);
       __publicField(this, "renderLayout", (childNode) => {
         var _a2, _b;
         const { label, name, required: required2, className, style, errorMessageAlign } = {
-          ...defaultProps$W,
+          ...defaultProps$V,
           ...this.props
         };
         const item = ((_a2 = this.context.errors) == null ? void 0 : _a2.length) > 0 && ((_b = this.context.errors) == null ? void 0 : _b.filter((item2) => {
@@ -16657,83 +16764,11 @@ Please add \`${key}Action\` when creating your handler.`);
       return /* @__PURE__ */ React.createElement(React.Fragment, { key: this.state.resetCount }, this.renderLayout(returnChildNode));
     }
   }
-  __publicField(FormItem, "defaultProps", defaultProps$W);
+  __publicField(FormItem, "defaultProps", defaultProps$V);
   __publicField(FormItem, "contextType", Context);
-  const defaultProps$V = {
-    ...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$V,
-      ...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$V;
-  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) {
@@ -19727,16 +19762,24 @@ Please add \`${key}Action\` when creating your handler.`);
     const handleClick2 = (e) => {
       onClick && onClick(e);
     };
-    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__outer`, onClick: (e) => handleClick2(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) => handleClick2(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 defaultDialogProps = {
@@ -19795,6 +19838,7 @@ Please add \`${key}Action\` when creating your handler.`);
   DialogWrap.defaultProps = defaultDialogProps;
   DialogWrap.displayName = "NutDialogWrap";
   const defaultProps$D = {
+    ...ComponentDefaults,
     confirmText: "",
     cancelText: "",
     overlay: true,
@@ -25229,7 +25273,7 @@ Please add \`${key}Action\` when creating your handler.`);
   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 v2.0.15 Wed Aug 30 2023 14:05:09 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v2.0.16 Wed Sep 06 2023 15:53:50 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+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/form/form.d.ts

@@ -1,7 +1,6 @@
-import React, { FunctionComponent, ReactNode } from 'react';
-import { useForm } from './useform';
+import React, { ReactNode } from 'react';
 import { BasicComponent } from '../../utils/typings';
-import { FormItem } from '../formitem/formitem';
+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 right
@@ -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.d.ts

@@ -1,3 +1,12 @@
-import { Form } from './form';
+import React from 'react';
+import { FormProps } from './form';
+import { FormItem } from '../formitem/formitem';
+import { FormInstance } from './types';
+import { useForm } from '../../packages/form/useform';
 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/package.json

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