tuain-ng-forms-lib 15.2.0 → 15.2.1

package/fesm2020/tuain-ng-forms-lib.mjs

@@ -2179,14 +2179,17 @@ class FormStructureAndData {
         }
         if (definitionReceived.actions) {
             const formActions = definitionReceived.actions.map(objDef => {
-                let visibleStates = objDef.visibleStates;
-                let enabledStates = objDef.enabledStates ?? objDef.editableStates;
-                if (!visibleStates) {
-                    visibleStates = (objDef.actionModes || '').split(',')
-                        .map(state => state.trim())
-                        .filter(state => state.length > 0) || [];
-                    enabledStates = [...visibleStates];
+                let visibleStates = objDef.visibleStates
+                    ?? (objDef.actionModes?.split(',')?.map(state => state.trim())?.filter(state => state))
+                    ?? [];
+                let enabledStates = objDef.enabledStates ?? objDef.editableStates ?? [];
+                if (!Array.isArray(visibleStates) && typeof visibleStates === 'string') {
+                    visibleStates = (visibleStates === neverVisible) ? [] : allStates;
                 }
+                if (!Array.isArray(enabledStates) && typeof enabledStates === 'string') {
+                    enabledStates = (enabledStates === neverVisible) ? [] : visibleStates;
+                }
+                enabledStates = enabledStates.filter(state => visibleStates.includes(state));
                 return { ...objDef, visibleStates, enabledStates };
             });
             for (const actionReceived of formActions) {
@@ -2201,9 +2204,9 @@ class FormStructureAndData {
         if (definitionReceived.fields) {
             const formFields = definitionReceived.fields.map(objDef => {
                 let visibleStates = objDef.visibleStates
-                    ?? (objDef.fieldModes?.map(state => state.trim())?.filter(state => state))
+                    ?? (objDef.fieldModes?.split(',')?.map(state => state.trim())?.filter(state => state))
                     ?? [];
-                let enabledStates = objDef.enabledStates ?? objDef.editableStates;
+                let enabledStates = objDef.enabledStates ?? objDef.editableStates ?? [];
                 if (!Array.isArray(visibleStates) && typeof visibleStates === 'string') {
                     visibleStates = (visibleStates === neverVisible) ? [] : allStates;
                 }
@@ -2224,14 +2227,17 @@ class FormStructureAndData {
         }
         if (definitionReceived.tables) {
             const tables = definitionReceived.tables.map(objDef => {
-                let visibleStates = objDef.visibleStates;
-                let enabledStates = objDef.enabledStates || objDef.editableStates;
-                if (!visibleStates) {
-                    visibleStates = (objDef.tableModes || '').split(',')
-                        .map(state => state.trim())
-                        .filter(state => state.length > 0) || [];
-                    enabledStates = [...visibleStates];
+                let visibleStates = objDef.visibleStates
+                    ?? (objDef.tableModes?.split(',')?.map(state => state.trim())?.filter(state => state))
+                    ?? [];
+                let enabledStates = objDef.enabledStates ?? objDef.editableStates ?? [];
+                if (!Array.isArray(visibleStates) && typeof visibleStates === 'string') {
+                    visibleStates = (visibleStates === neverVisible) ? [] : allStates;
                 }
+                if (!Array.isArray(enabledStates) && typeof enabledStates === 'string') {
+                    enabledStates = (enabledStates === neverVisible) ? [] : visibleStates;
+                }
+                enabledStates = enabledStates.filter(state => visibleStates.includes(state));
                 return { ...objDef, visibleStates, enabledStates };
             });
             for (const tableReceived of tables) {
@@ -2245,11 +2251,11 @@ class FormStructureAndData {
         }
         if (definitionReceived.sections) {
             const formSections = definitionReceived.sections.map(objDef => {
-                let visibleStates = objDef.visibleStates;
-                if (!visibleStates) {
-                    visibleStates = (objDef.sectionModes || '').split(',')
-                        .map(state => state.trim())
-                        .filter(state => state.length > 0) || [];
+                let visibleStates = objDef.visibleStates
+                    ?? (objDef.sectionModes?.split(',')?.map(state => state.trim())?.filter(state => state))
+                    ?? [];
+                if (!Array.isArray(visibleStates) && typeof visibleStates === 'string') {
+                    visibleStates = (visibleStates === neverVisible) ? [] : allStates;
                 }
                 return { ...objDef, visibleStates };
             });