@flowerforce/flower-core 3.1.2-beta.4 → 3.1.2-beta.5

package/dist/index.cjs.js

@@ -438,14 +438,13 @@ const FlowerStateUtils = {
 };
 const createFormData = (form) => {
     const validationErrors = form && form.errors;
-    const customErrors = form && form.customErrors;
-    const allErrors = { ...(validationErrors || {}), ...(customErrors || {}) };
+    const allErrors = Object.values(validationErrors || {});
     return {
         touched: form?.touched || false,
         errors: form?.errors,
         customErrors: form?.customErrors,
         isValidating: form?.isValidating,
-        isValid: allErrors ? Object.values(allErrors).flat().length === 0 : true
+        isValid: allErrors.flat().length === 0
     };
 };
 
@@ -620,18 +619,33 @@ const FlowerCoreReducers = {
             'errors',
             payload.id
         ]);
+        _unset(state, [
+            payload.name,
+            'form',
+            payload.currentNode,
+            'customErrors',
+            payload.id
+        ]);
         _unset(state, [payload.name, 'form', payload.currentNode, 'isValidating']);
     },
     formFieldTouch: (state, { payload }) => {
         _set(state, [payload.name, 'form', payload.currentNode, 'touches', payload.id], payload.touched);
     },
+    formFieldDirty: (state, { payload }) => {
+        _set(state, [payload.name, 'form', payload.currentNode, 'dirty', payload.id], payload.dirty);
+    },
     addData: (state, { payload }) => {
         const prevData = _get(state, [payload.flowName, 'data']);
         _set(state, [payload.flowName, 'data'], { ...prevData, ...payload.value });
     },
     addDataByPath: (state, { payload }) => {
+        const { path: newpath } = getPath(payload.id);
+        const currentNode = FlowerStateUtils.makeSelectCurrentNodeId(payload.flowName)(state);
         if (payload.id && payload.id.length) {
-            _set(state, [payload.flowName, 'data', ...payload.id], payload.value);
+            _set(state, [payload.flowName, 'data', ...newpath], payload.value);
+            if (payload?.dirty) {
+                _set(state, [payload.flowName, 'form', currentNode, 'dirty', payload.id], payload.dirty);
+            }
         }
     },
     // TODO usato al momento solo il devtool
