@fto-consult/expo-ui 6.89.2 → 6.90.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.89.2",
+  "version": "6.90.1",
   "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,17 +325,19 @@ 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 ? true : false,
+            save2newAction : canNew ? typeof save2newAction =="boolean"? save2newAction : saveAction !== false : false,
             save2cloneAction : cCloneAction && save2cloneAction !== false ? true : false,
             isMobile : isMobOrTab,
             saveAction,
-            save2closeAction,
+            save2closeAction : typeof save2cloneAction ==="boolean"? save2cloneAction : saveAction !== false,
             tableName,
             sessionName,
             table,
@@ -396,9 +399,12 @@ export default class TableDataScreenComponent extends FormDataScreen{
     handleCustomRender(){
         return true;
     }
+    canRenderActions(){
+       return (this.props.renderActions !== false); 
+    }
     componentWillRender({...rActionsArg}){
         rActionsArg.context = this;
-        const rActions = renderActions.call(this,rActionsArg);
+        const rActions = this.canRenderActions()? renderActions.call(this,rActionsArg) : {};
         const renderedActs = this.renderActions(rActionsArg);
         if(!rActionsArg.archived){
             const customActionKeyPrefix = this.getRenderedActionPrefix();
@@ -648,11 +654,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();