@fto-consult/expo-ui 7.4.36 → 7.4.38

package/bin/index.js

@@ -21,7 +21,6 @@ const description = packageObj.description;
 const packageName = packageObj.name;
 const localElectronPackage = path.resolve(projectRoot,"node_modules",packageName)
 const localElectronPackageElectron = path.resolve(localElectronPackage,"electron");
-//const pdfJSPath = path.resolve(projectRoot,"node_modules","pdfjs-dist");
 
 program
   .name(packageName)

package/electron/index.js

@@ -74,10 +74,11 @@ const setOSTheme = (theme) => {
 setOSTheme(session.get("os-theme"));
 const isObj = x => x && typeof x =='object';
 
+
 function createBrowserWindow (options){
   options = Object.assign({},options);
   let menu = options.menu;
-  options.webPreferences = isObj(options.webPreferences)? options.webPreferences : {}
+  options.webPreferences = isObj(options.webPreferences)? options.webPreferences : {};
   options.webPreferences = {
     sandbox: false,
     ...options.webPreferences,
@@ -110,7 +111,7 @@ function createBrowserWindow (options){
   if(typeof mainProcess.beforeCreateWindow =='function'){
      mainProcess.beforeCreateWindow(options);
   }
-  const _win = new BrowserWindow(options);
+  let _win = new BrowserWindow(options);
   if(!menu){
       _win.setMenu(null);
       _win.removeMenu();
@@ -118,6 +119,7 @@ function createBrowserWindow (options){
       _win.setAutoHideMenuBar(true)
   }
   const url = isValidUrl(options.loadURL) ? options.loadURL : isValidUrl(pUrl) ? pUrl : undefined;
+  console.log("will load file ",options.file,options);
   if(url){
     _win.loadURL(url);
   } else if(options.file && fs.existsSync(options.file)){

package/electron/pdf-viewer/viewer.html

@@ -34,10 +34,10 @@ See https://github.com/adobe-type-tools/cmap-resources
   <link rel="stylesheet" href="./viewer.css">
   
   
-  <link rel="stylesheet" href="../../../node_modules/pdfjs-dist/web/pdf_viewer.css">
+  <link rel="stylesheet" href="./web/pdf_viewer.css">
 
-  <script src="../../../node_modules/pdfjs-dist/build/pdf.min.mjs" type="module"></script>
-  <script src="../../../node_modules/pdfjs-dist/web/pdf_viewer.mjs" type="module"></script>
+  <script src="./pdf.min.mjs" type="module"></script>
+  <script src="./web/pdf_viewer.mjs" type="module"></script>
   
   </head>
 

package/electron/preload.js

@@ -381,6 +381,7 @@ const ELECTRON = {
     get printPDF (){
         return (options)=>{
             const urlPath = path.resolve("./pdf-viewer","viewer.html");
+            console.log("will create window ",urlPath);
             return createWindow({file:urlPath,modal:true,showOnLoad:true});
             return createPDFFile(options).then(({path,filePathUrl})=>{
                 if(fs.existsSync(path)){            

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.4.36",
+  "version": "7.4.38",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -104,7 +104,6 @@
     "js-base64": "^3.7.5",
     "node-machine-id": "^1.1.12",
     "npm": "^10.2.5",
-    "pdfjs-dist": "^4.0.269",
     "pdfmake": "^0.2.8",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",

package/src/pdf/print.js

@@ -1,7 +1,3 @@
-import {isElectron} from "$cplatform";
 export default function print(pdfMakeInstance,options,...rest){
-    if(isElectron() && ELECTRON.printPDF){
-        return ELECTRON.printPDF(options);
-    }
     return pdfMakeInstance.print(options,...rest);
 }

package/src/pdf/print.web.js

@@ -1,3 +1,7 @@
-export default function print(pdfMakeInstance,...rest){
-    return pdfMakeInstance.print(...rest);
+import {isElectron} from "$cplatform";
+export default function print(pdfMakeInstance,options,...rest){
+    if(isElectron() && ELECTRON.printPDF){
+        return ELECTRON.printPDF(options);
+    }
+    return pdfMakeInstance.print(options,...rest);
 }

package/electron/app/printer.js

@@ -1,52 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const _path = path;
-const createFile = (arg)=>{
-  let dir = ELECTRON.getPath("temp");
-  arg = defaultObj(arg);
-  let {content,filename,fileName,charset,success,fileExtension,extension,type} = arg;
-  filename = defaultStr(filename,fileName)
-  if(isDataURL(content)){
-      content = dataURLToBase64(content);
-  }
-  if(isBase64(content)){
-      content = Buffer.from ? Buffer.from(content,'base64') : new Buffer(content,'base64')
-  } else {
-     content = null;
-  }
-  if(!content){
-    console.warn('type de contenu invalide!! impression création fichier electron');
-    return null;
-  }
-  success = defaultFunc(success)
-  filename = defaultStr(filename,uniqid("print-salite-file-name"))
-  fileExtension = defaultStr(fileExtension,extension,'pdf');
-  charset = defaultStr(charset,'utf-8')
-  filename = sanitizeFileName(filename+"."+fileExtension);
-  fs.writeFile(path.join(dir,filename), content,{charset},(err)=>{
-      if(!err) {
-          let fileUrl = 'file://'+(dir+'/'+filename).replaceAll("\\","/");
-          let p = _path.join(dir,filename);
-          let filePathUrl = 'file://'+p.replaceAll("\\","/");
-          success({content,fileName:filename,filename,path:p,filePathUrl,filePathUri:filePathUrl,fileUrl,filePath:p,fileUri:fileUrl})
-      }
-  })
-}
-
-function preview(arg){
-  createFile({...defaultObj(arg),success:(opts)=>{
-    let {path,filePathUrl} = opts;
-    if(fs.existsSync(path)){            
-      let urlPath = _path.join(require.resolve("pdfjs-dist-viewer-min/package.json").replaceAll("package.json",""),'build','minified','web', 'viewer.html')
-      opts.loadURL = `file://${urlPath}?file=${decodeURIComponent(filePathUrl)}&locale=fr`;
-      opts.showOnLoad = true;
-      ELECTRON.createPDFWindow(opts)
-    }
-  }});
-}
-
-
-module.exports = {
-  preview,
-  createFile
-}