@fto-consult/expo-ui 2.48.4 → 2.48.6

package/src/components/Form/FormData/FormDataActions.js

@@ -4,6 +4,7 @@ import Dimensions from "$cplatform/dimensions";
 import {defaultStr,isObj,defaultObj,isNonNullString,defaultVal,defaultFunc} from "$utils";
 import React from "$react";
 import {isWeb} from "$cplatform";
+import PropTypes from "prop-types";
 
 export default class FormDataActionComponent extends FormData {
     isFullScreen(){
@@ -31,13 +32,25 @@ export default class FormDataActionComponent extends FormData {
         const isEditing = this.isDocEditing(data);
         let subtitle = (isEditing?'Modifier':this.getNewElementLabel());
         let title = React.getTextContent(defaultVal(appBarProps.title,mainProps.title,this.props.title));
-        if(isEditing){
-            let _title = this.getPrimaryKeysFieldsValueText(data);
-            if(isNonNullString(_title)){
-                subtitle+= " ["+_title+"]"
+        const cArgs = {...mainProps,isEditing,isDocUpdate:isEditing,isUpdate:isEditing,data};
+        if(typeof this.props.getAppBarTitle =='function'){
+            title = defaultStr(this.props.getAppBarTitle(cArgs),title)
+        }
+        let hasFoundSubtitle = false;
+        if(typeof this.props.getAppBarSubtitle =='function'){
+            const st = this.props.getAppBarSubtitle(cArgs);
+            hasFoundSubtitle = st === false || isNonNullString(st);
+            subtitle = hasFoundSubtitle ? st : subtitle;
+        }
+        if(!hasFoundSubtitle){
+            if(isEditing){
+                let _title = this.getPrimaryKeysFieldsValueText(data);
+                if(isNonNullString(_title)){
+                    subtitle+= " ["+_title+"]"
+                }
+            } else {
+                subtitle = " ["+subtitle+"]";
             }
-        } else {
-            subtitle = " ["+subtitle+"]";
         }
         if(this.props.title !== false && mainProps.title !== false) {
             appBarProps.title = title;
@@ -147,4 +160,6 @@ export default class FormDataActionComponent extends FormData {
 
 FormDataActionComponent.propTypes = {
     ...FormData.propTypes,
+    getAppBarTitle: PropTypes.func,//la fonction pour récupérer l'appbat title
+    getAppBarSubtitle : PropTypes.func, //la fonction pour récupérer le subtitle de l'appBar
 }

package/src/layouts/Screen/TableData.js

@@ -142,7 +142,6 @@ export default class TableDataScreenComponent extends FormDataScreen{
             archiveProp : {value : typeof mainProps.archive =='function' && mainProps.archive || undefined },
             testIDProp : {value : defaultStr(mainProps.testID)},
             showPreloaderOnUpsert : {value : mainProps.showPreloaderOnUpsert},
-            isDocEditingProp : {value : typeof mainProps.isDocEditing =='function'? mainProps.isDocEditing : typeof mainProps.isDocUpdate =='function'? mainProps.isDocUpdate : undefined}
         });
         this.hidePreloader = this.hidePreloader.bind(this);
         this.showPreloader = this.showPreloader.bind(this);
@@ -281,6 +280,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
         if(isObj(customFields)){
             extendObj(true,fields,customFields);
         }
+        console.log(this.primaryKeyFields," is pkeyFields heeeee");
         ///on effectue une mutator sur le champ en cours de modification
         if(typeof prepareField =='function'){
             Object.map(fields,(field,i,counterIndex)=>{
@@ -525,10 +525,13 @@ export default class TableDataScreenComponent extends FormDataScreen{
     }
     isDocEditing(data){
         data = defaultObj(data);
-        if(!this.isDocEditingProp){
+        const isDocEditingCb = typeof this.props.isDocEditing =='function'? this.props.isDocEditing : typeof this.props.isDocUpdate =='function'? this.props.isDocUpdate : undefined;
+        if(!isDocEditingCb){
             if(isDocEditing(data,this.primaryKeyFields,({index:field,data})=>{
                 return checkPrimary(data,field);
             })) return true;
+        } else {
+            return isDocEditingCb(data,{context:this});
         }
         return super.isDocEditing(data);
     }