@dnb/eufemia 10.42.0 → 10.44.0

package/es/extensions/forms/hooks/useDataValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataValue.js","names":["useCallback","useContext","useRef","pointer","DataContext","usePath","useDataValue","path","pathProp","value","dataContextRef","current","makePath","getValueByPath","isPath","_dataContextRef$curre2","selector","_dataContextRef$curre","data","has","get","undefined","getData","options","includeCurrentPath","set","getValue","source","startsWith"],"sources":["../../../../../src/extensions/forms/hooks/useDataValue.ts"],"sourcesContent":["import { useCallback, useContext, useRef } from 'react'\nimport pointer from 'json-pointer'\nimport { Path } from '../types'\nimport DataContext, { ContextState } from '../DataContext/Context'\nimport usePath from './usePath'\n\nexport type Props<Value> = {\n  path?: Path | undefined\n  value?: Value\n}\n\nexport default function useDataValue<Value>({\n  path: pathProp,\n  value,\n}: Props<Value> = {}) {\n  const dataContextRef = useRef<ContextState>()\n  dataContextRef.current = useContext<ContextState>(DataContext)\n\n  const { makePath } = usePath()\n\n  const getValueByPath = useCallback(\n    (path: Path) => {\n      if (isPath(path)) {\n        const selector = makePath(path)\n        if (selector === '/') {\n          return dataContextRef.current?.data\n        }\n        return pointer.has(dataContextRef.current?.data, selector)\n          ? pointer.get(dataContextRef.current.data, selector)\n          : undefined\n      }\n    },\n    [makePath]\n  )\n\n  const getData = useCallback(\n    (path: Path, options?: { includeCurrentPath?: boolean }) => {\n      if (isPath(path)) {\n        const value = getValueByPath(path)\n\n        if (options?.includeCurrentPath && path !== '/') {\n          const data = {}\n          pointer.set(data, path, value)\n          return data\n        }\n\n        return value\n      }\n    },\n    [getValueByPath]\n  )\n\n  const getValue = useCallback(\n    (source: Path | Value) => {\n      if (typeof source === 'string' && isPath(source)) {\n        return getValueByPath(source)\n      }\n\n      return source\n    },\n    [getValueByPath]\n  )\n\n  if (pathProp) {\n    value = getValue(pathProp)\n  }\n\n  return { getValue, getValueByPath, getData, value }\n}\n\nfunction isPath(path: Path | unknown) {\n  return typeof path === 'string' && path.startsWith('/')\n}\n"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,UAAU,EAAEC,MAAM,QAAQ,OAAO;AACvD,OAAOC,OAAO,MAAM,cAAc;AAElC,OAAOC,WAAW,MAAwB,wBAAwB;AAClE,OAAOC,OAAO,MAAM,WAAW;AAO/B,eAAe,SAASC,YAAYA,CAAQ;EAC1CC,IAAI,EAAEC,QAAQ;EACdC;AACY,CAAC,GAAG,CAAC,CAAC,EAAE;EACpB,MAAMC,cAAc,GAAGR,MAAM,CAAe,CAAC;EAC7CQ,cAAc,CAACC,OAAO,GAAGV,UAAU,CAAeG,WAAW,CAAC;EAE9D,MAAM;IAAEQ;EAAS,CAAC,GAAGP,OAAO,CAAC,CAAC;EAE9B,MAAMQ,cAAc,GAAGb,WAAW,CAC/BO,IAAU,IAAK;IACd,IAAIO,MAAM,CAACP,IAAI,CAAC,EAAE;MAAA,IAAAQ,sBAAA;MAChB,MAAMC,QAAQ,GAAGJ,QAAQ,CAACL,IAAI,CAAC;MAC/B,IAAIS,QAAQ,KAAK,GAAG,EAAE;QAAA,IAAAC,qBAAA;QACpB,QAAAA,qBAAA,GAAOP,cAAc,CAACC,OAAO,cAAAM,qBAAA,uBAAtBA,qBAAA,CAAwBC,IAAI;MACrC;MACA,OAAOf,OAAO,CAACgB,GAAG,EAAAJ,sBAAA,GAACL,cAAc,CAACC,OAAO,cAAAI,sBAAA,uBAAtBA,sBAAA,CAAwBG,IAAI,EAAEF,QAAQ,CAAC,GACtDb,OAAO,CAACiB,GAAG,CAACV,cAAc,CAACC,OAAO,CAACO,IAAI,EAAEF,QAAQ,CAAC,GAClDK,SAAS;IACf;EACF,CAAC,EACD,CAACT,QAAQ,CACX,CAAC;EAED,MAAMU,OAAO,GAAGtB,WAAW,CACzB,CAACO,IAAU,EAAEgB,OAA0C,KAAK;IAC1D,IAAIT,MAAM,CAACP,IAAI,CAAC,EAAE;MAChB,MAAME,KAAK,GAAGI,cAAc,CAACN,IAAI,CAAC;MAElC,IAAIgB,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEC,kBAAkB,IAAIjB,IAAI,KAAK,GAAG,EAAE;QAC/C,MAAMW,IAAI,GAAG,CAAC,CAAC;QACff,OAAO,CAACsB,GAAG,CAACP,IAAI,EAAEX,IAAI,EAAEE,KAAK,CAAC;QAC9B,OAAOS,IAAI;MACb;MAEA,OAAOT,KAAK;IACd;EACF,CAAC,EACD,CAACI,cAAc,CACjB,CAAC;EAED,MAAMa,QAAQ,GAAG1B,WAAW,CACzB2B,MAAoB,IAAK;IACxB,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIb,MAAM,CAACa,MAAM,CAAC,EAAE;MAChD,OAAOd,cAAc,CAACc,MAAM,CAAC;IAC/B;IAEA,OAAOA,MAAM;EACf,CAAC,EACD,CAACd,cAAc,CACjB,CAAC;EAED,IAAIL,QAAQ,EAAE;IACZC,KAAK,GAAGiB,QAAQ,CAAClB,QAAQ,CAAC;EAC5B;EAEA,OAAO;IAAEkB,QAAQ;IAAEb,cAAc;IAAES,OAAO;IAAEb;EAAM,CAAC;AACrD;AAEA,SAASK,MAAMA,CAACP,IAAoB,EAAE;EACpC,OAAO,OAAOA,IAAI,KAAK,QAAQ,IAAIA,IAAI,CAACqB,UAAU,CAAC,GAAG,CAAC;AACzD"}
+{"version":3,"file":"useDataValue.js","names":["useCallback","useContext","useRef","pointer","DataContext","usePath","useDataValue","path","pathProp","value","dataContextRef","current","makePath","makeIteratePath","get","selector","_dataContextRef$curre2","_dataContextRef$curre","data","has","undefined","getValueByPath","isPath","getValueByIteratePath","getData","options","includeCurrentPath","set","getValue","source","startsWith"],"sources":["../../../../../src/extensions/forms/hooks/useDataValue.ts"],"sourcesContent":["import { useCallback, useContext, useRef } from 'react'\nimport pointer from 'json-pointer'\nimport { Path } from '../types'\nimport DataContext, { ContextState } from '../DataContext/Context'\nimport usePath from './usePath'\n\nexport type Props<Value> = {\n  path?: Path | undefined\n  value?: Value\n}\n\nexport default function useDataValue<Value>({\n  path: pathProp,\n  value,\n}: Props<Value> = {}) {\n  const dataContextRef = useRef<ContextState>()\n  dataContextRef.current = useContext<ContextState>(DataContext)\n\n  const { makePath, makeIteratePath } = usePath()\n\n  const get = useCallback((selector: Path) => {\n    if (selector === '/') {\n      return dataContextRef.current?.data\n    }\n    return pointer.has(dataContextRef.current?.data, selector)\n      ? pointer.get(dataContextRef.current.data, selector)\n      : undefined\n  }, [])\n\n  const getValueByPath = useCallback(\n    (path: Path) => {\n      if (isPath(path)) {\n        return get(makePath(path))\n      }\n    },\n    [get, makePath]\n  )\n\n  const getValueByIteratePath = useCallback(\n    (path: Path) => {\n      if (isPath(path)) {\n        return get(makeIteratePath(path))\n      }\n    },\n    [get, makeIteratePath]\n  )\n\n  const getData = useCallback(\n    (path: Path, options?: { includeCurrentPath?: boolean }) => {\n      if (isPath(path)) {\n        const value = getValueByPath(path)\n\n        if (options?.includeCurrentPath && path !== '/') {\n          const data = {}\n          pointer.set(data, path, value)\n          return data\n        }\n\n        return value\n      }\n    },\n    [getValueByPath]\n  )\n\n  const getValue = useCallback(\n    (source: Path | Value) => {\n      if (typeof source === 'string' && isPath(source)) {\n        return getValueByPath(source)\n      }\n\n      return source\n    },\n    [getValueByPath]\n  )\n\n  if (pathProp) {\n    value = getValue(pathProp)\n  }\n\n  return {\n    getValue,\n    getValueByPath,\n    getValueByIteratePath,\n    getData,\n    value,\n  }\n}\n\nfunction isPath(path: Path | unknown) {\n  return typeof path === 'string' && path.startsWith('/')\n}\n"],"mappings":"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"}

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

