@fto-consult/expo-ui 2.7.0 → 2.7.3

package/expo-ui-path.js

@@ -6,6 +6,8 @@ const fs = require("fs");
 const path = require("path");
 ///retourne le chemin vers le package @expo-ui
 module.exports = function (...args){
+    const argv = require('args-parser')(process.argv);
+    console.log(argv," is argvvvvvvvv");    
     const suffix = path.join(...args);
     const p = require("./lookup-expo-ui-path")();
     const sep = path.sep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.7.0",
+  "version": "2.7.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "resolutions": {
@@ -75,12 +75,14 @@
     "@react-navigation/native": "^6.0.13",
     "@react-navigation/native-stack": "^6.9.1",
     "@shopify/flash-list": "1.3.1",
+    "args-parser": "^1.3.0",
     "babel-plugin-inline-dotenv": "^1.7.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-inline-environment-variables": "^0.4.4",
     "expo": "^47.0.8",
     "expo-camera": "~13.1.0",
     "expo-clipboard": "~4.0.1",
+    "expo-font": "~11.0.1",
     "expo-image-picker": "~14.0.2",
     "expo-linking": "~3.2.3",
     "expo-sqlite": "~11.0.0",
@@ -108,7 +110,6 @@
     "react-native-web": "~0.18.7",
     "react-native-webview": "11.23.1",
     "sharp-cli": "^2.1.0",
-    "tippy.js": "^6.3.7",
-    "expo-font": "~11.0.1"
+    "tippy.js": "^6.3.7"
   }
 }

package/src/components/Icon/Font.js

@@ -10,20 +10,58 @@ import * as FontAsset from 'expo-font';
 
 /*** @see :  https://materialdesignicons.com/ pour les icon MaterialComunityIcons*/
 import MaterialCommunityIcons from "@expo/vector-icons/MaterialCommunityIcons";
+import FontAwesome5 from "@expo/vector-icons/FontAwesome5";
+import AntDesign from "@expo/vector-icons/AntDesign";
+import Fontisto from "@expo/vector-icons/Fontisto";
+import Foundation from "@expo/vector-icons/Foundation";
+import Ionicons from "@expo/vector-icons/Ionicons";
+import MaterialIcons from "@expo/vector-icons/MaterialIcons";
+import Octicons from "@expo/vector-icons/Octicons";
+import SimpleLineIcons from "@expo/vector-icons/SimpleLineIcons";
+import Zocial from "@expo/vector-icons/Zocial";
+
 /*** @see : https://icons.expo.fyi/ popur tous les icons supportés*/
