@dnb/eufemia 10.46.0 → 10.47.0

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

@@ -22,12 +22,12 @@ function useDataValue() {
     makeIteratePath
   } = (0, _usePath.default)();
   const get = (0, _react.useCallback)(selector => {
-    var _dataContextRef$curre2;
+    var _dataContextRef$curre, _dataContextRef$curre2;
+    const data = (_dataContextRef$curre = dataContextRef.current) === null || _dataContextRef$curre === void 0 ? void 0 : (_dataContextRef$curre2 = _dataContextRef$curre.internalDataRef) === null || _dataContextRef$curre2 === void 0 ? void 0 : _dataContextRef$curre2.current;
     if (selector === '/') {
-      var _dataContextRef$curre;
-      return (_dataContextRef$curre = dataContextRef.current) === null || _dataContextRef$curre === void 0 ? void 0 : _dataContextRef$curre.data;
+      return data;
     }
-    return _jsonPointer.default.has((_dataContextRef$curre2 = dataContextRef.current) === null || _dataContextRef$curre2 === void 0 ? void 0 : _dataContextRef$curre2.data, selector) ? _jsonPointer.default.get(dataContextRef.current.data, selector) : undefined;
+    return _jsonPointer.default.has(data, selector) ? _jsonPointer.default.get(data, selector) : undefined;
   }, []);
   const getValueByPath = (0, _react.useCallback)(path => {
     if (isPath(path)) {
@@ -56,17 +56,17 @@ function useDataValue() {
       return value;
     }
   }, [getValueByPath, moveValueToPath]);
-  const getValue = (0, _react.useCallback)(source => {
+  const getSourceValue = (0, _react.useCallback)(source => {
     if (typeof source === 'string' && isPath(source)) {
       return getValueByPath(source);
     }
     return source;
   }, [getValueByPath]);
   if (pathProp) {
-    value = getValue(pathProp);
+    value = getSourceValue(pathProp);
   }
   return {
-    getValue,
+    getSourceValue,
     getValueByPath,
     getValueByIteratePath,
     moveValueToPath,

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

@@ -1 +1 @@
-{"version":3,"file":"useDataValue.js","names":["_react","require","_jsonPointer","_interopRequireDefault","_Context","_usePath","obj","__esModule","default","useDataValue","path","pathProp","value","arguments","length","undefined","dataContextRef","useRef","current","useContext","DataContext","makePath","makeIteratePath","usePath","get","useCallback","selector","_dataContextRef$curre2","_dataContextRef$curre","data","pointer","has","getValueByPath","isPath","getValueByIteratePath","moveValueToPath","set","getData","options","includeCurrentPath","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 moveValueToPath = useCallback(<T>(path: Path, value: unknown) => {\n    if (path !== '/' && isPath(path)) {\n      const obj = {} as T\n      pointer.set(obj, path, value)\n      return obj\n    }\n\n    return value as T\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          return moveValueToPath(path, value)\n        }\n\n        return value\n      }\n    },\n    [getValueByPath, moveValueToPath]\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    moveValueToPath,\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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"}
+{"version":3,"file":"useDataValue.js","names":["_react","require","_jsonPointer","_interopRequireDefault","_Context","_usePath","obj","__esModule","default","useDataValue","path","pathProp","value","arguments","length","undefined","dataContextRef","useRef","current","useContext","DataContext","makePath","makeIteratePath","usePath","get","useCallback","selector","_dataContextRef$curre","_dataContextRef$curre2","data","internalDataRef","pointer","has","getValueByPath","isPath","getValueByIteratePath","moveValueToPath","set","getData","options","includeCurrentPath","getSourceValue","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 type GetValueByPath<Value = unknown> = <T = Value>(path: Path) => T\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    const data = dataContextRef.current?.internalDataRef?.current\n    if (selector === '/') {\n      return data\n    }\n    return pointer.has(data, selector)\n      ? pointer.get(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 moveValueToPath = useCallback(<T>(path: Path, value: unknown) => {\n    if (path !== '/' && isPath(path)) {\n      const obj = {} as T\n      pointer.set(obj, path, value)\n      return obj\n    }\n\n    return value as T\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          return moveValueToPath(path, value)\n        }\n\n        return value\n      }\n    },\n    [getValueByPath, moveValueToPath]\n  )\n\n  const getSourceValue = 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 = getSourceValue(pathProp)\n  }\n\n  return {\n    getSourceValue,\n    getValueByPath,\n    getValueByIteratePath,\n    moveValueToPath,\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/cjs/extensions/forms/hooks/useFieldProps.d.ts

@@ -12,7 +12,7 @@ export interface ReturnAdditional<Value> {
     value: Value;
     isChanged: boolean;
     htmlAttributes: AriaAttributes | DataAttributes;
-    setHasFocus: (hasFocus: boolean, valueOverride?: unknown, additionalArgs?: AdditionalEventArgs) => void;
+    setHasFocus: (hasFocus: boolean, overrideValue?: Value, additionalArgs?: AdditionalEventArgs) => void;
     handleFocus: () => void;
     handleBlur: () => void;
     handleChange: (value: Value | unknown, additionalArgs?: AdditionalEventArgs) => void;