@@ -1,21 +1,21 @@
 import { AriaAttributes } from 'react';
-import { FieldProps, AdditionalEventArgs, SubmitState } from '../types';
+import { FieldPropsGeneric, AdditionalEventArgs, SubmitState } from '../types';
 import { ContextState } from '../DataContext';
 export type DataAttributes = {
     [property: `data-${string}`]: string | boolean | number;
 };
-export default function useFieldProps<Value = unknown, Props extends FieldProps<Value> = FieldProps<Value>>(localeProps: Props, { executeOnChangeRegardlessOfError }?: {
+export default function useFieldProps<Value, EmptyValue, Props>(localeProps: Props & FieldPropsGeneric<Value, EmptyValue>, { executeOnChangeRegardlessOfError }?: {
     executeOnChangeRegardlessOfError?: boolean;
-}): Props & FieldProps<Value> & ReturnAdditional<Value>;
+}): typeof localeProps & ReturnAdditional<Value>;
 export interface ReturnAdditional<Value> {
     /** Documented APIs */
     value: Value;
     isChanged: boolean;
     htmlAttributes: AriaAttributes | DataAttributes;
-    setHasFocus: (hasFocus: boolean, valueOverride?: unknown) => void;
+    setHasFocus: (hasFocus: boolean, valueOverride?: unknown, additionalArgs?: AdditionalEventArgs) => void;
     handleFocus: () => void;
     handleBlur: () => void;
-    handleChange: (value: Value, additionalArgs?: AdditionalEventArgs) => void;
+    handleChange: (value: Value | unknown, additionalArgs?: AdditionalEventArgs) => void;
     updateValue: (value: Value) => void;
     forceUpdate: () => void;
     hasError?: boolean;

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

@@ -9,6 +9,7 @@ import { errorChanged } from '../utils';
 import { ajvErrorsToOneFormError } from '../utils/ajv';
 import { FormError } from '../types';
 import { Context as DataContext } from '../DataContext';
+import { clearedData } from '../DataContext/Provider/Provider';
 import FieldPropsContext from '../Form/FieldProps/FieldPropsContext';
 import { combineDescribedBy } from '../../../shared/component-helper';
 import useId from '../../../shared/helpers/useId';
@@ -60,6 +61,7 @@ export default function useFieldProps(localeProps, {
     fromInput = value => value,
     toEvent = value => value,
     transformValue = value => value,
+    transformAdditionalArgs = additionalArgs => additionalArgs,
     fromExternal = value => value,
     validateRequired = (value, {
       emptyValue,
@@ -84,6 +86,7 @@ export default function useFieldProps(localeProps, {
   const transformers = useRef({
     transformIn,
     transformOut,
+    transformAdditionalArgs,
     toInput,
     fromInput,
     toEvent,
@@ -165,7 +168,7 @@ export default function useFieldProps(localeProps, {
       }
     }
   }, [sectionPath, dataContext.schema, identifier, requiredProp, schema]);
-  const showErrorRef = useRef(Boolean(validateInitially || errorProp));
+  const revealErrorRef = useRef(Boolean(validateInitially || errorProp));
   const errorMethodRef = useRef({});
   const localErrorRef = useRef();
   const hasLocalErrorRef = useRef(false);
@@ -253,15 +256,17 @@ export default function useFieldProps(localeProps, {
       forceUpdate();
     }
   }, [setFieldStateDataContext, identifier, validateInitially]);
-  const showError = useCallback(() => {
-    showErrorRef.current = true;
+  const revealError = useCallback(() => {
+    revealErrorRef.current = true;
     showFieldErrorFieldBlock === null || showFieldErrorFieldBlock === void 0 ? void 0 : showFieldErrorFieldBlock(identifier, true);
     if (localErrorRef.current) {
       setHasVisibleErrorDataContext === null || setHasVisibleErrorDataContext === void 0 ? void 0 : setHasVisibleErrorDataContext(identifier, true);
+    } else {
+      setHasVisibleErrorDataContext === null || setHasVisibleErrorDataContext === void 0 ? void 0 : setHasVisibleErrorDataContext(identifier, false);
     }
   }, [showFieldErrorFieldBlock, identifier, setHasVisibleErrorDataContext]);
   const hideError = useCallback(() => {
-    showErrorRef.current = false;
+    revealErrorRef.current = false;
     showFieldErrorFieldBlock === null || showFieldErrorFieldBlock === void 0 ? void 0 : showFieldErrorFieldBlock(identifier, false);
     setHasVisibleErrorDataContext === null || setHasVisibleErrorDataContext === void 0 ? void 0 : setHasVisibleErrorDataContext(identifier, false);
   }, [setHasVisibleErrorDataContext, identifier, showFieldErrorFieldBlock]);
@@ -279,10 +284,10 @@ export default function useFieldProps(localeProps, {
           message = fieldMessage;
         }
       }
-      const messageWithValues = Object.entries((_error$messageValues = error.messageValues) !== null && _error$messageValues !== void 0 ? _error$messageValues : {}).reduce((message, [key, value]) => {
+      const messagehasValues = Object.entries((_error$messageValues = error.messageValues) !== null && _error$messageValues !== void 0 ? _error$messageValues : {}).reduce((message, [key, value]) => {
         return message.replace(`{${key}}`, value);
       }, message);
-      error.message = messageWithValues;
+      error.message = messagehasValues;
       return error;
     }
     return error;
@@ -296,7 +301,7 @@ export default function useFieldProps(localeProps, {
       return error;
     }
   }, [dataContextError, prepareError]);
-  const error = showErrorRef.current || ((_localErrorRef$curren = localErrorRef.current) === null || _localErrorRef$curren === void 0 ? void 0 : _localErrorRef$curren['validationRule']) === 'type' ? (_ref = errorProp !== null && errorProp !== void 0 ? errorProp : localErrorRef.current) !== null && _ref !== void 0 ? _ref : contextErrorRef.current : undefined;
+  const error = revealErrorRef.current || ((_localErrorRef$curren = localErrorRef.current) === null || _localErrorRef$curren === void 0 ? void 0 : _localErrorRef$curren['validationRule']) === 'type' ? (_ref = errorProp !== null && errorProp !== void 0 ? errorProp : localErrorRef.current) !== null && _ref !== void 0 ? _ref : contextErrorRef.current : undefined;
   const hasVisibleError = Boolean(error) || inFieldBlock && fieldBlockContext.hasErrorProp;
   const hasError = useCallback(() => {
     var _ref2;
@@ -351,7 +356,7 @@ export default function useFieldProps(localeProps, {
       persistErrorState('gracefully', result);
       if (continuousValidation || runAsync) {
         window.requestAnimationFrame(() => {
-          showError();
+          revealError();
           forceUpdate();
         });
       }
@@ -365,7 +370,7 @@ export default function useFieldProps(localeProps, {
       }
     }
     return result;
-  }, [contextErrorMessages, continuousValidation, hideError, persistErrorState, defineAsyncProcess, setFieldState, showError]);
+  }, [contextErrorMessages, continuousValidation, hideError, persistErrorState, defineAsyncProcess, setFieldState, revealError]);
   const callOnBlurValidator = useCallback(async ({
     valueOverride = null
   } = {}) => {
@@ -384,9 +389,9 @@ export default function useFieldProps(localeProps, {
       defineAsyncProcess(undefined);
       setFieldState(result instanceof Error ? 'error' : 'complete');
     }
-    showError();
+    revealError();
     forceUpdate();
-  }, [persistErrorState, defineAsyncProcess, setFieldState, showError]);
+  }, [persistErrorState, defineAsyncProcess, setFieldState, revealError]);
   const prioritizeContextSchema = useMemo(() => {
     if (errorPrioritization) {
       const schemaPath = identifier.split('/').join('/properties/');
@@ -442,20 +447,25 @@ export default function useFieldProps(localeProps, {
   }, [startProcess, disabled, hideError, setFieldState, clearErrorState, emptyValue, requiredProp, required, prioritizeContextSchema, validateInitially, callValidator, persistErrorState]);
   const handleError = useCallback(() => {
     if (continuousValidation || continuousValidation !== false && !hasFocusRef.current) {
-      showError();
+      revealError();
     } else {
       hideError();
     }
-  }, [continuousValidation, hideError, showError]);
-  const setHasFocus = useCallback(async (hasFocus, valueOverride) => {
+  }, [continuousValidation, hideError, revealError]);
+  const setHasFocus = useCallback(async (hasFocus, valueOverride, additionalArgs) => {
+    const getArgs = type => {
+      const value = transformers.current.toEvent(valueOverride !== null && valueOverride !== void 0 ? valueOverride : valueRef.current, type);
+      const transformedAdditionalArgs = transformers.current.transformAdditionalArgs(additionalArgs, value);
+      return typeof transformedAdditionalArgs !== 'undefined' ? [value, transformedAdditionalArgs] : [value];
+    };
     if (hasFocus) {
       hasFocusRef.current = true;
-      const value = transformers.current.toEvent(valueOverride !== null && valueOverride !== void 0 ? valueOverride : valueRef.current, 'onFocus');
-      onFocus === null || onFocus === void 0 ? void 0 : onFocus(value);
+      const args = getArgs('onFocus');
+      onFocus === null || onFocus === void 0 ? void 0 : onFocus.apply(this, args);
     } else {
       hasFocusRef.current = false;
-      const value = transformers.current.toEvent(valueOverride !== null && valueOverride !== void 0 ? valueOverride : valueRef.current, 'onBlur');
-      onBlur === null || onBlur === void 0 ? void 0 : onBlur(value);
+      const args = getArgs('onBlur');
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur.apply(this, args);
       if (!changedRef.current && !validateUnchanged) {
         return;
       }
@@ -463,11 +473,11 @@ export default function useFieldProps(localeProps, {
         valueOverride
       }), isAsync(onBlurValidatorRef.current));
       await runPool(() => {
-        showError();
+        revealError();
         forceUpdate();
       });
     }
-  }, [addToPool, callOnBlurValidator, onBlur, onFocus, runPool, showError, validateUnchanged]);
+  }, [addToPool, callOnBlurValidator, onBlur, onFocus, runPool, revealError, validateUnchanged]);
   const yieldAsyncProcess = useCallback(async ({
     name,
     waitFor
@@ -477,10 +487,10 @@ export default function useFieldProps(localeProps, {
         const result = waitFor.some(({
           processName,
           withStates,
-          withValue
+          hasValue
         }) => {
-          const hasMatchingValue = withValue === validatedValue.current;
-          const result = (typeof withValue === 'undefined' ? false : !hasMatchingValue) || (processName ? processName === asyncProcessRef.current : true) && (withStates === null || withStates === void 0 ? void 0 : withStates.some(state => {
+          const hasMatchingValue = hasValue === validatedValue.current;
+          const result = (typeof hasValue === 'undefined' ? false : !hasMatchingValue) || (processName ? processName === asyncProcessRef.current : true) && (withStates === null || withStates === void 0 ? void 0 : withStates.some(state => {
             return state === fieldStateRef.current;
           }));
           return result;
@@ -502,7 +512,7 @@ export default function useFieldProps(localeProps, {
     const result = changeEventResultRef.current;
     if (typeof (result === null || result === void 0 ? void 0 : result.error) !== 'undefined') {
       persistErrorState('gracefully', result.error);
-      showError();
+      revealError();
     }
     if (typeof (result === null || result === void 0 ? void 0 : result.warning) !== 'undefined') {
       warningRef.current = result.warning;
@@ -526,7 +536,7 @@ export default function useFieldProps(localeProps, {
     } else if (asyncBehaviorIsEnabled) {
       setFieldState('complete');
     }
-  }, [asyncBehaviorIsEnabled, defineAsyncProcess, persistErrorState, setFieldState, showError, yieldAsyncProcess]);
+  }, [asyncBehaviorIsEnabled, defineAsyncProcess, persistErrorState, setFieldState, revealError, yieldAsyncProcess]);
   const setEventResult = useCallback(result => {
     if (result instanceof Error) {
       result = {
@@ -543,11 +553,11 @@ export default function useFieldProps(localeProps, {
         waitFor: [{
           processName: 'validator',
           withStates: ['validating', 'error'],
-          withValue: valueRef.current
+          hasValue: valueRef.current
         }, {
           processName: 'onBlurValidator',
           withStates: ['validating', 'error'],
-          withValue: valueRef.current
+          hasValue: valueRef.current
         }]
       });
     }
@@ -588,7 +598,7 @@ export default function useFieldProps(localeProps, {
     const transformedValue = transformers.current.transformOut(transformers.current.transformValue(fromInput, currentValue));
     changedRef.current = true;
     if (itemPath) {
-      handleChangeIterateContext === null || handleChangeIterateContext === void 0 ? void 0 : handleChangeIterateContext(makeIteratePath(), transformedValue);
+      handleChangeIterateContext === null || handleChangeIterateContext === void 0 ? void 0 : handleChangeIterateContext(makeIteratePath(itemPath, ''), transformedValue);
     }
     if (asyncBehaviorIsEnabled) {
       hideError();
@@ -598,7 +608,8 @@ export default function useFieldProps(localeProps, {
     }
     const getArgs = () => {
       const value = transformers.current.toEvent(valueRef.current, 'onChange');
-      return typeof additionalArgs !== 'undefined' ? [value, additionalArgs] : [value];
+      const transformedAdditionalArgs = transformers.current.transformAdditionalArgs(additionalArgs, value);
+      return typeof transformedAdditionalArgs !== 'undefined' ? [value, transformedAdditionalArgs] : [value];
     };
     if (isAsync(onChange)) {
       addToPool('onChangeLocal', async () => {
@@ -608,15 +619,15 @@ export default function useFieldProps(localeProps, {
           waitFor: [{
             processName: 'validator',
             withStates: ['validating', 'error'],
-            withValue: args[0]
+            hasValue: args[0]
           }, {
             processName: 'onBlurValidator',
             withStates: ['validating', 'error'],
-            withValue: args[0]
+            hasValue: args[0]
           }, {
             processName: 'onChangeContext',
             withStates: ['pending', 'error'],
-            withValue: args[0]
+            hasValue: args[0]
           }]
         });
         defineAsyncProcess('onChangeLocal');
@@ -649,6 +660,11 @@ export default function useFieldProps(localeProps, {
     schemaValidatorRef.current = schema ? (_dataContext$ajvInsta2 = dataContext.ajvInstance) === null || _dataContext$ajvInsta2 === void 0 ? void 0 : _dataContext$ajvInsta2.compile(schema) : undefined;
     validateValue();
   }, [schema, validateValue]);
+  useEffect(() => {
+    if (dataContext.data === clearedData) {
+      hideError();
+    }
+  }, [dataContext.data, hideError]);
   useUpdateEffect(() => {
     if (valueRef.current !== externalValue) {
       valueRef.current = externalValue;
@@ -697,11 +713,11 @@ export default function useFieldProps(localeProps, {
   useEffect(() => {
     if (showAllErrors) {
       if (fieldStateRef.current !== 'validating') {
-        showError();
+        revealError();
         forceUpdate();
       }
     }
-  }, [showAllErrors, showError]);
+  }, [showAllErrors, revealError]);
   useEffect(() => {
     if (dataContext.formState === 'pending' && (validatorRef.current || onBlurValidatorRef.current)) {
       hideError();