@dnb/eufemia 10.75.0 → 10.75.1

package/cjs/extensions/forms/hooks/useFieldProps.js

@@ -676,19 +676,20 @@ function useFieldProps(localProps) {
     if (!error && method === 'gracefully' && ((_errorMethodRef$curre = errorMethodRef.current) !== null && _errorMethodRef$curre !== void 0 && _errorMethodRef$curre.weak || (_errorMethodRef$curre2 = errorMethodRef.current) !== null && _errorMethodRef$curre2 !== void 0 && _errorMethodRef$curre2.gracefully)) {
       return;
     }
-    localErrorRef.current = error;
-    setFieldErrorDataContext === null || setFieldErrorDataContext === void 0 ? void 0 : setFieldErrorDataContext(identifier, error);
-    setFieldErrorBoundary === null || setFieldErrorBoundary === void 0 ? void 0 : setFieldErrorBoundary(identifier, error);
+    const currentError = handleFieldAsVisible !== false ? error : undefined;
+    localErrorRef.current = currentError;
+    setFieldErrorDataContext === null || setFieldErrorDataContext === void 0 ? void 0 : setFieldErrorDataContext(identifier, currentError);
+    setFieldErrorBoundary === null || setFieldErrorBoundary === void 0 ? void 0 : setFieldErrorBoundary(identifier, currentError);
     setBlockRecord === null || setBlockRecord === void 0 ? void 0 : setBlockRecord({
       stateId,
       identifier,
       type: 'error',
-      content: error,
+      content: currentError,
       showInitially: Boolean(inFieldBlock && validateInitially)
     });
     setFieldStateDataContext === null || setFieldStateDataContext === void 0 ? void 0 : setFieldStateDataContext(identifier, error ? 'error' : undefined);
     if (updateContextDataInSync) {
-      setFieldErrorWizard === null || setFieldErrorWizard === void 0 ? void 0 : setFieldErrorWizard(wizardIndex, identifier, handleFieldAsVisible !== false ? !!error : undefined);
+      setFieldErrorWizard === null || setFieldErrorWizard === void 0 ? void 0 : setFieldErrorWizard(wizardIndex, identifier, Boolean(currentError));
     }
     forceUpdate();
   }, [handleFieldAsVisible, identifier, inFieldBlock, prepareError, setBlockRecord, setFieldErrorBoundary, setFieldErrorDataContext, setFieldErrorWizard, setFieldStateDataContext, stateId, updateContextDataInSync, validateInitially, wizardIndex]);
@@ -1257,17 +1258,23 @@ function useFieldProps(localProps) {
     }
   }, [existingFieldsRef, hasItemPath, hasPath, identifier, iterateItemContext, omitMultiplePathWarning]);
   (0, _react.useEffect)(() => {
+    if (prerenderFieldProps) {
+      return;
+    }
     return () => {
       setFieldErrorDataContext === null || setFieldErrorDataContext === void 0 ? void 0 : setFieldErrorDataContext(identifier, undefined);
       setFieldErrorBoundary === null || setFieldErrorBoundary === void 0 ? void 0 : setFieldErrorBoundary(identifier, undefined);
       localErrorRef.current = undefined;
     };
-  }, [identifier, setFieldErrorBoundary, setFieldErrorDataContext]);
+  }, [identifier, prerenderFieldProps, setFieldErrorBoundary, setFieldErrorDataContext]);
   (0, _react.useEffect)(() => {
+    if (prerenderFieldProps) {
+      return;
+    }
     return () => {
       setFieldErrorWizard === null || setFieldErrorWizard === void 0 ? void 0 : setFieldErrorWizard(wizardIndex, identifier, undefined);
     };
-  }, [identifier, setFieldErrorWizard, wizardIndex]);
+  }, [identifier, prerenderFieldProps, setFieldErrorWizard, wizardIndex]);
   (0, _react.useEffect)(() => {
     validateValue();
   }, [validateValue]);