@fto-consult/expo-ui 8.76.5 → 8.76.7

package/bin/create-app/dependencies.js

@@ -1,38 +1,38 @@
-
-    module.exports = {
-	"@emotion/native": "^11.11.0",
-	"@expo/html-elements": "^0.5.1",
-	"@expo/vector-icons": "^14.0.0",
-	"@pchmn/expo-material3-theme": "^1.3.2",
-	"@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.17",
-	"@react-navigation/native-stack": "^6.9.26",
-	"@react-navigation/stack": "^6.3.29",
-	"@shopify/flash-list": "1.6.3",
-	"expo": "^50.0.17",
-	"expo-camera": "~14.1.3",
-	"expo-clipboard": "~5.0.1",
-	"expo-font": "~11.10.3",
-	"expo-image-picker": "~14.7.1",
-	"expo-linking": "~6.2.2",
-	"expo-sharing": "~11.10.0",
-	"expo-sqlite": "~13.4.0",
-	"expo-status-bar": "~1.11.1",
-	"expo-system-ui": "~2.9.4",
-	"expo-web-browser": "~12.8.2",
-	"react": "18.2.0",
-	"react-native": "0.73.6",
-	"react-native-safe-area-context": "4.8.2",
-	"react-native-screens": "~3.29.0",
-	"react-native-svg": "14.1.0",
-	"react-native-webview": "13.6.4",
-	"react-native-gesture-handler": "~2.14.0",
-	"react-native-reanimated": "~3.6.2",
-	"react-native-view-shot": "3.8.0",
-	"expo-intent-launcher": "~10.11.0",
-	"expo-image-manipulator": "~11.8.0",
-	"expo-document-picker": "~11.10.1"
-};
+
+    module.exports = {
+	"@emotion/native": "^11.11.0",
+	"@expo/html-elements": "^0.5.1",
+	"@expo/vector-icons": "^14.0.0",
+	"@pchmn/expo-material3-theme": "^1.3.2",
+	"@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.17",
+	"@react-navigation/native-stack": "^6.9.26",
+	"@react-navigation/stack": "^6.3.29",
+	"@shopify/flash-list": "1.6.3",
+	"expo": "^50.0.17",
+	"expo-camera": "~14.1.3",
+	"expo-clipboard": "~5.0.1",
+	"expo-font": "~11.10.3",
+	"expo-image-picker": "~14.7.1",
+	"expo-linking": "~6.2.2",
+	"expo-sharing": "~11.10.0",
+	"expo-sqlite": "~13.4.0",
+	"expo-status-bar": "~1.11.1",
+	"expo-system-ui": "~2.9.4",
+	"expo-web-browser": "~12.8.2",
+	"react": "18.2.0",
+	"react-native": "0.73.6",
+	"react-native-safe-area-context": "4.8.2",
+	"react-native-screens": "~3.29.0",
+	"react-native-svg": "14.1.0",
+	"react-native-webview": "13.6.4",
+	"react-native-gesture-handler": "~2.14.0",
+	"react-native-reanimated": "~3.6.2",
+	"react-native-view-shot": "3.8.0",
+	"expo-intent-launcher": "~10.11.0",
+	"expo-image-manipulator": "~11.8.0",
+	"expo-document-picker": "~11.10.1"
+};
                             

package/bin/create-app/eas.json

@@ -1,18 +1,18 @@
-{
-  "build": {
-    "development": {
-      "developmentClient": true,
-      "distribution": "internal"
-    },
-    "preview": {
-      "distribution": "internal",
-      "android": {
-        "buildType": "apk"
-      }
-    },
-    "production": {}
-  },
-  "submit": {
-    "production": {}
-  }
-}
+{
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal",
+      "android": {
+        "buildType": "apk"
+      }
+    },
+    "production": {}
+  },
+  "submit": {
+    "production": {}
+  }
+}

package/expo-ui.json

