@dnb/eufemia 10.74.0 → 10.75.1

package/extensions/forms/hooks/useFieldProps.d.ts

@@ -4,11 +4,12 @@ import { ContextState } from '../DataContext';
 export type DataAttributes = {
     [property: `data-${string}`]: string | boolean | number;
 };
-export default function useFieldProps<Value, EmptyValue, Props>(localProps: Props & FieldPropsGeneric<Value, EmptyValue>, { executeOnChangeRegardlessOfError, updateContextDataInSync, omitMultiplePathWarning, forceUpdateWhenContextDataIsSet, }?: {
+export default function useFieldProps<Value, EmptyValue, Props>(localProps: Props & FieldPropsGeneric<Value, EmptyValue>, { executeOnChangeRegardlessOfError, updateContextDataInSync, omitMultiplePathWarning, forceUpdateWhenContextDataIsSet, omitSectionPath, }?: {
     executeOnChangeRegardlessOfError?: boolean;
     updateContextDataInSync?: boolean;
     omitMultiplePathWarning?: boolean;
     forceUpdateWhenContextDataIsSet?: boolean;
+    omitSectionPath?: boolean;
 }): typeof localProps & ReturnAdditional<Value>;
 export interface ReturnAdditional<Value> {
     /** Documented APIs */

package/extensions/forms/hooks/useFieldProps.js

@@ -41,7 +41,8 @@ export default function useFieldProps(localProps) {
     executeOnChangeRegardlessOfError = false,
     updateContextDataInSync = false,
     omitMultiplePathWarning = false,
-    forceUpdateWhenContextDataIsSet = false
+    forceUpdateWhenContextDataIsSet = false,
+    omitSectionPath = false
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const {
     extend
@@ -198,7 +199,8 @@ export default function useFieldProps(localProps) {
   } = usePath({
     id,
     path: pathProp,
-    itemPath
+    itemPath,
+    omitSectionPath
   });
   const defaultValueRef = useRef(defaultValue);
   useLayoutEffect(() => {
@@ -662,19 +664,23 @@ export default 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, Boolean(currentError));
+    }
     forceUpdate();
-  }, [identifier, inFieldBlock, prepareError, setBlockRecord, setFieldErrorBoundary, setFieldErrorDataContext, setFieldStateDataContext, stateId, validateInitially]);
+  }, [handleFieldAsVisible, identifier, inFieldBlock, prepareError, setBlockRecord, setFieldErrorBoundary, setFieldErrorDataContext, setFieldErrorWizard, setFieldStateDataContext, stateId, updateContextDataInSync, validateInitially, wizardIndex]);
   const clearErrorState = useCallback(() => {
     var _schemaValidatorRef$c;
     persistErrorState('wipe', undefined);
@@ -1092,7 +1098,9 @@ export default function useFieldProps(localProps) {
       handlePathChangeUnvalidatedDataContext(nestedIteratePath || identifier, contextValue);
     }
     if (itemPath) {
-      handleChangeIterateContext === null || handleChangeIterateContext === void 0 ? void 0 : handleChangeIterateContext(makeIteratePath(itemPath, ''), contextValue);
+      handleChangeIterateContext === null || handleChangeIterateContext === void 0 ? void 0 : handleChangeIterateContext(makeIteratePath(itemPath, '', {
+        omitSectionPath: true
+      }), contextValue);
     }
     addToPool('onChangeValidator', validateValue, isAsync(onChangeValidatorRef.current));
     addToPool('onChangeContext', callOnChangeContext, isAsync(onChangeContext));
@@ -1188,6 +1196,9 @@ export default function useFieldProps(localProps) {
     }
   }, [setMountedFieldStateDataContext, identifier, isVisible]);
   useEffect(() => {
+    if (prerenderFieldProps) {
+      return;
+    }
     if (typeof (activeIndexRef === null || activeIndexRef === void 0 ? void 0 : activeIndexRef.current) === 'number') {
       setMountedFieldStateDataContext(identifier, {
         wasStepChange: false
@@ -1199,8 +1210,11 @@ export default function useFieldProps(localProps) {
         });
       };
     }
-  }, [activeIndex, activeIndexRef, identifier, setMountedFieldStateDataContext]);
+  }, [activeIndex, activeIndexRef, identifier, prerenderFieldProps, setMountedFieldStateDataContext]);
   useEffect(() => {
+    if (prerenderFieldProps) {
+      return;
+    }
     setMountedFieldStateDataContext(identifier, {
       isMounted: true,
       isPreMounted: true
@@ -1217,7 +1231,7 @@ export default function useFieldProps(localProps) {
         isMounted: false
       });
     };
-  }, [identifier, setMountedFieldSnapshot, setMountedFieldStateDataContext]);
+  }, [identifier, prerenderFieldProps, setMountedFieldSnapshot, setMountedFieldStateDataContext]);
   useEffect(() => {
     if (!omitMultiplePathWarning && process.env.NODE_ENV !== 'production' && (hasPath || hasItemPath) && (hasPath ? !iterateItemContext : true) && existingFieldsRef !== null && existingFieldsRef !== void 0 && existingFieldsRef.current) {
       const existingFields = existingFieldsRef.current;
@@ -1232,17 +1246,23 @@ export default function useFieldProps(localProps) {
     }
   }, [existingFieldsRef, hasItemPath, hasPath, identifier, iterateItemContext, omitMultiplePathWarning]);
   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]);
   useEffect(() => {
+    if (prerenderFieldProps) {
+      return;
+    }
     return () => {
       setFieldErrorWizard === null || setFieldErrorWizard === void 0 ? void 0 : setFieldErrorWizard(wizardIndex, identifier, undefined);
     };
-  }, [identifier, setFieldErrorWizard, wizardIndex]);
+  }, [identifier, prerenderFieldProps, setFieldErrorWizard, wizardIndex]);
   useEffect(() => {
     validateValue();
   }, [validateValue]);