@panneau/modal-form 4.0.50 → 4.0.52

package/dist/index.d.ts

@@ -1,19 +1,13 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ReactNode, ForwardedRef } from 'react';
+import { ForwardedRef } from 'react';
 import { FormProps } from '@panneau/form';
-import { DialogProps } from '@panneau/modal-dialog';
+import { DialogModalProps } from '@panneau/modal-dialog';
 
-interface FormModalProps extends Omit<FormProps, 'id' | 'title'>, Pick<DialogProps, 'id' | 'title' | 'size'> {
-    name?: string | null;
-    type?: string;
-    onCancel?: (() => void) | null;
-    onClosed?: (() => void) | null;
+interface FormModalProps extends Omit<FormProps, 'id' | 'title'>, DialogModalProps {
     withoutCloseOnComplete?: boolean;
-    className?: string | null;
-    children?: ReactNode | null;
     formRef?: ForwardedRef<HTMLFormElement> | null;
 }
-declare function FormModal({ id, title, name, fields, type, size, onComplete, onCancel, onClosed, withoutCloseOnComplete, className, children, formRef: customFormRef, submitButtonLabel, cancelButtonLabel, withCancelButton, withoutSubmitButton, ...props }: FormModalProps): 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 { FormModal as default };
 export type { FormModalProps };

package/dist/index.js

@@ -7,7 +7,7 @@ import Dialog from '@panneau/modal-dialog';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
 function FormModal(t0) {
-  const $ = c(51);
+  const $ = c(53);
   let id;
   let props;
   let t1;
@@ -30,10 +30,10 @@ function FormModal(t0) {
     ({
       id,
       title: t1,
-      name: t2,
-      fields: t3,
-      type: t4,
-      size: t5,
+      fields: t2,
+      size: t3,
+      visible: t4,
+      requestClose: t5,
       onComplete: t6,
       onCancel: t7,
       onClosed: t8,
@@ -87,10 +87,10 @@ function FormModal(t0) {
     t9 = $[18];
   }
   const title = t1 === undefined ? null : t1;
-  const name = t2 === undefined ? null : t2;
-  const fields = t3 === undefined ? null : t3;
-  const type = t4 === undefined ? "normal" : t4;
-  const size = t5 === undefined ? "lg" : 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;
@@ -105,138 +105,135 @@ function FormModal(t0) {
   const [opened, setOpened] = useState(true);
   const formRef = useRef(null);
   let t17;
-  if ($[19] === Symbol.for("react.memo_cache_sentinel")) {
-    t17 = () => {
+  if ($[19] !== customRequestClose) {
+    t17 = customRequestClose ?? (() => {
       setOpened(false);
-    };
-    $[19] = t17;
+    });
+    $[19] = customRequestClose;
+    $[20] = t17;
   } else {
-    t17 = $[19];
+    t17 = $[20];
   }
   const requestClose = t17;
   let t18;
-  if ($[20] !== onCancel) {
+  if ($[21] !== onCancel || $[22] !== requestClose) {
     t18 = () => {
-      setOpened(false);
+      requestClose();
       if (onCancel !== null) {
         onCancel();
       }
     };
-    $[20] = onCancel;
-    $[21] = t18;
+    $[21] = onCancel;
+    $[22] = requestClose;
+    $[23] = t18;
   } else {
-    t18 = $[21];
+    t18 = $[23];
   }
   const onFormCancel = t18;
   let t19;
-  if ($[22] !== onComplete || $[23] !== withoutCloseOnComplete) {
+  if ($[24] !== onComplete || $[25] !== requestClose || $[26] !== withoutCloseOnComplete) {
     t19 = value => {
       if (!withoutCloseOnComplete) {
-        setOpened(false);
+        requestClose();
       }
       if (onComplete !== null) {
         onComplete(value);
       }
     };
-    $[22] = onComplete;
-    $[23] = withoutCloseOnComplete;
-    $[24] = t19;
+    $[24] = onComplete;
+    $[25] = requestClose;
+    $[26] = withoutCloseOnComplete;
+    $[27] = t19;
   } else {
-    t19 = $[24];
+    t19 = $[27];
   }
   const onFormComplete = t19;
   let t20;
-  if ($[25] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[28] === Symbol.for("react.memo_cache_sentinel")) {
     t20 = () => {
       if (formRef.current !== null) {
-        formRef.current.submit();
+        formRef.current.requestSubmit();
       }
     };
-    $[25] = t20;
+    $[28] = t20;
   } else {
-    t20 = $[25];
+    t20 = $[28];
   }
   const onClickSubmit = t20;
   let t21;
-  if ($[26] !== name || $[27] !== title) {
-    t21 = title || (name !== null ? /*#__PURE__*/jsx(FormattedMessage, {
-      id: "smqUAV",
-      values: {
-        name
-      }
-    }) : /*#__PURE__*/jsx(FormattedMessage, {
+  if ($[29] !== title) {
+    t21 = title || /*#__PURE__*/jsx(FormattedMessage, {
       id: "T/NPHK"
-    }));
-    $[26] = name;
-    $[27] = title;
-    $[28] = t21;
+    });
+    $[29] = title;
+    $[30] = t21;
   } else {
-    t21 = $[28];
+    t21 = $[30];
   }
-  const t22 = !withoutSubmitButton;
-  let t23;
-  if ($[29] !== customFormRef) {
-    t23 = mergeRefs(formRef, customFormRef);
-    $[29] = customFormRef;
-    $[30] = t23;
+  const t22 = visible ?? opened;
+  const t23 = !withoutSubmitButton;
+  let t24;
+  if ($[31] !== customFormRef) {
+    t24 = mergeRefs(formRef, customFormRef);
+    $[31] = customFormRef;
+    $[32] = t24;
   } else {
-    t23 = $[30];
+    t24 = $[32];
   }
-  let t24;
-  if ($[31] !== fields || $[32] !== onFormCancel || $[33] !== onFormComplete || $[34] !== props || $[35] !== t23 || $[36] !== type) {
-    t24 = /*#__PURE__*/jsx(Form, {
+  let t25;
+  if ($[33] !== fields || $[34] !== onFormCancel || $[35] !== onFormComplete || $[36] !== props || $[37] !== t24) {
+    t25 = /*#__PURE__*/jsx(Form, {
       withoutActions: true,
       ...props,
-      ref: t23,
+      ref: t24,
       fields: fields,
-      type: type,
       onComplete: onFormComplete,
       onCancel: onFormCancel
     });
-    $[31] = fields;
-    $[32] = onFormCancel;
-    $[33] = onFormComplete;
-    $[34] = props;
-    $[35] = t23;
-    $[36] = type;
+    $[33] = fields;
+    $[34] = onFormCancel;
+    $[35] = onFormComplete;
+    $[36] = props;
     $[37] = t24;
+    $[38] = t25;
   } else {
-    t24 = $[37];
+    t25 = $[38];
   }
-  let t25;
-  if ($[38] !== cancelButtonLabel || $[39] !== children || $[40] !== className || $[41] !== id || $[42] !== onClosed || $[43] !== opened || $[44] !== size || $[45] !== submitButtonLabel || $[46] !== t21 || $[47] !== t22 || $[48] !== t24 || $[49] !== withCancelButton) {
-    t25 = /*#__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: t21,
       size: size,
-      visible: opened,
+      visible: t22,
       withCancelButton: withCancelButton,
-      withSubmitButton: t22,
+      withSubmitButton: t23,
       requestClose: requestClose,
       onClosed: onClosed,
       onClickSubmit: onClickSubmit,
       className: className,
       submitButtonLabel: submitButtonLabel,
       cancelButtonLabel: cancelButtonLabel,
-      children: [children, t24]
+      children: [children, t25]
     });
-    $[38] = cancelButtonLabel;
-    $[39] = children;
-    $[40] = className;
-    $[41] = id;
-    $[42] = onClosed;
-    $[43] = opened;
-    $[44] = size;
-    $[45] = submitButtonLabel;
-    $[46] = t21;
-    $[47] = t22;
-    $[48] = t24;
-    $[49] = withCancelButton;
+    $[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 {
-    t25 = $[50];
+    t26 = $[52];
   }
-  return t25;
+  return t26;
 }
 
 export { FormModal as default };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/modal-form",
-    "version": "4.0.50",
+    "version": "4.0.52",
     "description": "Resource form modal",
     "keywords": [
         "javascript"
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c5d4004686dae5529035f8eac83571739e24340d"
+    "gitHead": "280155c90cf1dfc39e0c36c76ef8bc2fea627041"
 }