@flowerforce/flower-core 3.1.2-beta.6 → 3.1.2-beta.8

package/dist/index.cjs.js

@@ -440,7 +440,8 @@ const createFormData = (form) => {
     const validationErrors = form && form.errors;
     const allErrors = Object.values(validationErrors || {});
     return {
-        touched: form?.touched || false,
+        isSubmitted: form?.isSubmitted || false,
+        isDirty: form?.isDirty || false,
         errors: form?.errors,
         customErrors: form?.customErrors,
         isValidating: form?.isValidating,
@@ -483,7 +484,7 @@ const FlowerCoreReducers = {
             typeof payload === 'string' ? payload : payload.flowName,
             'form',
             typeof payload === 'string' ? payload : payload.currentNode,
-            'touched'
+            'isSubmitted'
         ], true);
         return state;
     },
@@ -631,9 +632,6 @@ const FlowerCoreReducers = {
     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 });
@@ -643,8 +641,9 @@ const FlowerCoreReducers = {
         const currentNode = FlowerStateUtils.makeSelectCurrentNodeId(payload.flowName)(state);
         if (payload.id && payload.id.length) {
             _set(state, [payload.flowName, 'data', ...newpath], payload.value);
-            if (payload?.dirty) {
+            if (payload && payload.dirty) {
                 _set(state, [payload.flowName, 'form', currentNode, 'dirty', payload.id], payload.dirty);
+                _set(state, [payload.flowName, 'form', currentNode, 'isDirty'], true);
             }
         }
     },
@@ -666,8 +665,8 @@ const FlowerCoreReducers = {
             _unset(state, [flowNameFromPath, 'data', ...path]);
         });
         _unset(state, [payload.flowName, 'form', payload.id, 'touches']);
-        _unset(state, [payload.flowName, 'form', payload.id, 'dirty']);
-        _unset(state, [payload.flowName, 'form', payload.id, 'touched']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'isDirty']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'isSubmitted']);
     },
     node: (state, { payload }) => {
         const { name, history } = payload;
@@ -777,7 +776,7 @@ const FlowerCoreStateSelectors = {
     makeSelectStartNodeId: (flower) => _get(flower, ['startId']),
     getDataByFlow: (flower) => _get(flower, ['data']) ?? {},
     getDataFromState: (id) => (data) => (id === '*' ? data : _get(data, id)),
-    makeSelectNodeFormTouched: (form) => form && form.touched,
+    makeSelectNodeFormSubmitted: (form) => form && form.isSubmitted,
     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,

package/dist/index.esm.js

@@ -438,7 +438,8 @@ const createFormData = (form) => {
     const validationErrors = form && form.errors;
     const allErrors = Object.values(validationErrors || {});
     return {
-        touched: form?.touched || false,
+        isSubmitted: form?.isSubmitted || false,
+        isDirty: form?.isDirty || false,
         errors: form?.errors,
         customErrors: form?.customErrors,
         isValidating: form?.isValidating,
@@ -481,7 +482,7 @@ const FlowerCoreReducers = {
             typeof payload === 'string' ? payload : payload.flowName,
             'form',
             typeof payload === 'string' ? payload : payload.currentNode,
-            'touched'
+            'isSubmitted'
         ], true);
         return state;
     },
@@ -629,9 +630,6 @@ const FlowerCoreReducers = {
     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 });
@@ -641,8 +639,9 @@ const FlowerCoreReducers = {
         const currentNode = FlowerStateUtils.makeSelectCurrentNodeId(payload.flowName)(state);
         if (payload.id && payload.id.length) {
             _set(state, [payload.flowName, 'data', ...newpath], payload.value);
-            if (payload?.dirty) {
+            if (payload && payload.dirty) {
                 _set(state, [payload.flowName, 'form', currentNode, 'dirty', payload.id], payload.dirty);
+                _set(state, [payload.flowName, 'form', currentNode, 'isDirty'], true);
             }
         }
     },
@@ -664,8 +663,8 @@ const FlowerCoreReducers = {
             _unset(state, [flowNameFromPath, 'data', ...path]);
         });
         _unset(state, [payload.flowName, 'form', payload.id, 'touches']);
-        _unset(state, [payload.flowName, 'form', payload.id, 'dirty']);
-        _unset(state, [payload.flowName, 'form', payload.id, 'touched']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'isDirty']);
+        _unset(state, [payload.flowName, 'form', payload.id, 'isSubmitted']);
     },
     node: (state, { payload }) => {
         const { name, history } = payload;
@@ -775,7 +774,7 @@ const FlowerCoreStateSelectors = {
     makeSelectStartNodeId: (flower) => _get(flower, ['startId']),
     getDataByFlow: (flower) => _get(flower, ['data']) ?? {},
     getDataFromState: (id) => (data) => (id === '*' ? data : _get(data, id)),
-    makeSelectNodeFormTouched: (form) => form && form.touched,
+    makeSelectNodeFormSubmitted: (form) => form && form.isSubmitted,
     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,

package/dist/src/FlowerCoreStateUtils.d.ts

@@ -1,7 +1,8 @@
 import { CoreStateUtils } from './interfaces/UtilsInterface';
 export declare const FlowerStateUtils: CoreStateUtils;
 export declare const createFormData: (form: Record<string, any>) => {
-    touched: any;
+    isSubmitted: any;
+    isDirty: any;
     errors: any;
     customErrors: any;
     isValidating: any;

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' | 'formFieldDirty' | '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' | '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,20 +192,6 @@ 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

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

@@ -65,7 +65,8 @@ export interface ISelectors {
      * @returns
      */
     makeSelectNodeErrors<T extends Record<string, any>>(form: Form<T> | undefined): {
-        touched: boolean;
+        isSubmitted: boolean;
+        isDirty: boolean;
         errors: any;
         customErrors: any;
         isValid: boolean;
@@ -95,7 +96,7 @@ export interface ISelectors {
      * @param form
      * @returns
      */
-    makeSelectNodeFormTouched<T extends Record<string, any>>(form: Form<T>): boolean | undefined;
+    makeSelectNodeFormSubmitted<T extends Record<string, any>>(form: Form<T>): boolean | undefined;
     /**
      * @param name
      * @param id

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

@@ -44,7 +44,8 @@ export interface INode {
     disabled?: boolean;
 }
 export type Form<T> = {
-    touched?: boolean;
+    isSubmitted?: boolean;
+    isDirty?: boolean;
     isValidating?: boolean;
     errors?: {
         [K in keyof T]: Array<string>;

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

@@ -41,7 +41,8 @@ export interface CoreStateUtils {
      * It retrieves the form node using selectFlowerFormNode, then extracts information about touched state, errors, validation status, and validity.
      */
     makeSelectNodeErrors<T extends object>(name: string, currentNodeId: string): (state: T) => {
-        touched: boolean;
+        isSubmitted: boolean;
+        isDirty: boolean;
         errors: any;
         customErrors: any;
         isValid: boolean;

package/package.json

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