@fto-consult/expo-ui 6.42.2 → 6.44.0

package/babel.config.alias.js

@@ -15,6 +15,10 @@ module.exports = (opts)=>{
     const expoUI = require("./expo-ui-path")();
     const euCommon = path.resolve(expoUI,"node_modules","@fto-consult","common");
     const cpath = fs.existsSync(euCommon)? path.resolve(euCommon,"babel.config.alias") : "@fto-consult/common/babel.config.alias";
+    const mainAppPackage = path.resolve(projectRoot,"expo-ui.json");
+    if(fs.existsSync(mainAppPackage)){
+        opts.$packageJSON = mainAppPackage;
+    }
     const r = require(`${cpath}`)(opts);
     const expo = path.resolve(expoUI,"src");
     r["$ecomponents"] = r["$expo-components"] = path.resolve(expo,"components");
@@ -74,6 +78,7 @@ module.exports = (opts)=>{
     r.$ehooks = path.resolve(expo,"context","hooks");
     ///le chemin racine du projet expo-ui
     r["$expo-ui-root-path"] = r["$expo-ui-root"]= path.resolve(expo,"..");
+    
     const $assets = r.$assets;
     const $electron = path.resolve(dir,"electron");
     const electronPaths = {

package/metro.config.js

@@ -41,5 +41,19 @@ module.exports = function(opts){
   });*/
   ///on génère les librairies open sources utilisées par l'application
   require("./find-licenses");
+  
+  const packageJSonPath = path.resolve(projectRoot,"package.json");
+  const mainAppPackage = path.resolve(projectRoot,"expo-ui.json");
+  if(!fs.existsSync(mainAppPackage) && fs.existsSync(packageJSonPath)){
+    try {
+        const packageObj = require(`${packageJSonPath}`);
+        if(packageObj && typeof packageObj =='object'){
+          ["scripts","private","main","repository","keywords","bugs","dependencies","devDependencies"].map(v=>{
+              delete packageObj[v];
+          });
+          fs.writeFileSync(mainAppPackage,JSON.stringify(packageObj,null,"\t"));
+        }
+    } catch{}
+  }
   return config;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.42.2",
+  "version": "6.44.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -43,7 +43,7 @@
     "update-apexchart": "node ./bin/update-appex-chart.js",
     "update-appexchart": "npm run update-apexchart",
     "delete-node-modules": "rimraf ./**/node_modules",
-    "dev" : "npx expo start --no-dev --minify -c",
+    "dev": "npx expo start --no-dev --minify -c",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
     "update": "npm i expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @emotion/native@latest @fto-consult/common@latest @react-navigation/stack react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix && npm run update-apexchart && npm run find-licenses"
   },
@@ -105,11 +105,11 @@
     "react-native": "0.72.4",
     "react-native-big-list": "^1.6.1",
     "react-native-blob-util": "^0.18.6",
-    "react-native-gesture-handler": "^2.12.1",
+    "react-native-gesture-handler": "~2.12.0",
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
-    "react-native-paper": "^5.10.4",
-    "react-native-paper-dates": "^0.19.3",
+    "react-native-paper": "^5.10.5",
+    "react-native-paper-dates": "^0.19.6",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",
@@ -120,7 +120,8 @@
     "sharp-cli": "^4.1.1",
     "tippy.js": "^6.3.7",
     "websql": "^2.0.3",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "sentry-expo": "~7.0.0"
   },
   "devDependencies": {
     "@expo/metro-config": "^0.10.7",

package/src/components/BottomSheet/Sheet.js

@@ -17,7 +17,7 @@ import View from "$ecomponents/View";
 import Portal from "$ecomponents/Portal";
 import { ScrollView } from "react-native";
 import BackHandler from "$ecomponents/BackHandler";
-import Reanimated, { useSharedValue,withTiming,useAnimatedStyle, } from 'react-native-reanimated';
+import Reanimated, { useSharedValue,withTiming,useAnimatedStyle} from 'react-native-reanimated';
 import {
   Pressable,
   Animated,
@@ -128,7 +128,7 @@ const BottomSheetComponent = React.forwardRef((props,ref)=> {
         };
         hasCallCallbackRef.current = false;
         if(animatedHeight.value != 0){
-            animatedHeight.value = withTiming(0,{
+            animatedHeight.value = animate(0,{
                 duration: closeDuration,
                 callback,
             });
@@ -142,7 +142,7 @@ const BottomSheetComponent = React.forwardRef((props,ref)=> {
         onPanResponderMove: (e, gestureState) => {
             const diff = gestureState.dy > 0 ? animatedHeight.value - gestureState.dy : Math.min(heightRef.current,animatedHeight.value-gestureState.dy);
             if(diff >0 && diff !== animatedHeight.value){
-                animatedHeight.value = withTiming(diff,{duration:100});
+                animatedHeight.value = animate(diff,{duration:100});
             }
         },
         onPanResponderRelease: (e, gestureState) => { 
@@ -160,7 +160,7 @@ const BottomSheetComponent = React.forwardRef((props,ref)=> {
         if(typeof customVisible !=='boolean' || customVisible === visible) return;
         if(customVisible){
             if(animatedHeight.value >0){
-                animatedHeight.value = withTiming(0);
+                animatedHeight.value = animate(0);
             }
             setVisible(true);
         } else {
@@ -175,7 +175,7 @@ const BottomSheetComponent = React.forwardRef((props,ref)=> {
         if(visible){
             addListener();
             pan.setValue({ x: 0, y: 0 });
-            animatedHeight.value = withTiming(height,{
+            animatedHeight.value = animate(height,{
                 callback : ()=>{
                     if (typeof onOpen === "function") onOpen(props)  
                 },
@@ -425,4 +425,10 @@ const styles = StyleSheet.create({
     }
   });
 
-  BottomSheetComponent.displayName = "BottomSheetComponent";
+  BottomSheetComponent.displayName = "BottomSheetComponent";
+  
+  export const animate = (time,options)=>{
+    return withTiming(time,{
+        ...Object.assign({},options)
+    });
+  }

package/src/components/Datagrid/IndexComponent.js

@@ -5,16 +5,17 @@
 import Accordion,{ TableData as TableDataAccordion} from "./Accordion";
 import Table,{TableData as DatagridTableData} from "./Table";
 import {isDesktopMedia,isMobileMedia} from "$cplatform/dimensions";
-import {isFunction,defaultVal} from "$cutils";
+import {isFunction,defaultVal,defaultStr} from "$cutils";
 import React from "$react";
 import {getRenderType} from "./utils";
 
 
 const DatagridMainComponent = React.forwardRef((props,ref)=>{
     const isDesk = isDesktopMedia();
-    const isMob = isMobileMedia();
+    const isMob = defaultStr(isMobileMedia());
     const isTableData = typeof props.isTableData =='boolean'? props.isTableData  : defaultStr(props.tableName,props.table).trim() || typeof props.fetchData ==='function'?true : false;
-    const renderType = defaultStr(getRenderType(),isDesk? "table":'accordion').trim().toLowerCase();
+    const rType = defaultStr(getRenderType()).toLowerCase().trim();
+    const renderType = defaultStr(rType && ['table','accordion'].includes(rType) ? rType : "",isDesk? "table":'accordion').trim().toLowerCase();
     const canRenderAccordion = (isFunction(props.accordion) || (isObj(props.accordionProps) && isFunction(props.accordionProps.accordion)) || props.accordion === true);
     const Component = React.useMemo(()=>{
         if((renderType == 'accordion' || (renderType !=='table' && isMob)) && canRenderAccordion){

package/src/components/Datagrid/RenderType.js

@@ -18,18 +18,9 @@ const DatagridRenderTypeComponent = (props)=>{
     let type = defaultStr(get(typeKey),isDesk? "fixed":'accordion').toLowerCase().trim();
     const rTypes = [
         {...getActiveProps(type,'accordion'),tooltip:"Les éléments de liste s'affichent de manière optimisé pour téléphone mobile",code:'accordion',icon:accordionIcon,label:'Mobile',labelText:'environnement optimisé pour téléphone mobile'},
-        {...getActiveProps(type,'table'),tooltip:"Les éléments de listes s'affichent dans un tableau",code:'table',icon:tableIcon,label:'Tableau'}
+        {...getActiveProps(type,'table'),tooltip:"Les éléments de listes s'affichent dans un tableau",code:'table',icon:tableIcon,label:'Tableau'},
+        {...getActiveProps(type,'auto'),tooltip:"Les éléments de listes s'affichent de fasson automatique en fonction de la taille de l'écran",code:'auto',icon:"material-wb-auto",label:'Automatique'}
     ]  
-    /*Object.map(rendersTypes,(t,i)=>{
-        if(isObj(t)){
-            if((isDesk && t.desktop) || (!isDesk && t.mobile)){
-                rTypes.push({
-                    ...t,
-                    ...getActiveProps(type,i)
-                })
-            }
-        }
-    });*/
     let typeObj = {};
     Object.map(rTypes,(t)=>{
         if(isObj(t) && t.code == type){

package/src/navigation/index.js

@@ -57,7 +57,8 @@ export default function NavigationComponent (props){
                         screenOptions={{
                             ...opts,
                             presentation :"transparentModal",
-                            cardStyle
+                            cardStyle,
+                            animationEnabled : true,
                         }}
                     >
                         {stackScreens}

package/src/screens/Help/openLibraries.js

@@ -1 +1 @@
-module.exports = {"@fto-consult/expo-ui":{"version":"6.41.1","url":"https://github.com/borispipo/expo-ui#readme","license":"ISC"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/webpack-config":{"version":"19.0.0","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"}};
+module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.42.2","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"19.0.0","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.39.1","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@react-navigation/stack":{"version":"6.3.17","url":"https://reactnavigation.org/docs/stack-navigator/","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.42.0","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.11","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.4","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.3","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"is-plain-obj":{"version":"4.1.0","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.4","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.5","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.19.6","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.8","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.1","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};