@dnb/eufemia 10.43.0 → 10.45.0

package/extensions/forms/hooks/useDataValue.js

@@ -12,30 +12,44 @@ export default function useDataValue() {
   const dataContextRef = useRef();
   dataContextRef.current = useContext(DataContext);
   const {
-    makePath
+    makePath,
+    makeIteratePath
   } = usePath();
+  const get = useCallback(selector => {
+    var _dataContextRef$curre2;
+    if (selector === '/') {
+      var _dataContextRef$curre;
+      return (_dataContextRef$curre = dataContextRef.current) === null || _dataContextRef$curre === void 0 ? void 0 : _dataContextRef$curre.data;
+    }
+    return pointer.has((_dataContextRef$curre2 = dataContextRef.current) === null || _dataContextRef$curre2 === void 0 ? void 0 : _dataContextRef$curre2.data, selector) ? pointer.get(dataContextRef.current.data, selector) : undefined;
+  }, []);
   const getValueByPath = useCallback(path => {
     if (isPath(path)) {
-      var _dataContextRef$curre2;
-      const selector = makePath(path);
-      if (selector === '/') {
-        var _dataContextRef$curre;
-        return (_dataContextRef$curre = dataContextRef.current) === null || _dataContextRef$curre === void 0 ? void 0 : _dataContextRef$curre.data;
-      }
-      return pointer.has((_dataContextRef$curre2 = dataContextRef.current) === null || _dataContextRef$curre2 === void 0 ? void 0 : _dataContextRef$curre2.data, selector) ? pointer.get(dataContextRef.current.data, selector) : undefined;
+      return get(makePath(path));
+    }
+  }, [get, makePath]);
+  const getValueByIteratePath = useCallback(path => {
+    if (isPath(path)) {
+      return get(makeIteratePath(path));
+    }
+  }, [get, makeIteratePath]);
+  const moveValueToPath = useCallback((path, value) => {
+    if (path !== '/' && isPath(path)) {
+      const obj = {};
+      pointer.set(obj, path, value);
+      return obj;
     }
-  }, [makePath]);
+    return value;
+  }, []);
   const getData = useCallback((path, options) => {
     if (isPath(path)) {
       const value = getValueByPath(path);
       if (options !== null && options !== void 0 && options.includeCurrentPath && path !== '/') {
-        const data = {};
-        pointer.set(data, path, value);
-        return data;
+        return moveValueToPath(path, value);
       }
       return value;
     }
-  }, [getValueByPath]);
+  }, [getValueByPath, moveValueToPath]);
   const getValue = useCallback(source => {
     if (typeof source === 'string' && isPath(source)) {
       return getValueByPath(source);
@@ -48,6 +62,8 @@ export default function useDataValue() {
   return {
     getValue,
     getValueByPath,
+    getValueByIteratePath,
+    moveValueToPath,
     getData,
     value
   };

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

@@ -1 +1 @@
-{"version":3,"file":"useDataValue.js","names":["useCallback","useContext","useRef","pointer","DataContext","usePath","useDataValue","path","pathProp","value","arguments","length","undefined","dataContextRef","current","makePath","getValueByPath","isPath","_dataContextRef$curre2","selector","_dataContextRef$curre","data","has","get","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,CAAA,EAGd;EAAA,IAHsB;IAC1CC,IAAI,EAAEC,QAAQ;IACdC;EACY,CAAC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAClB,MAAMG,cAAc,GAAGX,MAAM,CAAe,CAAC;EAC7CW,cAAc,CAACC,OAAO,GAAGb,UAAU,CAAeG,WAAW,CAAC;EAE9D,MAAM;IAAEW;EAAS,CAAC,GAAGV,OAAO,CAAC,CAAC;EAE9B,MAAMW,cAAc,GAAGhB,WAAW,CAC/BO,IAAU,IAAK;IACd,IAAIU,MAAM,CAACV,IAAI,CAAC,EAAE;MAAA,IAAAW,sBAAA;MAChB,MAAMC,QAAQ,GAAGJ,QAAQ,CAACR,IAAI,CAAC;MAC/B,IAAIY,QAAQ,KAAK,GAAG,EAAE;QAAA,IAAAC,qBAAA;QACpB,QAAAA,qBAAA,GAAOP,cAAc,CAACC,OAAO,cAAAM,qBAAA,uBAAtBA,qBAAA,CAAwBC,IAAI;MACrC;MACA,OAAOlB,OAAO,CAACmB,GAAG,EAAAJ,sBAAA,GAACL,cAAc,CAACC,OAAO,cAAAI,sBAAA,uBAAtBA,sBAAA,CAAwBG,IAAI,EAAEF,QAAQ,CAAC,GACtDhB,OAAO,CAACoB,GAAG,CAACV,cAAc,CAACC,OAAO,CAACO,IAAI,EAAEF,QAAQ,CAAC,GAClDP,SAAS;IACf;EACF,CAAC,EACD,CAACG,QAAQ,CACX,CAAC;EAED,MAAMS,OAAO,GAAGxB,WAAW,CACzB,CAACO,IAAU,EAAEkB,OAA0C,KAAK;IAC1D,IAAIR,MAAM,CAACV,IAAI,CAAC,EAAE;MAChB,MAAME,KAAK,GAAGO,cAAc,CAACT,IAAI,CAAC;MAElC,IAAIkB,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEC,kBAAkB,IAAInB,IAAI,KAAK,GAAG,EAAE;QAC/C,MAAMc,IAAI,GAAG,CAAC,CAAC;QACflB,OAAO,CAACwB,GAAG,CAACN,IAAI,EAAEd,IAAI,EAAEE,KAAK,CAAC;QAC9B,OAAOY,IAAI;MACb;MAEA,OAAOZ,KAAK;IACd;EACF,CAAC,EACD,CAACO,cAAc,CACjB,CAAC;EAED,MAAMY,QAAQ,GAAG5B,WAAW,CACzB6B,MAAoB,IAAK;IACxB,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIZ,MAAM,CAACY,MAAM,CAAC,EAAE;MAChD,OAAOb,cAAc,CAACa,MAAM,CAAC;IAC/B;IAEA,OAAOA,MAAM;EACf,CAAC,EACD,CAACb,cAAc,CACjB,CAAC;EAED,IAAIR,QAAQ,EAAE;IACZC,KAAK,GAAGmB,QAAQ,CAACpB,QAAQ,CAAC;EAC5B;EAEA,OAAO;IAAEoB,QAAQ;IAAEZ,cAAc;IAAEQ,OAAO;IAAEf;EAAM,CAAC;AACrD;AAEA,SAASQ,MAAMA,CAACV,IAAoB,EAAE;EACpC,OAAO,OAAOA,IAAI,KAAK,QAAQ,IAAIA,IAAI,CAACuB,UAAU,CAAC,GAAG,CAAC;AACzD"}
+{"version":3,"file":"useDataValue.js","names":["useCallback","useContext","useRef","pointer","DataContext","usePath","useDataValue","path","pathProp","value","arguments","length","undefined","dataContextRef","current","makePath","makeIteratePath","get","selector","_dataContextRef$curre2","_dataContextRef$curre","data","has","getValueByPath","isPath","getValueByIteratePath","moveValueToPath","obj","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":";;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,CAAA,EAGd;EAAA,IAHsB;IAC1CC,IAAI,EAAEC,QAAQ;IACdC;EACY,CAAC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAClB,MAAMG,cAAc,GAAGX,MAAM,CAAe,CAAC;EAC7CW,cAAc,CAACC,OAAO,GAAGb,UAAU,CAAeG,WAAW,CAAC;EAE9D,MAAM;IAAEW,QAAQ;IAAEC;EAAgB,CAAC,GAAGX,OAAO,CAAC,CAAC;EAE/C,MAAMY,GAAG,GAAGjB,WAAW,CAAEkB,QAAc,IAAK;IAAA,IAAAC,sBAAA;IAC1C,IAAID,QAAQ,KAAK,GAAG,EAAE;MAAA,IAAAE,qBAAA;MACpB,QAAAA,qBAAA,GAAOP,cAAc,CAACC,OAAO,cAAAM,qBAAA,uBAAtBA,qBAAA,CAAwBC,IAAI;IACrC;IACA,OAAOlB,OAAO,CAACmB,GAAG,EAAAH,sBAAA,GAACN,cAAc,CAACC,OAAO,cAAAK,sBAAA,uBAAtBA,sBAAA,CAAwBE,IAAI,EAAEH,QAAQ,CAAC,GACtDf,OAAO,CAACc,GAAG,CAACJ,cAAc,CAACC,OAAO,CAACO,IAAI,EAAEH,QAAQ,CAAC,GAClDN,SAAS;EACf,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMW,cAAc,GAAGvB,WAAW,CAC/BO,IAAU,IAAK;IACd,IAAIiB,MAAM,CAACjB,IAAI,CAAC,EAAE;MAChB,OAAOU,GAAG,CAACF,QAAQ,CAACR,IAAI,CAAC,CAAC;IAC5B;EACF,CAAC,EACD,CAACU,GAAG,EAAEF,QAAQ,CAChB,CAAC;EAED,MAAMU,qBAAqB,GAAGzB,WAAW,CACtCO,IAAU,IAAK;IACd,IAAIiB,MAAM,CAACjB,IAAI,CAAC,EAAE;MAChB,OAAOU,GAAG,CAACD,eAAe,CAACT,IAAI,CAAC,CAAC;IACnC;EACF,CAAC,EACD,CAACU,GAAG,EAAED,eAAe,CACvB,CAAC;EAED,MAAMU,eAAe,GAAG1B,WAAW,CAAC,CAAIO,IAAU,EAAEE,KAAc,KAAK;IACrE,IAAIF,IAAI,KAAK,GAAG,IAAIiB,MAAM,CAACjB,IAAI,CAAC,EAAE;MAChC,MAAMoB,GAAG,GAAG,CAAC,CAAM;MACnBxB,OAAO,CAACyB,GAAG,CAACD,GAAG,EAAEpB,IAAI,EAAEE,KAAK,CAAC;MAC7B,OAAOkB,GAAG;IACZ;IAEA,OAAOlB,KAAK;EACd,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMoB,OAAO,GAAG7B,WAAW,CACzB,CAACO,IAAU,EAAEuB,OAA0C,KAAK;IAC1D,IAAIN,MAAM,CAACjB,IAAI,CAAC,EAAE;MAChB,MAAME,KAAK,GAAGc,cAAc,CAAChB,IAAI,CAAC;MAElC,IAAIuB,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEC,kBAAkB,IAAIxB,IAAI,KAAK,GAAG,EAAE;QAC/C,OAAOmB,eAAe,CAACnB,IAAI,EAAEE,KAAK,CAAC;MACrC;MAEA,OAAOA,KAAK;IACd;EACF,CAAC,EACD,CAACc,cAAc,EAAEG,eAAe,CAClC,CAAC;EAED,MAAMM,QAAQ,GAAGhC,WAAW,CACzBiC,MAAoB,IAAK;IACxB,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIT,MAAM,CAACS,MAAM,CAAC,EAAE;MAChD,OAAOV,cAAc,CAACU,MAAM,CAAC;IAC/B;IAEA,OAAOA,MAAM;EACf,CAAC,EACD,CAACV,cAAc,CACjB,CAAC;EAED,IAAIf,QAAQ,EAAE;IACZC,KAAK,GAAGuB,QAAQ,CAACxB,QAAQ,CAAC;EAC5B;EAEA,OAAO;IACLwB,QAAQ;IACRT,cAAc;IACdE,qBAAqB;IACrBC,eAAe;IACfG,OAAO;IACPpB;EACF,CAAC;AACH;AAEA,SAASe,MAAMA,CAACjB,IAAoB,EAAE;EACpC,OAAO,OAAOA,IAAI,KAAK,QAAQ,IAAIA,IAAI,CAAC2B,UAAU,CAAC,GAAG,CAAC;AACzD"}

package/extensions/forms/hooks/useExternalValue.js

@@ -3,7 +3,7 @@
 import { useContext, useMemo } from 'react';
 import pointer from 'json-pointer';
 import DataContext from '../DataContext/Context';
-import IterateElementContext from '../Iterate/IterateElementContext';
+import IterateElementContext from '../Iterate/IterateItemContext';
 export default function useExternalValue(props) {
   const {
     path,
@@ -13,11 +13,11 @@ export default function useExternalValue(props) {
     emptyValue = undefined
   } = props;
   const dataContext = useContext(DataContext);
-  const iterateElementContext = useContext(IterateElementContext);
-  const inIterate = Boolean(iterateElementContext);
+  const iterateItemContext = useContext(IterateElementContext);
+  const inIterate = Boolean(iterateItemContext);
   const {
     value: iterateElementValue
-  } = iterateElementContext !== null && iterateElementContext !== void 0 ? iterateElementContext : {};
+  } = iterateItemContext !== null && iterateItemContext !== void 0 ? iterateItemContext : {};
   return useMemo(() => {
     if (value !== emptyValue) {
       var _transformers$current, _transformers$current2;

package/extensions/forms/hooks/useExternalValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"useExternalValue.js","names":["useContext","useMemo","pointer","DataContext","IterateElementContext","useExternalValue","props","path","itemPath","value","transformers","emptyValue","undefined","dataContext","iterateElementContext","inIterate","Boolean","iterateElementValue","_transformers$current","_transformers$current2","current","fromExternal","call","has","get","data"],"sources":["../../../../../src/extensions/forms/hooks/useExternalValue.ts"],"sourcesContent":["import { useContext, useMemo } from 'react'\nimport pointer from 'json-pointer'\nimport { FieldProps, Path } from '../types'\nimport DataContext from '../DataContext/Context'\nimport IterateElementContext from '../Iterate/IterateElementContext'\n\nexport type Props<Value> = {\n  path?: Path | undefined\n  itemPath?: Path\n  value?: Value\n  transformers?: React.MutableRefObject<{\n    fromExternal: FieldProps<Value>['fromExternal']\n  }>\n  emptyValue?: FieldProps<Value>['emptyValue']\n}\n\nexport default function useExternalValue<Value>(props: Props<Value>) {\n  const {\n    path,\n    itemPath,\n    value,\n    transformers,\n    emptyValue = undefined,\n  } = props\n  const dataContext = useContext(DataContext)\n  const iterateElementContext = useContext(IterateElementContext)\n  const inIterate = Boolean(iterateElementContext)\n  const { value: iterateElementValue } = iterateElementContext ?? {}\n\n  return useMemo(() => {\n    if (value !== emptyValue) {\n      // Value-prop sent directly to the field has highest priority, overriding any surrounding source\n      return transformers?.current?.fromExternal?.(value)\n    }\n\n    if (inIterate && itemPath) {\n      // This field is inside an iterate, and has a pointer from the base of the element being iterated\n      if (itemPath === '/') {\n        return iterateElementValue\n      }\n\n      return pointer.has(iterateElementValue, itemPath)\n        ? pointer.get(iterateElementValue, itemPath)\n        : emptyValue\n    }\n\n    if (dataContext.data && path) {\n      // There is a surrounding data context and a path for where in the source to find the data\n      if (path === '/') {\n        return dataContext.data\n      }\n\n      return pointer.has(dataContext.data, path)\n        ? pointer.get(dataContext.data, path)\n        : emptyValue\n    }\n\n    return emptyValue\n  }, [\n    dataContext.data,\n    emptyValue,\n    inIterate,\n    itemPath,\n    iterateElementValue,\n    path,\n    transformers,\n    value,\n  ])\n}\n"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAC3C,OAAOC,OAAO,MAAM,cAAc;AAElC,OAAOC,WAAW,MAAM,wBAAwB;AAChD,OAAOC,qBAAqB,MAAM,kCAAkC;AAYpE,eAAe,SAASC,gBAAgBA,CAAQC,KAAmB,EAAE;EACnE,MAAM;IACJC,IAAI;IACJC,QAAQ;IACRC,KAAK;IACLC,YAAY;IACZC,UAAU,GAAGC;EACf,CAAC,GAAGN,KAAK;EACT,MAAMO,WAAW,GAAGb,UAAU,CAACG,WAAW,CAAC;EAC3C,MAAMW,qBAAqB,GAAGd,UAAU,CAACI,qBAAqB,CAAC;EAC/D,MAAMW,SAAS,GAAGC,OAAO,CAACF,qBAAqB,CAAC;EAChD,MAAM;IAAEL,KAAK,EAAEQ;EAAoB,CAAC,GAAGH,qBAAqB,aAArBA,qBAAqB,cAArBA,qBAAqB,GAAI,CAAC,CAAC;EAElE,OAAOb,OAAO,CAAC,MAAM;IACnB,IAAIQ,KAAK,KAAKE,UAAU,EAAE;MAAA,IAAAO,qBAAA,EAAAC,sBAAA;MAExB,OAAOT,YAAY,aAAZA,YAAY,wBAAAQ,qBAAA,GAAZR,YAAY,CAAEU,OAAO,cAAAF,qBAAA,wBAAAC,sBAAA,GAArBD,qBAAA,CAAuBG,YAAY,cAAAF,sBAAA,uBAAnCA,sBAAA,CAAAG,IAAA,CAAAJ,qBAAA,EAAsCT,KAAK,CAAC;IACrD;IAEA,IAAIM,SAAS,IAAIP,QAAQ,EAAE;MAEzB,IAAIA,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOS,mBAAmB;MAC5B;MAEA,OAAOf,OAAO,CAACqB,GAAG,CAACN,mBAAmB,EAAET,QAAQ,CAAC,GAC7CN,OAAO,CAACsB,GAAG,CAACP,mBAAmB,EAAET,QAAQ,CAAC,GAC1CG,UAAU;IAChB;IAEA,IAAIE,WAAW,CAACY,IAAI,IAAIlB,IAAI,EAAE;MAE5B,IAAIA,IAAI,KAAK,GAAG,EAAE;QAChB,OAAOM,WAAW,CAACY,IAAI;MACzB;MAEA,OAAOvB,OAAO,CAACqB,GAAG,CAACV,WAAW,CAACY,IAAI,EAAElB,IAAI,CAAC,GACtCL,OAAO,CAACsB,GAAG,CAACX,WAAW,CAACY,IAAI,EAAElB,IAAI,CAAC,GACnCI,UAAU;IAChB;IAEA,OAAOA,UAAU;EACnB,CAAC,EAAE,CACDE,WAAW,CAACY,IAAI,EAChBd,UAAU,EACVI,SAAS,EACTP,QAAQ,EACRS,mBAAmB,EACnBV,IAAI,EACJG,YAAY,EACZD,KAAK,CACN,CAAC;AACJ"}
+{"version":3,"file":"useExternalValue.js","names":["useContext","useMemo","pointer","DataContext","IterateElementContext","useExternalValue","props","path","itemPath","value","transformers","emptyValue","undefined","dataContext","iterateItemContext","inIterate","Boolean","iterateElementValue","_transformers$current","_transformers$current2","current","fromExternal","call","has","get","data"],"sources":["../../../../../src/extensions/forms/hooks/useExternalValue.ts"],"sourcesContent":["import { useContext, useMemo } from 'react'\nimport pointer from 'json-pointer'\nimport { FieldProps, Path } from '../types'\nimport DataContext from '../DataContext/Context'\nimport IterateElementContext from '../Iterate/IterateItemContext'\n\nexport type Props<Value> = {\n  path?: Path | undefined\n  itemPath?: Path\n  value?: Value\n  transformers?: React.MutableRefObject<{\n    fromExternal: FieldProps<Value>['fromExternal']\n  }>\n  emptyValue?: FieldProps<Value>['emptyValue']\n}\n\nexport default function useExternalValue<Value>(props: Props<Value>) {\n  const {\n    path,\n    itemPath,\n    value,\n    transformers,\n    emptyValue = undefined,\n  } = props\n  const dataContext = useContext(DataContext)\n  const iterateItemContext = useContext(IterateElementContext)\n  const inIterate = Boolean(iterateItemContext)\n  const { value: iterateElementValue } = iterateItemContext ?? {}\n\n  return useMemo(() => {\n    if (value !== emptyValue) {\n      // Value-prop sent directly to the field has highest priority, overriding any surrounding source\n      return transformers?.current?.fromExternal?.(value)\n    }\n\n    if (inIterate && itemPath) {\n      // This field is inside an iterate, and has a pointer from the base of the element being iterated\n      if (itemPath === '/') {\n        return iterateElementValue\n      }\n\n      return pointer.has(iterateElementValue, itemPath)\n        ? pointer.get(iterateElementValue, itemPath)\n        : emptyValue\n    }\n\n    if (dataContext.data && path) {\n      // There is a surrounding data context and a path for where in the source to find the data\n      if (path === '/') {\n        return dataContext.data\n      }\n\n      return pointer.has(dataContext.data, path)\n        ? pointer.get(dataContext.data, path)\n        : emptyValue\n    }\n\n    return emptyValue\n  }, [\n    dataContext.data,\n    emptyValue,\n    inIterate,\n    itemPath,\n    iterateElementValue,\n    path,\n    transformers,\n    value,\n  ])\n}\n"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAC3C,OAAOC,OAAO,MAAM,cAAc;AAElC,OAAOC,WAAW,MAAM,wBAAwB;AAChD,OAAOC,qBAAqB,MAAM,+BAA+B;AAYjE,eAAe,SAASC,gBAAgBA,CAAQC,KAAmB,EAAE;EACnE,MAAM;IACJC,IAAI;IACJC,QAAQ;IACRC,KAAK;IACLC,YAAY;IACZC,UAAU,GAAGC;EACf,CAAC,GAAGN,KAAK;EACT,MAAMO,WAAW,GAAGb,UAAU,CAACG,WAAW,CAAC;EAC3C,MAAMW,kBAAkB,GAAGd,UAAU,CAACI,qBAAqB,CAAC;EAC5D,MAAMW,SAAS,GAAGC,OAAO,CAACF,kBAAkB,CAAC;EAC7C,MAAM;IAAEL,KAAK,EAAEQ;EAAoB,CAAC,GAAGH,kBAAkB,aAAlBA,kBAAkB,cAAlBA,kBAAkB,GAAI,CAAC,CAAC;EAE/D,OAAOb,OAAO,CAAC,MAAM;IACnB,IAAIQ,KAAK,KAAKE,UAAU,EAAE;MAAA,IAAAO,qBAAA,EAAAC,sBAAA;MAExB,OAAOT,YAAY,aAAZA,YAAY,wBAAAQ,qBAAA,GAAZR,YAAY,CAAEU,OAAO,cAAAF,qBAAA,wBAAAC,sBAAA,GAArBD,qBAAA,CAAuBG,YAAY,cAAAF,sBAAA,uBAAnCA,sBAAA,CAAAG,IAAA,CAAAJ,qBAAA,EAAsCT,KAAK,CAAC;IACrD;IAEA,IAAIM,SAAS,IAAIP,QAAQ,EAAE;MAEzB,IAAIA,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOS,mBAAmB;MAC5B;MAEA,OAAOf,OAAO,CAACqB,GAAG,CAACN,mBAAmB,EAAET,QAAQ,CAAC,GAC7CN,OAAO,CAACsB,GAAG,CAACP,mBAAmB,EAAET,QAAQ,CAAC,GAC1CG,UAAU;IAChB;IAEA,IAAIE,WAAW,CAACY,IAAI,IAAIlB,IAAI,EAAE;MAE5B,IAAIA,IAAI,KAAK,GAAG,EAAE;QAChB,OAAOM,WAAW,CAACY,IAAI;MACzB;MAEA,OAAOvB,OAAO,CAACqB,GAAG,CAACV,WAAW,CAACY,IAAI,EAAElB,IAAI,CAAC,GACtCL,OAAO,CAACsB,GAAG,CAACX,WAAW,CAACY,IAAI,EAAElB,IAAI,CAAC,GACnCI,UAAU;IAChB;IAEA,OAAOA,UAAU;EACnB,CAAC,EAAE,CACDE,WAAW,CAACY,IAAI,EAChBd,UAAU,EACVI,SAAS,EACTP,QAAQ,EACRS,mBAAmB,EACnBV,IAAI,EACJG,YAAY,EACZD,KAAK,CACN,CAAC;AACJ"}

package/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/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';
@@ -16,7 +17,7 @@ import useUpdateEffect from '../../../shared/helpers/useUpdateEffect';
 import useMountEffect from '../../../shared/helpers/useMountEffect';
 import useUnmountEffect from '../../../shared/helpers/useUnmountEffect';
 import FieldBlockContext from '../FieldBlock/FieldBlockContext';
-import IterateElementContext from '../Iterate/IterateElementContext';
+import IterateElementContext from '../Iterate/IterateItemContext';
 import SectionContext from '../Form/Section/SectionContext';
 import FieldBoundaryContext from '../DataContext/FieldBoundary/FieldBoundaryContext';
 import useProcessManager from './useProcessManager';
@@ -68,6 +69,7 @@ export default function useFieldProps(localeProps) {
     fromInput = value => value,
     toEvent = value => value,
     transformValue = value => value,
+    transformAdditionalArgs = additionalArgs => additionalArgs,
     fromExternal = value => value,
     validateRequired = (value, _ref) => {
       let {
@@ -86,13 +88,14 @@ export default function useFieldProps(localeProps) {
   const id = useId(props.id);
   const dataContext = useContext(DataContext);
   const fieldBlockContext = useContext(FieldBlockContext);
-  const iterateElementContext = useContext(IterateElementContext);
+  const iterateItemContext = useContext(IterateElementContext);
   const sectionContext = useContext(SectionContext);
   const fieldBoundaryContext = useContext(FieldBoundaryContext);
   const translation = useTranslation();
   const transformers = useRef({
     transformIn,
     transformOut,
+    transformAdditionalArgs,
     toInput,
     fromInput,
     toEvent,
@@ -123,13 +126,14 @@ export default function useFieldProps(localeProps) {
   } = fieldBlockContext !== null && fieldBlockContext !== void 0 ? fieldBlockContext : {};
   const {
     handleChange: handleChangeIterateContext
-  } = iterateElementContext !== null && iterateElementContext !== void 0 ? iterateElementContext : {};
+  } = iterateItemContext !== null && iterateItemContext !== void 0 ? iterateItemContext : {};
   const {
     path: sectionPath,
     errorPrioritization
   } = sectionContext !== null && sectionContext !== void 0 ? sectionContext : {};
   const {
-    setFieldError
+    setFieldError,
+    showBoundaryErrors
   } = fieldBoundaryContext !== null && fieldBoundaryContext !== void 0 ? fieldBoundaryContext : {};
   const hasPath = Boolean(pathProp);
   const {
@@ -174,7 +178,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);
@@ -263,15 +267,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]);
@@ -307,7 +313,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' ? (_ref3 = errorProp !== null && errorProp !== void 0 ? errorProp : localErrorRef.current) !== null && _ref3 !== void 0 ? _ref3 : contextErrorRef.current : undefined;
+  const error = revealErrorRef.current || ((_localErrorRef$curren = localErrorRef.current) === null || _localErrorRef$curren === void 0 ? void 0 : _localErrorRef$curren['validationRule']) === 'type' ? (_ref3 = errorProp !== null && errorProp !== void 0 ? errorProp : localErrorRef.current) !== null && _ref3 !== void 0 ? _ref3 : contextErrorRef.current : undefined;
   const hasVisibleError = Boolean(error) || inFieldBlock && fieldBlockContext.hasErrorProp;
   const hasError = useCallback(() => {
     var _ref4;
@@ -363,7 +369,7 @@ export default function useFieldProps(localeProps) {
       persistErrorState('gracefully', result);
       if (continuousValidation || runAsync) {
         window.requestAnimationFrame(() => {
-          showError();
+          revealError();
           forceUpdate();
         });
       }
@@ -377,7 +383,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 function () {
     let {
       valueOverride = null
@@ -397,9 +403,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/');
@@ -455,20 +461,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;
       }
@@ -476,11 +487,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 _ref5 => {
     let {
       name,
@@ -517,7 +528,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;
@@ -541,7 +552,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 = {
@@ -614,7 +625,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 () => {
@@ -665,6 +677,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;
@@ -688,8 +705,8 @@ export default function useFieldProps(localeProps) {
   useEffect(() => {
     if (hasPath) {
       let value = valueProp;
-      const hasValue = pointer.has(dataContext.data, identifier);
-      const existingValue = hasValue ? pointer.get(dataContext.data, identifier) : undefined;
+      const hasValue = pointer.has(dataContext.data, identifier) || identifier === '/';
+      const existingValue = identifier === '/' ? dataContext.data : hasValue ? pointer.get(dataContext.data, identifier) : undefined;
       if (dataContext.id && !hasValue && typeof existingValue === 'undefined' && typeof value === 'undefined') {
         const sharedState = createSharedState(dataContext.id);
         const hasValue = pointer.has(sharedState.data, identifier);
@@ -711,13 +728,14 @@ export default function useFieldProps(localeProps) {
     }
   }, [dataContext.data, dataContext.id, hasPath, identifier, updateDataValueDataContext, validateDataDataContext, valueProp]);
   useEffect(() => {
-    if (showAllErrors) {
+    if (showAllErrors || showBoundaryErrors) {
       if (fieldStateRef.current !== 'validating') {
-        showError();
-        forceUpdate();
+        revealError();
       }
+    } else if (showBoundaryErrors === false) {
+      hideError();
     }
-  }, [showAllErrors, showError]);
+  }, [hideError, revealError, showAllErrors, showBoundaryErrors]);
   useEffect(() => {
     if (dataContext.formState === 'pending' && (validatorRef.current || onBlurValidatorRef.current)) {
       hideError();