@fto-consult/expo-ui 7.8.10 → 7.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.8.10",
+  "version": "7.10.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -72,7 +72,7 @@
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
     "@fto-consult/common": "^3.75.2",
-    "@fto-consult/electron-gen": "^1.3.7",
+    "@fto-consult/electron-gen": "^2.0.0",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",
@@ -114,12 +114,12 @@
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
     "react-native-paper": "^5.11.4",
-    "react-native-paper-dates": "^0.21.4",
+    "react-native-paper-dates": "^0.21.7",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",
     "react-native-svg": "13.9.0",
-    "react-native-web": "^0.19.9",
+    "react-native-web": "^0.19.10",
     "react-native-webview": "13.2.2",
     "react-virtuoso": "^4.6.2",
     "sanitize-filename": "^1.6.3",

package/src/components/Datagrid/Common/Common.js

@@ -45,7 +45,7 @@ import {MORE_ICON} from "$ecomponents/Icon"
 import ActivityIndicator from "$ecomponents/ActivityIndicator";
 import {createTableHeader,fields as pdfFields,pageHeaderMargin,sprintf as pdfSprintf} from "$cpdf";
 import {isWeb,isMobileNative} from "$cplatform";
-import { createPDF,getFields as getPdfFields } from '../../../pdf';
+import { createPDF,getFields as getPdfFields } from '$expo-ui/pdf';
 
 export const TIMEOUT = 100;
 
@@ -1835,16 +1835,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if(pdfDocumentTitle){
             content.unshift(pdfDocumentTitle);
         }
