awing-library 2.1.2-dev.542 → 2.1.2-dev.543

package/dist/AWING/DataForm/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/AWING/DataForm/container.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,2CA6QzE"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/AWING/DataForm/container.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAIjD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,2CA4RzE"}

package/dist/AWING/DataForm/container.js

@@ -6,6 +6,9 @@ import { calculateFormValid, handleFields, updateFieldsWithFormulas } from "./ut
 function DataForm(props) {
     const { caption, actions, fields, onUpdate, onValues, padding = 'normal', onValidateForm, onFormValid, autoValidateFieldText = false, oldValue: propsOldValue, fieldPermissions } = props;
     const [oldValue, setOldValue] = useState(propsOldValue);
+    const oldValueRef = useRef(propsOldValue);
+    const lastPropsOldValueStr = useRef(JSON.stringify(propsOldValue));
+    const isSyncingFromParent = useRef(false);
     const [keyUpdate, setKey] = useState('');
     const isFirstRender = useRef(true);
     const [dataFormState, setDataFormState] = useState(()=>{
@@ -26,44 +29,51 @@ function DataForm(props) {
     });
     useEffect(()=>{
         if (propsOldValue) {
-            const isFirstLoad = !oldValue || 0 === Object.keys(oldValue).length;
+            const currentPropsStr = JSON.stringify(propsOldValue);
+            const isFirstLoad = !oldValueRef.current || 0 === Object.keys(oldValueRef.current).length;
             const newId = propsOldValue?.id;
-            const currentId = oldValue?.id;
+            const currentId = oldValueRef.current?.id;
             const isNewId = newId !== currentId;
-            const isNewVersion = propsOldValue?.versionId !== oldValue?.versionId;
-            const isContentDifferent = JSON.stringify(propsOldValue) !== JSON.stringify(oldValue);
-            setOldValue(propsOldValue);
-            if (isFirstLoad || isNewId || isNewVersion || isContentDifferent) setDataFormState((pre)=>{
-                const newFieldsToUpdate = {
-                    ...pre.fieldsToUpdate
-                };
-                if (isFirstLoad || isNewId) {
-                    const resetFields = {};
-                    const newValidation = {};
-                    fields.forEach((field)=>{
-                        const fieldName = field.fieldName;
-                        resetFields[fieldName] = propsOldValue[fieldName];
-                        newValidation[fieldName] = true;
+            const isNewVersion = propsOldValue?.versionId !== oldValueRef.current?.versionId;
+            const isContentDifferent = currentPropsStr !== lastPropsOldValueStr.current;
+            if (isFirstLoad || isNewId || isNewVersion || isContentDifferent) {
+                lastPropsOldValueStr.current = currentPropsStr;
+                oldValueRef.current = propsOldValue;
+                setOldValue(propsOldValue);
+                isSyncingFromParent.current = true;
+                setDataFormState((pre)=>{
+                    if (isFirstLoad || isNewId) {
+                        const resetFields = {};
+                        const newValidation = {};
+                        fields.forEach((field)=>{
+                            const fieldName = field.fieldName;
+                            resetFields[fieldName] = propsOldValue[fieldName];
+                            newValidation[fieldName] = true;
+                        });
+                        return {
+                            fieldsToUpdate: resetFields,
+                            validation: newValidation
+                        };
+                    }
+                    const newFieldsToUpdate = {
+                        ...pre.fieldsToUpdate
+                    };
+                    Object.keys(propsOldValue).forEach((key)=>{
+                        const fieldKey = key;
+                        newFieldsToUpdate[fieldKey] = propsOldValue[fieldKey];
                     });
                     return {
-                        fieldsToUpdate: resetFields,
-                        validation: newValidation
+                        ...pre,
+                        fieldsToUpdate: newFieldsToUpdate
                     };
-                }
-                Object.keys(propsOldValue).forEach((key)=>{
-                    const fieldKey = key;
-                    newFieldsToUpdate[fieldKey] = propsOldValue[fieldKey];
                 });
-                return {
-                    ...pre,
-                    fieldsToUpdate: newFieldsToUpdate
-                };
-            });
+            }
         }
     }, [
         JSON.stringify(propsOldValue)
     ]);
     const handleChange = (fieldName, newValue, valid)=>{
+        isSyncingFromParent.current = false;
         setDataFormState((pre)=>{
             let newFieldsToUpdate = {
                 ...pre.fieldsToUpdate
@@ -95,7 +105,7 @@ function DataForm(props) {
             }
             const convertFields = fields.map((field)=>({
                     fieldName: String(field.fieldName),
-                    value: String(newFieldsToUpdate[field.fieldName] ?? oldValue?.[field.fieldName] ?? '')
+                    value: String(newFieldsToUpdate[field.fieldName] ?? oldValueRef.current?.[field.fieldName] ?? '')
                 }));
             const convertFormulas = fields.filter((field)=>field.autoFormula).map((field)=>({
                     fieldName: String(field.fieldName ?? ''),
@@ -115,21 +125,26 @@ function DataForm(props) {
         setKey(String(fieldName));
     };
     useEffect(()=>{
-        if (isFirstRender.current) {
-            isFirstRender.current = false;
+        if (isSyncingFromParent.current) {
+            isSyncingFromParent.current = false;
             return;
         }
+        const currentOldValue = oldValueRef.current;
         const completeValues = {
-            ...oldValue,
+            ...currentOldValue,
             ...dataFormState.fieldsToUpdate
         };
-        const formValid = calculateFormValid(dataFormState, fields, oldValue, onValidateForm, onFormValid);
+        const formValid = calculateFormValid(dataFormState, fields, currentOldValue, onValidateForm, onFormValid);
+        if (isFirstRender.current) {
+            isFirstRender.current = false;
+            if (onValues) onValues(completeValues, formValid, keyUpdate);
+            return;
+        }
         if (onUpdate) onUpdate(dataFormState.fieldsToUpdate, formValid, keyUpdate);
         if (onValues) onValues(completeValues, formValid, keyUpdate);
     }, [
         dataFormState,
-        keyUpdate,
-        oldValue
+        keyUpdate
     ]);
     const renderField = (fieldDef)=>{
         const { fieldName } = fieldDef;

package/dist/AWING/DataForm/container.test.js

@@ -6,7 +6,7 @@ import { fireEvent, render, screen } from "@testing-library/react";
 import { Constants } from "../../Commons/Constant.js";
 import container from "./container.js";
 var __webpack_modules__ = {
-    "AWING/DataInput": function(module) {
+    "../DataInput": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__DataInput_index_js_c7933a4f__;
     },
     "../helper": function(module) {
@@ -23,7 +23,7 @@ function __webpack_require__(moduleId) {
     __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
     return module.exports;
 }
-var index_js_ = __webpack_require__("AWING/DataInput");
+var index_js_ = __webpack_require__("../DataInput");
 jest.mock('../DataInput', ()=>({
         __esModule: true,
         default: jest.fn(),
@@ -91,7 +91,7 @@ jest.mock('@mui/material', ()=>({
                 children: children
             })
     }));
-const mockInputFactory = __webpack_require__("AWING/DataInput")["default"];
+const mockInputFactory = __webpack_require__("../DataInput")["default"];
 const mockCalculateValue = __webpack_require__("../helper").calculateValue;
 const mockConvertFormulaToBinaryTree = __webpack_require__("../helper").convertFormulaToBinaryTree;
 const mockReplaceFieldsValue = __webpack_require__("../helper").replaceFieldsValue;

package/dist/AWING/DataForm2/containerOptimized.test.js

@@ -5,7 +5,7 @@ import { act, fireEvent, render, screen, waitFor } from "@testing-library/react"
 import containerOptimized from "./containerOptimized.js";
 import { createFormStateManager } from "./formStateManager.js";
 var __webpack_modules__ = {
-    "AWING/DataInput": function(module) {
+    "../DataInput": function(module) {
         module.exports = __WEBPACK_EXTERNAL_MODULE__DataInput_index_js_c7933a4f__;
     }
 };
@@ -98,7 +98,7 @@ jest.mock('@mui/material', ()=>({
                 children: children
             })
     }));
-const mockInputFactory = __webpack_require__("AWING/DataInput")["default"];
+const mockInputFactory = __webpack_require__("../DataInput")["default"];
 describe('DataForm Optimized - Performance Tests', ()=>{
     let inputRenderCounts = {};
     const mockFields = [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-dev.542",
+    "version": "2.1.2-dev.543",
     "license": "MIT",
     "exports": {
         ".": {