@dnb/eufemia 10.63.4 → 10.64.0

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

@@ -123,7 +123,8 @@ function useFieldProps(localProps) {
     isVisible
   } = (0, _react.useContext)(_VisibilityContext.default) || {};
   const {
-    getValueByPath
+    getValueByPath,
+    getSourceValue
   } = (0, _useDataValue.default)();
   const translation = (0, _useTranslation.default)();
   const {
@@ -492,7 +493,7 @@ function useFieldProps(localProps) {
     var _ref4;
     return Boolean((_ref4 = error !== null && error !== void 0 ? error : localErrorRef.current) !== null && _ref4 !== void 0 ? _ref4 : contextErrorRef.current);
   }, [error]);
-  const connectWithPathListenerRef = (0, _react.useRef)(async () => {
+  const connectWithPathListenerRef = (0, _react.useRef)(() => {
     runOnChangeValidator();
     runOnBlurValidator();
   });
@@ -502,12 +503,20 @@ function useFieldProps(localProps) {
       getValue: () => getValueByPath(path)
     };
   }, [getValueByPath, setFieldEventListener]);
-  const exportValidatorsRef = (0, _react.useRef)(exportValidators);
-  exportValidatorsRef.current = exportValidators;
+  const additionalArgsRef = (0, _react.useRef)({
+    validators: exportValidators,
+    props,
+    dataContext,
+    getValueByPath,
+    getSourceValue,
+    setFieldEventListener
+  });
+  additionalArgsRef.current.validators = exportValidators;
+  additionalArgsRef.current.props = props;
   const additionalArgs = (0, _react.useMemo)(() => {
-    const args = _objectSpread(_objectSpread({}, combinedErrorMessages), {}, {
-      errorMessages: combinedErrorMessages,
-      validators: exportValidatorsRef.current,
+    const args = _objectSpread(_objectSpread(_objectSpread({}, combinedErrorMessages), {}, {
+      errorMessages: combinedErrorMessages
+    }, additionalArgsRef.current), {}, {
       connectWithPath: path => {
         return handleConnectWithPath(path);
       },
@@ -645,8 +654,10 @@ function useFieldProps(localProps) {
       persistErrorState('gracefully', 'onChangeValidator', result);
       if (validateInitially && !changedRef.current || validateUnchanged || validateContinuously || runAsync) {
         window.requestAnimationFrame(() => {
-          revealError();
-          forceUpdate();
+          if (localErrorInitiatorRef.current === 'onChangeValidator') {
+            revealError();
+            forceUpdate();
+          }
         });
       }
     }
@@ -884,11 +895,11 @@ function useFieldProps(localProps) {
     }
     return [transformedValue];
   }, []);
-  const setHasFocus = (0, _react.useCallback)(async (hasFocus, overrideValue, additionalArgs) => {
+  const setHasFocus = (0, _react.useCallback)(async (hasFocus, overrideValue, localAdditionalArgs) => {
     const args = getEventArgs({
       eventName: hasFocus ? 'onFocus' : 'onBlur',
       overrideValue,
-      additionalArgs
+      additionalArgs: localAdditionalArgs ? _objectSpread(_objectSpread({}, additionalArgs), localAdditionalArgs) : additionalArgs
     });
     if (hasFocus) {
       hasFocusRef.current = true;
@@ -913,7 +924,7 @@ function useFieldProps(localProps) {
         forceUpdate();
       });
     }
-  }, [getEventArgs, onFocus, setMountedFieldStateDataContext, identifier, onBlur, validateUnchanged, addToPool, runPool, startOnBlurValidatorProcess, revealError]);
+  }, [getEventArgs, additionalArgs, onFocus, setMountedFieldStateDataContext, identifier, onBlur, validateUnchanged, addToPool, runPool, startOnBlurValidatorProcess, revealError]);
   const yieldAsyncProcess = (0, _react.useCallback)(async _ref8 => {
     let {
       name,
@@ -1055,7 +1066,7 @@ function useFieldProps(localProps) {
     };
   }, [identifier, emptyValue, fieldDisplayValueRef, itemPath, path]);
   const handleChange = (0, _react.useCallback)(async function (argFromInput) {
-    let additionalArgs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+    let localAdditionalArgs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
     const currentValue = valueRef.current;
     const fromInput = transformers.current.fromInput(argFromInput);
     if (fromInput === currentValue) {
@@ -1072,7 +1083,7 @@ function useFieldProps(localProps) {
       addToPool('onChangeLocal', async () => {
         const args = getEventArgs({
           eventName: 'onChange',
-          additionalArgs
+          additionalArgs: localAdditionalArgs ? _objectSpread(_objectSpread({}, additionalArgs), localAdditionalArgs) : additionalArgs
         });
         await yieldAsyncProcess({
           name: 'onChangeLocal',
@@ -1100,12 +1111,12 @@ function useFieldProps(localProps) {
     } else {
       const args = getEventArgs({
         eventName: 'onChange',
-        additionalArgs
+        additionalArgs: localAdditionalArgs ? _objectSpread(_objectSpread({}, additionalArgs), localAdditionalArgs) : additionalArgs
       });
       setEventResult(onChange === null || onChange === void 0 ? void 0 : onChange.apply(_this, args));
     }
     await runPool();
-  }, [addToPool, asyncBehaviorIsEnabled, defineAsyncProcess, getEventArgs, hasError, hideError, onChange, runPool, setChanged, setEventResult, updateValue, yieldAsyncProcess]);
+  }, [addToPool, additionalArgs, asyncBehaviorIsEnabled, defineAsyncProcess, getEventArgs, hasError, hideError, onChange, runPool, setChanged, setEventResult, updateValue, yieldAsyncProcess]);
   const handleFocus = (0, _react.useCallback)(() => setHasFocus(true), [setHasFocus]);
   const handleBlur = (0, _react.useCallback)(() => setHasFocus(false), [setHasFocus]);
   setFieldInternalsDataContext === null || setFieldInternalsDataContext === void 0 ? void 0 : setFieldInternalsDataContext(identifier, props, id);
@@ -1479,6 +1490,7 @@ function useFieldProps(localProps) {
     validateValue,
     revealError,
     forceUpdate,
+    additionalArgs,
     dataContext
   });
 }