@fto-consult/expo-ui 7.5.35 → 7.5.36

package/bin/index.js

@@ -53,13 +53,13 @@ program.command('electron')
   .option('-b, --build [boolean]', 'si ce flag est spécfifié alors l\'application sera compilée; combinée avec la commande start|package pour indiquer que l\'application sera à nouveau exportée ou pas.')
   .option('-a, --arch [architecture]', 'l\'architecture de la plateforme; Commande package')
   .option('-p, --platform [platform]', 'la plateforme à utiliser pour la compilation; commande package')
-  .option('-l, --logo [logoPath]', 'le chemin vers le logo de l\'application : (.ico pour window, .incs pour mac et .png pour linux)')
+  .option('-l, --icon [iconPath]', 'le chemin vers l\'icon de l\'application : (.ico pour window, .incs pour mac et .png pour linux)')
   .option('-i, --import [boolean]', 'la commande d\'initialisation du package electron forge, utile pour le packaging de l\'application. Elle permet d\'exécuter le cli electron package, pour l\'import d\'un projet existant. Commande package. exemple : expo-ui electron package --import')
   
   .action((script, options) => {
     const electronProjectRoot = path.resolve(projectRoot,"electron");
     const opts = Object.assign({},typeof options.opts =='function'? options.opts() : options);
-    let {out,arch,url,build,platform,import:packageImport,logo} = opts;
+    let {out,arch,url,build,platform,import:packageImport,icon} = opts;
     //let {projectRoot} = opts;
     if(projectRoot == dir){
         throwError(`Invalid project root ${projectRoot}; project root must be different to ${dir}`);
@@ -78,8 +78,8 @@ program.command('electron')
     const packageObj = require(`${packagePath}`);
     const homepage = packageObj.homepage;
     let cmd = undefined;
-    logo = logo && typeof logo =="string" && fs.existsSync(path.resolve(logo)) && logo || undefined;
-    require("../electron/create-index-file")({electronProjectRoot,appName:packageObj.name,logo});
+    icon = icon && typeof icon =="string" && fs.existsSync(path.resolve(icon)) && icon || undefined;
+    require("../electron/create-index-file")({electronProjectRoot,appName:packageObj.name,icon});
     if(!isElectionInitialized || script =='init'){
         if(script !=='init'){
             console.log("initializing electron application before ....");
@@ -96,7 +96,7 @@ program.command('electron')
     }
     const start = x=>{
        return new Promise((resolve,reject)=>{
-        cmd = `electron "${electronProjectRoot}" ${isValidUrl(url)? ` --url ${url}`:''}`;
+        cmd = `electron "${electronProjectRoot}" --root ${electronProjectRoot} ${isValidUrl(url)? ` --url ${url}`:''} ${icon ? `--icon ${path.resolve(icon)}`:""}`;
           exec({
             cmd, 
             projectRoot : electronProjectRoot,

package/electron/index.js

@@ -1,5 +1,7 @@
 const { program } = require('commander');
-const mainApp = require("./main-app");
+const path = require("path");
+const fs = require("fs");
+const isValidUrl = require("./utils/isValidUrl");
 
 const debounce = require("./utils/debounce");
 const {app, BrowserWindow,Tray,Menu,MenuItem,globalShortcut,systemPreferences,powerMonitor,ipcMain,dialog, nativeTheme} = require('electron')
@@ -11,15 +13,14 @@ const isObj = x => x && typeof x =='object';
 program
   .option('-u, --url <url>', 'L\'adresse url à ouvrir au lancement de l\'application')
   .option('-r, --root <projectRoot>', 'le chemin du project root de l\'application')
+  .option('-l, --icon [iconPath]', 'le chemin vers le icon de l\'application : (.ico pour window, .incs pour mac et .png pour linux)')
   .parse();
 
 const programOptions = program.opts();
-const {url:pUrl,root:mainProjectRoot} = programOptions;
+const {url:pUrl,root:mainProjectRoot,icon} = programOptions;
+const iconPath = icon && typeof icon =="string" && fs.existsSync(path.resolve(icon)) && path.resolve(icon) || undefined; 
 
 const isAsar = (typeof require.main =="string" && require.main ||"").indexOf('app.asar') !== -1;
-const path = require("path");
-const fs = require("fs");
-const isValidUrl = require("./utils/isValidUrl");
 const distPath = path.join("dist",'index.html');
 
 const processCWD = process.cwd();
@@ -31,7 +32,7 @@ const packageJSON = fs.existsSync(packageJSONPath) ? Object.assign({},require(`$
 const appName = typeof packageJSON.realAppName =='string' && packageJSON.realAppName || typeof packageJSON.name =="string" && packageJSON.name || "";  
 
 // fermee automatiquement quand l'objet JavaScript sera garbage collected.
-let win = undefined;
+let mainWindow = undefined;
 
 Menu.setApplicationMenu(null);
 
@@ -42,15 +43,7 @@ const mainProcessRequired = mainProcessIndex && require(`${mainProcessIndex}`);
 //pour étendre les fonctionnalités au niveau du main proceess, bien vouloir écrire dans le fichier projectRoot/electron/main/index.js
 const mainProcess = mainProcessRequired && typeof mainProcessRequired =='object'? mainProcessRequired : {};
 
-// Gardez une reference globale de l'objet window, si vous ne le faites pas, la fenetre sera
-if(!isValidUrl(pUrl) && !fs.existsSync(indexFilePath)){
-    throw {message:`Unable to start the application: index file located at [${indexFilePath}] does not exists : projectRoot = [${projectRoot}], isAsar:[${require.main}]`}
-}
-  
-const ipcMainHandleEvent  = (event,callback)=>{
-    ipcMain.removeHandler(event,callback);
-    return ipcMain.handle(event,callback);
-}
+
 const quit = ()=>{
     try {
       app.quit();
@@ -59,6 +52,11 @@ const quit = ()=>{
     }
 }
 
+// Gardez une reference globale de l'objet window, si vous ne le faites pas, la fenetre sera
+if(!isValidUrl(pUrl) && !fs.existsSync(indexFilePath)){
+    throw {message:`Unable to start the application: index file located at [${indexFilePath}] does not exists : projectRoot = [${projectRoot}], isAsar:[${require.main}]`}
+}
+
 //app.disableHardwareAcceleration();
 
 function createBrowserWindow (options){
@@ -85,8 +83,8 @@ function createBrowserWindow (options){
       nodeIntegration: false,
       preload: options.preload ? options.preload : null,
     }
-    if(options.modal && !options.parent && win){
-      options.parent = win;
+    if(options.modal && !options.parent && mainWindow){
+      options.parent = mainWindow;
     }
     if(typeof options.show ==='undefined'){
       options.show = false;
@@ -99,38 +97,53 @@ function createBrowserWindow (options){
        const opts = Object.assign({},mainProcess.beforeCreateWindow(options));
        options = {...options,...opts};
     }
-    let _win = new BrowserWindow(options);
+    options.icon = options.icon || iconPath;
+    const window = new BrowserWindow(options);
     if(!menu){
-        _win.setMenu(null);
-        _win.removeMenu();
-        _win.setMenuBarVisibility(false)
-        _win.setAutoHideMenuBar(true)
+        window.setMenu(null);
+        window.removeMenu();
+        window.setMenuBarVisibility(false)
+        window.setAutoHideMenuBar(true)
     }
-    const url = isValidUrl(options.loadURL) || typeof options.loadURL ==='string' && options.loadURL.trim().startsWith("file://") ? options.loadURL : undefined;
-    if(url){
-      _win.loadURL(url);
-    } else if(options.file && fs.existsSync(path.resolve(options.file))){
-      _win.loadFile(path.resolve(options.file));
-    } 
     if(showOnLoad){
-      _win.once('ready-to-show', () => {
-          _win.show();
-          _win.webContents.send("window-ready-to-show",JSON.stringify(options.readyToShowOptions));
+      window.once('ready-to-show', () => {
+          window.show();
+          window.webContents.send("window-ready-to-show",JSON.stringify(options.readyToShowOptions));
       });
     }
-    _win.on('closed', function() {
+    window.on('closed', function() {
         if(isMainWindow && typeof mainProcess?.onMainWindowClosed == "function"){
-          mainProcess.onMainWindowClosed(_win);
+          mainProcess.onMainWindowClosed(window);
         }
-        _win = null;
+        window = null;
     });
-    _win.webContents.on('context-menu',clipboadContextMenu);
-    return _win;
+    window.webContents.on('context-menu',clipboadContextMenu);
+    const url = isValidUrl(options.loadURL) || typeof options.loadURL ==='string' && options.loadURL.trim().startsWith("file://") ? options.loadURL : undefined;
+    if(url){
+      window.loadURL(url);
+    } else if(options.file && fs.existsSync(path.resolve(options.file))){
+      window.loadFile(path.resolve(options.file));
+    } 
+    return window;
 }
+  
+app.whenReady().then(() => {
+    createWindow();
+    const readOpts = {toggleDevTools,browserWindow:mainWindow,mainWindow:mainWindow};
+    if(typeof mainProcess.whenAppReady =='function'){
+       mainProcess.whenAppReady(readOpts);
+    }
+    globalShortcut.register('CommandOrControl+F12', () => {
+      return toggleDevTools();
+    });
+    app.on('activate', function () {
+      if (mainWindow == null || (BrowserWindow.getAllWindows().length === 0)) createWindow()
+    });
+});
 
 function createWindow () {
     // Créer le browser window
-    win = createBrowserWindow({
+    mainWindow = createBrowserWindow({
       showOnLoad : false,
       loadURL : undefined,
       isMainWindow : true,
@@ -149,54 +162,54 @@ function createWindow () {
       || (mainProcess.splashScreen instanceof BrowserWindow) && mainProcess.splashScreen;
       null;
     let hasInitWindows = false;
-    win.on('show', () => {
-      //win.blur();
+    mainWindow.on('show', () => {
+      //mainWindow.blur();
       setTimeout(() => {
-        win.focus();
-        win.moveTop();
-        win.webContents.focus(); 
+        mainWindow.focus();
+        mainWindow.moveTop();
+        mainWindow.webContents.focus(); 
         if(!hasInitWindows){
           hasInitWindows = true; 
-          win.webContents.send('appReady');
+          mainWindow.webContents.send('appReady');
         } 
       }, 200);
     });
   
-    win.on("focus",()=>{
-      if(win && hasInitWindows){
-        win.webContents.send("main-window-focus");
+    mainWindow.on("focus",()=>{
+      if(mainWindow && hasInitWindows){
+        mainWindow.webContents.send("main-window-focus");
       }
     });
-    win.on("blur",()=>{
-      if(win && hasInitWindows){
-        win.webContents.send("main-window-blur");
+    mainWindow.on("blur",()=>{
+      if(mainWindow && hasInitWindows){
+        mainWindow.webContents.send("main-window-blur");
       }
     });
-    win.once("ready-to-show",function(){
+    mainWindow.once("ready-to-show",function(){
         if(typeof mainProcess.onMainWindowReadyToShow ==='function'){
-            mainProcess.onMainWindowReadyToShow(win);
+            mainProcess.onMainWindowReadyToShow(mainWindow);
         }
-        win.minimize()
+        mainWindow.minimize()
         try {
           if(splash && splash instanceof BrowserWindow){
             splash.destroy();
           }
         } catch{ }
-        win.restore();
-        win.show();
+        mainWindow.restore();
+        mainWindow.show();
     })    
    
-    win.on('close', (e) => {
-        if (win) {
+    mainWindow.on('close', (e) => {
+        if (mainWindow) {
           if(typeof mainProcess.onMainWindowClose == "function"){
-            mainProcess.onMainWindowClose(win);
+            mainProcess.onMainWindowClose(mainWindow);
           }
           e.preventDefault();
-          win.webContents.send('before-app-exit');
+          mainWindow.webContents.send('before-app-exit');
         }
     });
     
-    win.on('unresponsive', async () => {
+    mainWindow.on('unresponsive', async () => {
       const { response } = await dialog.showMessageBox({
         title: "L'application a cessé de répondre",
         message : 'Voulez vous relancer l\'application?',
@@ -204,19 +217,19 @@ function createWindow () {
         cancelId: 1
       });
       if (response === 0) {
-        win.forcefullyCrashRenderer()
-        win.reload()
+        mainWindow.forcefullyCrashRenderer()
+        mainWindow.reload()
       } else {
-        win.forcefullyCrashRenderer()
+        mainWindow.forcefullyCrashRenderer()
         app.exit();
       }
     });
     
     // Émit lorsque la fenêtre est fermée.
-    win.on('closed', () => {
-      win = null
+    mainWindow.on('closed', () => {
+      mainWindow = null
     })
-    win.setMenu(null);
+    mainWindow.setMenu(null);
   
     /*** les dimenssions de la fenêtre principale */
     let mWindowSessinName = "mainWindowSizes";
@@ -231,45 +244,45 @@ function createWindow () {
     }
     let isNumber = x => typeof x =="number";
     if(isNumber(sizeW.width) && isNumber(sizeW.height)){
-        win.setSize(sizeW.width,sizeW.height);
+        mainWindow.setSize(sizeW.width,sizeW.height);
         if(isNumber(sPositions.x) && isNumber(sPositions.y)){
-            win.setPosition(sPositions.x,sPositions.y);
+            mainWindow.setPosition(sPositions.x,sPositions.y);
         }
     }
     const onWinResizeEv =  debounce(function () {
-        if(win){
-            let wSize = win.getSize();
+        if(mainWindow){
+            let wSize = mainWindow.getSize();
             if(Array.isArray(wSize) && wSize.length == 2){
                 let [width,height] = wSize;
                 if(width && height){
                     session.set(mWindowSessinName,{width,height});
                 }
-                let [x,y] = win.getPosition();
+                let [x,y] = mainWindow.getPosition();
                 session.set(mWindowPositionSName,{x,y});
             }
         }
     }, 100);
-    win.off('resize',onWinResizeEv);
-    win.on('resize',onWinResizeEv);
-    win.off('move',onWinResizeEv);
-    win.on('move',onWinResizeEv);
+    mainWindow.off('resize',onWinResizeEv);
+    mainWindow.on('resize',onWinResizeEv);
+    mainWindow.off('move',onWinResizeEv);
+    mainWindow.on('move',onWinResizeEv);
     if(typeof mainProcess.onCreateMainWindow =='function'){
-       mainProcess.onCreateMainWindow(win);
+       mainProcess.onCreateMainWindow(mainWindow);
     }
-    return win;
-  }
+    return mainWindow;
+}
   
   const toggleDevTools = (value)=>{
-    if(win !==null && win.webContents){
-      const isOpen= win.webContents.isDevToolsOpened();
+    if(mainWindow !==null && mainWindow.webContents){
+      const isOpen= mainWindow.webContents.isDevToolsOpened();
       value = value === undefined ? !isOpen : value;
       if(value && !isOpen){
-          win.webContents.openDevTools();
-          return win.webContents.isDevToolsOpened();
+          mainWindow.webContents.openDevTools();
+          return mainWindow.webContents.isDevToolsOpened();
       } else {
-          if(isOpen) win.webContents.closeDevTools();
+          if(isOpen) mainWindow.webContents.closeDevTools();
       }
-      return win.webContents.isDevToolsOpened();
+      return mainWindow.webContents.isDevToolsOpened();
     }
     return false;
   }
@@ -311,7 +324,7 @@ function createWindow () {
       contextMenu.map((m,index)=>{
          if(!m || typeof m !=='object') return;
          m.click = (e)=>{
-           if(win && win.webContents) win.webContents.send("click-on-system-tray-menu-item",{
+           if(mainWindow && mainWindow.webContents) mainWindow.webContents.send("click-on-system-tray-menu-item",{
               action : m.action && typeof m.action =='string'? m.action : undefined,
               index,
               menuItem : JSON.stringify(m),
@@ -359,11 +372,11 @@ function createWindow () {
   });
     
   ipcMain.on("get-app-icon",(event)=>{
-    event.returnValue = win != win && win.getIcon && win.getIcon();
+    event.returnValue = mainWindow != mainWindow && mainWindow.getIcon && mainWindow.getIcon();
   });
   ipcMain.on("set-app-icon",(event,iconPath)=>{
-     if(iconPath && win != null){
-        win.setIcon(iconPath);
+     if(iconPath && mainWindow != null){
+        mainWindow.setIcon(iconPath);
         event.returnValue = iconPath;
      } else {
         event.returnValue = null;
@@ -371,27 +384,27 @@ function createWindow () {
   });
     
   ipcMain.on('minimize-main-window', () => {
-    if(win !== null && win){
-       win.blur();
-       win.minimize();
+    if(mainWindow !== null && mainWindow){
+       mainWindow.blur();
+       mainWindow.minimize();
     }
   })
   ipcMain.on('restore-main-window', () => {
-    if(win && win !== null){
-      win.restore()
-      win.blur();
+    if(mainWindow && mainWindow !== null){
+      mainWindow.restore()
+      mainWindow.blur();
       setTimeout(() => {
-        win.focus();
-        win.moveTop();
-        win.webContents.focus();   
+        mainWindow.focus();
+        mainWindow.moveTop();
+        mainWindow.webContents.focus();   
       }, 200);
     }
   })
   ipcMain.on('close-main-render-process', _ => {
-    if(win){
-      win.destroy();
+    if(mainWindow){
+      mainWindow.destroy();
     }
-    win = null;
+    mainWindow = null;
     if(typeof gc =="function"){
       gc();
     }
@@ -399,13 +412,13 @@ function createWindow () {
   });
   
   const powerMonitorCallbackEvent = (action)=>{
-    if(!win || !win.webContents) return;
+    if(!mainWindow || !mainWindow.webContents) return;
     if(action =="suspend" || action =="lock-screen"){
-        win.webContents.send("main-app-suspended",action);
+        mainWindow.webContents.send("main-app-suspended",action);
         return;
     }
-    win.webContents.send("main-app-restaured",action);
-    win.webContents.focus();  
+    mainWindow.webContents.send("main-app-restaured",action);
+    mainWindow.webContents.focus();  
     return null;
   }
   if(powerMonitor){
@@ -416,8 +429,8 @@ function createWindow () {
     })
   }
   ipcMain.on("set-main-window-title",(event,title)=>{
-    if(win !== null){
-        win.setTitle(title);
+    if(mainWindow !== null){
+        mainWindow.setTitle(title);
     }
   });
   
@@ -431,19 +444,19 @@ function createWindow () {
     if(!isObj(options)){
        options = {};
     }
-    return dialog.showOpenDialog(win,options)
+    return dialog.showOpenDialog(mainWindow,options)
   })
   
   ipcMain.handle("show-save-dialog",function(event,options){
     if(!isObj(options)){
        options = {};
     }
-    return dialog.showSaveDialog(win,options)
+    return dialog.showSaveDialog(mainWindow,options)
   });
   
   ipcMain.on("is-dev-tools-open",function(event,value) {
-    if(win !==null && win.webContents){
-      return win.webContents.isDevToolsOpened();
+    if(mainWindow !==null && mainWindow.webContents){
+      return mainWindow.webContents.isDevToolsOpened();
     }
     return false;
   });
@@ -451,12 +464,13 @@ function createWindow () {
   ipcMain.on("window-set-progressbar",(event,interval)=>{
      if(typeof interval !="number" || interval <0) interval = 0;
      interval = Math.floor(interval);
-     if(win){
-       win.setProgressBar(interval);
+     if(mainWindow){
+       mainWindow.setProgressBar(interval);
      }
-  })
+  });
   
-  const setOSTheme = (theme) => {
+  /**** customisation des thèmes de l'application */
+  ipcMain.handle('set-system-theme:toggle', (event,theme) => {
     theme = theme && typeof theme == "string"? theme : "light";
     theme = theme.toLowerCase().trim();
     if(theme !== 'system' && theme !=='dark'){
@@ -465,11 +479,6 @@ function createWindow () {
     nativeTheme.themeSource = theme;
     session.set("os-theme",theme);
     return nativeTheme.shouldUseDarkColors
-  }
-  
-  /**** customisation des thèmes de l'application */
-  ipcMain.handle('set-system-theme:toggle', (event,theme) => {
-    return setOSTheme(theme);
   });
   
   ipcMain.handle('set-system-theme:dark-mode', (event) => {
@@ -519,31 +528,19 @@ app.on('window-all-closed', () => {
       quit();
     }
 });
-  
-const gotTheLock = app.requestSingleInstanceLock()
-if (!gotTheLock) {
-  quit()
-} else {
-  app.on('second-instance', (event, commandLine, workingDirectory) => {
-    // Someone tried to run a second instance, we should focus our window.
-    //pour plus tard il sera possible d'afficher la gestion multi fenêtre en environnement electron
-    if (win) {
-        if (win.isMinimized()) win.restore()
-        win.focus()
-    }
-  })
-}
-  
-app.whenReady().then(() => {
-    createWindow();
-    const readOpts = {toggleDevTools,browserWindow:win,mainWindow:win};
-    if(typeof mainProcess.whenAppReady =='function'){
-       mainProcess.whenAppReady(readOpts);
+
+if(mainProcess.enableSingleInstance !== false){
+    const gotTheLock = app.requestSingleInstanceLock()
+    if (!gotTheLock) {
+      quit()
+    } else {
+      app.on('second-instance', (event, commandLine, workingDirectory) => {
+        // Someone tried to run a second instance, we should focus our window.
+        //pour plus tard il sera possible d'afficher la gestion multi fenêtre en environnement electron
+        if (mainWindow) {
+            if (mainWindow.isMinimized()) mainWindow.restore()
+            mainWindow.focus()
+        }
+      })
     }
-    globalShortcut.register('CommandOrControl+F12', () => {
-      return toggleDevTools();
-    });
-    app.on('activate', function () {
-      if (win == null || (BrowserWindow.getAllWindows().length === 0)) createWindow()
-    });
-});
+}

package/electron/init/main.js

@@ -8,6 +8,7 @@
 */
 
 module.exports = {
+    enableSingleInstance: true, // si l'application n'autorise qu'une seule instance active. ça sous entend qu'à l'instant t, une seule instance de l'application ne peut être exécutée sur le profil de l'utilisateur lambda
     /**** cette fonction est appelée à chaque fois que l'on désire créer une instance du BrowserWindow
         @param {object} BrowserWindowOptions
         Lors de la création de la fenêtre principal, BrowserWindowOptions continent la propriété isMainWindow à true

package/package.json

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