@mcurros2/microm 1.1.415-0 → 1.1.417-0

package/dist/index.js

@@ -4377,9 +4377,6 @@ function $896277638843ba48$export$894a0a0a56a800a7() {
                     operation: "other",
                     okButtonText: $896277638843ba48$export$f5e2cdf14a0d5fe.continueLabel,
                     cancelButtonText: $896277638843ba48$export$f5e2cdf14a0d5fe.cancelLabel,
-                    cancelButtonProps: {
-                        color: 'gray'
-                    },
                     onOK: async ()=>{
                         confirmed = true;
                         await modals.close();
@@ -4400,11 +4397,7 @@ function $896277638843ba48$export$894a0a0a56a800a7() {
                                 children: $896277638843ba48$export$f5e2cdf14a0d5fe.warningTitle
                             })
                         ]
-                    }),
-                    size: 'md',
-                    withCloseButton: false,
-                    closeOnClickOutside: false,
-                    closeOnEscape: false
+                    })
                 },
                 // single resolution point: fires on any close, so an external close counts as cancel
                 onClosed: ()=>resolve(confirmed)
@@ -4686,7 +4679,7 @@ const $6d150b07756690a5$export$1c1b666b210bfb32 = {
     formHeight: '100%'
 };
 function $6d150b07756690a5$export$6d892edbc3527d79(props) {
-    const { formAPI: formAPI, children: children, showOK: showOK, showCancel: showCancel, showErrors: showErrors, showFormValidationNotification: showFormValidationNotification, showLoadingProgress: showLoadingProgress, OKText: OKText, CancelText: CancelText, invalidFieldsLabel: invalidFieldsLabel, showHelpButton: showHelpButton, preventEnterSubmission: preventEnterSubmission, CloseText: CloseText, buttons: buttons, isDirtyColor: isDirtyColor, cancelButtonVariant: cancelButtonVariant, okButtonVariant: okButtonVariant, disableOKIfNotDirty: disableOKIfNotDirty, formHeight: formHeight, disableOK: disableOK } = (0, $b4te3$mantinecore.useComponentDefaultProps)('EntityForm', $6d150b07756690a5$export$1c1b666b210bfb32, props);
+    const { formAPI: formAPI, children: children, showOK: showOK, showCancel: showCancel, showErrors: showErrors, showFormValidationNotification: showFormValidationNotification, showLoadingProgress: showLoadingProgress, OKText: OKText, CancelText: CancelText, invalidFieldsLabel: invalidFieldsLabel, showHelpButton: showHelpButton, preventEnterSubmission: preventEnterSubmission, CloseText: CloseText, buttons: buttons, isDirtyColor: isDirtyColor, cancelButtonVariant: cancelButtonVariant, okButtonVariant: okButtonVariant, disableOKIfNotDirty: disableOKIfNotDirty, formHeight: formHeight, disableOK: disableOK, loadingOK: loadingOK } = (0, $b4te3$mantinecore.useComponentDefaultProps)('EntityForm', $6d150b07756690a5$export$1c1b666b210bfb32, props);
     const { entity: entity } = formAPI;
     const theme = (0, $b4te3$mantinecore.useMantineTheme)();
     const { handleCancel: handleCancel, handleSubmit: handleSubmit, notifyValidationErrorState: notifyValidationErrorState, status: status, form: form, formMode: formMode, showDescriptionState: showDescriptionState, isFormValid: isFormValid, asyncErrors: asyncErrors } = formAPI;
@@ -4789,7 +4782,7 @@ function $6d150b07756690a5$export$6d892edbc3527d79(props) {
                                             variant: okButtonVariant,
                                             type: "submit",
                                             color: form.isDirty() ? isDirtyColor : theme.primaryColor,
-                                            loading: status?.loading,
+                                            loading: loadingOK || status?.loading,
                                             disabled: disableOK === true || disableOKIfNotDirty && !form.isDirty(),
                                             leftIcon: /*#__PURE__*/ (0, $b4te3$reactjsxruntime.jsx)((0, $b4te3$tablericonsreact.IconCircleCheck), {
                                                 size: "1.125rem"
@@ -6996,60 +6989,77 @@ const $7f5304fd68d04ed6$var$areParentKeysArraysEqual = (left, right)=>{
         return leftNames.length === rightNames.length && leftNames.every((name)=>leftKeys[name] === rightKeys[name]);
     });
 };
+const $7f5304fd68d04ed6$var$areStringArraysEqual = (left, right)=>{
+    if (left === undefined || right === undefined) return left === right;
+    return left.length === right.length && left.every((value, index)=>value === right[index]);
+};
 function $7f5304fd68d04ed6$export$1dc6a021c60990b5(props) {
     const { formAPI: formAPI, hierarchy: hierarchy, mappedHierarchy: mappedHierarchy } = props;
-    const [parentKeysArray, setParentKeysArray] = (0, $b4te3$react.useState)(()=>$7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, formAPI.form.values));
-    const parentKeysArrayRef = (0, $b4te3$react.useRef)(parentKeysArray);
-    // Previous values are handled in hierarchy order and are not affected by mapping.
-    const previousHierarchyValues = (0, $b4te3$react.useRef)(hierarchy.map((name)=>formAPI.form.values[name]));
-    const processedGetStatus = (0, $b4te3$react.useRef)(undefined);
-    (0, $b4te3$react.useEffect)(()=>{
-        const currentHierarchyValues = hierarchy.map((name)=>formAPI.form.values[name]);
-        const isGetLoading = formAPI.status.operationType === 'get' && formAPI.status.loading === true;
-        // Values applied by a get are authoritative. Wait for the get to finish, then
-        // synchronize the hierarchy without treating those values as user changes.
-        if (isGetLoading) return;
-        const isExistingRecordMode = formAPI.formMode === 'edit' || formAPI.formMode === 'view';
-        const isNewCompletedGet = isExistingRecordMode && formAPI.status.operationType === 'get' && formAPI.status.loading === false && processedGetStatus.current !== formAPI.status;
-        if (isNewCompletedGet) {
-            const fetchedParentKeysArray = $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, formAPI.form.values);
-            if (!$7f5304fd68d04ed6$var$areParentKeysArraysEqual(parentKeysArrayRef.current, fetchedParentKeysArray)) {
-                // eslint-disable-next-line react-hooks/set-state-in-effect
-                setParentKeysArray(fetchedParentKeysArray);
-                parentKeysArrayRef.current = fetchedParentKeysArray;
-            }
-            previousHierarchyValues.current = currentHierarchyValues;
-            processedGetStatus.current = formAPI.status;
-            return;
-        }
-        // Use the deepest changed level so controls that update several valid hierarchy
-        // levels together only invalidate values below the last value they supplied.
-        let changedIndex = -1;
-        currentHierarchyValues.forEach((value, index)=>{
-            if (previousHierarchyValues.current[index] !== value) changedIndex = index;
-        });
-        if (changedIndex === -1) return;
+    const [hierarchyState, setHierarchyState] = (0, $b4te3$react.useState)(()=>({
+            parentKeysArray: $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, formAPI.form.values),
+            hierarchyValues: hierarchy.map((name)=>formAPI.form.values[name]),
+            hierarchy: [
+                ...hierarchy
+            ],
+            mappedHierarchy: mappedHierarchy ? [
+                ...mappedHierarchy
+            ] : undefined,
+            changeRevision: 0
+        }));
+    const currentHierarchyValues = hierarchy.map((name)=>formAPI.form.values[name]);
+    const isGetLoading = formAPI.status.operationType === 'get' && formAPI.status.loading === true;
+    const isExistingRecordMode = formAPI.formMode === 'edit' || formAPI.formMode === 'view';
+    const isNewCompletedGet = isExistingRecordMode && formAPI.status.operationType === 'get' && formAPI.status.loading === false && hierarchyState.processedGetStatus !== formAPI.status;
+    const hierarchyConfigurationChanged = !$7f5304fd68d04ed6$var$areStringArraysEqual(hierarchyState.hierarchy, hierarchy) || !$7f5304fd68d04ed6$var$areStringArraysEqual(hierarchyState.mappedHierarchy, mappedHierarchy);
+    let detectedChangedIndex = -1;
+    if (!isGetLoading && !isNewCompletedGet && !hierarchyConfigurationChanged) // Use the deepest changed level so controls that update several valid hierarchy
+    // levels together only invalidate values below the last value they supplied.
+    currentHierarchyValues.forEach((value, index)=>{
+        if (hierarchyState.hierarchyValues[index] !== value) detectedChangedIndex = index;
+    });
+    let resolvedHierarchyState = hierarchyState;
+    if (!isGetLoading) {
+        const changedIndex = isNewCompletedGet || hierarchyConfigurationChanged ? undefined : detectedChangedIndex === -1 ? hierarchyState.changedIndex : detectedChangedIndex;
         const newParentKeysArray = $7f5304fd68d04ed6$var$generateParentKeysArray(hierarchy, mappedHierarchy, formAPI.form.values, changedIndex);
-        if (!$7f5304fd68d04ed6$var$areParentKeysArraysEqual(parentKeysArrayRef.current, newParentKeysArray)) {
-            // eslint-disable-next-line react-hooks/set-state-in-effect
-            setParentKeysArray(newParentKeysArray);
-            parentKeysArrayRef.current = newParentKeysArray;
+        const parentKeysChanged = !$7f5304fd68d04ed6$var$areParentKeysArraysEqual(hierarchyState.parentKeysArray, newParentKeysArray);
+        const hierarchyChanged = isNewCompletedGet || hierarchyConfigurationChanged || detectedChangedIndex !== -1;
+        if (parentKeysChanged || hierarchyChanged) {
+            // Reconcile before children render so callbacks and effects cannot capture
+            // form values from this render with parent keys from the previous render.
+            const newHierarchyState = {
+                parentKeysArray: parentKeysChanged ? newParentKeysArray : hierarchyState.parentKeysArray,
+                hierarchyValues: currentHierarchyValues,
+                hierarchy: [
+                    ...hierarchy
+                ],
+                mappedHierarchy: mappedHierarchy ? [
+                    ...mappedHierarchy
+                ] : undefined,
+                processedGetStatus: isNewCompletedGet ? formAPI.status : hierarchyState.processedGetStatus,
+                changedIndex: changedIndex,
+                changeRevision: detectedChangedIndex === -1 ? hierarchyState.changeRevision : hierarchyState.changeRevision + 1
+            };
+            setHierarchyState(newHierarchyState);
+            resolvedHierarchyState = newHierarchyState;
         }
-        previousHierarchyValues.current = currentHierarchyValues;
+    }
+    const committedChangedIndex = hierarchyState.changedIndex;
+    const committedChangeRevision = hierarchyState.changeRevision;
+    const committedHierarchy = hierarchyState.hierarchy;
+    (0, $b4te3$react.useEffect)(()=>{
+        if (committedChangedIndex === undefined) return;
         // Changing the bound value is handled by the control. Descendants must be
         // changed through the form controls receive the update.
-        hierarchy.slice(changedIndex + 1).forEach((name)=>{
+        committedHierarchy.slice(committedChangedIndex + 1).forEach((name)=>{
             formAPI.form.setFieldValue(name, '');
         });
     }, [
-        formAPI.form,
-        formAPI.form.values,
-        formAPI.formMode,
-        formAPI.status,
-        hierarchy,
-        mappedHierarchy
+        committedChangedIndex,
+        committedChangeRevision,
+        committedHierarchy,
+        formAPI.form
     ]);
-    return parentKeysArray;
+    return resolvedHierarchyState.parentKeysArray;
 }
 
 });