@panneau/modal-form 4.0.49 → 4.0.52

package/dist/index.d.ts

@@ -1,23 +1,13 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ReactNode, ForwardedRef } from 'react';
-import { Field } from '@panneau/core';
+import { ForwardedRef } from 'react';
+import { FormProps } from '@panneau/form';
+import { DialogModalProps } from '@panneau/modal-dialog';
 
-interface ModalFormProps {
-    id: string | number;
-    title?: ReactNode | null;
-    name?: string | null;
-    fields?: Field[] | null;
-    action?: string | null;
-    type?: string;
-    onComplete?: ((value: unknown) => void) | null;
-    onCancel?: (() => void) | null;
-    onClosed?: (() => void) | null;
-    submitButtonLabel?: ReactNode | null;
+interface FormModalProps extends Omit<FormProps, 'id' | 'title'>, DialogModalProps {
     withoutCloseOnComplete?: boolean;
-    className?: string | null;
-    children?: ReactNode | null;
     formRef?: ForwardedRef<HTMLFormElement> | null;
 }
-declare function ModalForm({ id, title, name, fields, action, type, onComplete, onCancel, onClosed, submitButtonLabel, withoutCloseOnComplete, className, children, formRef, ...props }: ModalFormProps): react_jsx_runtime.JSX.Element;
+declare function FormModal({ id, title, fields, size, visible, requestClose: customRequestClose, onComplete, onCancel, onClosed, withoutCloseOnComplete, className, children, formRef: customFormRef, submitButtonLabel, cancelButtonLabel, withCancelButton, withoutSubmitButton, ...props }: FormModalProps): react_jsx_runtime.JSX.Element;
 
-export { ModalForm as default };
+export { FormModal as default };
+export type { FormModalProps };

package/dist/index.js

@@ -1,12 +1,13 @@
 import { c } from 'react/compiler-runtime';
-import { useState } from 'react';
+import { useState, useRef } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { mergeRefs } from '@panneau/core/utils';
 import Form from '@panneau/form';
 import Dialog from '@panneau/modal-dialog';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
-function ModalForm(t0) {
-  const $ = c(42);
+function FormModal(t0) {
+  const $ = c(53);
   let id;
   let props;
   let t1;
@@ -14,6 +15,9 @@ function ModalForm(t0) {
   let t11;
   let t12;
   let t13;
+  let t14;
+  let t15;
+  let t16;
   let t2;
   let t3;
   let t4;
@@ -26,18 +30,21 @@ function ModalForm(t0) {
     ({
       id,
       title: t1,
-      name: t2,
-      fields: t3,
-      action: t4,
-      type: t5,
+      fields: t2,
+      size: t3,
+      visible: t4,
+      requestClose: t5,
       onComplete: t6,
       onCancel: t7,
       onClosed: t8,
-      submitButtonLabel: t9,
-      withoutCloseOnComplete: t10,
-      className: t11,
-      children: t12,
-      formRef: t13,
+      withoutCloseOnComplete: t9,
+      className: t10,
+      children: t11,
+      formRef: t12,
+      submitButtonLabel: t13,
+      cancelButtonLabel: t14,
+      withCancelButton: t15,
+      withoutSubmitButton: t16,
       ...props
     } = t0);
     $[0] = t0;
@@ -48,14 +55,17 @@ function ModalForm(t0) {
     $[5] = t11;
     $[6] = t12;
     $[7] = t13;
-    $[8] = t2;
-    $[9] = t3;
-    $[10] = t4;
-    $[11] = t5;
-    $[12] = t6;
-    $[13] = t7;
-    $[14] = t8;
-    $[15] = t9;
+    $[8] = t14;
+    $[9] = t15;
+    $[10] = t16;
+    $[11] = t2;
+    $[12] = t3;
+    $[13] = t4;
+    $[14] = t5;
+    $[15] = t6;
+    $[16] = t7;
+    $[17] = t8;
+    $[18] = t9;
   } else {
     id = $[1];
     props = $[2];
@@ -64,135 +74,166 @@ function ModalForm(t0) {
     t11 = $[5];
     t12 = $[6];
     t13 = $[7];
-    t2 = $[8];
-    t3 = $[9];
-    t4 = $[10];
-    t5 = $[11];
-    t6 = $[12];
-    t7 = $[13];
-    t8 = $[14];
-    t9 = $[15];
+    t14 = $[8];
+    t15 = $[9];
+    t16 = $[10];
+    t2 = $[11];
+    t3 = $[12];
+    t4 = $[13];
+    t5 = $[14];
+    t6 = $[15];
+    t7 = $[16];
+    t8 = $[17];
+    t9 = $[18];
   }
   const title = t1 === undefined ? null : t1;
-  const name = t2 === undefined ? null : t2;
-  const fields = t3 === undefined ? null : t3;
-  const action = t4 === undefined ? null : t4;
-  const type = t5 === undefined ? "normal" : t5;
+  const fields = t2 === undefined ? null : t2;
+  const size = t3 === undefined ? "lg" : t3;
+  const visible = t4 === undefined ? null : t4;
+  const customRequestClose = t5 === undefined ? null : t5;
   const onComplete = t6 === undefined ? null : t6;
   const onCancel = t7 === undefined ? null : t7;
   const onClosed = t8 === undefined ? null : t8;
-  const submitButtonLabel = t9 === undefined ? null : t9;
-  const withoutCloseOnComplete = t10 === undefined ? false : t10;
-  const className = t11 === undefined ? null : t11;
-  const children = t12 === undefined ? null : t12;
-  const formRef = t13 === undefined ? null : t13;
+  const withoutCloseOnComplete = t9 === undefined ? false : t9;
+  const className = t10 === undefined ? null : t10;
+  const children = t11 === undefined ? null : t11;
+  const customFormRef = t12 === undefined ? null : t12;
+  const submitButtonLabel = t13 === undefined ? null : t13;
+  const cancelButtonLabel = t14 === undefined ? null : t14;
+  const withCancelButton = t15 === undefined ? true : t15;
+  const withoutSubmitButton = t16 === undefined ? false : t16;
   const [opened, setOpened] = useState(true);
-  let t14;
-  if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
-    t14 = () => {
+  const formRef = useRef(null);
+  let t17;
+  if ($[19] !== customRequestClose) {
+    t17 = customRequestClose ?? (() => {
       setOpened(false);
-    };
-    $[16] = t14;
+    });
+    $[19] = customRequestClose;
+    $[20] = t17;
   } else {
-    t14 = $[16];
+    t17 = $[20];
   }
-  const requestClose = t14;
-  let t15;
-  if ($[17] !== onCancel) {
-    t15 = () => {
-      setOpened(false);
+  const requestClose = t17;
+  let t18;
+  if ($[21] !== onCancel || $[22] !== requestClose) {
+    t18 = () => {
+      requestClose();
       if (onCancel !== null) {
         onCancel();
       }
     };
-    $[17] = onCancel;
-    $[18] = t15;
+    $[21] = onCancel;
+    $[22] = requestClose;
+    $[23] = t18;
   } else {
-    t15 = $[18];
+    t18 = $[23];
   }
-  const onFormCancel = t15;
-  let t16;
-  if ($[19] !== onComplete || $[20] !== withoutCloseOnComplete) {
-    t16 = value => {
+  const onFormCancel = t18;
+  let t19;
+  if ($[24] !== onComplete || $[25] !== requestClose || $[26] !== withoutCloseOnComplete) {
+    t19 = value => {
       if (!withoutCloseOnComplete) {
-        setOpened(false);
+        requestClose();
       }
       if (onComplete !== null) {
         onComplete(value);
       }
     };
-    $[19] = onComplete;
-    $[20] = withoutCloseOnComplete;
-    $[21] = t16;
+    $[24] = onComplete;
+    $[25] = requestClose;
+    $[26] = withoutCloseOnComplete;
+    $[27] = t19;
   } else {
-    t16 = $[21];
+    t19 = $[27];
   }
-  const onFormComplete = t16;
-  let t17;
-  if ($[22] !== name || $[23] !== title) {
-    t17 = title || (name !== null ? /*#__PURE__*/jsx(FormattedMessage, {
-      id: "smqUAV",
-      values: {
-        name
+  const onFormComplete = t19;
+  let t20;
+  if ($[28] === Symbol.for("react.memo_cache_sentinel")) {
+    t20 = () => {
+      if (formRef.current !== null) {
+        formRef.current.requestSubmit();
       }
-    }) : /*#__PURE__*/jsx(FormattedMessage, {
+    };
+    $[28] = t20;
+  } else {
+    t20 = $[28];
+  }
+  const onClickSubmit = t20;
+  let t21;
+  if ($[29] !== title) {
+    t21 = title || /*#__PURE__*/jsx(FormattedMessage, {
       id: "T/NPHK"
-    }));
-    $[22] = name;
-    $[23] = title;
-    $[24] = t17;
+    });
+    $[29] = title;
+    $[30] = t21;
   } else {
-    t17 = $[24];
+    t21 = $[30];
   }
-  let t18;
-  if ($[25] !== action || $[26] !== fields || $[27] !== formRef || $[28] !== onFormCancel || $[29] !== onFormComplete || $[30] !== props || $[31] !== submitButtonLabel || $[32] !== type) {
-    t18 = /*#__PURE__*/jsx(Form, {
+  const t22 = visible ?? opened;
+  const t23 = !withoutSubmitButton;
+  let t24;
+  if ($[31] !== customFormRef) {
+    t24 = mergeRefs(formRef, customFormRef);
+    $[31] = customFormRef;
+    $[32] = t24;
+  } else {
+    t24 = $[32];
+  }
+  let t25;
+  if ($[33] !== fields || $[34] !== onFormCancel || $[35] !== onFormComplete || $[36] !== props || $[37] !== t24) {
+    t25 = /*#__PURE__*/jsx(Form, {
+      withoutActions: true,
       ...props,
-      ref: formRef,
+      ref: t24,
       fields: fields,
-      action: action,
-      type: type,
-      buttonSize: "md",
       onComplete: onFormComplete,
-      onCancel: onFormCancel,
-      submitButtonLabel: submitButtonLabel
+      onCancel: onFormCancel
     });
-    $[25] = action;
-    $[26] = fields;
-    $[27] = formRef;
-    $[28] = onFormCancel;
-    $[29] = onFormComplete;
-    $[30] = props;
-    $[31] = submitButtonLabel;
-    $[32] = type;
-    $[33] = t18;
+    $[33] = fields;
+    $[34] = onFormCancel;
+    $[35] = onFormComplete;
+    $[36] = props;
+    $[37] = t24;
+    $[38] = t25;
   } else {
-    t18 = $[33];
+    t25 = $[38];
   }
-  let t19;
-  if ($[34] !== children || $[35] !== className || $[36] !== id || $[37] !== onClosed || $[38] !== opened || $[39] !== t17 || $[40] !== t18) {
-    t19 = /*#__PURE__*/jsxs(Dialog, {
+  let t26;
+  if ($[39] !== cancelButtonLabel || $[40] !== children || $[41] !== className || $[42] !== id || $[43] !== onClosed || $[44] !== requestClose || $[45] !== size || $[46] !== submitButtonLabel || $[47] !== t21 || $[48] !== t22 || $[49] !== t23 || $[50] !== t25 || $[51] !== withCancelButton) {
+    t26 = /*#__PURE__*/jsxs(Dialog, {
       id: id,
-      title: t17,
-      size: "lg",
-      visible: opened,
+      title: t21,
+      size: size,
+      visible: t22,
+      withCancelButton: withCancelButton,
+      withSubmitButton: t23,
       requestClose: requestClose,
       onClosed: onClosed,
+      onClickSubmit: onClickSubmit,
       className: className,
-      children: [children, t18]
+      submitButtonLabel: submitButtonLabel,
+      cancelButtonLabel: cancelButtonLabel,
+      children: [children, t25]
     });
-    $[34] = children;
-    $[35] = className;
-    $[36] = id;
-    $[37] = onClosed;
-    $[38] = opened;
-    $[39] = t17;
-    $[40] = t18;
-    $[41] = t19;
+    $[39] = cancelButtonLabel;
+    $[40] = children;
+    $[41] = className;
+    $[42] = id;
+    $[43] = onClosed;
+    $[44] = requestClose;
+    $[45] = size;
+    $[46] = submitButtonLabel;
+    $[47] = t21;
+    $[48] = t22;
+    $[49] = t23;
+    $[50] = t25;
+    $[51] = withCancelButton;
+    $[52] = t26;
   } else {
-    t19 = $[41];
+    t26 = $[52];
   }
-  return t19;
+  return t26;
 }
 
-export { ModalForm as default };
+export { FormModal as default };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/modal-form",
-    "version": "4.0.49",
+    "version": "4.0.52",
     "description": "Resource form modal",
     "keywords": [
         "javascript"
@@ -52,11 +52,11 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.28.6",
-        "@panneau/core": "^4.0.48",
-        "@panneau/form": "^4.0.49",
-        "@panneau/intl": "^4.0.48",
-        "@panneau/modal-dialog": "^4.0.48",
-        "@panneau/themes": "^4.0.48",
+        "@panneau/core": "^4.0.50",
+        "@panneau/form": "^4.0.50",
+        "@panneau/intl": "^4.0.50",
+        "@panneau/modal-dialog": "^4.0.50",
+        "@panneau/themes": "^4.0.50",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "react-intl": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^10.0.0"
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "cc6f219752687293408ee6b8a08be173ef85f80e"
+    "gitHead": "280155c90cf1dfc39e0c36c76ef8bc2fea627041"
 }