@fto-consult/expo-ui 8.0.6 → 8.1.0

package/app.json

@@ -5,6 +5,7 @@
     "scheme": "fto-consult-expo-ui",
     "version": "1.0.0",
     "orientation": "portrait",
+    "expoSdkVersion" : "50",
     "web": {
       "bundler": "webpack"
     },

package/babel.config.alias.js

@@ -54,7 +54,7 @@ module.exports = (opts)=>{
     if(!r["$screen"]){
         r["$screen"] = r["$escreen"];
     }
-    if(!r["$preloader"]){
+    if(!r["$preloader"] || r["$preloader"] === r["$cpreloader"]){
         r["$preloader"] = r["$epreloader"];
     }
     if(!r["$enotify"]){

package/babel.config.js

@@ -15,16 +15,26 @@ module.exports = function(api,opts) {
   /*** par défaut, les variables d'environnements sont stockés dans le fichier .env situé à la racine du projet, référencée par la prop base  */
   const alias =  require("./babel.config.alias")(options);
   require(`${path.resolve(__dirname,"bin","generate-tables")}`)();//génère les tables des bases de données
+  const plugins = (Array.isArray(opts.plugins) ? options.plugins : []);
+  let reanimated = "react-native-reanimated/plugin";
+  const filteredPlugins = plugins.filter((p)=>{
+    if(p === reanimated || Array.isArray(p) && p[0] === reanimated){
+      reanimated = p;
+      return false;
+    }
+    return true;
+  })
   return {
     presets: [
-      ['babel-preset-expo']
+      ...filteredPlugins,
+      ['babel-preset-expo'],
     ],
     plugins : [
-      ...(Array.isArray(opts.plugins) ? options.plugins : []),
+      ...plugins,
       ["inline-dotenv",inlineDovOptions],
       ["module-resolver", {"alias": alias}],
       "@babel/plugin-proposal-export-namespace-from",
-      'react-native-reanimated/plugin',
+      ...(reanimated?[reanimated]:[]),
     ],
   };
 };

package/bin/create-app.js

@@ -36,7 +36,7 @@ module.exports = function(appName,{projectRoot:root}){
             "dev" : "npx expo start --no-dev --minify -c",
             "serve-web" : "npx serve web-build --single",
             "build-web" : "npx expo export:web",
-            "build-android" : "npx eas build --platform android",
+            "build-android" : "npx eas build --platform android --profile preview",
             "build-ios" : "eas build --platform ios",
           },
           "dependencies" : {
@@ -103,6 +103,16 @@ const createAPPJSONFile = (projectRoot,{name,version})=>{
         writeFile(gP,gitignore);
       } catch{};
     }
+    const imagePluginOptions = {
+      "photosPermission": `Autoriser $(PRODUCT_NAME) d'accéder à vos photos.`,
+      "cameraPermission" : `Autoriser $(PRODUCT_NAME) d'accéder à votre camera`
+    }, cameraPluginsOptions = {
+      "cameraPermission" : `Autoriser $(PRODUCT_NAME) d'accéder à votre camera`
+    };
+    const plugins = [
+      ["expo-image-picker",imagePluginOptions],
+      ["expo-camera",cameraPluginsOptions]
+    ];
     appSheme = name? sanitizeFileName(name).replace(/ /g, '') : null;
     const appJSONPath = path.join(projectRoot,"app.json");
         if(!fs.existsSync(appJSONPath)){
@@ -114,6 +124,7 @@ const createAPPJSONFile = (projectRoot,{name,version})=>{
       "slug": "${name.toLowerCase().replace(/\s\s+/g, '-')}",
       "version":"${version}",
       "orientation": "portrait",
+      "plugins":${JSON.stringify(plugins,null,'\t')},
       "icon": "./assets/icon.png",
       "jsEngine": "hermes",
       "splash": {
@@ -153,8 +164,38 @@ const createAPPJSONFile = (projectRoot,{name,version})=>{
               });
             }
             appJSONManager.set({version})
+            let appPlugins = appJSONManager.get("expo.plugins");
+            if(!Array.isArray(appPlugins)){
+              appPlugins = plugins;
+            } else {
+              let hasFoundCamera = false, hasFoundImagePicker = false;
+              appPlugins.map(pl=>{
+                if(Array.isArray(pl)){
+                  if(typeof pl[0] ==="expo-image-picker"){
+                    hasFoundImagePicker = true;
+                  } else if(pl[0] === "expo-camera"){
+                    hasFoundCamera = true;
+                  }   
+                }
+              });
+              if(!hasFoundImagePicker){
+                appPlugins.push(plugins[0]);
+              }
+              if(!hasFoundCamera){
+                appPlugins.push(plugins[1]);
+              }
+            }
+            appJSONManager.set({
+              expo : {plugins:appPlugins}
+            });
             appJSONManager.save();
         }
+    const eas = path.resolve(projectRoot,"eas.json");
+    if(!fs.existsSync(eas)){
+      try {
+        copy(path.resolve(__dirname,"eas.json"),eas,{overwrite:false})
+      } catch{}
+    }
     return fs.existsSync(appJSONPath);
 }
 

package/docs/screens/Home/index.js

@@ -6,7 +6,6 @@ import theme from "$theme";
 import Link from "$ecomponents/Link";
 import {StyleSheet} from "react-native";
 import {H1,H2,H3,H4,H5,Paragraph} from "$ecomponents/Typography";
-
 export default function ExpoUIHomeScreen (props){
     return  <Screen {...props}>
         <View style={theme.styles.p1}>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.0.6",
+  "version": "8.1.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -70,7 +70,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^14.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.8.33",
+    "@fto-consult/common": "^4.10.11",
     "@fto-consult/node-utils": "^1.4.7",
     "@pchmn/expo-material3-theme": "^1.3.2",
     "@react-native-async-storage/async-storage": "1.21.0",

package/src/components/BottomSheet/Sheet.js

@@ -27,7 +27,6 @@ import {
   Button,
   Platform
 } from "react-native";
-import Animation from "$ecomponents/Animation";
 export const defaultHeight = 300;
 
 const useNativeDriver = false;

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

@@ -1787,9 +1787,12 @@ export default class CommonDatagridComponent extends AppComponent {
                     args.isOnlytotal = isOnlytotal;
                     args.sessionData = sData;
                     args.pdfConfig = pdfConfig;
-                    args = this.handleTableExport({...args,excel,pdf});
                     DialogProvider.close();
-                    resolve(args);
+                    Preloader.open("export des données...");
+                    setTimeout(()=>{
+                        args = this.handleTableExport({...args,excel,pdf});
+                        resolve(args);
+                    },500)
                     return args;
                 },
                 onCancel : reject,
@@ -1803,6 +1806,7 @@ export default class CommonDatagridComponent extends AppComponent {
         const wb = XLSX.utils.book_new();
         const ws = XLSX.utils.aoa_to_sheet(data);
         XLSX.utils.book_append_sheet(wb, ws, config.sheetName);
+        Preloader.open(`Export des données, fichier : [${config.fileName|| ''}], fueille : ${config.sheetName}`)
         FileSystem.writeExcel({...config,workbook:wb}).then(({path})=>{
             if(isNonNullString(path)){
                 notify.success("Fichier enregistré dans le répertoire {0}".sprintf(path))

package/src/components/Datagrid/Test/index.js

@@ -15,6 +15,7 @@ export default function TestDatagridComponent({count,...props}){
     },[count])
     return <Table 
         title = "Utilisateurs"
+        sessionName="datagrid-test-data"
         accordion = {({rowData})=>{
             return {
                 content : `${rowData.email}`,

package/src/components/Image/index.js

@@ -132,7 +132,9 @@ export default function ImageComponent(props){
     }
     const handlePickedImage = (image,opts)=>{
         opts = defaultObj(opts);
-        image.dataUrl = image.dataURL = 'data:image/jpeg;base64,'+image.base64;
+        if(!isDataURL(image.dataURL)){
+            return notify.error(`Le fichier sélectionné est une image non valide`);
+        }
         let diffWidth = image.width - cropWidth - maxWidthDiff,
         diffHeight = image.height - cropHeight - maxHeightDiff;
         let canCrop = isMobileNative()? false : ((width && diffWidth > 0) || (height && diffHeight > 0)? true : false);

package/src/context/Provider.js

@@ -1,3 +1,5 @@
+import "$session";
+import "react-native-gesture-handler";
 import React from "$react";
 import appConfig from "$capp/config";
 import {MD3LightTheme,MD3DarkTheme,configureFonts} from "react-native-paper";

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

@@ -7,8 +7,18 @@ export const save = ({content,isBase64:isB64,share,directory,fileName,path})=>{
     path = defaultStr(path,directory,Directories.DOCUMENTS).trim().rtrim("/");
     share = defaultBool(share,true);
     let foundDirectory = null,dirToMake = null;
+    fileName = defaultStr(fileName).replaceAll("\\","/").trim();
     for(let i in Directories){
-        if(path.includes(Directories[i].rtrim("/"))){
+        const dir = Directories[i].rtrim("/");
+        if(fileName.includes(dir)){
+            path = Directories[i];
+            const fName = fileName.split(Directories[i])[1];
+            const spl = fName.trim().ltrim("/").rtrim("/").split("/");
+            fileName = spl.pop();
+            path = p.join(path,spl);
+            break;
+        }
+        if(path.includes(dir)){
            foundDirectory = Directories[i];
            break;
         }
@@ -65,15 +75,21 @@ export const save = ({content,isBase64:isB64,share,directory,fileName,path})=>{
                 }
                 const dir = dirToMake.shift();
                 path = p.join(path,dir);
-                return FileSystem.makeDirectoryAsync(path,{ intermediates: true }).then(next).catch(reject);
+                const makeDir = ()=>FileSystem.makeDirectoryAsync(path,{ intermediates: true });
+                // Checks if gif directory exists. If not, creates it
+                return new Promise((r,err)=>{
+                    return FileSystem.getInfoAsync(path).then((info)=>{
+                        if(info.exists){
+                            return r(info);
+                        } else {
+                            return makeDir().then(r);
+                        }
+                    }).catch((e)=>{
+                        return makeDir().then(r).catch(err);
+                    });
+                }).then(next).catch(reject);
             }
-            return (typeof FileSystem.requestDirectoryPermissionsAsync == "function"? FileSystem.requestDirectoryPermissionsAsync: ()=>Promise.resolve(({directoryUri:path,granted:true})))(path).then(({directoryUri,granted})=>{
-                if(granted){
-                    path = directoryUri;
-                    return next();
-                }
-                return {message:`Accès au repertoire ${path} non autorisé par l'utilisateur`}
-            }).catch(reject);
+            return next();
         });
     }
     return success();

package/src/media/index.js

@@ -48,7 +48,13 @@ export * from "./utils";
 
 const prepareImageResult = (result)=>{
     if(!isObj(result)) return result;
-    result.dataURL = result.dataUrl = isBase64(result.base64) ? ('data:image/jpeg;base64,'+result.base64) : undefined;
+    if(Array.isArray(result.assets) && isObj(result.assets[0])){
+        result = {
+            ...result,
+            ...result.assets[0],
+        }
+    }
+    result.dataURL = result.dataUrl = isBase64(result.base64) ? ('data:image/jpeg;base64,'+result.base64) : null;
     return result;
 }
 

package/src/screens/Help/openLibraries.js

@@ -1,7 +1,7 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
 		"name": "@fto-consult/expo-ui",
-		"version": "8.0.3",
+		"version": "8.0.7",
 		"repository": {
 			"type": "git",
 			"url": "git+https://github.com/borispipo/expo-ui.git"