@fto-consult/expo-ui 1.1.4 → 1.1.6

package/babel.config.alias.js

@@ -71,13 +71,5 @@ module.exports = (opts)=>{
     if(typeof opts.mutator =='function'){
         opts.mutator(r);
     }
-    const aliases = [];
-    for(let i in r){
-        aliases.push({
-            root: r[i],
-            rootPathPrefix: i,
-            rootPathSuffix: '',
-        })
-    }
-    return aliases;
+    return r;
 }

package/babel.config.js

@@ -1,13 +1,22 @@
+require("./expo-ui-path");
 module.exports = function(api,opts) {
     opts = typeof opts =='object' && opts ? opts : {};
     ///les chemin vers la variable d'environnement, le chemin du fichier .env,@see : https://github.com/brysgo/babel-plugin-inline-dotenv
-    const environmentPath = opts.environmentPath || opts.envPath;
+    let environmentPath = opts.environmentPath || opts.envPath;
     const path = require("path");
     const fs = require("fs");
     const dir = path.resolve(__dirname);
     api.cache(true);
     const inlineDovOptions = {};
-    if(environmentPath && typeof environmentPath =='string' && fs.existsSync(environmentPath)){
+    const options = {base:dir,...opts,platform:"expo"};
+    /*** par défaut, les variables d'environnements sont stockés dans le fichier .env situé à la racine du projet, référencée par la prop base  */
+    if(!environmentPath || typeof environmentPath !== 'string'){
+      const baseStr = typeof options.base =='string' && fs.existsSync(options.base)? options.base : typeof options.dir =='string' && fs.existsSync(options.dir)? options.dir : dir;
+      environmentPath = path.resolve(baseStr,".env");
+    } else {
+      environmentPath = "";
+    }
+    if(environmentPath && fs.existsSync(environmentPath)){
       // File ".env" will be created or overwritten by default.
       try {
         fs.copyFileSync(environmentPath, path.resolve(dir,'.env'));
@@ -16,7 +25,7 @@ module.exports = function(api,opts) {
         inlineDovOptions.path = environmentPath;
       }
     }
-    const alias =  require("./babel.config.alias")({base:dir,...opts,platform:"expo"});
+    const alias =  require("./babel.config.alias")(options);
     return {
       presets: [
         ['babel-preset-expo'],
@@ -24,7 +33,7 @@ module.exports = function(api,opts) {
       ],
       plugins : [
         ["inline-dotenv",inlineDovOptions],
-        ['babel-plugin-root-import', {"paths": alias}],
+        ["module-resolver", {"alias": alias}],
         ['react-native-reanimated/plugin'],
         ['transform-inline-environment-variables'],
       ],

package/expo-ui-path.js

@@ -0,0 +1,31 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+const fs = require("fs");
+const path = require("path");
+const dir = path.resolve(__dirname)
+let devExpoUIPath = path.resolve(dir);
+const parentPackage = require("./parent-package");
+if(parentPackage){
+    console.log(parentPackage," is parent packag path heinn")
+}
+///retourne le chemin vers le package @expo-ui
+module.exports = (()=>{
+    const isDev = fs.existsSync(devExpoUIPath) && fs.existsSync(path.resolve(devExpoUIPath,"babel.config.alias.js"))
+    && fs.existsSync(path.resolve(devExpoUIPath,"src"));
+    const isDevFile = path.resolve(dir,"expo-ui-production-path.js");
+    const expoUIPath = isDev ? "./expo-ui" : "@fto-consult/expo-ui"
+    try {
+        var writeStream = fs.createWriteStream(isDevFile);
+        writeStream.write("module.exports=\""+expoUIPath+"\";");
+        writeStream.end();
+    } catch{
+        if(fs.existsSync(isDevFile)){
+            try {
+                fs.rmSync(isDevFile);
+            } catch{}
+        }
+    }
+    return expoUIPath;
+})();

package/expo.metro.config.js

@@ -1,26 +1,49 @@
 const { getDefaultConfig } = require('@expo/metro-config');
 const path = require("path");
+const isCaseSensitive = require("./is-os-case-sensitive");
 module.exports = (opts)=>{
   opts = opts && typeof opts =='object'? opts : {};
-  let {dir,nodeModulesPaths} = opts;
+  let {dir,nodeModulesPaths,assetExts,sourceExts} = opts;
   nodeModulesPaths = Array.isArray(nodeModulesPaths)? nodeModulesPaths : [];
+  assetExts = Array.isArray(assetExts)? assetExts: [];
+  sourceExts= Array.isArray(sourceExts)?sourceExts : [];
   dir = dir || path.resolve(__dirname);
   const projectRoot = path.resolve(dir);
-  const workspaceRoot = path.resolve(projectRoot, '../..');
+  const localDir = path.resolve(__dirname);
   const config = getDefaultConfig(projectRoot);
-  config.watchFolders = [workspaceRoot];
-  // 2. Let Metro know where to resolve packages and in what order
-  config.resolver.nodeModulesPaths = [
-      path.resolve(projectRoot, 'node_modules'),
-      path.resolve(workspaceRoot, 'node_modules'),
-	    path.resolve(__dirname,"node_modules"),
-      ...nodeModulesPaths,
-    ];
-  config.resolver.assetExts.push('db');
+  config.watchFolders = [projectRoot];
+  if(projectRoot !== localDir){
+    config.watchFolders.push(localDir);
+  }
+  config.resolver.assetExts = [
+     ...config.resolver.assetExts,
+     ...assetExts,
+     "db",
+     "txt"
+  ];
   config.resolver.sourceExts = [
       ...config.resolver.sourceExts,
-      'jsx', 'js','tsx'
+      ...sourceExts,"txt",
+      'jsx', 'js','tsx',
   ]
+  const allNodePaths = [
+    path.resolve(projectRoot, 'node_modules'),
+    path.resolve(localDir, 'node_modules'),
+    ...nodeModulesPaths,
+  ];
+  const existingNodesPath= {},nPaths = [];
+  allNodePaths.map(p=>{
+    if(!p || typeof p !='string') return;
+    if(isCaseSensitive){
+      p = p.toLocaleLowerCase();
+    }
+    if(!existingNodesPath[p]){
+      existingNodesPath[p] = true;
+      nPaths.push(p);
+    }
+  });
+  
+  config.resolver.nodeModulesPaths = nPaths;
   // 3. Force Metro to resolve (sub)dependencies only from the `nodeModulesPaths`
   config.resolver.disableHierarchicalLookup = true;
   return config;

package/index.js

@@ -10,7 +10,7 @@ const defaultObj = x=> isObj(x)? x : {};
  *      config {object}, le fichier de configuration de l'application
  * }
  */
-export default function ExpoUIApp (options){
+export default function registerExpoUIApp (options){
     options = defaultObj(options);
     const config = defaultObj(options.config);
     appConfig.current = config;

package/is-os-case-sensitive.js

@@ -0,0 +1,27 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+const path = require("path");
+const dir = path.resolve(__dirname);
+const fs = require("fs");
+
+/*** check weather os is case sensitive 
+ * @see : https://stackoverflow.com/questions/27367261/check-if-file-exists-case-sensitive/52908385#52908385
+*/
+function fileExistsWithCaseSync(filepath) {
+    var dir = path.dirname(filepath);
+    if (dir === '/' || dir === '.') return true;
+    var filenames = fs.readdirSync(dir);
+    if (filenames.indexOf(path.basename(filepath)) === -1) {
+        return false;
+    }
+    return fileExistsWithCaseSync(dir);
+}
+
+/***vérifie si le système supporte la cassse où non 
+ * c'est à dire si 2 noms de fichiers ayant la case différentes sont considérés comme le même où pas
+*/
+module.exports = (()=>{
+    return fileExistsWithCaseSync(path.resolve(dir,"metro.config.js")) == fileExistsWithCaseSync(path.resolve(dir,"Metro.config.js"))
+})();

package/metro.config.js

@@ -1 +1,4 @@
-module.exports = require("./expo.metro.config")();
+const path = require("path");
+module.exports = require("./expo.metro.config")({
+    dir : path.resolve(__dirname)
+});

package/package.json

@@ -1,98 +1,102 @@
-{
-  "name": "@fto-consult/expo-ui",
-  "version": "1.1.4",
-  "description": "Bibliothèque de composants UI Expo,react-native",
-  "main": "index.js",
-  "scripts": {
-    "publish": "npm publish --access=public",
-    "unpublish": "npm -f unpublish @fto-consult/expo-ui",
-    "build-web": "",
-    "dev": "npx expo start -c --no-minify",
-    "start": "npx expo start --dev --no-minify",
-    "start-d": "npx expo start -c --no-dev --no-minify",
-    "start-p": "npm run start-d",
-    "expo-start-client": "npx expo start --dev --no-minify --dev-client",
-    "start-m": "npx expo start - c--dev--no -minify",
-    "android": "npx expo start --android -c",
-    "ios": "npx expo start --ios",
-    "web": "npx expo start --web",
-    "web-c": "npx expo start --web -c",
-    "eject": "expo eject",
-    "emulator": "npm run android-emulator",
-    "web-server": "npx serve web-build",
-    "build-android": "eas build --clear-cache -p android --profile preview",
-    "build-android-local": "eas build --platform android --local",
-    "build-android-dist": "eas build --clear-cache -p android",
-    "build-ios": "eas build --clear-cache -p ios --profile preview",
-    "build-ios-dist": "eas build --clear-cache -p ios",
-    "install-apk": "adb -s emulator-5554 install myapp.apk",
-    "android-emulator": "emulator -avd EMULATOR",
-    "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
-    "build-electron": "electron-webpack && electron-builder --dir -c.compression=store",
-    "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
-    "compile-electron": "webpack --config ./electron/webpack.config.js",
-    "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
-    "electron": "electron ./electron",
-    "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",
-    "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
-    "electron-c": "npm run compile-electron && npm run electron",
-    "electron-p": "npm run compile-electron-p && npm run electron",
-    "update-app-version": "node ./update-app-version.js",
-    "find-licenses": "node ./find-licenses.js",
-    "fix-dependencies": "expo doctor --fix-dependencies"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/borispipo/expo-ui.git"
-  },
-  "keywords": [
-    "Expo",
-    "React-Native"
-  ],
-  "author": "Boris Fouomene",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/borispipo/expo-ui/issues"
-  },
-  "homepage": "https://github.com/borispipo/expo-ui#readme",
-  "dependencies": {
-    "@babel/preset-react": "^7.18.6",
-    "@emotion/native": "^11.10.0",
-    "@expo/metro-config": "^0.4.0",
-    "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.1.24",
-    "@gorhom/portal": "^1.0.14",
-    "@react-native-async-storage/async-storage": "~1.17.3",
-    "@react-native-community/netinfo": "9.3.0",
-    "@react-navigation/native": "^6.0.13",
-    "@react-navigation/native-stack": "^6.9.1",
-    "@shopify/flash-list": "1.1.0",
-    "babel-plugin-inline-dotenv": "^1.7.0",
-    "babel-plugin-root-import": "^6.6.0",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
-    "expo": "^46.0.15",
-    "expo-camera": "~12.3.0",
-    "expo-linking": "~3.2.2",
-    "expo-sqlite": "~10.3.0",
-    "expo-status-bar": "~1.4.0",
-    "expo-system-ui": "~1.3.0",
-    "expo-web-browser": "~11.0.0",
-    "google-libphonenumber": "^3.2.31",
-    "parent-package-json": "^2.0.1",
-    "prop-types": "^15.8.1",
-    "react-apexcharts": "^1.4.0",
-    "react-content-loader": "^6.2.0",
-    "react-dom": "18.0.0",
-    "react-native": "0.69.6",
-    "react-native-big-list": "^1.5.5",
-    "react-native-gesture-handler": "~2.5.0",
-    "react-native-paper": "^4.12.5",
-    "react-native-paper-dates": "^0.9.2",
-    "react-native-reanimated": "~2.9.1",
-    "react-native-safe-area-context": "4.3.1",
-    "react-native-svg": "12.3.0",
-    "react-native-web": "~0.18.7",
-    "sharp-cli": "^2.1.0",
-    "tippy.js": "^6.3.7"
-  }
-}
+{
+  "name": "@fto-consult/expo-ui",
+  "version": "1.1.6",
+  "description": "Bibliothèque de composants UI Expo,react-native",
+  "main": "index.js",
+  "scripts": {
+    "publish": "npm publish --access=public",
+    "unpublish": "npm -f unpublish @fto-consult/expo-ui",
+    "build-web": "",
+    "dev": "npx expo start -c --no-minify",
+    "start": "npx expo start --dev --no-minify",
+    "start-d": "npx expo start -c --no-dev --no-minify",
+    "start-p": "npm run start-d",
+    "expo-start-client": "npx expo start --dev --no-minify --dev-client",
+    "start-m": "npx expo start - c--dev--no -minify",
+    "android": "npx expo start --android -c",
+    "ios": "npx expo start --ios",
+    "web": "npx expo start --web",
+    "web-c": "npx expo start --web -c",
+    "eject": "expo eject",
+    "emulator": "npm run android-emulator",
+    "web-server": "npx serve web-build",
+    "build-android": "eas build --clear-cache -p android --profile preview",
+    "build-android-local": "eas build --platform android --local",
+    "build-android-dist": "eas build --clear-cache -p android",
+    "build-ios": "eas build --clear-cache -p ios --profile preview",
+    "build-ios-dist": "eas build --clear-cache -p ios",
+    "install-apk": "adb -s emulator-5554 install myapp.apk",
+    "android-emulator": "emulator -avd EMULATOR",
+    "flipper": "npx cross-env METRO_SERVER_PORT=19000 E:\\Studies\\react-native\\debugger\\Flipper-win\\Flipper.exe",
+    "build-electron": "electron-webpack && electron-builder --dir -c.compression=store",
+    "test:build": "electron-webpack && electron-builder --dir -c.compression=store -c.mac.identity=null",
+    "compile-electron": "webpack --config ./electron/webpack.config.js",
+    "compile-electron-p": "webpack --config ./electron/webpack.config.js --mode=production",
+    "electron": "electron ./electron",
+    "logcat": "adb -d logcat com.ftc.apps.salite1:E > errors.txt",
+    "logcat-export": "adb -d logcat com.ftc.apps.salite1 *:S > logcat.txt",
+    "electron-c": "npm run compile-electron && npm run electron",
+    "electron-p": "npm run compile-electron-p && npm run electron",
+    "update-app-version": "node ./update-app-version.js",
+    "find-licenses": "node ./find-licenses.js",
+    "fix-dependencies": "expo doctor --fix-dependencies"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/borispipo/expo-ui.git"
+  },
+  "keywords": [
+    "Expo",
+    "React-Native"
+  ],
+  "author": "Boris Fouomene",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/borispipo/expo-ui/issues"
+  },
+  "homepage": "https://github.com/borispipo/expo-ui#readme",
+  "dependencies": {
+    "@babel/preset-react": "^7.18.6",
+    "@emotion/native": "^11.10.0",
+    "@expo/html-elements": "^0.2.0",
+    "@expo/metro-config": "^0.4.0",
+    "@expo/webpack-config": "^0.17.2",
+    "@fto-consult/common": "^1.1.28",
+    "@gorhom/portal": "^1.0.14",
+    "@react-native-async-storage/async-storage": "~1.17.3",
+    "@react-native-community/datetimepicker": "6.2.0",
+    "@react-native-community/netinfo": "9.3.0",
+    "@react-navigation/native": "^6.0.13",
+    "@react-navigation/native-stack": "^6.9.1",
+    "@shopify/flash-list": "1.1.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": "^46.0.15",
+    "expo-camera": "~12.3.0",
+    "expo-linking": "~3.2.2",
+    "expo-sqlite": "~10.3.0",
+    "expo-status-bar": "~1.4.0",
+    "expo-system-ui": "~1.3.0",
+    "expo-web-browser": "~11.0.0",
+    "google-libphonenumber": "^3.2.31",
+    "htmlparser2-without-node-native": "^3.9.2",
+    "parent-package-json": "^2.0.1",
+    "prop-types": "^15.8.1",
+    "react-apexcharts": "^1.4.0",
+    "react-content-loader": "^6.2.0",
+    "react-dom": "18.0.0",
+    "react-native": "0.69.6",
+    "react-native-big-list": "^1.5.5",
+    "react-native-gesture-handler": "~2.5.0",
+    "react-native-paper": "^4.12.5",
+    "react-native-paper-dates": "^0.9.2",
+    "react-native-reanimated": "~2.9.1",
+    "react-native-safe-area-context": "4.3.1",
+    "react-native-svg": "12.3.0",
+    "react-native-web": "~0.18.7",
+    "react-native-webview": "11.23.0",
+    "sharp-cli": "^2.1.0",
+    "tippy.js": "^6.3.7"
+  }
+}

package/src/components/Br/index.js

@@ -1,4 +1,3 @@
-import {Text} from "react-native"
-export default function BrComponent(props){
-    return <Text>{"\n"}{props.children|| null}</Text>
-}
+import {BR } from '@expo/html-elements';
+
+export default BR;

package/src/components/Chart/index.native.js

@@ -1,15 +1,12 @@
 import FileSystem from "$file-system";
-import appexChartCode from "./appexchart.3.5.js.text";
+import appexChartCode from "./appexchart.3.5.html";
 import React from "$react";
 import WebView from "$ecomponents/WebView";
-import HTMLView from '$ecomponents/Html/View';
 import {defaultStr,uniqid} from "$utils";
 import View from "$ecomponents/View";
 
 let appexchartJSString = null;
 
-
-
 export const ChartComponent = React.forwardRef(({options,containerId,...props},ref)=>{
     const containerIdRef = React.useRef(defaultStr(containerId,uniqid("chart-container-id")))
     const appexChartJS = appexchartJSString? (appexchartJSString+"\n"):"";

package/src/components/Html/View.js

@@ -1,7 +1,7 @@
 /***@see : https://github.com/jsdf/react-native-htmlview */
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import htmlToElement from './htmlToElement';
+import htmlToElement from './HtmlToElement';
 import {Linking, Platform, StyleSheet, View} from 'react-native';
 import {StyleProp} from "$theme";
 

package/src/components/Html/index.js

@@ -0,0 +1 @@
+export * from "./HtmlToElement";

package/src/components/HtmlElements/index.js

@@ -0,0 +1,9 @@
+// Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+/***@see : https://www.npmjs.com/package/@expo/html-elements */
+export * from "@expo/html-elements";
+
+import {BR} from "@expo/html-elements";
+
+export {BR as Br};

package/src/index.js

@@ -1,5 +1,6 @@
 import React from "$react"
-import { AppState,Linking,BackHandler,} from "react-native"
+import { AppState,BackHandler,} from "react-native";
+import * as Linking from 'expo-linking';
 import APP from "$capp";
 import {AppStateService,trackIDLE,stop as stopIDLE} from "$capp/idle";
 import { NavigationContainer} from '@react-navigation/native';
@@ -31,10 +32,10 @@ const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
 function App(props) {
   AppStateService.init();
   const [initialState, setInitialState] = React.useState(undefined);
-  const appReadyRef = React.useRef(false);
+  const appReadyRef = React.useRef(true);
   const [state,setState] = React.useState({
      isLoading : true,
-     isInitialized:false,
+     isInitialized:true,
   });
   React.useEffect(() => {
     const restoreState = () => {
@@ -99,17 +100,16 @@ function App(props) {
        APP.setOnlineState(state);
     });
     NetInfo.fetch().catch((e)=>{});
-    restoreState().then(()=>{
-      init().then(()=>{
-        if(Auth.isLoggedIn()){
-          Auth.loginUser(false);
-        }
-        setState({
-          ...state,isInitialized:true,isLoading : false,
-        });  
-      }).catch((e)=>{
-          setState({...state,isInitialized:true,isLoading : false});
-      });
+    init().then(()=>{
+      if(Auth.isLoggedIn()){
+        Auth.loginUser(false);
+      }
+      setState({
+        ...state,isInitialized:true,isLoading : false,
+      });  
+    }).catch((e)=>{
+        console.error(e," initializing app")
+        setState({...state,isInitialized:true,isLoading : false});
     });
 
     const Events = {}

package/src/navigation/Drawer/index.js

@@ -45,7 +45,7 @@ const DrawerNavigator = React.forwardRef(({content,children,state,...props},ref)
     React.useEffect(()=>{
         if(prevIsLoggedIn === isLoggedIn) return;
         navigate("Home");
-    },[isLoggedIn])
+    },[isLoggedIn]);
     if(!isLoggedIn) {
         return <Login withPortal
             onSuccess = {(data)=>{

package/src/components/Br/index.web.js

@@ -1,3 +0,0 @@
-export default function BrComponent(props){
-    return <><br/>{props.children|| null}</>
-}