@fto-consult/expo-ui 6.43.0 → 6.44.1

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.43.0",
+  "version": "6.44.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {

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){