@mcurros2/microm 1.1.93-0 → 1.1.95-0

package/dist/index.js

@@ -194,7 +194,7 @@ const $8b0c683387a5432f$export$659b17aab7c47d60 = {
     cancelSaveOnUnmount: true
 };
 function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
-    const { entity: entity, initialFormMode: initialFormMode, validateInputOnBlur: validateInputOnBlur, validateInputOnChange: validateInputOnChange, onSaved: onSaved, onCancel: onCancel, getDataOnInit: getDataOnInit, forceDirty: forceDirty, initialShowDescriptionInFields: initialShowDescriptionInFields, saveAndGetOverride: saveAndGetOverride, noSaveOnSubmit: noSaveOnSubmit, bindedColumnNames: bindedColumnNames, saveAndGetOnSubmit: saveAndGetOnSubmit, cancelGetOnUnmount: cancelGetOnUnmount, cancelSaveOnUnmount: cancelSaveOnUnmount } = (0, $b4te3$mantinecore.useComponentDefaultProps)("", $8b0c683387a5432f$export$659b17aab7c47d60, props);
+    const { entity: entity, initialFormMode: initialFormMode, validateInputOnBlur: validateInputOnBlur, validateInputOnChange: validateInputOnChange, onSaved: onSaved, onCancel: onCancel, getDataOnInit: getDataOnInit, forceDirty: forceDirty, initialShowDescriptionInFields: initialShowDescriptionInFields, saveAndGetOverride: saveAndGetOverride, noSaveOnSubmit: noSaveOnSubmit, bindedColumnNames: bindedColumnNames, saveAndGetOnSubmit: saveAndGetOnSubmit, cancelGetOnUnmount: cancelGetOnUnmount, cancelSaveOnUnmount: cancelSaveOnUnmount, saveBeforeLocalNavigation: saveBeforeLocalNavigation, saveBeforeRemoteNavigation: saveBeforeRemoteNavigation } = (0, $b4te3$mantinecore.useComponentDefaultProps)("", $8b0c683387a5432f$export$659b17aab7c47d60, props);
     const [status, setStatus] = (0, $b4te3$react.useState)({}); // Initial queryStatus is empty on purpose to not disable fields before data is loaded
     const notifyValidationErrorState = (0, $b4te3$react.useState)(false);
     const [, setNotifyValidationError] = notifyValidationErrorState;
@@ -457,6 +457,48 @@ function $8b0c683387a5432f$export$f1f43a62560a15ec(props) {
     }, [
         initialFormMode
     ]);
