@fto-consult/expo-ui 1.5.3 → 1.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@expo/html-elements": "^0.2.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.8.2",
+    "@fto-consult/common": "^1.9.0",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.2.0",

package/src/components/Avatar/Text.js

@@ -1,5 +1,5 @@
 import React from '$react';
-import {Text,StyleSheet} from 'react-native';
+import {Text,StyleSheet,Pressable} from 'react-native';
 import View from "$ecomponents/View";
 import PropTypes from 'prop-types';
 import {Colors,StylePropTypes} from "$theme";
@@ -16,9 +16,12 @@ const AvatarTextComponent = (props) => {
     labelStyle,
     children,
     style : customStyle,
+    onPress:customOnPress,
+    testID : customTestID,
   } = props;
   const containerProps = defaultObj(customContainerProps);
   const size = defaultNumber(customSize,defaultSize);
+  const testID = defaultStr(customTestID,"RN_AvatarComponent.Text");
   const style = Object.assign({},StyleSheet.flatten(customStyle));
   let label = defaultStr(customLabel,children);
   if(!label) return null;
@@ -40,9 +43,12 @@ const AvatarTextComponent = (props) => {
     height: size,
     width: size,
   };
+  const onPress = typeof customOnPress =='function' ? customOnPress : undefined;
+  const C = onPress? Pressable : View;
   return (
-    <View  pointerEvents='none' {...containerProps} style={[styles.container,style,containerProps.style,textContainerStyle,{borderRadius:size/2}]}>
+    <C testID={testID+"_Container"} pointerEvents={onPress?"auto":'none'} {...containerProps} style={[styles.container,style,containerProps.style,textContainerStyle,{borderRadius:size/2}]}>
       { <Text
+        testID={testID}
         style={[{
           color: color,
           fontSize: size / 2.5,
@@ -51,7 +57,7 @@ const AvatarTextComponent = (props) => {
       >
         {l}
       </Text>}
-    </View>
+    </C>
   );
 };
 
@@ -59,7 +65,7 @@ AvatarTextComponent.propTypes = {
   label: PropTypes.string,
   size: PropTypes.number,
   color: PropTypes.string,
-  labelStyle: PropTypes.object,
+  labelStyle: StylePropTypes,
   style: StylePropTypes,
 };
 

package/src/components/Avatar/index.js

@@ -24,7 +24,8 @@ const AvatarComponent = React.forwardRef((props,ref)=>{
 	if(typeof label =='number') label = label+"";
     rest = defaultObj(rest);
     containerProps = defaultObj(containerProps);
-    size = defaultDecimal(size,defaultSize)
+    size = defaultDecimal(size,defaultSize);
+    let handleOnPress = false;
     let cProps = {size};
     if(source || image || src){
         Component = AvatarImage;
@@ -32,6 +33,7 @@ const AvatarComponent = React.forwardRef((props,ref)=>{
     } else if(icon){
         Component = Avatar.Icon;
         cProps.icon = icon;
+        handleOnPress = true;
     } else if(label){
         cProps.label = label;
         cProps.pointerEvents = "none";
@@ -59,12 +61,13 @@ const AvatarComponent = React.forwardRef((props,ref)=>{
             {...rest}
             {...cProps}
             ref={ref}
+            onPress = {!handleOnPress && onPress ? onPress : undefined}
             title = {onPress?null : defaultVal(toolip,title)}
             testID = {defaultStr(testID,"RN_AvatarComponent")}
             style = {style}
             size= {size}
         />;
-    return onPress ?  <Tooltip title={title} toolip={toolip} Component = {Pressable} testID={testID+"_Container"} {...containerProps} onPress={onPress}>{c}</Tooltip> : c;
+    return onPress && handleOnPress ?  <Tooltip title={title} toolip={toolip} Component = {Pressable} testID={testID+"_Container"} {...containerProps} onPress={onPress}>{c}</Tooltip> : c;
 });
 
 AvatarComponent.displayName = "AvatarComponent";

package/src/screens/Help/deviceProps.js

@@ -1,14 +1,19 @@
-export default  {
+import appConfig from "$capp/config";
+import {defaultObj, extendObj} from "$utils";
+/*** par défaut, il est possible de spécifier les devices props personnalisés pour l'application.
+ * Il suffit de les définir dans la props deviceProps du fichier de configuration de l'application
+ */
+const defaultProps = defaultObj(appConfig.get("deviceProps"));
+export default  extendObj({
     computerName : "Nom de l'ordinateur",
     operatingSystem : "Système d'exploitation",
     osVersion : "Version",
     model : "Model", //le model du device
     platform : "Plateforme", 
     computerUserName : "Utilisateur connecté au système",
-    uuid : "Unique id",
     deviceId : "ID du poste de travail",
     id : "Id application", //le bundle id de l'application
     name : "Nom de l'application", //display name of the app
     version : "Version de l'application",
-    storageUsage : "Stockage",
-};
+    uuid : "Unique id du poste de travail",
+},defaultProps);