@dnb/eufemia 10.69.0 → 10.70.0

package/cjs/extensions/forms/DataContext/Provider/Provider.js

@@ -81,10 +81,10 @@ function Provider(props) {
   } = (0, _react.useContext)(_Context.default) || {};
   const translation = (0, _useTranslation.default)().Field;
   const ajvRef = (0, _react.useRef)((0, _utils.makeAjvInstance)(ajvInstance));
-  const mountedFieldsRef = (0, _react.useRef)({});
+  const mountedFieldsRef = (0, _react.useRef)(new Map());
   const snapshotsRef = (0, _react.useRef)(new Map());
   const existingFieldsRef = (0, _react.useRef)(new Map());
-  const hasVisibleErrorRef = (0, _react.useRef)({});
+  const hasVisibleErrorRef = (0, _react.useRef)(new Map());
   const errorsRef = (0, _react.useRef)();
   const addSetShowAllErrorsRef = (0, _react.useRef)([]);
   const showAllErrorsRef = (0, _react.useRef)(false);
@@ -95,9 +95,9 @@ function Provider(props) {
   }, []);
   const revealError = (0, _react.useCallback)((path, hasError) => {
     if (hasError) {
-      hasVisibleErrorRef.current[path] = hasError;
+      hasVisibleErrorRef.current.set(path, hasError);
     } else {
-      delete hasVisibleErrorRef.current[path];
+      hasVisibleErrorRef.current.delete(path);
     }
     forceUpdate();
   }, []);