+    // save before navigation
+    (0, $b4te3$react.useEffect)(()=>{
+        const handleBeforeUnload = ()=>$8b0c683387a5432f$var$__awaiter(this, void 0, void 0, function*() {
+                try {
+                    if (saveBeforeRemoteNavigation) {
+                        form.validate();
+                        yield saveAndGet();
+                    }
+                } catch (ex) {
+                    console.error("SaveBeforeRemoteNavigation", ex);
+                }
+            });
+        window.addEventListener("beforeunload", handleBeforeUnload);
+        return ()=>{
+            window.removeEventListener("beforeunload", handleBeforeUnload);
+        };
+    }, [
+        form,
+        saveAndGet,
+        saveBeforeRemoteNavigation
+    ]);
+    const prevLocationRef = (0, $b4te3$react.useRef)(window.location.hash);
+    (0, $b4te3$react.useEffect)(()=>{
+        const handleLocalNavigation = ()=>$8b0c683387a5432f$var$__awaiter(this, void 0, void 0, function*() {
+                try {
+                    if (saveBeforeLocalNavigation && prevLocationRef.current !== window.location.hash) {
+                        form.validate();
+                        yield saveAndGet();
+                    }
+                } catch (ex) {
+                    console.error("SaveBeforeLocalNavigation", ex);
+                }
+            });
+        window.addEventListener("hashchange", handleLocalNavigation);
+        return ()=>{
+            window.removeEventListener("hashchange", handleLocalNavigation);
+        };
+    }, [
+        form,
+        saveAndGet,
+        saveBeforeLocalNavigation
+    ]);
     const result = (0, $b4te3$react.useMemo)(()=>({
             form: form,
             formMode: formMode,
@@ -47831,33 +47873,6 @@ $parcel$export(module.exports, "EntityFormPage", function () { return $637861954
 
 parcelRequire("7xGLy");
 var $gYKfx = parcelRequire("gYKfx");
-var $637861954d3d6876$var$__awaiter = undefined && undefined.__awaiter || function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve) {
-            resolve(value);
-        });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-        function fulfilled(value) {
-            try {
-                step(generator.next(value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function rejected(value) {
-            try {
-                step(generator["throw"](value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function step(result) {
-            result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var $637861954d3d6876$var$__rest = undefined && undefined.__rest || function(s, e) {
     var t = {};
     for(var p in s)if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -47871,12 +47886,10 @@ const $637861954d3d6876$export$e73f1d9fe021a92b = {
     defaultLoadingComponent: (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$mantinecore.Skeleton), {})
 };
 function $637861954d3d6876$export$bf63b1212bff1393(props) {
-    const _a = (0, $b4te3$mantinecore.useComponentDefaultProps)("EntityFormPage", $637861954d3d6876$export$e73f1d9fe021a92b, props), { entityConstructor: entityConstructor, client: client, defaultLoadingComponent: defaultLoadingComponent, saveBeforeLocalNavigation: saveBeforeLocalNavigation, saveBeforeRemoteNavigation: saveBeforeRemoteNavigation } = _a, rest = $637861954d3d6876$var$__rest(_a, [
+    const _a = (0, $b4te3$mantinecore.useComponentDefaultProps)("EntityFormPage", $637861954d3d6876$export$e73f1d9fe021a92b, props), { entityConstructor: entityConstructor, client: client, defaultLoadingComponent: defaultLoadingComponent } = _a, rest = $637861954d3d6876$var$__rest(_a, [
         "entityConstructor",
         "client",
-        "defaultLoadingComponent",
-        "saveBeforeLocalNavigation",
-        "saveBeforeRemoteNavigation"
+        "defaultLoadingComponent"
     ]);
     const [entityForm, setEntityForm] = (0, $b4te3$react.useState)(null);
     const entityRef = (0, $b4te3$react.useRef)(null);
@@ -47897,38 +47910,6 @@ function $637861954d3d6876$export$bf63b1212bff1393(props) {
         client,
         entityConstructor
     ]);
-    // save before navigation
-    (0, $b4te3$react.useEffect)(()=>{
-        const handleBeforeUnload = ()=>$637861954d3d6876$var$__awaiter(this, void 0, void 0, function*() {
-                try {
-                    if (saveBeforeRemoteNavigation && entityRef.current) yield entityRef.current.API.editData();
-                } catch (ex) {
-                    console.error("SaveBeforeRemoteNavigation", ex);
-                }
-            });
-        window.addEventListener("beforeunload", handleBeforeUnload);
-        return ()=>{
-            window.removeEventListener("beforeunload", handleBeforeUnload);
-        };
-    }, [
-        saveBeforeRemoteNavigation
-    ]);
-    const prevLocationRef = (0, $b4te3$react.useRef)(window.location.hash);
-    (0, $b4te3$react.useEffect)(()=>{
-        const handleLocalNavigation = ()=>$637861954d3d6876$var$__awaiter(this, void 0, void 0, function*() {
-                try {
-                    if (saveBeforeLocalNavigation && entityRef.current && prevLocationRef.current !== window.location.hash) yield entityRef.current.API.editData();
-                } catch (ex) {
-                    console.error("SaveBeforeLocalNavigation", ex);
-                }
-            });
-        window.addEventListener("hashchange", handleLocalNavigation);
-        return ()=>{
-            window.removeEventListener("hashchange", handleLocalNavigation);
-        };
-    }, [
-        saveBeforeLocalNavigation
-    ]);
     return (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$reactjsxruntime.Fragment), {
         children: entityForm || defaultLoadingComponent
     });