@fto-consult/expo-ui 8.75.0 → 8.76.1

package/src/components/Datagrid/Accordion/Row.js

@@ -9,6 +9,9 @@ import theme from "$theme"
 import {styles as rStyles,getRowStyle} from "../utils";
 import { useIsRowSelected,useDatagrid} from "../hooks";
 import {HStack} from "$ecomponents/Stack";
+import { isMobileNative, isReactNativeWebview} from "$cplatform";
+
+const isNative = isMobileNative() || isReactNativeWebview();
 
 const DatagridAccordionRow = React.forwardRef(({selectable,
         rowKey,
@@ -81,10 +84,7 @@ const DatagridAccordionRow = React.forwardRef(({selectable,
     const wrapStyle = React.useMemo(()=>{
         return getRowStyle({row:item,index,selected,numColumns,isAccordion:true,rowIndex:index});
     },[selected,numColumns]);
-    const viewWrapperStyle = [selectable !== false && theme.styles.cursorPointer];
-    if(!hasAvatar){
-        viewWrapperStyle.push(styles.hasNotAvatar);
-    }
+    const viewWrapperStyle = [selectable !== false && theme.styles.cursorPointer,hasAvatar ? styles.hasAvatar : styles.hasNotAvatar];
     if(selected) {
         const handleAvatarRowToggle = (event)=>{
             React.stopEventPropagation(event);
@@ -238,7 +238,9 @@ const styles = StyleSheet.create({
     },
     container : {
         paddingVertical : 0,
-        paddingHorizontal : 7,
+        paddingLeft : isNative ? 7 : 2,
+        //paddingHorizontal : 7,
+        paddingRight : 7,
         marginHorizontal : 0,
         flexWrap : 'nowrap',
         justifyContent : 'center',
@@ -249,14 +251,17 @@ const styles = StyleSheet.create({
         marginRight : 10,
     },
     hasNotAvatar : {
-        borderLeftWidth : 5,
+        borderLeftWidth : 7,
         paddingLeft : 0,
         height : "100%",
         borderLeftColor : "transparent",
     },
+    hasAvatar : {
+        paddingLeft : isNative ? 10 : 7,
+    },
     selected : {
-        paddingHorizontal : 0,
-        paddingVertical : 0,
+        //paddingHorizontal : 0,
+        //paddingVertical : 0,
     },
     contentContainerNotAvatar : {
         paddingLeft : 2,

package/src/components/Datagrid/Accordion/index.js

@@ -194,7 +194,7 @@ export default class DatagridAccordionComponent extends Datagrid {
         if(!(item) || typeof item !== 'object') return null;
         const canHandleRow = typeof this.props.filter =='function' ? this.props.filter(this.getItemCallArgs({item,index})) : true;
         if(canHandleRow === false || canHandleRow === null) return null;
-        const rowKey = this.getRowKeyByIndex(index);
+        const rowKey = this.getRowKey(item);
         return <DatagridAccordionRow 
             item = {item}
             index = {index}

package/src/components/Datagrid/Common/Common.js

@@ -47,6 +47,7 @@ import {createTableHeader,fields as pdfFields,pageHeaderMargin,sprintf as pdfSpr
 import {isWeb,isMobileNative} from "$cplatform";
 import { createPDF,getFields as getPdfFields } from '$expo-ui/pdf';
 import actions from '$cactions';
+import {printTableData} from "$epdf";
 
 export const TIMEOUT = 100;
 
@@ -831,15 +832,21 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         return copyToClipboard({...rest,isDatagrid:true,data:row,fields : this.props.columns,sessionName:defaultStr(this.props.sessionName,"datagrid")});
     }
-    
+    isPrintable(){
+        if(!this.isTableData() || this.props.printAction === false) return false;
+        if(typeof this.props.printable ==='function'){
+            return !!this.props.printable({context:this,tableName:this.tableName,table:this.tableName,context:this,isDatagrid:true,isTableData:false});
+        }
+        return this.props.printable === true;
+    }
     /*** les actions représentes les différents menus apparaissant lorsqu'une ligne est sélectionnée
      *   ou pas.
      */
     renderSelectedRowsActions(sActions){
         let {makePhoneCallProps,canMakePhoneCall,archivable} = this.props;
         const size = this.getSelectedRowsCount();
-        let r = [];
-        let endActs = [];
+        const r = [];
+        const endActs = [];
         if(size <=0) {
             return r
         };
@@ -851,6 +858,28 @@ export default class CommonDatagridComponent extends AppComponent {
         if(isFunction(selectedR)) {
             selectedR = selectedR.call(this,sArgs)
         }
+        if(this.isPrintable()){
+            const {filter:printFilter,onPress,...printAction} = defaultObj(this.props.printAction);
+            r.push({
+                icon : "printer",
+                ...printAction,
+                text : printAction.text || printAction.label || "Imprimer",
+                label : printAction.label || printAction.label || 'Imprimer',
+                onPress : (r)=>{
+                    const opts2 = {isTableData:false,context:this,isDatagrid:true,tableName:this.tableName,table:this.tableName};
+                    const args = {...React.getOnPressArgs(r),...sArgs,...opts2};
+                    if(typeof onPress =='function' && onPress(args) === false) return;
+                    const printDat = [];
+                    const filter = typeof printFilter =="function" ? printFilter : x=>true;
+                    Object.map(args.selectedRows,(row,rowKey,index)=>{
+                        if(!!!filter({...args,data:row,key:rowKey,rowData:row,index,rowIndex:index})) return;
+                        printDat.push(row); 
+                    });
+                    if(!printDat.length) return notify.error(printAction.noDataError,"Aucune données sélectionnée pour l'impression");
+                    return this.print(printDat,opts2);
+                },
+            });
+        }
         Object.map(sActions,(o,i)=>{
             if(isObj(o)){
                 let {onPress, ...rest} = o;
@@ -878,7 +907,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 }
                 r.push(rest)
             }
-        })
+        });
         endActs.map((a)=>{
             r.push(a);
         })
@@ -914,7 +943,18 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         return r;
     }
-
+    getTableName(){
+        return defaultStr(this.tableName,this.props.table,this.props.tableName).toUpperCase().trim();
+    }
+    print(data,options){   
+        if(!this.isPrintable()) return;
+        if(!isObj(data) && !Array.isArray(data)) return;
+        const opts = {...defaultObj(options),tableName:this.getTableName(),table:this.getTableName(),isTableData:false,isDatagrid:true,context:this};
+        if(typeof this.props.print ==='function'){
+            return this.props.print.call(this,data,opts);
+        } 
+        return printTableData(data,opts);
+    }
     /*** le trie du tableau prend en paramètre 
         : le nom de la colonne de trie, la direction de la conne de trie
         par défaut, le trie se fait en ignorant la casse
@@ -3926,6 +3966,10 @@ export default class CommonDatagridComponent extends AppComponent {
     getRowsKeysIndexes(){
         return Array.isArray(this.rowsKeysIndexes) ? this.rowsKeysIndexes : [];
     }
+    /****
+        attention cette fonction est uniquement valide lorsque les données ne sont pas groupées
+        Lorsque les données sont groupées, cette fonction est inutile
+    */
     getRowKeyByIndex(rowIndex){
         if(typeof rowIndex !='number') return undefined;
         const idx = this.getRowsKeysIndexes();
@@ -4279,6 +4323,21 @@ CommonDatagridComponent.propTypes = {
     abreviateValues : PropTypes.bool, //si les valeurs numériques seront abregées
     handleTitle : PropTypes.bool,//si le titre du datagrid, props title, sera pris en compte dans les actions du datagrid, pour le rendu du DataSourceSelector, fonction renderDataSourceSelector
     checkPerms : PropTypes.func,//la fonction utilisée pour vérifier les permissions de l'utilisateur
+    printAction : PropTypes.oneOfType([
+        PropTypes.bool,
+        PropTypes.shape({
+            label : PropTypes.any,
+            text  : PropTypes.any,
+            icon : PropTypes.any,
+            onPress : PropTypes.func, //({selectedRows,context,.....})=><boolean | any>,
+            filter : PropTypes.func,//la fonction permettant de filtrer les données à imprimer,
+            noDataError : PropTypes.oneOfType([ //le message d'erreur lorsque aucune données n'a été selectionnée pour l'impression
+                PropTypes.string, 
+                PropTypes.object,
+            ]),
+            ///....rest, les options similaires à celles du composant Menu où de l'AppBar en fonction des cas
+        }), //les props à passer à l'action d'impression du datagrid
+    ]), //si l'action d'impression sera affiché dans le datagrid
 }
 
 const styles = StyleSheet.create({

package/src/layouts/Screen/TableData.js

@@ -25,6 +25,7 @@ import i18n from "$i18n";
 import fetch from "$capi/fetch";
 import appConfig from "$capp/config";
 import {Vertical} from "$ecomponents/AutoSizer";
+import {printTableData} from "$epdf";
 
 
 const HIDE_PRELOADER_TIMEOUT = 300;
@@ -566,6 +567,9 @@ export default class TableDataScreenComponent extends FormDataScreen{
         return true;    
     }
     isPrintable(){
+        if(typeof this.props.printable ==='function'){
+            return !!this.props.printable({context:this,tableName:this.getTableName(),isTableData:true,table:this.getTableName()})
+        }
         return !!(this.props.printable);
     }
     /*** retourne la liste des valeurs de clé primarire associés à la table data pour la données en cours de modification 
@@ -596,10 +600,11 @@ export default class TableDataScreenComponent extends FormDataScreen{
     print(data){   
         if(!this.isPrintable()) return;
         data = this.isDocEditing(data)? data : isObj(data) && this.isDocEditing(data.data)? data.data : {};
+        const opts = {tableName:this.getTableName(),table:this.getTableName(),isTableData:true,fromTableData:true,context:this};
         if(typeof this.props.print ==='function'){
-            return this.props.print.call(this,data);
-        }
-        return data;
+            return this.props.print.call(this,data,opts);
+        } 
+        return printTableData(data,opts);
     }
     isClonable(){
         return !!(this.props.clonable !==false);
@@ -961,6 +966,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
 
 TableDataScreenComponent.propTypes = {
     ...defaultObj(FormData.propTypes),
+    printable : PropTypes.oneOfType([PropTypes.func,PropTypes.bool]),//si la table data est imprimable
     renderTabsType : PropTypes.oneOf([...defaultRendersTypes,undefined,"responsive"]),//spécifie le type de rendue : mobile, alors le tab sera rendu en mobile, desktop, ce sera rendu en desktop, responsible ou undefined, alors les deux rendu seront possible
     prepareComponentProps : PropTypes.func, //permet d'appreter les components props à utiliser pour le rendu des données
     prepareField : PropTypes.func,//La fonction permettant de faire des mutations sur le champ field à passer au formulaire form. si elle retourne false alors la field ne sera pas pris een compte

package/src/pdf/index.js

@@ -277,9 +277,9 @@ export function printTableData(data,options){
     } else if(!Auth.isTableDataAllowed({table,action:'print'})){
         return Promise.reject({message:'Vous n\'etes pas autorisé à imprimer ce type de document'});
     }
-    const printOptions = typeof tableObj.printOptions =="function"? tableObj.printOptions({...options,table,data}) : tableObj.printOptions;
     return print(data,{
         getSettings : (options)=>{
+            const printOptions = typeof tableObj.printOptions =="function"? tableObj.printOptions({...options,table}) : tableObj.printOptions;
             return getPrintSettings(extendObj(true,{},{sessionName:`print-${table}`,isTableData:true,tableDataFields:defaultObj(options.tableDataFields,tableObj.printableFields,tableObj.fields)},options,printOptions)).then(({data})=>{
                 return data;
             });

package/src/screens/Help/openLibraries.js

@@ -1,6 +1,6 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
-		"version": "8.74.2",
+		"version": "8.73.1",
 		"url": "https://github.com/borispipo/expo-ui#readme",
 		"license": "ISC"
 	},
@@ -9,64 +9,34 @@ module.exports = {
 		"url": "https://babel.dev/docs/en/next/babel-plugin-proposal-export-namespace-from",
 		"license": "MIT"
 	},
-	"@emotion/native": {
-		"version": "11.11.0",
-		"url": "https://emotion.sh",
-		"license": "MIT"
-	},
-	"@expo/html-elements": {
-		"version": "0.5.1",
-		"url": "https://github.com/expo/expo/tree/main/packages/html-elements",
+	"@emotion/react": {
+		"version": "11.11.4",
+		"url": "https://github.com/emotion-js/emotion/tree/main/packages/react",
 		"license": "MIT"
 	},
 	"@expo/metro-config": {
-		"version": "0.17.7",
+		"version": "0.17.6",
 		"url": "https://github.com/expo/expo.git",
 		"license": "MIT"
 	},
-	"@expo/vector-icons": {
-		"version": "14.0.0",
-		"url": "https://expo.github.io/vector-icons",
-		"license": "MIT"
-	},
 	"@expo/webpack-config": {
 		"version": "19.0.1",
 		"url": "https://github.com/expo/expo-webpack-integrations/tree/main/packages/webpack-config#readme",
 		"license": "MIT"
 	},
-	"@pchmn/expo-material3-theme": {
-		"version": "1.3.2",
-		"url": "https://github.com/pchmn/expo-material3-theme#readme",
-		"license": "MIT"
-	},
-	"@react-native-community/netinfo": {
-		"version": "11.1.0",
-		"url": "https://github.com/react-native-netinfo/react-native-netinfo#readme",
-		"license": "MIT"
-	},
-	"@react-native/assets-registry": {
-		"version": "0.72.0",
-		"url": "git@github.com:facebook/react-native.git",
+	"@faker-js/faker": {
+		"version": "8.4.1",
+		"url": "https://github.com/faker-js/faker.git",
 		"license": "MIT"
 	},
-	"@react-navigation/native": {
-		"version": "6.1.17",
-		"url": "https://reactnavigation.org",
-		"license": "MIT"
-	},
-	"@react-navigation/native-stack": {
-		"version": "6.9.26",
-		"url": "https://github.com/software-mansion/react-native-screens#readme",
-		"license": "MIT"
-	},
-	"@react-navigation/stack": {
-		"version": "6.3.29",
-		"url": "https://reactnavigation.org/docs/stack-navigator/",
-		"license": "MIT"
+	"@fto-consult/common": {
+		"version": "4.47.0",
+		"url": "https://github.com/borispipo/common#readme",
+		"license": "ISC"
 	},
-	"@shopify/flash-list": {
-		"version": "1.6.3",
-		"url": "https://shopify.github.io/flash-list/",
+	"apexcharts": {
+		"version": "3.49.0",
+		"url": "https://apexcharts.com",
 		"license": "MIT"
 	},
 	"babel-plugin-inline-dotenv": {
@@ -84,74 +54,48 @@ module.exports = {
 		"url": "https://github.com/crypto-browserify/crypto-browserify",
 		"license": "MIT"
 	},
-	"expo": {
-		"version": "50.0.17",
-		"url": "https://github.com/expo/expo/tree/main/packages/expo",
+	"file-saver": {
+		"version": "2.0.5",
+		"url": "https://github.com/eligrey/FileSaver.js#readme",
 		"license": "MIT"
 	},
-	"expo-camera": {
-		"version": "14.1.3",
-		"url": "https://docs.expo.dev/versions/latest/sdk/camera/",
-		"license": "MIT"
+	"google-libphonenumber": {
+		"version": "3.2.34",
+		"url": "https://ruimarinho.github.io/google-libphonenumber/",
+		"license": "(MIT AND Apache-2.0)"
 	},
-	"expo-clipboard": {
-		"version": "5.0.1",
-		"url": "https://docs.expo.dev/versions/latest/sdk/clipboard",
+	"html2canvas": {
+		"version": "1.4.1",
+		"url": "https://html2canvas.hertzen.com",
 		"license": "MIT"
 	},
-	"expo-document-picker": {
-		"version": "11.10.1",
-		"url": "https://docs.expo.dev/versions/latest/sdk/document-picker/",
+	"htmlparser2-without-node-native": {
+		"version": "3.9.2",
+		"url": "git://github.com/fb55/htmlparser2.git",
 		"license": "MIT"
 	},
-	"expo-font": {
-		"version": "11.10.3",
-		"url": "https://docs.expo.dev/versions/latest/sdk/font/",
+	"is-plain-obj": {
+		"version": "4.1.0",
 		"license": "MIT"
 	},
-	"expo-image-picker": {
-		"version": "14.7.1",
-		"url": "https://docs.expo.dev/versions/latest/sdk/imagepicker/",
+	"jsbarcode": {
+		"version": "3.11.6",
+		"url": "https://github.com/lindell/JsBarcode#readme",
 		"license": "MIT"
 	},
-	"expo-intent-launcher": {
-		"version": "10.11.0",
-		"url": "https://docs.expo.dev/versions/latest/sdk/intent-launcher/",
+	"prop-types": {
+		"version": "15.8.1",
+		"url": "https://facebook.github.io/react/",
 		"license": "MIT"
 	},
-	"expo-linking": {
-		"version": "6.2.2",
-		"url": "https://docs.expo.dev/versions/latest/sdk/linking",
+	"react-content-loader": {
+		"version": "6.2.1",
+		"url": "https://github.com/danilowoz/react-content-loader",
 		"license": "MIT"
 	},
-	"expo-sharing": {
-		"version": "11.10.0",
-		"url": "https://docs.expo.dev/versions/latest/sdk/sharing/",
-		"license": "MIT"
-	},
-	"expo-sqlite": {
-		"version": "13.4.0",
-		"url": "https://docs.expo.dev/versions/latest/sdk/sqlite/",
-		"license": "MIT"
-	},
-	"expo-status-bar": {
-		"version": "1.11.1",
-		"url": "https://docs.expo.dev/versions/latest/sdk/status-bar/",
-		"license": "MIT"
-	},
-	"expo-system-ui": {
-		"version": "2.9.4",
-		"url": "https://docs.expo.dev/versions/latest/sdk/system-ui",
-		"license": "MIT"
-	},
-	"expo-web-browser": {
-		"version": "12.8.2",
-		"url": "https://docs.expo.dev/versions/latest/sdk/webbrowser/",
-		"license": "MIT"
-	},
-	"react-native": {
-		"version": "0.73.6",
-		"url": "https://reactnative.dev/",
+	"react-dom": {
+		"version": "18.2.0",
+		"url": "https://reactjs.org/",
 		"license": "MIT"
 	},
 	"react-native-big-list": {
@@ -159,45 +103,44 @@ module.exports = {
 		"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",
+	"react-native-iphone-x-helper": {
+		"version": "1.3.1",
+		"url": "https://github.com/ptelad/react-native-iphone-x-helper#readme",
 		"license": "MIT"
 	},
-	"react-native-gesture-handler": {
-		"version": "2.14.1",
-		"url": "https://github.com/software-mansion/react-native-gesture-handler#readme",
+	"react-native-mime-types": {
+		"version": "2.5.0",
 		"license": "MIT"
 	},
-	"react-native-reanimated": {
-		"version": "3.6.2",
-		"url": "https://github.com/software-mansion/react-native-reanimated#readme",
+	"react-native-paper": {
+		"version": "5.12.3",
+		"url": "https://callstack.github.io/react-native-paper",
 		"license": "MIT"
 	},
-	"react-native-safe-area-context": {
-		"version": "4.8.2",
-		"url": "https://github.com/th3rdwave/react-native-safe-area-context#readme",
+	"react-native-paper-dates": {
+		"version": "0.22.7",
+		"url": "https://github.com/web-ridge/react-native-paper-dates#readme",
 		"license": "MIT"
 	},
-	"react-native-screens": {
-		"version": "3.29.0",
-		"url": "https://github.com/software-mansion/react-native-screens#readme",
+	"react-native-web": {
+		"version": "0.19.11",
+		"url": "git://github.com/necolas/react-native-web.git",
 		"license": "MIT"
 	},
-	"react-native-svg": {
-		"version": "14.1.0",
-		"url": "https://github.com/react-native-community/react-native-svg",
+	"react-virtuoso": {
+		"version": "4.7.10",
+		"url": "https://virtuoso.dev/",
 		"license": "MIT"
 	},
-	"react-native-view-shot": {
-		"version": "3.8.0",
-		"url": "https://github.com/gre/react-native-view-shot",
+	"readable-stream": {
+		"version": "4.5.2",
+		"url": "https://github.com/nodejs/readable-stream",
 		"license": "MIT"
 	},
-	"react-native-webview": {
-		"version": "13.6.4",
-		"url": "https://github.com/react-native-webview/react-native-webview#readme",
-		"license": "MIT"
+	"sanitize-filename": {
+		"version": "1.6.3",
+		"url": "git@github.com:parshap/node-sanitize-filename.git",
+		"license": "WTFPL OR ISC"
 	},
 	"sharp-cli": {
 		"version": "2.1.1",
@@ -209,9 +152,19 @@ module.exports = {
 		"url": "https://github.com/browserify/stream-browserify",
 		"license": "MIT"
 	},
+	"tippy.js": {
+		"version": "6.3.7",
+		"url": "https://atomiks.github.io/tippyjs/",
+		"license": "MIT"
+	},
 	"vm": {
 		"version": "0.1.0",
 		"url": "https://github.com/DiegoRBaquero/node-vm#readme",
 		"license": "MIT"
+	},
+	"xlsx": {
+		"version": "0.18.5",
+		"url": "https://sheetjs.com/",
+		"license": "Apache-2.0"
 	}
 };