@fto-consult/expo-ui 7.21.0 → 7.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",

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

@@ -3,7 +3,7 @@ import Dialog from "./Dialog";
 import { createProviderRef } from "$ecomponents/Dialog/Provider";
 import {isMobileOrTabletMedia} from "$cplatform/dimensions";
 import {MAX_WIDTH} from "$ecomponents/Dialog/utils";
-import {extendObj,defaultObj,isObj,defaultBool,defaultStr} from "$cutils";
+import {extendObj,defaultObj,isObj,defaultBool,defaultStr,defaultVal} from "$cutils";
 import grid from "$theme/grid";
 import theme from "$theme";
 import {isDesktopMedia} from "$cdimensions";
@@ -11,6 +11,9 @@ import {isDesktopMedia} from "$cdimensions";
 let dialogProviderRef = null;
 
 
+/*** l'on peut override par défaut l'action ok par les props ok|yes
+    l'on peut override par défaut l'acction cancel par les props closeAction|no
+*/
 const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
     innerRef = innerRef || createProviderRef((eRef)=>{
         dialogProviderRef = eRef;
@@ -59,22 +62,27 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
         isProvider
         ref={formRef}  
         windowWidth = {MAX_WIDTH}
-        propsMutator = {(rest)=>{
+        propsMutator = {({cancelButton,...rest})=>{
             const isMob = isMobileOrTabletMedia();
             if(closeAction === true || state.closeAction === true) return rest;
             rest.windowWidth = !isMob ? MAX_WIDTH : undefined;
+            const no = extendObj({},props.no,state.no);
             rest.actions = Array.isArray(rest.actions)? Object.clone(rest.actions) : isObj(rest.actions)? Object.clone(rest.actions) : null;
+            const closeAction = defaultObj(closeAction);
             rest.cancelButton = false;
-            if(rest.actions && (!isMob || rest.fullScreen === false)){
+            if(cancelButton !== false && rest.actions && (!isMob || rest.fullScreen === false) && state.no !== false){
                 if(isDesktopMedia() && typeof rest.maxActions !=='number'){
                     rest.maxActions = 2;
                 }
+                const noText = defaultVal(no.text,no.label,closeAction.text,closeAction.label,'Annuler')
                 const closeBtn ={
-                    text : 'Annuler',
-                    icon : 'close',
+                    ...closeAction,
+                    ...no,
+                    text : noText,
+                    label : noText,
+                    icon : defaultVal(no.icon,closeAction.icon,'close'),
                     isCancelButton : true,
                     error : true,
-                    ...defaultObj(closeAction),
                     onPress : context.close,
                     isAction : false,
                 } 

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

@@ -1,4 +1,4 @@
-import {isNonNullString,isObj,defaultObj,isPromise,isFunction,defaultStr,isObjOrArray,defaultFunc} from "$cutils";
+import {isNonNullString,isObj,defaultObj,extendObj,defaultVal,isPromise,isFunction,defaultStr,isObjOrArray,defaultFunc} from "$cutils";
 import notify from "$notify";
 import { getFormData } from "../utils/FormsManager";
 import {isMobileBrowser,isMobileNative} from "$cplatform";
@@ -15,21 +15,25 @@ export const canHandleShurtCut = x=> !isMobileNative(true) && !isMobileBrowser()
 
 const canHandleS = canHandleShurtCut();
 export const getAppBarActionsProps = function(_props){
-    let {actions,formName,save,cancel,actionMutator,saveButton,saveButtonIcon,data,style,...props} = defaultObj(_props);
+    let {actions,formName,save,cancel,actionMutator,saveButton,saveButtonIcon,data,style,yes,ok,...props} = defaultObj(_props);
     props = Object.assign({},props);
     cancel = defaultFunc(cancel);
     save = defaultFunc(save);
     saveButton = isNonNullString(saveButton)? saveButton : Object.size(data,true) > 0 && (isNonNullString(data.code) || isNonNullString(data._id))? "Modifier":'Enregister';
-    saveButtonIcon = defaultStr(saveButtonIcon,'check')
+    saveButtonIcon = defaultStr(saveButtonIcon,'check');
+    const yesOk = extendObj({},yes,ok);
     if(typeof actions =='function'){
         actions = actions(props);
     }
-    if(actions === undefined){
+    if(actions === undefined && yes !== false && ok !== false){
+        const yesOKText = defaultVal(yesOk.text,yesOk.label);
         actions = [{
             formName,
-            text : saveButton,
-            icon : saveButtonIcon,
             isAction: true,
+            ...yesOk,
+            text : yesOKText,
+            label: yesOKText,
+            icon : defaultVal(yesOk.icon,saveButtonIcon),
         }]
     } else {
         actions = (isObjOrArray(actions))?actions : [];