@dnb/eufemia 10.62.3 → 10.63.0

package/extensions/forms/hooks/useFieldProps.js

@@ -40,7 +40,8 @@ export default function useFieldProps(localProps) {
     executeOnChangeRegardlessOfError = false,
     updateContextDataInSync = false,
     omitMultiplePathWarning = false,
-    forceUpdateWhenContextDataIsSet = false
+    forceUpdateWhenContextDataIsSet = false,
+    alwaysRevealError = false
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const {
     extend
@@ -54,8 +55,8 @@ export default function useFieldProps(localProps) {
     emptyValue,
     required: requiredProp,
     disabled: disabledProp,
-    info,
-    warning,
+    info: infoProp,
+    warning: warningProp,
     error: errorProp,
     errorMessages,
     onFocus,
@@ -69,6 +70,7 @@ export default function useFieldProps(localProps) {
     validateInitially,
     validateUnchanged,
     continuousValidation,
+    validateContinuously = continuousValidation,
     transformIn = external => external,
     transformOut = internal => internal,
     toInput = value => value,
@@ -83,8 +85,9 @@ export default function useFieldProps(localProps) {
         required,
         error
       } = _ref;
-      const res = required && (value === emptyValue || typeof emptyValue === 'undefined' && value === '') ? error : undefined;
-      return res;
+      if (required && (value === emptyValue || typeof emptyValue === 'undefined' && value === '')) {
+        return error;
+      }
     }
   } = props;
   const [salt, forceUpdate] = useReducer(() => ({}), {});
@@ -108,6 +111,9 @@ export default function useFieldProps(localProps) {
   const {
     isVisible
   } = useContext(VisibilityContext) || {};
+  const {
+    getValueByPath
+  } = useDataValue();
   const translation = useTranslation();
   const {
     formatMessage
@@ -132,7 +138,7 @@ export default function useFieldProps(localProps) {
     validateData: validateDataDataContext,
     setFieldState: setFieldStateDataContext,
     setFieldError: setFieldErrorDataContext,
-    setFieldProps: setFieldPropsDataContext,
+    setFieldInternals: setFieldInternalsDataContext,
     setFieldConnection: setFieldConnectionDataContext,
     setVisibleError: setVisibleErrorDataContext,
     setMountedFieldState: setMountedFieldStateDataContext,
@@ -141,7 +147,8 @@ export default function useFieldProps(localProps) {
     showAllErrors,
     contextErrorMessages,
     fieldDisplayValueRef,
-    existingFieldsRef
+    existingFieldsRef,
+    fieldInternalsRef
   } = dataContext || {};
   const onChangeContext = dataContext === null || dataContext === void 0 ? void 0 : (_dataContext$props = dataContext.props) === null || _dataContext$props === void 0 ? void 0 : _dataContext$props.onChange;
   const disabled = disabledProp !== null && disabledProp !== void 0 ? disabledProp : props.readOnly;
@@ -155,7 +162,8 @@ export default function useFieldProps(localProps) {
   const {
     handleChange: handleChangeIterateContext,
     index: iterateIndex,
-    arrayValue: iterateArrayValue
+    arrayValue: iterateArrayValue,
+    nestedIteratePath
   } = iterateItemContext || {};
   const {
     path: sectionPath,
@@ -195,6 +203,7 @@ export default function useFieldProps(localProps) {
   const valueRef = useRef(externalValue);
   const changedRef = useRef();
   const hasFocusRef = useRef();
+  const revealErrorRef = useRef(null);
   const required = useMemo(() => {
     if (typeof requiredProp !== 'undefined') {
       return requiredProp;
@@ -227,7 +236,66 @@ export default function useFieldProps(localProps) {
       }
     }
   }, [cleanPath, dataContext.schema, identifier, joinPath, requiredProp, schema, sectionPath]);
-  const revealErrorRef = useRef(validateInitially !== null && validateInitially !== void 0 ? validateInitially : Boolean(errorProp));
+  const getFieldByPath = useCallback(path => {
+    var _fieldInternalsRef$cu;
+    return ((_fieldInternalsRef$cu = fieldInternalsRef.current) === null || _fieldInternalsRef$cu === void 0 ? void 0 : _fieldInternalsRef$cu[path]) || {
+      props: undefined,
+      id: undefined
+    };
+  }, [fieldInternalsRef]);
+  const messageCacheRef = useRef({
+    isSet: false,
+    message: undefined
+  });
+  const executeMessage = useCallback(message => {
+    if (typeof message === 'function') {
+      const ALWAYS = 4;
+      const INITIALLY = 8;
+      let currentMode = ALWAYS;
+      const msg = message(valueRef.current, {
+        conditionally: (callback, options) => {
+          currentMode &= ~ALWAYS;
+          if (options !== null && options !== void 0 && options.showInitially) {
+            currentMode |= INITIALLY;
+          }
+          return callback();
+        },
+        getValueByPath,
+        getFieldByPath
+      });
+      if (msg === undefined) {
+        messageCacheRef.current.message = undefined;
+        return null;
+      }
+      const isError = msg instanceof Error || msg instanceof FormError || Array.isArray(msg) && checkForError(msg);
+      if (!messageCacheRef.current.isSet && currentMode & INITIALLY || currentMode & ALWAYS || hasFocusRef.current === false || messageCacheRef.current.message) {
+        if (isInternalRerenderRef.current || currentMode & ALWAYS || !messageCacheRef.current.isSet && currentMode & INITIALLY) {
+          if (msg) {
+            messageCacheRef.current.isSet = true;
+          }
+          if (msg || !hasFocusRef.current || currentMode & ALWAYS) {
+            messageCacheRef.current.message = msg;
+          }
+        }
+        message = messageCacheRef.current.message;
+        if (isError && message) {
+          revealErrorRef.current = true;
+        }
+        if (!isError && !message) {
+          return null;
+        }
+      } else {
+        return undefined;
+      }
+    }
+    return message;
+  }, [getFieldByPath, getValueByPath]);
+  const error = executeMessage(errorProp);
+  const warning = executeMessage(warningProp);
+  const info = executeMessage(infoProp);
+  if (revealErrorRef.current === null) {
+    revealErrorRef.current = validateInitially !== null && validateInitially !== void 0 ? validateInitially : Boolean(errorProp);
+  }
   const errorMethodRef = useRef({});
   const localErrorRef = useRef();
   const localErrorInitiatorRef = useRef();
@@ -319,13 +387,13 @@ export default function useFieldProps(localProps) {
       revealErrorRef.current = undefined;
       return;
     }
-    if (!revealErrorRef.current) {
+    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);
     }
-  }, [identifier, setVisibleErrorDataContext, setVisibleErrorBoundary, showFieldErrorFieldBlock, validateInitially]);
+  }, [validateInitially, alwaysRevealError, showFieldErrorFieldBlock, identifier, setVisibleErrorBoundary, setVisibleErrorDataContext]);
   const hideError = useCallback(() => {
     if (revealErrorRef.current) {
       revealErrorRef.current = undefined;
@@ -407,23 +475,22 @@ 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 error = revealErrorRef.current ? (_ref3 = (_prepareError = prepareError(errorProp)) !== null && _prepareError !== void 0 ? _prepareError : localErrorRef.current) !== null && _ref3 !== void 0 ? _ref3 : contextErrorRef.current : undefined;
-  const hasVisibleError = Boolean(error) || inFieldBlock && fieldBlockContext.hasErrorProp;
+  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 hasVisibleError = Boolean(bufferedError) || inFieldBlock && fieldBlockContext.hasErrorProp;
   const hasError = useCallback(() => {
     var _ref4;
-    return Boolean((_ref4 = errorProp !== null && errorProp !== void 0 ? errorProp : localErrorRef.current) !== null && _ref4 !== void 0 ? _ref4 : contextErrorRef.current);
-  }, [errorProp]);
+    return Boolean((_ref4 = error !== null && error !== void 0 ? error : localErrorRef.current) !== null && _ref4 !== void 0 ? _ref4 : contextErrorRef.current);
+  }, [error]);
   const connectWithPathListenerRef = useRef(async () => {
-    if (localErrorRef.current || validateUnchanged || continuousValidation) {
-      runOnChangeValidator();
-    }
-    if (localErrorRef.current) {
-      runOnBlurValidator();
-    }
+    runOnChangeValidator();
+    runOnBlurValidator();
   });
-  const {
-    getValueByPath
-  } = useDataValue();
+  const handleConnectWithPath = useCallback(path => {
+    setFieldEventListener === null || setFieldEventListener === void 0 ? void 0 : setFieldEventListener(path, 'onPathChange', connectWithPathListenerRef.current);
+    return {
+      getValue: () => getValueByPath(path)
+    };
+  }, [getValueByPath, setFieldEventListener]);
   const exportValidatorsRef = useRef(exportValidators);
   exportValidatorsRef.current = exportValidators;
   const additionalArgs = useMemo(() => {
@@ -431,14 +498,14 @@ export default function useFieldProps(localProps) {
       errorMessages: combinedErrorMessages,
       validators: exportValidatorsRef.current,
       connectWithPath: path => {
-        setFieldEventListener === null || setFieldEventListener === void 0 ? void 0 : setFieldEventListener(path, 'onPathChange', connectWithPathListenerRef.current);
-        return {
-          getValue: () => getValueByPath(path)
-        };
+        return handleConnectWithPath(path);
+      },
+      connectWithItemPath: itemPath => {
+        return handleConnectWithPath(makeIteratePath(itemPath));
       }
     });
     return args;
-  }, [combinedErrorMessages, getValueByPath, setFieldEventListener]);
+  }, [combinedErrorMessages, handleConnectWithPath, makeIteratePath]);
   const callStackRef = useRef([]);
   const hasBeenCalledRef = useCallback(validator => {
     const result = callStackRef.current.includes(validator);
@@ -452,15 +519,23 @@ export default function useFieldProps(localProps) {
     }
     const result = await validator(value, additionalArgs);
     if (Array.isArray(result)) {
-      for (const validator of result) {
-        if (!hasBeenCalledRef(validator)) {
-          const result = await callValidatorFnAsync(validator, value);
+      const errors = [];
+      for (const validatorOrError of result) {
+        if (validatorOrError instanceof Error) {
+          errors.push(validatorOrError);
+        } else if (!hasBeenCalledRef(validatorOrError)) {
+          const result = await callValidatorFnAsync(validatorOrError, value);
           if (result instanceof Error) {
             callStackRef.current = [];
             return result;
           }
         }
       }
+      if (errors.length > 0) {
+        return new FormError('Error', {
+          errors
+        });
+      }
       callStackRef.current = [];
     } else {
       return result;
@@ -481,15 +556,23 @@ export default function useFieldProps(localProps) {
           });
         });
       }
-      for (const validator of result) {
-        if (!hasBeenCalledRef(validator)) {
-          const result = callValidatorFnSync(validator, value);
+      const errors = [];
+      for (const validatorOrError of result) {
+        if (validatorOrError instanceof Error) {
+          errors.push(validatorOrError);
+        } else if (!hasBeenCalledRef(validatorOrError)) {
+          const result = callValidatorFnSync(validatorOrError, value);
           if (result instanceof Error) {
             callStackRef.current = [];
             return result;
           }
         }
       }
+      if (errors.length > 0) {
+        return new FormError('Error', {
+          errors
+        });
+      }
       callStackRef.current = [];
     } else {
       return result;
@@ -534,11 +617,14 @@ export default function useFieldProps(localProps) {
       schemaValidatorRef.current.errors = [];
     }
   }, [persistErrorState]);
+  const setChanged = useCallback(state => {
+    changedRef.current = state;
+  }, []);
   const removeError = useCallback(() => {
-    changedRef.current = false;
+    setChanged(false);
     hideError();
     clearErrorState();
-  }, [clearErrorState, hideError]);
+  }, [clearErrorState, hideError, setChanged]);
   const validatorCacheRef = useRef({
     onChangeValidator: null,
     onBlurValidator: null
@@ -551,7 +637,7 @@ export default function useFieldProps(localProps) {
     const runAsync = isAsync(onChangeValidatorRef.current);
     if (unchangedValue) {
       persistErrorState('gracefully', 'onChangeValidator', result);
-      if (validateInitially && !changedRef.current || validateUnchanged || continuousValidation || runAsync) {
+      if (validateInitially && !changedRef.current || validateUnchanged || validateContinuously || runAsync) {
         window.requestAnimationFrame(() => {
           revealError();
           forceUpdate();
@@ -566,7 +652,7 @@ export default function useFieldProps(localProps) {
         setFieldState('pending');
       }
     }
-  }, [continuousValidation, defineAsyncProcess, persistErrorState, revealError, setFieldState, validateInitially, validateUnchanged]);
+  }, [validateContinuously, defineAsyncProcess, persistErrorState, revealError, setFieldState, validateInitially, validateUnchanged]);
   const callOnChangeValidator = useCallback(async () => {
     if (typeof onChangeValidatorRef.current !== 'function') {
       return {};
@@ -722,7 +808,7 @@ export default function useFieldProps(localProps) {
     try {
       const requiredError = transformers.current.validateRequired(value, {
         emptyValue,
-        required: requiredProp !== null && requiredProp !== void 0 ? requiredProp : required,
+        required,
         isChanged: changedRef.current,
         error: new FormError('Field.errorRequired')
       });
@@ -764,14 +850,14 @@ export default function useFieldProps(localProps) {
         persistErrorState('weak', initiator, error);
       }
     }
-  }, [clearErrorState, disabled, emptyValue, hideError, persistErrorState, prioritizeContextSchema, required, requiredProp, setFieldState, startOnBlurValidatorProcess, startOnChangeValidatorValidation, startProcess, validateInitially, validateUnchanged]);
+  }, [clearErrorState, disabled, emptyValue, hideError, persistErrorState, prioritizeContextSchema, required, setFieldState, startOnBlurValidatorProcess, startOnChangeValidatorValidation, startProcess, validateInitially, validateUnchanged]);
   const handleError = useCallback(() => {
-    if (continuousValidation || continuousValidation !== false && !hasFocusRef.current) {
+    if (validateContinuously || validateContinuously !== false && !hasFocusRef.current) {
       revealError();
     } else {
       hideError();
     }
-  }, [continuousValidation, hideError, revealError]);
+  }, [validateContinuously, hideError, revealError]);
   const getEventArgs = useCallback(_ref7 => {
     let {
       eventName,
@@ -929,8 +1015,8 @@ export default function useFieldProps(localProps) {
     const transformedValue = (_transformers$current = transformers.current.transformValue(newValue, currentValue)) !== null && _transformers$current !== void 0 ? _transformers$current : emptyValue;
     const contextValue = transformers.current.transformOut(transformedValue, transformers.current.provideAdditionalArgs(transformedValue, additionalArgs));
     valueRef.current = transformedValue;
-    if (hasPath) {
-      handlePathChangeUnvalidatedDataContext(identifier, contextValue);
+    if (hasPath || itemPath) {
+      handlePathChangeUnvalidatedDataContext(nestedIteratePath || identifier, contextValue);
     }
     if (itemPath) {
       handleChangeIterateContext === null || handleChangeIterateContext === void 0 ? void 0 : handleChangeIterateContext(makeIteratePath(itemPath, ''), contextValue);
@@ -941,15 +1027,13 @@ export default function useFieldProps(localProps) {
       handleError();
     });
   }, [emptyValue, additionalArgs, hasPath, itemPath, addToPool, validateValue, callOnChangeContext, onChangeContext, runPool, handlePathChangeUnvalidatedDataContext, identifier, handleChangeIterateContext, makeIteratePath, handleError]);
-  const setChanged = state => {
-    changedRef.current = state;
-  };
-  const setDisplayValue = useCallback((path, content) => {
-    if (!path || !(fieldDisplayValueRef !== null && fieldDisplayValueRef !== void 0 && fieldDisplayValueRef.current)) {
+  const setDisplayValue = useCallback(function (content) {
+    let fieldPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : itemPath ? identifier : path;
+    if (!fieldPath || !(fieldDisplayValueRef !== null && fieldDisplayValueRef !== void 0 && fieldDisplayValueRef.current)) {
       return;
     }
-    fieldDisplayValueRef.current[path] = valueRef.current === emptyValue ? undefined : content;
-  }, [emptyValue, fieldDisplayValueRef]);
+    fieldDisplayValueRef.current[fieldPath] = valueRef.current === emptyValue ? undefined : content;
+  }, [identifier, emptyValue, fieldDisplayValueRef, itemPath, path]);
   const handleChange = useCallback(async function (argFromInput) {
     let additionalArgs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
     const currentValue = valueRef.current;
@@ -957,7 +1041,7 @@ export default function useFieldProps(localProps) {
     if (fromInput === currentValue) {
       return;
     }
-    changedRef.current = true;
+    setChanged(true);
     if (asyncBehaviorIsEnabled) {
       hideError();
       await updateValue(fromInput);
@@ -1001,10 +1085,10 @@ export default function useFieldProps(localProps) {
       setEventResult(onChange === null || onChange === void 0 ? void 0 : onChange.apply(_this, args));
     }
     await runPool();
-  }, [asyncBehaviorIsEnabled, onChange, runPool, hideError, updateValue, addToPool, getEventArgs, yieldAsyncProcess, defineAsyncProcess, hasError, setEventResult]);
+  }, [addToPool, asyncBehaviorIsEnabled, defineAsyncProcess, getEventArgs, hasError, hideError, onChange, runPool, setChanged, setEventResult, updateValue, yieldAsyncProcess]);
   const handleFocus = useCallback(() => setHasFocus(true), [setHasFocus]);
   const handleBlur = useCallback(() => setHasFocus(false), [setHasFocus]);
-  setFieldPropsDataContext === null || setFieldPropsDataContext === void 0 ? void 0 : setFieldPropsDataContext(identifier, props);
+  setFieldInternalsDataContext === null || setFieldInternalsDataContext === void 0 ? void 0 : setFieldInternalsDataContext(identifier, props, id);
   const {
     activeIndex,
     activeIndexRef
@@ -1120,13 +1204,14 @@ export default function useFieldProps(localProps) {
     }
     let valueToStore = valueProp !== null && valueProp !== void 0 ? valueProp : emptyValue;
     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 hasValue = pointer.has(data, identifier) || identifier === '/';
-    const existingValue = identifier === '/' ? data : hasValue ? pointer.get(data, identifier) : undefined;
+    const storePath = nestedIteratePath ? makeIteratePath(itemPath, nestedIteratePath) : identifier;
+    const hasValue = pointer.has(data, storePath) || storePath === '/';
+    const existingValue = storePath === '/' ? data : hasValue ? pointer.get(data, storePath) : undefined;
     if (dataContext.id && !hasValue && typeof existingValue === 'undefined' && typeof valueToStore === 'undefined') {
       const sharedState = createSharedState(dataContext.id);
-      const hasValue = pointer.has(sharedState.data, identifier);
+      const hasValue = pointer.has(sharedState.data, storePath);
       if (hasValue) {
-        const sharedValue = pointer.get(sharedState.data, identifier);
+        const sharedValue = pointer.get(sharedState.data, storePath);
         if (sharedValue) {
           valueToStore = sharedValue;
         }
@@ -1174,25 +1259,25 @@ export default function useFieldProps(localProps) {
     if (!skipEqualCheck && hasValue && (valueToStore === existingValue || valueRef.current === existingValue)) {
       return;
     }
-    if (identifier in tmpTransValueRef.current && tmpTransValueRef.current[identifier] === valueToStore) {
+    if (storePath in tmpTransValueRef.current && tmpTransValueRef.current[storePath] === valueToStore) {
       return;
     }
     const valueIn = transformers.current.transformIn(valueToStore);
     const transformedValue = transformers.current.transformOut(valueIn, transformers.current.provideAdditionalArgs(valueIn));
     if (transformedValue !== valueToStore) {
-      tmpTransValueRef.current[identifier] = valueToStore;
+      tmpTransValueRef.current[storePath] = valueToStore;
       valueToStore = transformedValue;
     }
-    if (hasItemPath && iterateIndex < (iterateArrayValue === null || iterateArrayValue === void 0 ? void 0 : iterateArrayValue.length) - 1) {
+    if (hasItemPath && !nestedIteratePath && iterateIndex < (iterateArrayValue === null || iterateArrayValue === void 0 ? void 0 : iterateArrayValue.length) - 1) {
       preventUpdate = true;
     }
-    updateDataValueDataContext === null || updateDataValueDataContext === void 0 ? void 0 : updateDataValueDataContext(identifier, valueToStore, {
+    updateDataValueDataContext === null || updateDataValueDataContext === void 0 ? void 0 : updateDataValueDataContext(storePath, valueToStore, {
       preventUpdate
     });
     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, 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, wizardContext === null || wizardContext === void 0 ? void 0 : wizardContext.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);
@@ -1200,11 +1285,11 @@ export default function useFieldProps(localProps) {
   useLayoutEffect(() => {
     if (isEmptyData()) {
       defaultValueRef.current = defaultValue;
-      changedRef.current = false;
+      setChanged(false);
       hideError();
       clearErrorState();
     }
-  }, [clearErrorState, defaultValue, hideError, isEmptyData]);
+  }, [clearErrorState, defaultValue, hideError, isEmptyData, setChanged]);
   useMemo(() => {
     if (updateContextDataInSync && !isEmptyData()) {
       setContextData({
@@ -1257,7 +1342,7 @@ export default function useFieldProps(localProps) {
       setBlockRecord === null || setBlockRecord === void 0 ? void 0 : setBlockRecord({
         identifier,
         type: 'error',
-        content: errorProp,
+        content: error,
         showInitially: true,
         show: true
       });
@@ -1281,14 +1366,15 @@ export default function useFieldProps(localProps) {
         }
       };
     }
-  }, [errorProp, identifier, inFieldBlock, info, mountedFieldsRefFieldBlock, setBlockRecord, warning]);
+  }, [error, identifier, inFieldBlock, info, mountedFieldsRefFieldBlock, setBlockRecord, warning]);
   const infoRef = useRef(info);
   const warningRef = useRef(warning);
-  useUpdateEffect(() => {
+  if (typeof info !== 'undefined') {
     infoRef.current = info;
+  }
+  if (typeof warning !== 'undefined') {
     warningRef.current = warning;
-    forceUpdate();
-  }, [info, warning]);
+  }
   const connections = useMemo(() => {
     return {
       setEventResult
@@ -1303,8 +1389,8 @@ export default function useFieldProps(localProps) {
       return acc;
     }, _objectSpread({}, props.htmlAttributes));
   }, [props]);
-  if (error) {
-    htmlAttributes['aria-invalid'] = error ? 'true' : 'false';
+  if (bufferedError) {
+    htmlAttributes['aria-invalid'] = bufferedError ? 'true' : 'false';
   }
   if (required) {
     htmlAttributes['aria-required'] = 'true';
@@ -1316,10 +1402,10 @@ export default function useFieldProps(localProps) {
     }
     const stateIds = (_fieldBlockContext$fi = fieldBlockContext.fieldStateIdsRef) === null || _fieldBlockContext$fi === void 0 ? void 0 : _fieldBlockContext$fi.current;
     if (stateIds) {
-      htmlAttributes['aria-describedby'] = combineDescribedBy(htmlAttributes, [error && stateIds.error, warning && stateIds.warning, info && stateIds.info].filter(Boolean));
+      htmlAttributes['aria-describedby'] = combineDescribedBy(htmlAttributes, [bufferedError && stateIds.error, warning && stateIds.warning, info && stateIds.info].filter(Boolean));
     }
   } else {
-    const ids = [(error || errorProp) && `${id}-form-status--error`, warning && `${id}-form-status--warning`, info && `${id}-form-status--info`].filter(Boolean);
+    const ids = [(bufferedError || error) && `${id}-form-status--error`, warning && `${id}-form-status--warning`, info && `${id}-form-status--info`].filter(Boolean);
     if (ids.length) {
       htmlAttributes['aria-describedby'] = combineDescribedBy(htmlAttributes, ids);
     }
@@ -1331,7 +1417,7 @@ export default function useFieldProps(localProps) {
   const fieldBlockProps = {
     info: !inFieldBlock ? infoRef.current : undefined,
     warning: !inFieldBlock ? warningRef.current : undefined,
-    error: !inFieldBlock ? error : undefined,
+    error: !inFieldBlock ? bufferedError : undefined,
     required,
     label: props.label,
     labelDescription: props.labelDescription,
@@ -1364,6 +1450,8 @@ export default function useFieldProps(localProps) {
     updateValue,
     setChanged,
     setDisplayValue,
+    validateValue,
+    revealError,
     forceUpdate,
     dataContext
   });