@fto-consult/expo-ui 7.4.62 → 7.4.64

package/electron/index.js

@@ -127,10 +127,7 @@ function createBrowserWindow (options){
   if(showOnLoad){
     _win.once('ready-to-show', () => {
         _win.show();
-        ipcMain.send("window-ready-to-show",JSON.stringify(options.readyToShowOptions));
-        if(options.devTools){
-          _win.webContents.openDevTools();
-        }
+        _win.webContents.send("window-ready-to-show",JSON.stringify(options.readyToShowOptions));
     });
   }
   _win.on('closed', function() {

package/electron/preload.js

@@ -383,36 +383,17 @@ const ELECTRON = {
         return (options)=>{
             options = Object.assign({},options);
             return createPDFFile(options).then(({path:mainPath,filePathUrl,fileName})=>{
-                const urlPath = path.resolve(__dirname,"pdf-viewer","viewer.html");
                 if(fs.existsSync(mainPath)){            
-                    const queryString = `file=${filePathUrl}&locale=fr&fileName=${fileName}`;
                     const opts = {
-                        //loadURL  : `file://${urlPath}?${queryString}`,
                         file : mainPath,
                         fileName,
-                        filePathUrl,
-                        queryString,
                         pdfFilePath : mainPath,
                         showOnLoad : true,
-                        devTools : true,
-                        webPreferences : {
-                            devTools : true,
-                            //webSecurity: false,
-                            preload : path.resolve(__dirname,"pdf-viewer",'preload.js'),
-                            ...Object.assign({},options.webPreferences),
-                        },
-                        fileName
-                    };
-                    ["width","height"].map((v)=>{
-                        if(v in options){
-                            opts[v] = options;
+                        webPreferences: {
+                            plugins: true
                         }
-                    });
-                    console.log("will print options ",opts);
-                    return this.createPDFWindow({
-                        ...opts,
-                        readyToShowOptions : opts,
-                    })
+                    };
+                    return this.createPDFWindow(opts)
                 }
             })
         }

package/electron/utils/index.js

@@ -11,6 +11,7 @@ module.exports = {
         console.error(...args);
         process.exit(-1);
     },
+    json : require("./json"),
     replaceAll : require("./replaceAll"),
     isBase64 : require("./isBase64"),
     isDataURL : require("./isDataURL"),

package/electron/utils/json.js

@@ -0,0 +1,57 @@
+// 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.
+
+
+module.exports.decycle = function decycle(obj, stack = []) {
+    if(typeof obj ==='function') return undefined;
+    if (!obj || typeof obj !== 'object')
+        return obj;
+    
+    if (stack.includes(obj))
+        return null;
+
+    let s = stack.concat([obj]);
+    return Array.isArray(obj)
+        ? obj.map(x => decycle(x, s))
+        : Object.fromEntries(
+            Object.entries(obj)
+                .map(([k, v]) => [k, decycle(v, s)]));
+}
+
+module.exports.stringify = function(jsonObj,decylcleVal){
+    return isJSON(jsonObj) ? jsonObj : JSON.stringify(decylcleVal !== false ? decycle(jsonObj) : jsonObj);
+}
+
+module.exports.isJSON = function (json_string){
+    if(!json_string || typeof json_string != 'string') return false;
+    var text = json_string;
+    return !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(text.replace(/"(\\.|[^"\\])*"/g, '')));
+}
+
+/***
+ * parse JSON string recursively
+ * @param {string} json string to parse
+ * @return {object} or null, parse json
+ */
+ module.exports. parseJSON  = function(jsonStr){
+    if(!isJSON(jsonStr)) {
+        if(jsonStr && typeof(jsonStr) == 'object'){
+            for(var i in jsonStr){
+                jsonStr[i] = parseJSON(jsonStr[i]);
+            }
+        }
+        return jsonStr;
+    }
+    try {
+        jsonStr = JSON.parse(jsonStr);
+        if(jsonStr && typeof(jsonStr) == 'object'){
+            for(var i in jsonStr){
+                jsonStr[i] = parseJSON(jsonStr[i]);
+            }
+        }
+    } catch(e){
+        return jsonStr;
+    }
+    return jsonStr;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.4.62",
+  "version": "7.4.64",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -103,7 +103,6 @@
     "js-base64": "^3.7.5",
     "node-machine-id": "^1.1.12",
     "pdfmake": "^0.2.8",
-    "pdfobject": "^2.2.12",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",

package/electron/pdf-viewer/preload.js

@@ -1,29 +0,0 @@
-
-const {ipcRenderer} = require('electron')
-
-ipcRenderer.on('print-document', (...args) => {
-    console.log("willl print document ",window.PDFObject)
-});
-ipcRenderer.on("window-ready-to-show",(...args)=>{
-    console.log("window is ready to show ",...args,window.PDFObject);
-});
-function test(){
-    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}`
-    } 
-    alert(JSON.stringify(params)," is params heeein");
-    alert(params.file," is paraments fieleeeeee");
-    if(params.file){
-        PDFObject.embed(params.file,container,params);
-    } else if(params.dataURL){
-        PDFObject.embed(params.dataURL,container,params);
-    }
-}

package/electron/pdf-viewer/viewer.css

@@ -1,14 +0,0 @@
-body {
-    width: 100vh!important;
-    height: 100%!important;
-    padding: 0!important;
-    margin: 0!important;
-}
-
-#pdf-container{
-    width: 100vh!important;
-    height: 100%!important;
-    padding: 0!important;
-    margin: 0!important;
-    position: relative!important;
-}

package/electron/pdf-viewer/wiewer.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title id="document-title">PDF Viewer</title>
-    <link rel="stylesheet" type="text/css" href="./viewer.css">
-    <script src="../../node_modules/pdfobject/pdfobject.min.js"></script>
-  </head>
-
-  <body>
-    <div id="pdf-container"></div>
-  </body>
-</html>