@fto-consult/expo-ui 7.20.6 → 7.22.0

package/bin/utils.js

@@ -1 +1 @@
-module.exports = require("@fto-consult/electron-gen/src/utils");
+module.exports = require("@fto-consult/node-utils");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.20.6",
+  "version": "7.22.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -46,7 +46,7 @@
     "delete-node-modules": "rimraf ./**/node_modules",
     "dev": "npx expo start --no-dev --minify -c",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
-    "update": "npm i @fto-consult/electron-gen@latest pdfmake@latest expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @emotion/native@latest @fto-consult/common@latest @react-navigation/stack react-native-blob-util  react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@5 react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest react-native-web@latest react-dom@latest && npx expo install --fix && npm run update-apexchart && npm run update-pdfmake && npm run find-licenses"
+    "update": "npm i @fto-consult/node-utils@latest pdfmake@latest expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @emotion/native@latest @fto-consult/common@latest @react-navigation/stack react-native-blob-util  react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@5 react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest react-native-web@latest react-dom@latest && npx expo install --fix && npm run update-apexchart && npm run update-pdfmake && npm run find-licenses"
   },
   "bin": {
     "expo-ui": "./bin/index.js"
@@ -72,8 +72,8 @@
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
     "@fto-consult/common": "^4.6.0",
-    "@fto-consult/electron-gen": "^2.3.1",
     "@fto-consult/expo-ui": "^7.17.9",
+    "@fto-consult/node-utils": "^1.3.4",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",
@@ -98,7 +98,7 @@
     "expo-web-browser": "~12.3.2",
     "file-saver": "^2.0.5",
     "fs-extra": "^11.2.0",
-    "google-libphonenumber": "^3.2.33",
+    "google-libphonenumber": "^3.2.34",
     "htmlparser2-without-node-native": "^3.9.2",
     "is-plain-obj": "^4.1.0",
     "js-base64": "^3.7.5",
@@ -114,7 +114,7 @@
     "react-native-get-random-values": "~1.9.0",
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
-    "react-native-paper": "^5.12.0",
+    "react-native-paper": "^5.12.1",
     "react-native-paper-dates": "^0.21.7",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",

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 : [];

package/src/screens/Help/openLibraries.js

@@ -45,13 +45,13 @@ module.exports = {
 		"license": "MIT"
 	},
 	"@fto-consult/common": {
-		"version": "4.4.0",
+		"version": "4.6.0",
 		"url": "https://github.com/borispipo/common#readme",
 		"license": "ISC"
 	},
-	"@fto-consult/electron-gen": {
-		"version": "2.3.1",
-		"license": "ISC"
+	"@fto-consult/node-utils": {
+		"version": "1.3.4",
+		"license": "MIT"
 	},
 	"@pchmn/expo-material3-theme": {
 		"version": "1.3.1",
@@ -184,7 +184,7 @@ module.exports = {
 		"license": "MIT"
 	},
 	"google-libphonenumber": {
-		"version": "3.2.33",
+		"version": "3.2.34",
 		"url": "https://ruimarinho.github.io/google-libphonenumber/",
 		"license": "(MIT AND Apache-2.0)"
 	},
@@ -259,7 +259,7 @@ module.exports = {
 		"license": "MIT"
 	},
 	"react-native-paper": {
-		"version": "5.12.0",
+		"version": "5.12.1",
 		"url": "https://callstack.github.io/react-native-paper",
 		"license": "MIT"
 	},