@fto-consult/expo-ui 2.16.3 → 2.16.6

package/package.json

@@ -1,117 +1,117 @@
-{
-  "name": "@fto-consult/expo-ui",
-  "version": "2.16.3",
-  "description": "Bibliothèque de composants UI Expo,react-native",
-  "main": "index.js",
-  "scripts": {
-    "publish1": "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-cli doctor --fix-dependencies",
-    "delete-node-modules": "rimraf ./**/node_modules",
-    "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
-  },
-  "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": {
-    "@emotion/native": "^11.10.0",
-    "@expo/html-elements": "^0.2.0",
-    "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.21.3",
-    "@gorhom/portal": "^1.0.14",
-    "@react-native-async-storage/async-storage": "~1.17.3",
-    "@react-native-community/datetimepicker": "6.5.2",
-    "@react-native-community/netinfo": "9.3.5",
-    "@react-navigation/native": "^6.0.13",
-    "@react-navigation/native-stack": "^6.9.1",
-    "@shopify/flash-list": "1.3.1",
-    "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",
-    "expo-status-bar": "~1.4.2",
-    "expo-system-ui": "~2.0.1",
-    "expo-web-browser": "~12.0.0",
-    "file-saver": "^2.0.5",
-    "google-libphonenumber": "^3.2.31",
-    "htmlparser2-without-node-native": "^3.9.2",
-    "mime-types": "^2.1.35",
-    "mongo-parse": "^2.1.0",
-    "parent-package-json": "^2.0.1",
-    "prop-types": "^15.8.1",
-    "react": "18.1.0",
-    "react-apexcharts": "^1.4.0",
-    "react-content-loader": "^6.2.0",
-    "react-dom": "18.1.0",
-    "react-native": "0.70.5",
-    "react-native-big-list": "^1.6.0",
-    "react-native-gesture-handler": "~2.8.0",
-    "react-native-paper": "^4.12.5",
-    "react-native-paper-dates": "^0.9.2",
-    "react-native-reanimated": "~2.12.0",
-    "react-native-safe-area-context": "4.4.1",
-    "react-native-screens": "~3.18.0",
-    "react-native-svg": "13.4.0",
-    "react-native-web": "~0.18.7",
-    "react-native-webview": "11.23.1",
-    "sharp-cli": "^2.1.0",
-    "tippy.js": "^6.3.7",
-    "xlsx": "^0.18.5"
-  },
-  "devDependencies": {
-    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-    "@babel/preset-react": "^7.18.6",
-    "@expo/metro-config": "^0.5.1",
-    "@expo/webpack-config": "^0.17.3",
-    "babel-plugin-inline-dotenv": "^1.7.0",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4"
-  }
-}
+{
+  "name": "@fto-consult/expo-ui",
+  "version": "2.16.6",
+  "description": "Bibliothèque de composants UI Expo,react-native",
+  "main": "index.js",
+  "scripts": {
+    "publish1": "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-cli doctor --fix-dependencies",
+    "delete-node-modules": "rimraf ./**/node_modules",
+    "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
+  },
+  "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": {
+    "@emotion/native": "^11.10.0",
+    "@expo/html-elements": "^0.2.0",
+    "@expo/vector-icons": "^13.0.0",
+    "@fto-consult/common": "^1.22.12",
+    "@gorhom/portal": "^1.0.14",
+    "@react-native-async-storage/async-storage": "~1.17.3",
+    "@react-native-community/datetimepicker": "6.5.2",
+    "@react-native-community/netinfo": "9.3.5",
+    "@react-navigation/native": "^6.0.13",
+    "@react-navigation/native-stack": "^6.9.1",
+    "@shopify/flash-list": "1.3.1",
+    "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",
+    "expo-status-bar": "~1.4.2",
+    "expo-system-ui": "~2.0.1",
+    "expo-web-browser": "~12.0.0",
+    "file-saver": "^2.0.5",
+    "google-libphonenumber": "^3.2.31",
+    "htmlparser2-without-node-native": "^3.9.2",
+    "mime-types": "^2.1.35",
+    "mongo-parse": "^2.1.0",
+    "parent-package-json": "^2.0.1",
+    "prop-types": "^15.8.1",
+    "react": "18.1.0",
+    "react-apexcharts": "^1.4.0",
+    "react-content-loader": "^6.2.0",
+    "react-dom": "18.1.0",
+    "react-native": "0.70.5",
+    "react-native-big-list": "^1.6.0",
+    "react-native-gesture-handler": "~2.8.0",
+    "react-native-paper": "^4.12.5",
+    "react-native-paper-dates": "^0.9.2",
+    "react-native-reanimated": "~2.12.0",
+    "react-native-safe-area-context": "4.4.1",
+    "react-native-screens": "~3.18.0",
+    "react-native-svg": "13.4.0",
+    "react-native-web": "~0.18.7",
+    "react-native-webview": "11.23.1",
+    "sharp-cli": "^2.1.0",
+    "tippy.js": "^6.3.7",
+    "xlsx": "^0.18.5"
+  },
+  "devDependencies": {
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/preset-react": "^7.18.6",
+    "@expo/metro-config": "^0.5.1",
+    "@expo/webpack-config": "^0.17.3",
+    "babel-plugin-inline-dotenv": "^1.7.0",
+    "babel-plugin-module-resolver": "^4.1.0",
+    "babel-plugin-transform-inline-environment-variables": "^0.4.4"
+  }
+}