+/*** L'iconSet par défaut est le MaterialCommunityIcon qui ne nécessite pas de préfixer les noms des icones
+ *  Les prefix suivant doivent être utilisés : 
+ *      fa - pour l'iconSet FontAweSome5
+ *      ant - pour l'iconSet AntDesign
+ *      fontisto - pour l'iconSet Fontisto
+ *      foundation - pour l'iconSet Foundation
+ *      ionic - pour l'iconSet IonicIcons
+ *      octicons - pour l'iconSet Octicons
+ *      simple-line - pour l'iconSet SimpleLinesIcons
+ *      zocial - pour l'iconSet Zocial
+ */
 const FontIcon = React.forwardRef(({icon,name,testID,color,iconStyle,backgroundColor,style,...props},ref)=>{
     icon = defaultStr(icon,name).trim();
     testID = defaultStr(testID,"RN_FontIconComponent");
     const fStyle = StyleSheet.flatten(style) || {};
     color = theme.Colors.isValid(color)? color : fStyle.color || theme.colors.text;
     backgroundColor = theme.Colors.isValid(backgroundColor)? backgroundColor : fStyle.backgroundColor || 'transparent';
-    const isMaterial = isIcon(name,"material") || true;
-    const isExpo = isIcon(name,"expo");
-    let Icon = isExpo ? null : MaterialCommunityIcons;
+    const isMaterial = isIcon(name,"material");
+    const isFa = isIcon(name,"fa");
+    const isAnt = isIcon(name,"ant");
+    const isFontisto = isIcon(name,"fontisto");
+    const isFoundation = isIcon(name,"foundation");
+    const isIonicons = isIcon(name,"ionic");
+    const isOcticons = isIcon(name,"octicons");
+    const isSimpleLineIcons = isIcon(name,"simple-line");
+    const isZocial = isIcon(name,"zocial");
+    let Icon = isMaterial ? MaterialIcons : 
+            isFa ? FontAwesome5 :  
+            isFontisto ? Fontisto : 
+            isAnt ? AntDesign : 
+            isFoundation ? Foundation : 
+            isIonicons ? Ionicons : 
+            isOcticons ? Octicons: 
+            isSimpleLineIcons ? SimpleLineIcons :
+            isZocial ? Zocial : 
+            MaterialCommunityIcons;
     if(!icon || !Icon){
         console.warn("Icone non définie pour le composant FontIcon, icon [{0}], merci de spécifier une icone supportée par la liste du module https://github.com/expo/vector-icons/MaterialCommunityIcons".sprintf(icon),props);
         return null;
     }
+    const iconName = icon.ltrim("")
     return <Icon {...props} 
         ref = {ref}
         testID = {testID}
@@ -55,22 +93,45 @@ FontIcon.displayName = "FontIconComponent";
 export const isIcon = (name,iconSet)=>{
     if(!isNonNullString(name) || !isNonNullString(iconSet)) return false;
     name = name.toLowerCase();
-    iconSet = iconSet.toLowerCase().rtrim().rtrim("-");
-    return name.contains(iconSet+"-") || name.contains(iconSet+"s"+"-") ? true : false;
+    iconSet = iconSet.toLowerCase().trim();
+    return name.startsWith(iconSet+"-") || name.startsWith(iconSet+"s"+"-") ? true : false;
 }
 
 export default theme.withStyles(FontIcon,{displayName:FontIcon.displayName,mode:'normal'});
 export const fonts = [
     MaterialCommunityIcons.font,
+    FontAwesome5.font,
+    AntDesign.font,
+    Fontisto.font,
+    Foundation.font,
+    Ionicons.font,
+    MaterialIcons.font,
+    Octicons.font,
+    SimpleLineIcons.font,
+    Zocial.font,
 ];
+export const fontsNames = {};
+Object.map(fonts,(f,k)=>{
+    if(isObj(f)){
+        for(let i in f){
+            fontsNames[i] = true;
+        }
+    }
+});
 
-export const fontsNames = {
-    MaterialCommunityIcons:true,
-}
-
-export function loadFonts() {
+/*** chage les fonts liés à l'application
+ * @param {function} filter, le filtre prenant en paramètr ele fontAsset en suite et le nom de la font en question
+ * @return {Promise}
+ */
+export function loadFonts(filter) {
+    filter = typeof filter =='function'? filter : (f,name,nameLower)=> name.toLowerCase().contains("material") ? true : false;
     return Promise.all(fonts.map(font =>  {
         if(!isObj(font)) return Promise.reject({message:'Invalid font'});
+        const fontName = Object.keys(font)[0]?.toLowerCase();
+        if(!isNonNullString(fontName) || !fontsNames[fontName] || !filter(font,fontName,fontName.toLowerCase)) return Promise.resolve({
+            status : false,
+            message : 'Font {0} introuvable'.sprintf(fontName)
+        });
         return FontAsset.loadAsync(font);
     }))
  };

package/src/index.js

@@ -19,6 +19,7 @@ import init from "$capp/init";
 import { setIsInitialized} from "$capp/utils";
 import {isObj,isNonNullString} from "$cutils";
 import {loadFonts} from "$ecomponents/Icon/Font";
+import appConfig from "$capp/config";
 
 let MAX_BACK_COUNT = 1;
 let countBack = 0;
@@ -42,7 +43,8 @@ function App(props) {
   React.useEffect(() => {
     const loadResources = ()=>{
        return new Promise((resolve)=>{
-          loadFonts().catch((e)=>{
+          //FontsIconsFilter porte le nom de la props de appConfig dans lequel définir les filtres à utiliser pour charger l'iconSet désirée pour l'appication
+          loadFonts(appConfig.get("FontsIconsFilter")).catch((e)=>{
             console.warn(e," ierror loading app resources fonts");
           }).finally(()=>{
             resolve(true);