@fto-consult/expo-ui 7.4.43 → 7.4.45

package/electron/pdf-viewer/wiewer.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 
-    <title>PDF Viewer</title>
+    <title id="document-title">PDF Viewer</title>
 
     <link rel="stylesheet" type="text/css" href="./viewer.css">
 
@@ -16,10 +16,16 @@
     <script type="text/javascript">
         const url = new URL(window.location.href);
         const container = `#pdf-container`;
+        const title = document.querySelector(`document-title`)
         // Get a URLSearchParams object from the URL object
         const params = Object.assign({},url.searchParams);
         params.width = params.width ||"100%";
         params.height = params.height || "100%";
+        if(params.fileName && title){
+           title.innerHTML = `${params.fileName}`
+        } else if(params.title && title){
+           title.innerHTML = `${params.title}`
+        } 
         if(params.file){
             PDFObject.embed(params.file,container,params);
         } else if(params.dataURL){

package/electron/preload.js

@@ -12,6 +12,7 @@ const pathsStr = ipcRenderer.sendSync("get-paths.json");
 const paths = typeof pathsStr ==='string' && pathsStr ? JSON.parse(pathsStr) : {};
 const appName = ipcRenderer.sendSync("get-app-name");
 const sanitize = require("sanitize-filename");
+const uniqid = require("./utils/uniqid");
 if(!appName || typeof appName !=='string'){
     throw {message : "Nom de l'application invalide!! Veuillez spécifier un nom valide d'application"}
 }
@@ -108,7 +109,7 @@ const createPDFFile = (options)=>{
     return new Promise((resolve,reject)=>{
         const dir = getPath("temp");
         options = Object.assign({},options);
-        let {content,filename,fileName,charset,success,fileExtension,extension,type} = options;
+        let {content,filename,fileName,charset,fileExtension,extension} = options;
         filename = defaultStr(filename,fileName)
         if(isDataURL(content)){
             content = isDataURL.toBase64(content);
@@ -383,7 +384,7 @@ const ELECTRON = {
             return createPDFFile(options).then(({path,filePathUrl})=>{
                 const urlPath = path.resolve(__dirname,"pdf-viewer","viewer.html");
                 if(fs.existsSync(path)){            
-                    opts.loadURL = `file://${urlPath}?file=${decodeURIComponent(filePathUrl)}&locale=fr`;
+                    opts.loadURL = `file://${urlPath}?file=${decodeURIComponent(filePathUrl)}&locale=fr&fileName=${fileName}`;
                     opts.showOnLoad = true;
                     console.log("will print url ",options.loadURL,options);
                     return this.createPDFWindow(opts)

package/electron/utils/index.js

@@ -6,6 +6,7 @@ module.exports = {
     electronDir : path.resolve(__dirname, ".."),
     paths : require("./paths"),
     exec : require("./exec"),
+    uniqid : require("./uniqid"),
     throwError : (...args)=>{
         console.error(...args);
         process.exit(-1);

package/electron/utils/uniqid.js

@@ -0,0 +1,33 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/***
+* generate uid : uid(16) generate uid with 16 max  characters
+* uid("prefix",16) generate uid with max 16 chars and having prefix like prefix
+* 
+* @param {type} prefix
+* @param {type} idStrLen
+* @param {type} separator
+* @returns {String|Number|uid.idStr}
+*/
+module.exports =  function uniqid (prefix,idStrLen,separator) {
+    if(typeof prefix == "number" & typeof idStrLen == "undefined"){
+        idStrLen = prefix
+        prefix = ""
+    }
+    separator = typeof separator =="string" && separator ? separator : "";
+    prefix =  typeof prefix =="string" && prefix ? prefix : "";
+    if(typeof idStrLen !=='number') idStrLen = idStrLen-prefix.length;
+    if(idStrLen <= 0) idStrLen = 16;
+    idStrLen = Math.floor(idStrLen);
+    // always start with a letter -- base 36 makes for a nice shortcut
+    var idStr = prefix+(Math.floor((Math.random() * 25)) + 10).toString(36) + separator;
+    // add a timestamp in milliseconds (base 36 again) as the base
+    idStr += (new Date()).getTime().toString(36) + separator;
+    // similar to above, complete the Id using random, alphanumeric characters
+    do {
+        idStr += (Math.floor((Math.random() * 35))).toString(36);
+    } while (idStr.length < idStrLen);
+    return (idStr);
+}

package/package.json

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

package/src/pdf/print.electron.js

@@ -1,4 +1,12 @@
-export default function print(pdfMakeInstance,...rest){
-    console.log("printint electron pdf make ",rest);
-    return pdfMakeInstance.print(...rest);
+import {isElectron} from "$cplatform";
+export default function print(pdfMakeInstance,options){
+    if(isElectron() && window?.ELECTRON && typeof window?.ELECTRON?.printPDF =='function'){
+        return pdfMakeInstance.getBase64((content)=>{
+            ELECTRON.printPDF({
+                ...Object.assign({},options),
+                content,
+            })
+        })
+    }
+    return pdfMakeInstance.print();
 }

package/src/pdf/print.web.js

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