@fto-consult/expo-ui 8.43.0 → 8.44.0

package/bin/create-app/dependencies.js

@@ -7,9 +7,9 @@
 	"@react-native-community/netinfo": "11.1.0",
 	"@react-native/assets-registry": "^0.72.0",
 	"react-native-get-random-values": "~1.8.0",
-	"@react-navigation/native": "^6.1.15",
-	"@react-navigation/native-stack": "^6.9.24",
-	"@react-navigation/stack": "^6.3.27",
+	"@react-navigation/native": "^6.1.16",
+	"@react-navigation/native-stack": "^6.9.25",
+	"@react-navigation/stack": "^6.3.28",
 	"@shopify/flash-list": "1.6.3",
 	"expo": "^50.0.11",
 	"expo-camera": "~14.0.6",

package/package.json

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

package/src/components/Dialog/AppBarDialog.js

@@ -1,11 +1,12 @@
 import AppBar from "$ecomponents/AppBar";
 import React from "$react";
-import APP from "$capp/instance";
 import { renderActions } from "./utils";
 import {isIos,isAndroid,isWeb} from "$cplatform";
+import {useWindowDimensions} from "$cdimensions/utils";
 
 const AppBarDialogComponent = React.forwardRef((props,ref)=>{
     const {actions,responsive,isFullScreen,fullScreen,actionsProps,...rest} = props;
+    useWindowDimensions();
     if(responsive && !isFullScreen() || (typeof fullScreen =='boolean' && !fullScreen)){
         return null;
     }

package/src/components/Dialog/Dialog.js

@@ -171,8 +171,20 @@ const DialogComponent = React.forwardRef((props,ref)=>{
         paddingRight : borderRadius,
         paddingVertical : borderRadius?10:0,
     };
+    const getRRProps = (containerProps,setDimensions)=>{
+        if(!isPreloader){
+            const {mediaQueryUpdateStyle} = containerProps;
+            containerProps.mediaQueryUpdateStyle = (...rest)=>{
+                const r = typeof mediaQueryUpdateStyle =="function"? mediaQueryUpdateStyle(...rest) : undefined;
+                const {width,height} = rest[0];
+                const rW = setDimensions !==  false ? {width,height} : {};
+                return isFullScreenDialog()? [r,{...rW,maxWidth:"100%",maxHeight:"100%"}] : [r,setDimensions !== false && {maxHeight:getMaxHeight(),maxWidth:getMaxWidth()}];
+            }
+        }
+        return containerProps;
+    }
     const alertContentStyle = isAlert ? {paddingHorizontal:15} : null;
-    content = <View ref={contentRef} testID = {testID+"_Content11"} {...contentProps} style={[fullScreen? {flex:1}:{maxWidth,maxHeight:maxHeight-Math.min(SCREEN_INDENT*2+50,100)},isPreloader && {paddingHorizontal:10},{backgroundColor},alertContentStyle,contentProps.style]}>
+    content = <View ref={contentRef} testID = {testID+"_Content11"} {...getRRProps(contentProps,false)} style={[fullScreen? {flex:1}:{maxWidth,maxHeight:maxHeight-Math.min(SCREEN_INDENT*2+50,100)},isPreloader && {paddingHorizontal:10},{backgroundColor},alertContentStyle,contentProps.style]}>
         {content}
     </View>
     if(withScrollView){
@@ -182,17 +194,6 @@ const DialogComponent = React.forwardRef((props,ref)=>{
             {content}
         </ScrollView>
     }
-    const getRRProps = (containerProps)=>{
-        if(!isPreloader){
-            const {mediaQueryUpdateStyle} = containerProps;
-            containerProps.mediaQueryUpdateStyle = (...rest)=>{
-                const r = typeof mediaQueryUpdateStyle =="function"? mediaQueryUpdateStyle(...rest) : undefined;
-                const {width,height} = rest[0];
-                return isFullScreenDialog()? [r,{width,height}] : r;
-            }
-        }
-        return containerProps;
-    }
     return <ModalComponent
                 onDismiss={(e)=>{
                     return handleBack(e,false);

package/src/components/Dialog/DialogActions.js

@@ -7,10 +7,10 @@ import {renderActions} from "./utils";
 import View from "$ecomponents/View";
 import { StyleSheet } from "react-native";
 import DialogActions from "./RNPDialogActions";
-import {usePageDimensions} from "$cdimensions/utils";
+import {usePageDimensions,useWindowDimensions} from "$cdimensions/utils";
 
 const DialogActionsComponent = React.forwardRef(({actions,isAlert,onAlertRequestClose,testID,containerProps,actionMutator,actionProps,cancelButton,responsive,isFullScreen,fullScreen,actionsProps,menuProps,...rest},ref)=>{
-    usePageDimensions();
+    useWindowDimensions();
     if(responsive && isFullScreen() || fullScreen){
         return null;
     }

package/src/components/Dialog/DialogFooter.js

@@ -2,10 +2,10 @@ import React from "$react";
 import {defaultObj} from "$cutils";;
 import View from "$ecomponents/View";
 import { StyleSheet } from "react-native";
-import {usePageDimensions} from "$cdimensions/utils";
+import {useWindowDimensions} from "$cdimensions/utils";
 
 const DialogFullPageFooter = React.forwardRef(({responsive,containerProps,children,isFullScreen,fullScreen,...rest},ref)=>{
-    usePageDimensions();
+    useWindowDimensions();
     if(responsive && !isFullScreen() || (typeof fullScreen =='boolean' && !fullScreen) || !React.isValidElement(children)){
         return null;
     }

package/src/components/Dialog/DialogTitle.js

@@ -5,10 +5,10 @@ import {isNonNullString,defaultObj} from "$cutils";
 import View from "$ecomponents/View";
 import theme from "$theme";
 import { StyleSheet } from "react-native";
-import {usePageDimensions} from "$cdimensions/utils";
+import {useWindowDimensions} from "$cdimensions/utils";
 
 const DialogTitleComponent = React.forwardRef(({responsive,containerProps,title,titleProps,isFullScreen,fullScreen,...rest},ref)=>{
-    usePageDimensions();
+    useWindowDimensions();
     if(responsive && isFullScreen() || fullScreen || !React.isValidElement(title,true)){
         return null;
     }

package/src/context/Provider.js

@@ -100,7 +100,6 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
       },
     }
     Auth.setRef(auth);
-    console.log("has set ref auth ",auth);
     extendFormFields(customFormFields);
     structsData = isObj(structsData)? structsData : null;
     appConfig.tablesData = tablesData;

package/src/pdf/index.js

@@ -26,8 +26,12 @@ export const hashQRCode = (data)=>{
     }
 }
 
-export const decryptQRCode = (hashedQRCode)=>{
-    return crypToJS.decode(hashedQRCode,QR_CODE_HASH_KEY);
+export const decryptQRCodeData = (hashedQRCode)=>{
+    try {
+        return crypToJS.decode(hashedQRCode,QR_CODE_HASH_KEY);
+    } catch {
+        return null;
+    }
 }
 
 export const isValidQRCode = (data)=>{
@@ -35,7 +39,17 @@ export const isValidQRCode = (data)=>{
         data = JSON.parse(data);
     }
     data = defaultObj(data);
-    return hashQRCode(data.data) === data.hash && QR_CODE_HASH_KEY_PREFIX.toLowerCase() == defaultStr(data.provider).toLowerCase().replace(/\s/g, "");
+    data.data = decryptQRCodeData(data.data);
+    if(!data.data || !isJSON(data.data)) return false;
+    return QR_CODE_HASH_KEY_PREFIX.toLowerCase() == defaultStr(data.provider).toLowerCase().replace(/\s/g, "");
+}
+export const decryptQRCode = (data)=>{
+    if(isJSON(data)){
+        data = JSON.parse(data);
+    }
+    data = defaultObj(data);
+    if(!isValidQRCode(data)) return null;
+    return data;
 }
 
 const {createPdf} = pdfMake;
@@ -198,7 +212,7 @@ export const getPrintSettings = ({multiple,duplicateDocOnPage,isTableData,tableD
             },
             qrCodeFitSize : {
                 type :"number",
-                defaultValue : 150,
+                defaultValue : 120,
                 label : "Taille du QR Code",
                 validType : "numberGreaterThanOrEquals[120]"
             },
@@ -289,7 +303,7 @@ export function printTableData(data,options){
                         const pseudo = Auth.getUserPseudo();
                         const fullName = Auth.getUserFullName() || pseudo || Auth.getLoggedUserCode();
                         const printBy = isNonNullString(fullName)? (`${fullName}${uEmail?`[${uEmail}]`:""}`) : "";
-                        result.content.push({ qr: JSON.stringify({data:qrData,hash:hashQRCode(qrData),provider:defaultStr(appConfig.name).replace(/\s/g, ""),printBy,printDate:new Date().toFormat(DateLib.defaultDateTimeFormat),tableName:table}),margin:[0,8,0,5], fit: defaultNumber(data.qrCodeFitSize,150), alignment: qrCodeAlignmentPosition})
+                        result.content.push({ qr: JSON.stringify({data:hashQRCode(qrData),provider:defaultStr(appConfig.name).replace(/\s/g, ""),printBy,printDate:new Date().toFormat(DateLib.defaultDateTimeFormat),tableName:table}),margin:[0,8,0,5], fit: defaultNumber(data.qrCodeFitSize,120), alignment: qrCodeAlignmentPosition})
                     }
                 }
                 return result;

package/src/screens/Auth/PermLines.js

@@ -120,6 +120,9 @@ const PermTextType = PropTypes.shape({
     defaultAction : PropTypes.bool,//si les actions par défaut seront associés à la permission en cours
 });
 
+const permsType = PropTypes.oneOfType([
+    PropTypes.func,PropTypes.object,
+]);
 PermLines.propTypes = {
     data : PropTypes.object,
     gridProps : PropTypes.object,//les props du composant Grid, wrapper au contentu expandable
@@ -129,10 +132,10 @@ PermLines.propTypes = {
         PropTypes.shape({
             table : PropTypes.string,
             tableName : PropTypes.string,
-            perms : PropTypes.object,
+            perms : permsType,
         })
     ).isRequired,
-    perms : PropTypes.object,//la liste des permissions qui peuvent associer au compte d'un utilisaters
+    perms : permsType,//la liste des permissions qui peuvent associer au compte d'un utilisaters
     /*** si les élements de permissions seront modifiable où non */
     disabled : PropTypes.bool,
     title : PropTypes.oneOfType([

package/src/screens/Help/openLibraries.js

@@ -1,6 +1,6 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
-		"version": "8.41.0",
+		"version": "8.43.1",
 		"url": "https://github.com/borispipo/expo-ui#readme",
 		"license": "ISC"
 	},
@@ -39,6 +39,11 @@ module.exports = {
 		"url": "https://github.com/pchmn/expo-material3-theme#readme",
 		"license": "MIT"
 	},
+	"@react-native-async-storage/async-storage": {
+		"version": "1.21.0",
+		"url": "https://github.com/react-native-async-storage/async-storage#readme",
+		"license": "MIT"
+	},
 	"@react-native-community/netinfo": {
 		"version": "11.1.0",
 		"url": "https://github.com/react-native-netinfo/react-native-netinfo#readme",
@@ -50,17 +55,17 @@ module.exports = {
 		"license": "MIT"
 	},
 	"@react-navigation/native": {
-		"version": "6.1.15",
+		"version": "6.1.16",
 		"url": "https://reactnavigation.org",
 		"license": "MIT"
 	},
 	"@react-navigation/native-stack": {
-		"version": "6.9.24",
+		"version": "6.9.25",
 		"url": "https://github.com/software-mansion/react-native-screens#readme",
 		"license": "MIT"
 	},
 	"@react-navigation/stack": {
-		"version": "6.3.27",
+		"version": "6.3.28",
 		"url": "https://reactnavigation.org/docs/stack-navigator/",
 		"license": "MIT"
 	},
@@ -139,26 +144,25 @@ module.exports = {
 		"url": "https://docs.expo.dev/versions/latest/sdk/webbrowser/",
 		"license": "MIT"
 	},
+	"react": {
+		"version": "18.2.0",
+		"url": "https://reactjs.org/",
+		"license": "MIT"
+	},
 	"react-native": {
 		"version": "0.73.4",
 		"url": "https://reactnative.dev/",
 		"license": "MIT"
 	},
-	"react-native-big-list": {
-		"version": "1.6.1",
-		"url": "https://marcocesarato.github.io/react-native-big-list-docs/",
-		"license": "GPL-3.0-or-later"
-	},
-	"react-native-blob-util": {
-		"version": "0.18.6",
-		"url": "https://github.com/RonRadtke/react-native-blob-util",
-		"license": "MIT"
-	},
 	"react-native-gesture-handler": {
 		"version": "2.14.1",
 		"url": "https://github.com/software-mansion/react-native-gesture-handler#readme",
 		"license": "MIT"
 	},
+	"react-native-get-random-values": {
+		"version": "1.8.0",
+		"license": "MIT"
+	},
 	"react-native-reanimated": {
 		"version": "3.6.2",
 		"url": "https://github.com/software-mansion/react-native-reanimated#readme",
@@ -188,5 +192,10 @@ module.exports = {
 		"version": "13.6.4",
 		"url": "https://github.com/react-native-webview/react-native-webview#readme",
 		"license": "MIT"
+	},
+	"socket.io-client": {
+		"version": "4.7.4",
+		"url": "https://github.com/socketio/socket.io-client.git",
+		"license": "MIT"
 	}
 };