@fto-consult/expo-ui 6.90.0 → 6.90.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.90.0",
+  "version": "6.90.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {

package/src/layouts/Screen/TableData.js

@@ -246,6 +246,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             clone,
             isArchivable,clonable,isPrintable,print,data:customData,getRowKey,
             save2newAction,
+            newAction,
             save2cloneAction,
             saveAction,
             save2closeAction,
@@ -324,13 +325,15 @@ export default class TableDataScreenComponent extends FormDataScreen{
             isUpdated,
             fields,
         });
-        const cCloneAction = this.isClonable() && this.canCreateNew() && clonable !== false && cloneAction !== false && true || false;
+        const canNew = this.canCreateNew() && newAction !== false;
+        const cCloneAction = this.isClonable() && canNew && clonable !== false && cloneAction !== false && true || false;
         const rActionsArg = this.currentRenderingProps = {
             ...rest,
             ...formProps,
             context,
+            newAction,
             cloneAction : cCloneAction,
-            save2newAction : this.canCreateNew() && save2newAction !== false ? typeof save2cloneAction =="boolean"? save2cloneAction : saveAction !== false : false,
+            save2newAction : canNew ? typeof save2newAction =="boolean"? save2newAction : saveAction !== false : false,
             save2cloneAction : cCloneAction && save2cloneAction !== false ? true : false,
             isMobile : isMobOrTab,
             saveAction,
@@ -358,15 +361,20 @@ export default class TableDataScreenComponent extends FormDataScreen{
             archivedPermsFilter : this.archivedPermsFilter.bind(this),
             onPressCopyToClipboard : this.copyToClipboard.bind(this)
         }
-        if(isUpdated){
-            fields.approved = this.isApprovable()? {
-                text : 'Approuvé',
-                type : 'switch',
-                defaultValue : 0,
-                checkedTooltip: 'Oui',
-                disabled : Auth.isTableDataAllowed({table:tableName,action:'updateapproved'})? false:true,
-                uncheckedTooltip : 'Non'
-            } : null;
+        if(Object.size(fields,true)){
+            if(isUpdated){
+                fields.approved = this.isApprovable()? {
+                    text : 'Approuvé',
+                    type : 'switch',
+                    defaultValue : 0,
+                    checkedTooltip: 'Oui',
+                    disabled : Auth.isTableDataAllowed({table:tableName,action:'updateapproved'})? false:true,
+                    uncheckedTooltip : 'Non',
+                    ...Object.assign({},fields.approved)
+                } : null;
+            }
+        } else {
+            formProps.style = [theme.styles.noPadding,formProps.style]
         }
         rActionsArg.contentProps = Object.assign({},customContentProps);
         rActionsArg.containerProps = Object.assign({},customContainerProps);
@@ -651,11 +659,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
         return this.doSave(args);
     }
     canCreateNew(){
-        const editingProps = this.getCurrentRenderingProps();
-        if("newAction" in editingProps){
-            return !!editingProps.newAction;
-        }
-        return this.props.newAction !== false ? true : false;
+        return this.props.newAction !== false;
     }
     isMobileOrTabletMedia(){
         const r = this.getRenderTabsType();