@@ -646,12 +660,14 @@ const FlowerCoreReducers = {
         _set(state, [payload.name, 'form', payload.currentNode, 'isValidating'], payload.isValidating);
     },
     resetForm: (state, { payload }) => {
-        const touchedFields = _get(state, [payload.flowName, 'form', payload.id, 'touches'], {});
+        const touchedFields = _get(state, [payload.flowName, 'form', payload.id, 'errors'], {});
         Object.keys(touchedFields).forEach((key) => {
             const { flowNameFromPath = payload.flowName, path } = getPath(key);
             _unset(state, [flowNameFromPath, 'data', ...path]);
         });
-        _unset(state, [payload.flowName, 'form', payload.id]);
+        _unset(state, [payload.flowName, 'form', payload.id, 'touches']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'dirty']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'touched']);
     },
     node: (state, { payload }) => {
         const { name, history } = payload;
@@ -763,6 +779,7 @@ const FlowerCoreStateSelectors = {
     getDataFromState: (id) => (data) => (id === '*' ? data : _get(data, id)),
     makeSelectNodeFormTouched: (form) => form && form.touched,
     makeSelectNodeFormFieldTouched: (id) => (form) => form && form.touches && form.touches[id],
+    makeSelectNodeFormFieldDirty: (id) => (form) => form && form.dirty && form.dirty[id],
     makeSelectCurrentNodeId: (flower, startNodeId) => _get(flower, ['current']) || startNodeId,
     makeSelectCurrentNodeDisabled: (nodes, current) => !!_get(nodes, [current, 'disabled']),
     makeSelectPrevNodeRetain: (nodes, history, current) => {
@@ -780,7 +797,9 @@ const FlowerCoreStateSelectors = {
         if (nodes[prevFlowerNode] && nodes[prevFlowerNode].disabled)
             return;
         // eslint-disable-next-line consistent-return
-        return (nodes[prevFlowerNode] && nodes[prevFlowerNode].retain && prevFlowerNode);
+        return nodes[prevFlowerNode] && nodes[prevFlowerNode].retain
+            ? prevFlowerNode
+            : undefined;
     },
     makeSelectNodeErrors: createFormData,
     makeSelectFieldError: (name, id, validate) => (data, form) => {

package/dist/index.esm.js

@@ -436,14 +436,13 @@ const FlowerStateUtils = {
 };
 const createFormData = (form) => {
     const validationErrors = form && form.errors;
-    const customErrors = form && form.customErrors;
-    const allErrors = { ...(validationErrors || {}), ...(customErrors || {}) };
+    const allErrors = Object.values(validationErrors || {});
     return {
         touched: form?.touched || false,
         errors: form?.errors,
         customErrors: form?.customErrors,
         isValidating: form?.isValidating,
-        isValid: allErrors ? Object.values(allErrors).flat().length === 0 : true
+        isValid: allErrors.flat().length === 0
     };
 };
 
@@ -618,18 +617,33 @@ const FlowerCoreReducers = {
             'errors',
             payload.id
         ]);
+        _unset(state, [
+            payload.name,
+            'form',
+            payload.currentNode,
+            'customErrors',
+            payload.id
+        ]);
         _unset(state, [payload.name, 'form', payload.currentNode, 'isValidating']);
     },
     formFieldTouch: (state, { payload }) => {
         _set(state, [payload.name, 'form', payload.currentNode, 'touches', payload.id], payload.touched);
     },
+    formFieldDirty: (state, { payload }) => {
+        _set(state, [payload.name, 'form', payload.currentNode, 'dirty', payload.id], payload.dirty);
+    },
     addData: (state, { payload }) => {
         const prevData = _get(state, [payload.flowName, 'data']);
         _set(state, [payload.flowName, 'data'], { ...prevData, ...payload.value });
     },
     addDataByPath: (state, { payload }) => {
+        const { path: newpath } = getPath(payload.id);
+        const currentNode = FlowerStateUtils.makeSelectCurrentNodeId(payload.flowName)(state);
         if (payload.id && payload.id.length) {
-            _set(state, [payload.flowName, 'data', ...payload.id], payload.value);
+            _set(state, [payload.flowName, 'data', ...newpath], payload.value);
+            if (payload?.dirty) {
+                _set(state, [payload.flowName, 'form', currentNode, 'dirty', payload.id], payload.dirty);
+            }
         }
     },
     // TODO usato al momento solo il devtool
@@ -644,12 +658,14 @@ const FlowerCoreReducers = {
         _set(state, [payload.name, 'form', payload.currentNode, 'isValidating'], payload.isValidating);
     },
     resetForm: (state, { payload }) => {
-        const touchedFields = _get(state, [payload.flowName, 'form', payload.id, 'touches'], {});
+        const touchedFields = _get(state, [payload.flowName, 'form', payload.id, 'errors'], {});
         Object.keys(touchedFields).forEach((key) => {
             const { flowNameFromPath = payload.flowName, path } = getPath(key);
             _unset(state, [flowNameFromPath, 'data', ...path]);
         });
-        _unset(state, [payload.flowName, 'form', payload.id]);
+        _unset(state, [payload.flowName, 'form', payload.id, 'touches']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'dirty']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'touched']);
     },
     node: (state, { payload }) => {
         const { name, history } = payload;
@@ -761,6 +777,7 @@ const FlowerCoreStateSelectors = {
     getDataFromState: (id) => (data) => (id === '*' ? data : _get(data, id)),
     makeSelectNodeFormTouched: (form) => form && form.touched,
     makeSelectNodeFormFieldTouched: (id) => (form) => form && form.touches && form.touches[id],
+    makeSelectNodeFormFieldDirty: (id) => (form) => form && form.dirty && form.dirty[id],
     makeSelectCurrentNodeId: (flower, startNodeId) => _get(flower, ['current']) || startNodeId,
     makeSelectCurrentNodeDisabled: (nodes, current) => !!_get(nodes, [current, 'disabled']),
     makeSelectPrevNodeRetain: (nodes, history, current) => {
@@ -778,7 +795,9 @@ const FlowerCoreStateSelectors = {
         if (nodes[prevFlowerNode] && nodes[prevFlowerNode].disabled)
             return;
         // eslint-disable-next-line consistent-return
-        return (nodes[prevFlowerNode] && nodes[prevFlowerNode].retain && prevFlowerNode);
+        return nodes[prevFlowerNode] && nodes[prevFlowerNode].retain
+            ? prevFlowerNode
+            : undefined;
     },
     makeSelectNodeErrors: createFormData,
     makeSelectFieldError: (name, id, validate) => (data, form) => {

package/dist/src/interfaces/ReducerInterface.d.ts

@@ -5,7 +5,7 @@ export type ActionWithPayload<T> = {
     payload: T;
 };
 type ReducerFunctionSign<T extends object, R> = (state: Record<string, Flower<T>>, action: ActionWithPayload<R>) => Record<string, Flower<T>> | void;
-export type ActionsTypes = 'historyAdd' | 'historyPrevToNode' | 'setFormTouched' | 'forceAddHistory' | 'historyPop' | 'restoreHistory' | 'replaceNode' | 'initializeFromNode' | 'forceResetHistory' | 'destroy' | 'initNodes' | 'setCurrentNode' | 'formAddErrors' | 'formRemoveErrors' | 'addData' | 'addDataByPath' | 'replaceData' | 'unsetData' | 'setFormIsValidating' | 'resetForm' | 'formFieldTouch' | 'node' | 'prevToNode' | 'next' | 'prev' | 'reset';
+export type ActionsTypes = 'historyAdd' | 'historyPrevToNode' | 'setFormTouched' | 'forceAddHistory' | 'historyPop' | 'restoreHistory' | 'replaceNode' | 'initializeFromNode' | 'forceResetHistory' | 'destroy' | 'initNodes' | 'setCurrentNode' | 'formAddErrors' | 'formRemoveErrors' | 'addData' | 'addDataByPath' | 'replaceData' | 'unsetData' | 'setFormIsValidating' | 'resetForm' | 'formFieldTouch' | 'formFieldDirty' | 'node' | 'prevToNode' | 'next' | 'prev' | 'reset';
 /**
  * These functions are Redux reducers used in a Flux architecture for managing state transitions and updates in a Flower application.
  */
@@ -192,6 +192,20 @@ export type ReducersFunctions<T extends Record<string, any> = Record<string, Flo
             [x: string]: string[];
         } | string[];
     }>;
+    /**
+     * @param state
+     * @param action
+     *
+     * Set touch form single field
+     *
+     * @returns state
+     */
+    formFieldDirty: ReducerFunctionSign<T, {
+        name: string;
+        currentNode: string;
+        id: string;
+        dirty?: boolean;
+    }>;
     /**
      * @param state
      * @param action
@@ -240,9 +254,10 @@ export type ReducersFunctions<T extends Record<string, any> = Record<string, Flo
      * @returns state
      */
     addDataByPath: ReducerFunctionSign<T, {
-        id: string[];
+        id: string;
         flowName: string;
         value: T | string;
+        dirty?: boolean;
     }>;
     /**
      * @param state

package/dist/src/interfaces/SelectorsInterface.d.ts

@@ -51,7 +51,7 @@ export interface ISelectors {
      * @param current
      * @returns
      */
-    makeSelectPrevNodeRetain<T extends Record<string, any>>(nodes: Flower<T>['nodes'], history: Flower<T>['history'], current: Flower<T>['current']): boolean | string | undefined;
+    makeSelectPrevNodeRetain<T extends Record<string, any>>(nodes: Flower<T>['nodes'], history: Flower<T>['history'], current: Flower<T>['current']): string | undefined;
     /**
      * @param nodes
      * @param current
@@ -76,6 +76,11 @@ export interface ISelectors {
      * @returns
      */
     makeSelectNodeFormFieldTouched<T extends Record<string, any>>(id: string): (form: Form<T> | undefined) => boolean | undefined;
+    /**
+     * @param form
+     * @returns
+     */
+    makeSelectNodeFormFieldDirty<T extends Record<string, any>>(id: string): (form: Form<T> | undefined) => boolean | undefined;
     /**
      * @param flower
      * @returns

package/dist/src/interfaces/Store.d.ts

@@ -52,6 +52,9 @@ export type Form<T> = {
     customErrors?: {
         [K in keyof T]: Array<string>;
     };
+    dirty?: {
+        [K in keyof T]: boolean;
+    };
     touches?: {
         [K in keyof T]: boolean;
     };

package/dist/src/interfaces/UtilsInterface.d.ts

@@ -43,6 +43,7 @@ export interface CoreStateUtils {
     makeSelectNodeErrors<T extends object>(name: string, currentNodeId: string): (state: T) => {
         touched: boolean;
         errors: any;
+        customErrors: any;
         isValid: boolean;
         isValidating?: boolean;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flower-core",
-  "version": "3.1.2-beta.4",
+  "version": "3.1.2-beta.5",
   "description": "Core functions for flowerJS",
   "repository": {
     "type": "git",