@fto-consult/expo-ui 8.38.0 → 8.39.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.38.0",
+  "version": "8.39.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -68,7 +68,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.34.0",
+    "@fto-consult/common": "^4.35.9",
     "@fto-consult/node-utils": "^1.7.1",
     "apexcharts": "^3.47.0",
     "crypto-browserify": "^3.12.0",

package/src/media/file-system/utils/Fsaver.web.js

@@ -1,6 +1,5 @@
 const FileSaver = require('file-saver');
-import {defaultNumber,postWebviewMessage} from "$cutils";
-import {isReactNativeWebview} from "$cplatform";
+import {defaultNumber,postWebviewMessage,canPostWebviewMessage,logRNWebview,WEBVIEW_SAVE_FILE_EVENT} from "$cutils";
 
 /*** 
     sauvegarde par défaut un fichier blob
@@ -8,16 +7,18 @@ import {isReactNativeWebview} from "$cplatform";
 export const save = ({content,fileName,mimeType,contentType,isBase64,timeout,delay})=>{
     return new Promise((resolve,reject)=>{
         try {
-            if(isReactNativeWebview()){
-                postWebviewMessage("FILE_SAVER_SAVE_FILE",{
+            if(canPostWebviewMessage()){
+                logRNWebview("SAVE RN FILE FROM WEBVIEWddd ",fileName,mimeType,contentType);
+                postWebviewMessage(WEBVIEW_SAVE_FILE_EVENT,{
                     content,
                     fileName,
                     contentType,
                     mimeType,
                     isBase64,
                 });
+            } else {
+                FileSaver.saveAs(content, fileName);
             }
-            FileSaver.saveAs(content, fileName);
             setTimeout(() => {
                 resolve({path:fileName,isWeb : true});
             }, defaultNumber(timeout,delay,3000));

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

@@ -1,7 +1,7 @@
 // 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.
-import {defaultStr,base64toBlob,dataURLToBlob,getTypeFromDataURL,isNonNullString,getFileName,getFileExtension,defaultNumber,defaultBool,dataURLToBase64,isBlob,isBase64,isDataURL} from "$cutils";
+import {defaultStr,base64toBlob,dataURLToBlob,getTypeFromDataURL,isNonNullString,getFileName,getFileExtension,defaultNumber,defaultBool,dataURLToBase64,isBlob,isBase64,isDataURL,canPostWebviewMessage} from "$cutils";
 const mime = require('react-native-mime-types')
 const XLSX = require("xlsx");
 import Preloader from "$preloader";
@@ -70,7 +70,7 @@ export const writeExcel = ({workbook,content,contentType,fileName,...rest})=>{
     if(isBlob(content)){
         return write({...rest,content,fileName,contentType}).finally(Preloader.close)
     }
-    if(isNative){
+    if(isNative || canPostWebviewMessage()){
         return FileSaver.save({...rest,content:XLSX.write(workbook, {type:'base64', bookType:ext}),fileName}).finally(Preloader.close).finally(Preloader.close);
     }
     return new Promise((resolve,reject)=>{

package/src/pdf/print.web.js

@@ -1,7 +1,7 @@
 import {isElectron} from "$cplatform";
 import electronPrint from "./print.electron";
 import {isTouchDevice} from "$cplatform";
-import {canPostWebviewMessage,postWebviewMessage} from "$cutils/webview";
+import {canPostWebviewMessage,postWebviewMessage,logRNWebview,WEBVIEW_SAVE_FILE_EVENT} from "$cutils/rn-webview";
 import {defaultStr,getFileExtension} from "$cutils";
 import DateLib from "$clib/date";
 export default function print(pdfMakeInstance,options,...rest){
@@ -18,7 +18,8 @@ export default function print(pdfMakeInstance,options,...rest){
             if(!ext || ext.toLowerCase() !=="pdf"){
                 fileName+=".pdf";
             }
-            return postWebviewMessage("FILE_SAVER_SAVE_FILE",{
+            logRNWebview("printing pdf file",options?.fileName);
+            return postWebviewMessage(WEBVIEW_SAVE_FILE_EVENT,{
                 content,
                 contentType : 'application/pdf',
                 fileName,

package/src/screens/Help/openLibraries.js

@@ -1,7 +1,7 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
 		"name": "@fto-consult/expo-ui",
-		"version": "8.37.0",
+		"version": "8.38.0",
 		"repository": {
 			"type": "git",
 			"url": "git+https://github.com/borispipo/expo-ui.git"
@@ -34,7 +34,7 @@ module.exports = {
 		"license": "MIT"
 	},
 	"@fto-consult/common": {
-		"version": "4.34.0",
+		"version": "4.35.0",
 		"url": "https://github.com/borispipo/common#readme",
 		"license": "ISC"
 	},