@@ -1,11 +1,11 @@
-{
-	"name": "@fto-consult/expo-ui",
-	"version": "6.44.4",
-	"description": "Bibliothèque de composants UI Expo,react-native",
-	"bin": {
-		"expo-ui": "./bin/index.js"
-	},
-	"author": "Boris Fouomene",
-	"license": "ISC",
-	"homepage": "https://github.com/borispipo/expo-ui#readme"
+{
+	"name": "@fto-consult/expo-ui",
+	"version": "6.44.4",
+	"description": "Bibliothèque de composants UI Expo,react-native",
+	"bin": {
+		"expo-ui": "./bin/index.js"
+	},
+	"author": "Boris Fouomene",
+	"license": "ISC",
+	"homepage": "https://github.com/borispipo/expo-ui#readme"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.76.5",
+  "version": "8.76.7",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {
@@ -70,7 +70,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.47.0",
+    "@fto-consult/common": "^4.48.3",
     "@fto-consult/expo-ui": "^8.73.1",
     "apexcharts": "^3.49.0",
     "file-saver": "^2.0.5",

package/src/components/Button/Status.js

@@ -5,12 +5,14 @@ import {defaultObj} from "$cutils";
 import Icon from "$ecomponents/Icon";
 import {Pressable,StyleSheet} from "react-native";
 import PropTypes from "prop-types";
+import View from "$ecomponents/View";
 
-const ButtonStatusComponent = React.forwardRef(({status,withIcon,color,backgroundColor,label,text,icon,editIconProps,editIcon,iconProps,onPress,editable,testID,left,right,labelProps,...containerProps},ref)=>{
+const ButtonStatusComponent = React.forwardRef(({withIcon,color,backgroundColor,label,text,icon,editIconProps,editIcon,iconProps,onPress,editable,testID,left,right,labelProps,containerProps,...rest},ref)=>{
     labelProps = defaultObj(labelProps);
     iconProps = defaultObj(iconProps);
-    testID = defaultStr(testID,"RN_ButtonStatusComponent_"+status);
-    const style = defaultObj(StyleSheet.flatten(containerProps.style));
+    containerProps = defaultObj(containerProps);
+    testID = defaultStr(testID,"RN_ButtonStatusComponent_");
+    const style = defaultObj(StyleSheet.flatten(rest.style));
     color = theme.Colors.isValid(color) ? color : theme.Colors.isValid(style.color)? style.color : undefined;
     backgroundColor = theme.Colors.isValid(backgroundColor) ? backgroundColor : theme.Colors.isValid(style.backgroundColor)?style.backgroundColor : undefined;
     const rP = {style:[color && {color}, backgroundColor && {backgroundColor}]};
@@ -27,14 +29,17 @@ const ButtonStatusComponent = React.forwardRef(({status,withIcon,color,backgroun
     label = React.isValidElement(label,true) && label || React.isValid(text,true) && text || null;
     left = typeof left =='function'? left(rP) : left;
     right = typeof right =='function'? right(rP) : right;
+    icon = typeof icon =="function"? icon(rP) : icon;
     const icProps = {color,size:15,...iconProps,style:[theme.styles.noMargin,theme.styles.noPadding,iconProps.style],onPress}
-    return <Pressable ref={ref} onPres={onPress} testID={`${testID}_Container`} {...containerProps} style={[styles.button,theme.styles.row,theme.styles.flexWrap,backgroundColor && {backgroundColor},style]}>
-        {React.isValidElement(left)? left : null}
-        {withIcon !== false && React.isValidElement(icon,true) ? <Icon {...icProps} icon={icon} />:null}
-        {label ? <Label testID={`${testID}_Label`} {...labelProps} style={[color && {color},{fontSize:13},labelProps.style]}>{label}</Label> : null}
-        {withIcon !== false && editable && React.isValidElement(editIcon,true) ? <Icon {...icProps} icon={editIcon} {...defaultObj(editIconProps)}/>:null}
-        {React.isValidElement(right)? right : null}
-    </Pressable>
+    return <View {...containerProps} testID={testID+"_Container"} style={[styles.container,containerProps.style]}>
+        <Pressable ref={ref} onPres={onPress} testID={`${testID}`} {...rest} style={[styles.button,theme.styles.row,theme.styles.flexWrap,backgroundColor && {backgroundColor},style]}>
+            {React.isValidElement(left)? left : null}
+            {withIcon !== false && React.isValidElement(icon,true) ? <Icon testID={testID+"_Icon"} {...icProps} icon={icon} />:null}
+            {label ? <Label testID={`${testID}_Label`} {...labelProps} style={[color && {color},{fontSize:13},labelProps.style]}>{label}</Label> : null}
+            {withIcon !== false && editable && React.isValidElement(editIcon,true) ? <Icon {...icProps} icon={editIcon} {...defaultObj(editIconProps)}/>:null}
+            {React.isValidElement(right)? right : null}
+        </Pressable>
+    </View>
 });
 
 ButtonStatusComponent.displayName = "ButtonStatusComponent";
@@ -52,6 +57,9 @@ const styles = StyleSheet.create({
         paddingVertical:4,
         paddingHorizontal:10,
         alignSelf: 'flex-start',
+    },
+    container : {
+        alignSelf : "flex-start",
     }
 });
 
@@ -70,9 +78,16 @@ ButtonStatusComponent.propTypes = {
     withIcon : PropTypes.bool, //si les icones seront affichés 
     color : PropTypes.string, //la couleur du status
     backgroundColor : PropTypes.string, //la couleur d'arrière plan
-    iconProps : PropTypes.object, //les props à passer aux différents icones du composant
     onPres : PropTypes.func, //la fonction appelée lorsqu'on clique sur le status
     editable : PropTypes.bool, //si le status est modifiable, dans ce cas une icone est affiché à droite lorsque le status est editable
+    /**** l'icone du composant Status par défaut */
+    icon : PropTypes.oneOfType([
+        PropTypes.node,
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func,
+    ]),
+    iconProps : PropTypes.object, //les props à passer aux différents icones du composant
     left : PropTypes.oneOfType([ //l'élément react à rendre à gauche du texte (label)
         PropTypes.func,
         PropTypes.node,
@@ -86,4 +101,5 @@ ButtonStatusComponent.propTypes = {
         PropTypes.element,
     ]),
     editIconProps : PropTypes.object,//les props de l'iconne edit
+    containerProps : PropTypes.shape(Object.assign({},View.propTypes)), //les props du composant container, idem à ceux du composant $ecomponents/View
 }