@dnb/eufemia 10.65.0 → 10.66.0

package/extensions/forms/hooks/useFieldProps.js

@@ -26,12 +26,11 @@ import { isAsync } from '../../../shared/helpers/isAsync';
 import useTranslation from './useTranslation';
 import useExternalValue from './useExternalValue';
 import useDataValue from './useDataValue';
+import WizardStepContext from '../Wizard/Step/StepContext';
 const useLayoutEffect = typeof window === 'undefined' ? React.useEffect : React.useLayoutEffect;
 export default function useFieldProps(localProps) {
   var _dataContext$props,
     _localErrorRef$curren,
-    _ref3,
-    _prepareError,
     _this = this,
     _dataContext$props3,
     _props$path,
@@ -57,7 +56,7 @@ export default function useFieldProps(localProps) {
     disabled: disabledProp,
     info: infoProp,
     warning: warningProp,
-    error: errorProp,
+    error: initialErrorProp = 'initial',
     errorMessages,
     onFocus,
     onBlur,
@@ -105,6 +104,7 @@ export default function useFieldProps(localProps) {
   const sectionContext = useContext(SectionContext);
   const fieldBoundaryContext = useContext(FieldBoundaryContext);
   const wizardContext = useContext(WizardContext);
+  const wizardStepContext = useContext(WizardStepContext);
   const {
     setMountedField: setMountedFieldSnapshot
   } = useContext(SnapshotContext) || {};
@@ -141,7 +141,7 @@ export default function useFieldProps(localProps) {
     setFieldError: setFieldErrorDataContext,
     setFieldInternals: setFieldInternalsDataContext,
     setFieldConnection: setFieldConnectionDataContext,
-    setVisibleError: setVisibleErrorDataContext,
+    revealError: revealErrorDataContext,
     setMountedFieldState: setMountedFieldStateDataContext,
     setFieldEventListener,
     errors: dataContextErrors,
@@ -160,6 +160,15 @@ export default function useFieldProps(localProps) {
     showFieldError: showFieldErrorFieldBlock,
     mountedFieldsRef: mountedFieldsRefFieldBlock
   } = inFieldBlock ? fieldBlockContext : {};
+  const {
+    activeIndex,
+    activeIndexRef,
+    prerenderFieldProps,
+    revealError: revealErrorWizard
+  } = wizardContext || {};
+  const {
+    index: wizardIndex
+  } = wizardStepContext || {};
   const {
     handleChange: handleChangeIterateContext,
     index: iterateIndex,
@@ -172,7 +181,7 @@ export default function useFieldProps(localProps) {
   } = sectionContext || {};
   const {
     setFieldError: setFieldErrorBoundary,
-    setVisibleError: setVisibleErrorBoundary,
+    revealError: revealErrorBoundary,
     showBoundaryErrors
   } = fieldBoundaryContext || {};
   const hasPath = Boolean(pathProp);
@@ -291,6 +300,7 @@ export default function useFieldProps(localProps) {
     }
     return message;
   }, [getFieldByPath, getValueByPath]);
+  const errorProp = initialErrorProp === 'initial' ? undefined : initialErrorProp;
   const error = executeMessage(errorProp);
   const warning = executeMessage(warningProp);
   const info = executeMessage(infoProp);
@@ -391,18 +401,20 @@ export default function useFieldProps(localProps) {
     if (!revealErrorRef.current || alwaysRevealError) {
       revealErrorRef.current = true;
       showFieldErrorFieldBlock === null || showFieldErrorFieldBlock === void 0 ? void 0 : showFieldErrorFieldBlock(identifier, true);
-      setVisibleErrorBoundary === null || setVisibleErrorBoundary === void 0 ? void 0 : setVisibleErrorBoundary(identifier, !!localErrorRef.current);
-      setVisibleErrorDataContext === null || setVisibleErrorDataContext === void 0 ? void 0 : setVisibleErrorDataContext(identifier, !!localErrorRef.current);
+      revealErrorBoundary === null || revealErrorBoundary === void 0 ? void 0 : revealErrorBoundary(identifier, !!localErrorRef.current);
+      revealErrorDataContext === null || revealErrorDataContext === void 0 ? void 0 : revealErrorDataContext(identifier, !!localErrorRef.current);
+      revealErrorWizard === null || revealErrorWizard === void 0 ? void 0 : revealErrorWizard(wizardIndex, identifier, !!localErrorRef.current);
     }
-  }, [validateInitially, alwaysRevealError, showFieldErrorFieldBlock, identifier, setVisibleErrorBoundary, setVisibleErrorDataContext]);
+  }, [validateInitially, alwaysRevealError, showFieldErrorFieldBlock, identifier, revealErrorBoundary, revealErrorDataContext, revealErrorWizard, wizardIndex]);
   const hideError = useCallback(() => {
     if (revealErrorRef.current) {
       revealErrorRef.current = undefined;
       showFieldErrorFieldBlock === null || showFieldErrorFieldBlock === void 0 ? void 0 : showFieldErrorFieldBlock(identifier, false);
-      setVisibleErrorBoundary === null || setVisibleErrorBoundary === void 0 ? void 0 : setVisibleErrorBoundary(identifier, false);
-      setVisibleErrorDataContext === null || setVisibleErrorDataContext === void 0 ? void 0 : setVisibleErrorDataContext(identifier, false);
+      revealErrorBoundary === null || revealErrorBoundary === void 0 ? void 0 : revealErrorBoundary(identifier, false);
+      revealErrorDataContext === null || revealErrorDataContext === void 0 ? void 0 : revealErrorDataContext(identifier, false);
+      revealErrorWizard === null || revealErrorWizard === void 0 ? void 0 : revealErrorWizard(wizardIndex, identifier, false);
     }
-  }, [identifier, setVisibleErrorBoundary, setVisibleErrorDataContext, showFieldErrorFieldBlock]);
+  }, [identifier, revealErrorBoundary, revealErrorDataContext, revealErrorWizard, showFieldErrorFieldBlock, wizardIndex]);
   const errorMessagesCacheRef = useRef({
     errorMessages: null,
     extendedErrorMessages: null
@@ -476,7 +488,17 @@ export default function useFieldProps(localProps) {
   if (((_localErrorRef$curren = localErrorRef.current) === null || _localErrorRef$curren === void 0 ? void 0 : _localErrorRef$curren['ajvKeyword']) === 'type') {
     revealErrorRef.current = true;
   }
-  const bufferedError = revealErrorRef.current ? (_ref3 = (_prepareError = prepareError(error)) !== null && _prepareError !== void 0 ? _prepareError : localErrorRef.current) !== null && _ref3 !== void 0 ? _ref3 : contextErrorRef.current : error === null ? null : undefined;
+  const getBufferedError = useCallback(() => {
+    if (initialErrorProp !== 'initial' && typeof errorProp !== 'function') {
+      return prepareError(errorProp);
+    } else if (revealErrorRef.current) {
+      var _ref3, _prepareError;
+      return (_ref3 = (_prepareError = prepareError(error)) !== null && _prepareError !== void 0 ? _prepareError : localErrorRef.current) !== null && _ref3 !== void 0 ? _ref3 : contextErrorRef.current;
+    } else if (error === null) {
+      return null;
+    }
+  }, [error, errorProp, initialErrorProp, prepareError]);
+  const bufferedError = getBufferedError();
   const hasVisibleError = Boolean(bufferedError) || inFieldBlock && fieldBlockContext.hasErrorProp;
   const hasError = useCallback(() => {
     var _ref4;
@@ -1109,10 +1131,6 @@ export default function useFieldProps(localProps) {
   const handleFocus = useCallback(() => setHasFocus(true), [setHasFocus]);
   const handleBlur = useCallback(() => setHasFocus(false), [setHasFocus]);
   setFieldInternalsDataContext === null || setFieldInternalsDataContext === void 0 ? void 0 : setFieldInternalsDataContext(identifier, props, id);
-  const {
-    activeIndex,
-    activeIndexRef
-  } = wizardContext || {};
   const activeIndexTmpRef = useRef(activeIndex);
   useEffect(() => {
     activeIndexTmpRef.current = activeIndex;
@@ -1177,7 +1195,7 @@ export default function useFieldProps(localProps) {
       setFieldErrorBoundary === null || setFieldErrorBoundary === void 0 ? void 0 : setFieldErrorBoundary(identifier, undefined);
       localErrorRef.current = undefined;
     };
-  }, [identifier, setFieldErrorBoundary, setFieldErrorDataContext, setMountedFieldStateDataContext]);
+  }, [identifier, setFieldErrorBoundary, setFieldErrorDataContext, setMountedFieldStateDataContext, wizardIndex]);
   useEffect(() => {
     validateValue();
   }, [validateValue]);
@@ -1226,7 +1244,7 @@ export default function useFieldProps(localProps) {
       return;
     }
     let valueToStore = valueProp;
-    const data = wizardContext !== null && wizardContext !== void 0 && wizardContext.prerenderFieldProps ? dataContext.data : (_dataContext$internal = dataContext.internalDataRef) === null || _dataContext$internal === void 0 ? void 0 : _dataContext$internal.current;
+    const data = prerenderFieldProps ? dataContext.data : (_dataContext$internal = dataContext.internalDataRef) === null || _dataContext$internal === void 0 ? void 0 : _dataContext$internal.current;
     const storePath = nestedIteratePath ? makeIteratePath(itemPath, nestedIteratePath) : identifier;
     const hasValue = pointer.has(data, storePath) || storePath === '/';
     const existingValue = storePath === '/' ? data : hasValue ? pointer.get(data, storePath) : undefined;
@@ -1302,7 +1320,7 @@ export default function useFieldProps(localProps) {
     if (!preventUpdate) {
       validateDataDataContext === null || validateDataDataContext === void 0 ? void 0 : validateDataDataContext();
     }
-  }, [dataContext.data, dataContext.id, dataContext.internalDataRef, emptyValue, hasItemPath, hasPath, identifier, itemPath, iterateArrayValue === null || iterateArrayValue === void 0 ? void 0 : iterateArrayValue.length, iterateIndex, makeIteratePath, nestedIteratePath, updateContextDataInSync, updateDataValueDataContext, validateDataDataContext, valueProp, wizardContext === null || wizardContext === void 0 ? void 0 : wizardContext.prerenderFieldProps]);
+  }, [dataContext.data, dataContext.id, dataContext.internalDataRef, emptyValue, hasItemPath, hasPath, identifier, itemPath, iterateArrayValue === null || iterateArrayValue === void 0 ? void 0 : iterateArrayValue.length, iterateIndex, makeIteratePath, nestedIteratePath, updateContextDataInSync, updateDataValueDataContext, validateDataDataContext, valueProp, prerenderFieldProps]);
   const isEmptyData = useCallback(() => {
     var _dataContext$isEmptyD, _dataContext$internal2, _dataContext$props$em, _dataContext$props2;
     return ((_dataContext$isEmptyD = dataContext.isEmptyDataRef) === null || _dataContext$isEmptyD === void 0 ? void 0 : _dataContext$isEmptyD.current) || ((_dataContext$internal2 = dataContext.internalDataRef) === null || _dataContext$internal2 === void 0 ? void 0 : _dataContext$internal2.current) === ((_dataContext$props$em = (_dataContext$props2 = dataContext.props) === null || _dataContext$props2 === void 0 ? void 0 : _dataContext$props2.emptyData) !== null && _dataContext$props$em !== void 0 ? _dataContext$props$em : clearedData);
@@ -1394,12 +1412,12 @@ export default function useFieldProps(localProps) {
   }, [error, identifier, inFieldBlock, info, mountedFieldsRefFieldBlock, setBlockRecord, warning]);
   const infoRef = useRef(info);
   const warningRef = useRef(warning);
-  if (typeof info !== 'undefined') {
+  useMemo(() => {
     infoRef.current = info;
-  }
-  if (typeof warning !== 'undefined') {
+  }, [info]);
+  useMemo(() => {
     warningRef.current = warning;
-  }
+  }, [warning]);
   const connections = useMemo(() => {
     return {
       setEventResult,