@@ -154,22 +154,16 @@ function Provider(props) {
     return Boolean(state === 'error' ? ((_errorsRef$current = errorsRef.current) === null || _errorsRef$current === void 0 ? void 0 : _errorsRef$current[path]) instanceof Error || fieldErrorRef.current[path] instanceof Error : fieldStateRef.current[path] === state);
   }, []);
   const hasFieldState = (0, _react.useCallback)(state => {
-    for (const path in mountedFieldsRef.current) {
-      const item = mountedFieldsRef.current[path];
-      if (item.isMounted && checkFieldStateFor(path, state)) {
-        return true;
-      }
-    }
-    return false;
+    return Array.from(mountedFieldsRef.current.entries()).some(_ref => {
+      let [path, item] = _ref;
+      return item.isMounted && checkFieldStateFor(path, state);
+    });
   }, [checkFieldStateFor]);
   const hasFieldError = (0, _react.useCallback)(path => {
-    for (const p in mountedFieldsRef.current) {
-      const item = mountedFieldsRef.current[path];
-      if (item.isMounted && p === path && checkFieldStateFor(path, 'error')) {
-        return true;
-      }
-    }
-    return false;
+    return Array.from(mountedFieldsRef.current.entries()).some(_ref2 => {
+      let [p, item] = _ref2;
+      return item.isMounted && p === path && checkFieldStateFor(path, 'error');
+    });
   }, [checkFieldStateFor]);
   const hasErrors = (0, _react.useCallback)(() => {
     return hasFieldState('error');
@@ -250,11 +244,11 @@ function Provider(props) {
       }
       return data;
     } else if (handler) {
-      const runFilter = _ref => {
+      const runFilter = _ref3 => {
         let {
           path,
           condition
-        } = _ref;
+        } = _ref3;
         const exists = _jsonPointer.default.has(data, path);
         if (exists) {
           const result = typeof condition === 'function' ? condition(getDataPathHandlerParameters(path, data)) : condition;
@@ -262,8 +256,8 @@ function Provider(props) {
         }
       };
       const wildcardPaths = [];
-      Object.entries(handler).forEach(_ref2 => {
-        let [path, condition] = _ref2;
+      Object.entries(handler).forEach(_ref4 => {
+        let [path, condition] = _ref4;
         if (path.includes('*')) {
           const parts = path.split(/\/\*/g);
           const exists = _jsonPointer.default.has(data, parts[0]);
@@ -304,12 +298,11 @@ function Provider(props) {
       removePaths
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     const visibleData = {};
-    for (const path in mountedFieldsRef.current) {
-      const item = mountedFieldsRef.current[path];
+    mountedFieldsRef.current.forEach((item, path) => {
       if (item && item.isVisible !== false && (item.isPreMounted !== false || item.wasStepChange === true) && (removePaths ? !removePaths.includes(path) : true) && _jsonPointer.default.has(data, path)) {
         _jsonPointer.default.set(visibleData, path, _jsonPointer.default.get(data, path));
       }
-    }
+    });
     if (keepPaths) {
       keepPaths.forEach(path => {
         if (_jsonPointer.default.has(data, path)) {
@@ -352,7 +345,7 @@ function Provider(props) {
   const hasFieldWithAsyncValidator = (0, _react.useCallback)(() => {
     for (const path in fieldInternalsRef.current) {
       var _mountedFieldsRef$cur;
-      if ((_mountedFieldsRef$cur = mountedFieldsRef.current[path]) !== null && _mountedFieldsRef$cur !== void 0 && _mountedFieldsRef$cur.isMounted) {
+      if ((_mountedFieldsRef$cur = mountedFieldsRef.current.get(path)) !== null && _mountedFieldsRef$cur !== void 0 && _mountedFieldsRef$cur.isMounted) {
         var _fieldInternalsRef$cu2;
         const props = (_fieldInternalsRef$cu2 = fieldInternalsRef.current[path]) === null || _fieldInternalsRef$cu2 === void 0 ? void 0 : _fieldInternalsRef$cu2.props;
         if ((0, _isAsync.isAsync)(props === null || props === void 0 ? void 0 : props.onChangeValidator) || (0, _isAsync.isAsync)(props === null || props === void 0 ? void 0 : props.onBlurValidator)) {
@@ -400,9 +393,9 @@ function Provider(props) {
   }, [id, initialData, sharedData, data]);
   internalDataRef.current = props.path && _jsonPointer.default.has(internalData, props.path) ? _jsonPointer.default.get(internalData, props.path) : internalData;
   const clearData = (0, _react.useCallback)(() => {
-    var _ref3, _requestAnimationFram;
+    var _ref5, _requestAnimationFram;
     isEmptyDataRef.current = true;
-    internalDataRef.current = (_ref3 = typeof emptyData === 'function' ? emptyData(internalDataRef.current) : emptyData) !== null && _ref3 !== void 0 ? _ref3 : Array.isArray(internalDataRef.current) ? [] : clearedData;
+    internalDataRef.current = (_ref5 = typeof emptyData === 'function' ? emptyData(internalDataRef.current) : emptyData) !== null && _ref5 !== void 0 ? _ref5 : Array.isArray(internalDataRef.current) ? [] : clearedData;
     if (id) {
       setSharedData(internalDataRef.current);
     }
@@ -526,11 +519,7 @@ function Provider(props) {
     }
   }, []);
   const setMountedFieldState = (0, _react.useCallback)((path, state) => {
-    if (!mountedFieldsRef.current[path]) {
-      mountedFieldsRef.current[path] = _objectSpread({}, state);
-    } else {
-      Object.assign(mountedFieldsRef.current[path], state);
-    }
+    mountedFieldsRef.current.set(path, _objectSpread(_objectSpread({}, mountedFieldsRef.current.get(path)), state));
     for (const itm of fieldEventListenersRef.current) {
       if (itm.type === 'onMount' && itm.path === path) {
         const {
@@ -572,7 +561,7 @@ function Provider(props) {
           type,
           callback
         } = item;
-        if (type === 'onSubmit' && (_mountedFieldsRef$cur2 = mountedFieldsRef.current[path]) !== null && _mountedFieldsRef$cur2 !== void 0 && _mountedFieldsRef$cur2.isMounted) {
+        if (type === 'onSubmitCall' && (_mountedFieldsRef$cur2 = mountedFieldsRef.current.get(path)) !== null && _mountedFieldsRef$cur2 !== void 0 && _mountedFieldsRef$cur2.isMounted) {
           if (asyncBehaviorIsEnabled) {
             await callback();
           } else {
@@ -619,9 +608,8 @@ function Provider(props) {
       }
     } else {
       if (asyncBehaviorIsEnabled) {
-        window.requestAnimationFrame(() => {
-          setFormState(undefined);
-        });
+        await new Promise(resolve => window.requestAnimationFrame(resolve));
+        setFormState(undefined);
         if (!skipFieldValidation) {
           onSubmitContinueRef.current = () => {
             window.requestAnimationFrame(() => {
@@ -636,38 +624,21 @@ function Provider(props) {
       onSubmitRequest === null || onSubmitRequest === void 0 ? void 0 : onSubmitRequest({
         getErrors: () => Object.keys(fieldErrorRef.current).map(path => {
           return getDataPathHandlerParameters(path);
-        }).filter(_ref4 => {
+        }).filter(_ref6 => {
           let {
             error
-          } = _ref4;
+          } = _ref6;
           return error;
         })
       });
+      for (const itm of fieldEventListenersRef.current) {
+        if (itm.type === 'onSubmitRequest') {
+          itm.callback();
+        }
+      }
     }
     return result;
   }, [clearData, getDataPathHandlerParameters, hasErrors, hasFieldState, hasFieldWithAsyncValidator, isolate, onCommit, onSubmitRequest, setFormState, setShowAllErrors, setSubmitState]);
-  const handleSubmitListenersRef = (0, _react.useRef)([]);
-  const setHandleSubmit = (0, _react.useCallback)(function (callback) {
-    let {
-      remove = false
-    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    const listeners = handleSubmitListenersRef.current;
-    if (remove) {
-      handleSubmitListenersRef.current = listeners.filter(item => item !== callback);
-    } else if (!listeners.includes(callback)) {
-      listeners.push(callback);
-    }
-  }, []);
-  const handleSubmitListeners = (0, _react.useCallback)(() => {
-    let stop = false;
-    const preventSubmit = () => stop = true;
-    handleSubmitListenersRef.current.forEach(cb => {
-      cb({
-        preventSubmit
-      });
-    });
-    return stop;
-  }, []);
   const getSubmitData = (0, _react.useCallback)(() => {
     const data = internalDataRef.current;
     const mutatedData = transformOut ? mutateDataHandler(data, transformOut) : data;
@@ -681,10 +652,10 @@ function Provider(props) {
     const transformData = (data, handler) => {
       return mutateDataHandler(data, handler, {
         mutate: false,
-        fireHandlerWhen: _ref5 => {
+        fireHandlerWhen: _ref7 => {
           let {
             type
-          } = _ref5;
+          } = _ref7;
           return type === 'field';
         }
       });
@@ -712,7 +683,20 @@ function Provider(props) {
     return await handleSubmitCall({
       enableAsyncBehavior: (0, _isAsync.isAsync)(onSubmit),
       onSubmit: async () => {
-        if (handleSubmitListeners()) {
+        let stop = false;
+        const preventSubmit = () => stop = true;
+        for (const item of fieldEventListenersRef.current) {
+          const {
+            type,
+            callback
+          } = item;
+          if (type === 'onSubmit') {
+            callback({
+              preventSubmit
+            });
+          }
+        }
+        if (stop) {
           return;
         }
         const data = getSubmitData();
@@ -733,22 +717,27 @@ function Provider(props) {
         return result;
       }
     });
-  }, [getSubmitData, getSubmitParams, handleSubmitCall, handleSubmitListeners, onSubmit, onSubmitComplete, scrollToTop, scrollTopOnSubmit]);
+  }, [getSubmitData, getSubmitParams, handleSubmitCall, onSubmit, onSubmitComplete, scrollToTop, scrollTopOnSubmit]);
   const fieldEventListenersRef = (0, _react.useRef)([]);
-  const setFieldEventListener = (0, _react.useCallback)((path, type, callback) => {
-    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref6 => {
+  const setFieldEventListener = (0, _react.useCallback)(function (path, type, callback) {
+    let {
+      remove = false
+    } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    fieldEventListenersRef.current = fieldEventListenersRef.current.filter(_ref8 => {
       let {
         path: p,
         type: t,
         callback: c
-      } = _ref6;
+      } = _ref8;
       return !(p === path && t === type && c === callback);
     });
-    fieldEventListenersRef.current.push({
-      path,
-      type,
-      callback
-    });
+    if (!remove) {
+      fieldEventListenersRef.current.push({
+        path,
+        type,
+        callback
+      });
+    }
   }, []);
   const onSubmitContinueRef = (0, _react.useRef)(null);
   if (!hasFieldState('pending')) {
@@ -859,7 +848,6 @@ function Provider(props) {
     getSubmitData,
     getSubmitParams,
     addOnChangeHandler,
-    setHandleSubmit,
     scrollToTop,
     schema,
     disabled,
@@ -870,7 +858,7 @@ function Provider(props) {
     hasContext: true,
     errors: errorsRef.current,
     showAllErrors: showAllErrorsRef.current,
-    hasVisibleError: Object.keys(hasVisibleErrorRef.current).length > 0,
+    hasVisibleError: hasVisibleErrorRef.current.size > 0,
     addSetShowAllErrorsRef,
     fieldConnectionsRef,
     fieldDisplayValueRef,