package/src/auth/ThemeSelector/index.js

@@ -14,7 +14,7 @@ import Dropdown from "$ecomponents/Dropdown";
 import {defaultObj} from "$utils";
 import Icon from "$ecomponents/Icon";
 import {open,close} from "$preloader";
-import {fields,getThemeData} from "./utils";
+import {fields,getThemeData} from "$theme/utils";
 
 const getStyle = (color)=>{
     if(!Colors.isValid(color)) return {};
@@ -51,6 +51,7 @@ export const getThemeFieldProps = (props,ref)=>{
         const title = data && data.name ? ("Modifier ["+data.name+"]") : ('Nouv theme['+user.code+"]");
         const isEditing = isDocEditing(data);
         fields.textFieldMode.defaultValue = theme.textFieldMode;
+        fields.profilAvatarPosition.defaultValue = theme.profilAvatarPosition;
         Provider.open({
             cancelButton : true,
             dialogProps : {
@@ -81,7 +82,8 @@ export const getThemeFieldProps = (props,ref)=>{
                     }
                     data.custom = true;
                     customThemes[data.name] = data;
-                    itemsRef.current = user.customThemes = customThemes;
+                    itemsRef.current = {...customThemes,...getColors()};
+                    user.customThemes = customThemes;
                     open((isEditing?"Modification ":"Enregistrement ")+"du thème...");
                     Auth.upsertUser(user,false).then(()=>{
                         if(Auth.getLoggedUserCode() == user.code){

package/src/components/AppBar/index.js

@@ -7,7 +7,7 @@ import theme,{Colors,flattenStyle} from "$theme";
 import {StyleSheet} from "react-native";
 import {goBack as navGoBack,useNavigation,useRoute,useScreenOptions } from "$cnavigation";
 import PropTypes from "prop-types";
-import { Dimensions,TouchableWithoutFeedback} from "react-native";
+import { Dimensions,View,TouchableWithoutFeedback} from "react-native";
 import Content from "./Content";
 import Icon from "$ecomponents/Icon";
 import {Elevations} from "$ecomponents/Surface";
@@ -35,6 +35,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
       onUnmount,drawerType,options,allowDrawer,back,menuProps,appBarType, 
       drawerRef,beforeGoBack,title,subtitle,titleProps,backAction,backActionProps,
       subtitleProps,testID,
+      right,
       onBackActionPress : customOnBackActionPress,actions,backActionRef,route,
       ...appBarProps} = props;
     const customOptions = options;
@@ -99,6 +100,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
     context.forceUpdate = ()=>{
       return setLayout({...Dimensions.get("window")});
     }
+    const rightContent = typeof right =='function' ? right ({drawerRef,context,isMobile:Dimensions.isMobileMedia(),isDesktop:Dimensions.isDesktopMedia(),isTablet:Dimensions.isTabletMedia(),isPhone:Dimensions.isPhoneMedia(),dimensions,...dimensions}): right;
     const splitedActions = isSplitedActions(actions)? actions:  splitActions({...appBarProps,windowWidth:layout.width,canGoBack:back || options.back?true:false,isAppBarAction:true,onBackActionPress,goBack,route,navigation,actions});
     const onPageResize = bindResizeEvent !== false ? (e)=>{
           if(!e || !e.nativeEvent || !e.nativeEvent.layout) return null;
@@ -128,6 +130,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
             color : anchorStyle.color,
            }
         })}
+        {React.isValidElement(rightContent) && rightContent || right}
       </Appbar.Header>
     );
 });
@@ -144,7 +147,7 @@ const styles = StyleSheet.create({
   header : {
     paddingHorizontal : 5,
     paddingRight : 10,
-  }
+  },
 })
 
 AppBarComponent.GO_BACK_EVENT = GO_BACK_EVENT;

package/src/components/AppBar/utils.js

@@ -14,7 +14,7 @@ export const ACTION_ICON_SIZE = 30;
 export const TITLE_FONT_SIZE = 16;
 
 export const getMaxActions = (windowWidth) => {
-    let iWidth = typeof windowWidth =='number' && windowWidth > 200 ? windowWidth : getWindowSizes().width;
+    let iWidth = typeof windowWidth =='number' && windowWidth > 200 ? windowWidth : getWindowSizes().width - 100;
     return iWidth >= 3000 ? 8 : iWidth >= 2500? 7 : iWidth >= 2000 ? 6 : iWidth >= 1600 ? 5 : iWidth >= 1300 ? 4 : iWidth >= 800 ? 2 : iWidth >= 600 ? 1 : 0
 }