-        const pdf = createPDF({...config,content});
-        if(isWeb()){
-            return pdf.open();
-        }
-        return;
-        FileSystem.writeExcel({...config,workbook:wb}).then(({path})=>{
-            if(isNonNullString(path)){
-                notify.success("Fichier enregistré dans le répertoire {0}".sprintf(path))
-            }
-         })
+        return createPDF({...config,content});
     }).finally(Preloader.close);
 }
    handleTableExport(args){

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -1,7 +1,7 @@
 import React from '$react';
 import {StyleSheet} from 'react-native';
 import PropTypes from "prop-types";
-import {defaultObj,defaultStr,defaultNumber,defaultBool,uniqid} from "$cutils";
+import {defaultObj,defaultStr,defaultNumber,isValidUrl,uniqid} from "$cutils";
 import View from "$ecomponents/View";
 import { useNavigation} from '$cnavigation';
 import Fab from "$elayouts/Fab";
@@ -75,7 +75,7 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
   
   
   React.useEffect(() => {
-    if((title||subtitle) && navigation && navigation.setOptions){
+    if(navigation && typeof navigation?.setOptions ==="function"){
       const appName = APP.getName().toUpperCase();
       subtitle = React.getTextContent(subtitle);
       let screenTitle = getDefaultTitle(title,true);
@@ -85,15 +85,18 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
       if(!screenTitle.toUpperCase().contains(appName)){
           screenTitle+=" | "+appName;
       }
+      if(isElectron() && typeof window?.ELECTRON !== "undefined" && typeof ELECTRON?.getLoadedAppUrl =='function'){
+        const loadedUrl = ELECTRON.getLoadedAppUrl();
+        if(isValidUrl(loadedUrl) && !screenTitle.includes(loadedUrl)){
+            screenTitle = `${screenTitle} [${loadedUrl}]`;
+        }
+      }
       navigation.setOptions({
         ...options,
         appBarProps:{...options.appBarProps,...appBarProps,title,subtitle},
         subtitle :subtitle,
         title : screenTitle,
       });
-      if(isElectron() && typeof window?.ELECTRON !== "undefined" && typeof ELECTRON?.setTitle =='function'){
-        ELECTRON.setTitle(screenTitle);
-      }
     }
   }, [title,subtitle]);
   const fab = withFab ? <Fab 

package/src/media/file-system/utils/FileSaver.electron.js

@@ -0,0 +1,7 @@
+import {save as saveWeb} from "./Fsaver.web";
+import {isElectron} from "$cplatform";
+
+export const save = (options,...rest)=>{
+    if(!isElectron() || typeof window?.ELECTRON =="undefined" || typeof window?.ELECTRON?.FILE !=="object" || typeof window?.ELECTRON?.FILE?.write !=="function") return saveWeb(options,...rest);
+    return ELECTRON.FILE.write(options,...rest);
+}

package/src/media/file-system/utils/FileSaver.js

@@ -1,18 +1,8 @@
-const FileSaver = require('file-saver');
-import {defaultNumber} from "$cutils";
+import {save as saveWeb} from "./Fsaver.web";
+import {save as saveEelectron} from "./FileSaver.electron";
+import {isElectron} from "$cplatform";
 
-/*** 
-    sauvegarde par défaut un fichier blob
-*/
-export const save = ({content,fileName,timeout,delay})=>{
-    return new Promise((resolve,reject)=>{
-        try {
-            FileSaver.saveAs(content, fileName);
-            setTimeout(() => {
-                resolve({path:fileName,isWeb : true});
-            }, defaultNumber(timeout,delay,3000));
-        } catch(e){
-            reject(e);
-        }
-    })
+export const save = (options,...rest)=> {
+    if(isElectron()) return saveEelectron(options,...rest);
+    return saveWeb(options,...rest);
 }

package/src/media/file-system/utils/FileSaver.native.js

@@ -1,5 +1,5 @@
 import { Directories,FileSystem } from "./native";
-import {defaultStr,defaultBool} from "$cutils";
+import {defaultStr,defaultBool,isBase64} from "$cutils";
 import p from "../path";
 import * as Sharing from 'expo-sharing';
 

package/src/media/file-system/utils/Fsaver.web.js

@@ -0,0 +1,18 @@
+const FileSaver = require('file-saver');
+import {defaultNumber} from "$cutils";
+
+/*** 
+    sauvegarde par défaut un fichier blob
+*/
+export const save = ({content,fileName,timeout,delay})=>{
+    return new Promise((resolve,reject)=>{
+        try {
+            FileSaver.saveAs(content, fileName);
+            setTimeout(() => {
+                resolve({path:fileName,isWeb : true});
+            }, defaultNumber(timeout,delay,3000));
+        } catch(e){
+            reject(e);
+        }
+    })
+}

package/src/media/file-system/utils/utils.js

@@ -6,8 +6,7 @@ const mime = require('react-native-mime-types')
 const XLSX = require("xlsx");
 import Preloader from "$preloader";
 import * as FileSaver from "./FileSaver";
-import {isWeb,isMobileNative} from "$cplatform";
-
+import {isMobileNative,isElectron} from "$cplatform";
 
 /**** sauvegarde un fichier sur le disque 
      *  @param {object} {
@@ -28,14 +27,15 @@ import {isWeb,isMobileNative} from "$cplatform";
     if(!isNonNullString(fileName)){
         return Promise.reject({status:false,msg:'Nom de fichier invalide'});
     }
+    const isNative = isMobileNative() || isElectron();
     if(isBase64(content)){
-       if(isMobileNative()){
+       if(isNative){
          return FileSaver.save({content,contentType,isBase64:true,fileName,...rest});
        }
        content = new Blob([base64toBlob(content,contentType)], {});
     } else if(isDataURL(content)){
-        if(isMobileNative()){
-            return FileSaver.save({content:dataURLToBase64(content),contentType,isBase64:true,fileName,...rest});
+        if(isNative){
+            return FileSaver.save({content:dataURLToBase64(content),contentType,mime:contentType,isBase64:true,fileName,...rest});
         }
         const type = getTypeFromDataURL(content);
         content = dataURLToBlob(content);
@@ -61,16 +61,16 @@ export const writeExcel = ({workbook,content,contentType,fileName,...rest})=>{
     if(!isNonNullString(fileName)){
         return Promise.reject({status:false,message:'Nom de fichier invalide pour le contenu excel à créer'});
     }
-    
+    const isNative = isMobileNative() || isElectron();
     Preloader.open("génération du fichier excel "+fileName);
     if(isBase64(content)){
-        if(isMobileNative()) return FileSaver.save({content,isBase64:true,contentType,fileName,...rest}).finally(Preloader.close);
+        if(isNative) return FileSaver.save({content,isBase64:true,contentType,fileName,...rest}).finally(Preloader.close);
         content = new Blob([base64toBlob(content, 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')], {});
     }
     if(isBlob(content)){
         return write({...rest,content,fileName,contentType}).finally(Preloader.close)
     }
-    if(isMobileNative()){
+    if(isNative){
         return FileSaver.save({...rest,content:XLSX.write(workbook, {type:'base64', bookType:ext}),fileName}).finally(Preloader.close).finally(Preloader.close);
     }
     return new Promise((resolve,reject)=>{

package/src/screens/Help/About.js

@@ -77,8 +77,6 @@ export default function HelpScreen(props){
                 <Link routeName={"releaseNotes"}>
                     <Label primary textBold style={theme.styles.mv05} >{appConfig.name+", Notes de mise à jour."}</Label>
                 </Link>
-            </View>
-            <View testID={testID+"_OpenLibrariesLinkContainer"} style={[theme.styles.w100,theme.styles.alignItemsCenter]}>
                 <OpenLibraries.Link testID={testID+"_OpenLibrariesLink"}/>
             </View>
         </View>

package/src/screens/Help/OpenLibraryScreen.js

@@ -1,6 +1,6 @@
 import View from "$ecomponents/View";
 import Screen from "$escreen";
-import {defaultStr,defaultObj,isValidUrl} from "$cutils";
+import {defaultStr,defaultObj,isValidUrl,isObj,isNonNullString} from "$cutils";
 import Label from "$ecomponents/Label";
 import theme from "$theme";
 import Link from "$ecomponents/Link";
@@ -10,8 +10,10 @@ import Table from "$ecomponents/Table";
 import React  from "$react";
 import AutoLink from "$ecomponents/AutoLink";
 import {Vertical} from "$ecomponents/AutoSizer";
+const packageJSON = require("$packageJSON");
 
 const openLibraries = require("./openLibraries");
+const euPackageName = "@fto-consult/expo-ui";
 
 const columns = {
     index : {
@@ -33,8 +35,12 @@ const columns = {
 }
 export default function OpenLibrariesScreen({testID,...props}){
     testID = defaultStr(testID,"RN_HealScreenOpenLibraries");
-    const gridStyles = [styles.grid0,styles.grid1,styles.grid2,styles.grid3];
-    const borderStyle = {borderColor:theme.colors.divider,borderWidth:1,justifyContent:'space-between'};
+    if(isObj(packageJSON?.dependencies)){
+        const devExpo = packageJSON?.dependencies[euPackageName];
+        const opo = isNonNullString(devExpo) ? {version:devExpo.trim().ltrim("^")} : Object.assign({},devExpo);
+        openLibraries[euPackageName] = Object.assign({},openLibraries[euPackageName]);
+        openLibraries[euPackageName] = {...openLibraries[euPackageName],...opo};
+    }
     const data = React.useMemo(()=>{
         const data = [];
         Object.map(openLibraries,(lib,i,_i)=>{

package/src/screens/Help/openLibraries.js

@@ -1,7 +1,7 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
 		"name": "@fto-consult/expo-ui",
-		"version": "7.6.49",
+		"version": "7.8.10",
 		"repository": {
 			"type": "git",
 			"url": "git+https://github.com/borispipo/expo-ui.git"
@@ -49,12 +49,12 @@ module.exports = {
 		"license": "MIT"
 	},
 	"@fto-consult/common": {
-		"version": "3.73.34",
+		"version": "3.75.2",
 		"url": "https://github.com/borispipo/common#readme",
 		"license": "ISC"
 	},
 	"@fto-consult/electron-gen": {
-		"version": "1.1.0",
+		"version": "1.3.7",
 		"license": "ISC"
 	},
 	"@pchmn/expo-material3-theme": {
@@ -268,7 +268,7 @@ module.exports = {
 		"license": "MIT"
 	},
 	"react-native-paper-dates": {
-		"version": "0.21.4",
+		"version": "0.21.7",
 		"url": "https://github.com/web-ridge/react-native-paper-dates#readme",
 		"license": "MIT"
 	},
@@ -293,7 +293,7 @@ module.exports = {
 		"license": "MIT"
 	},
 	"react-native-web": {
-		"version": "0.19.9",
+		"version": "0.19.10",
 		"url": "git://github.com/necolas/react-native-web.git",
 		"license": "MIT"
 	},