@fto-consult/expo-ui 4.0.1 → 4.0.4

package/electron/createDir.js

@@ -1,8 +1,8 @@
-const getDirName = require('path').dirname;
 const fs = require("fs");
 module.exports = function createDir(path,cb) {
     if(!path || typeof path !='string') return false;
-    const p = getDirName(path);
+    const p = require("./getDirname")(path);
+    if(!p) return false;
     if(!fs.existsSync(p)){
        try {
           fs.mkdirSync(p,{ recursive: true});

package/electron/getDirname.js

@@ -0,0 +1,14 @@
+///retourne le nom du repertoire d'un chemin passé en paramètre
+const path = require("path");
+function isFile(pathItem) {
+    return !!path.extname(pathItem);
+}
+module.exports = (path_string)=>{
+    if(!path_string || typeof path_string !=='string'){
+        return null;
+    }
+    if(isFile(path_string)){
+        return path.dirname(path_string);
+    } 
+    return path.resolve(path_string);
+}

package/electron/getIcon.js

@@ -0,0 +1,24 @@
+const isWindow = process.platform =="win32",
+isMac = process.platform =='darwin',
+isLinux = process.platform =="linux";
+const fs = require("fs");
+const getDirname = require("./getDirname");
+const path = require("path");
+module.exports = (p)=>{
+    if(Array.isArray(p)){
+       for(let i in p){
+         const r = getIcon(p[i]);
+         if(r) return r;
+       }
+    } else if(typeof p =='string' && p && fs.existsSync(p)){
+      const ext = isWindow ? ".ico" : isMac ? ".incs" : ".png";
+      const possibles =  ["icon","logo","favicon"];
+      for(let i in possibles){
+        const ico = path.join(getDirname(p),possibles[i]+ext);
+        if(fs.existsSync(ico)){
+           return ico;
+        }
+      }
+    }
+    return undefined;
+};

package/electron/index.js

@@ -4,6 +4,7 @@ const session = require("./session");
 const path = require("path");
 const fs = require("fs");
 const ePath = path.resolve(__dirname);
+const getDirname = require("./getDirname");
 if(!fs.existsSync(path.resolve(ePath,"paths.json"))){
   throw {message : 'Chemin de noms, fichier paths.json introuvable!! Exécutez l\'application en enviornnement web|mobile|android|ios puis re-essayez'}
 }
@@ -18,37 +19,11 @@ const mainProcess = mainProcessRequired && typeof mainProcessRequired =='object'
 // Gardez une reference globale de l'objet window, si vous ne le faites pas, la fenetre sera
 // fermee automatiquement quand l'objet JavaScript sera garbage collected.
 let win = undefined;
-const isWindow = process.platform =="win32",
-isMac = process.platform =='darwin',
-isLinux = process.platform =="linux";
-const getIcon = (p)=>{
-    if(Array.isArray(p)){
-       for(let i in p){
-         const r = getIcon(p[i]);
-         if(r) return r;
-       }
-    } else if(typeof p =='string' && p && fs.existsSync(p)){
-      const ext = isWindow ? ".ico" : isMac ? ".incs" : ".png";
-      const possibles =  ["icon","logo","favicon"];
-      for(let i in possibles){
-        const icon = path.join(p,possibles[i]+ext);
-        if(fs.existsSync(icon)){
-           return icon;
-        }
-      }
-    }
-    return undefined;
-}
-const icon = isLinux && logo && fs.existsSync(logo) && logo || getIcon(
-    logo && fs.existsSync(logo) && path.dirname(logo),
-    images,
-    assets,
-)
-/*console.log(icon," is iccccccc");
-console.log(logo," is logo ",images,assets);
-throw {
-  message : "icon is "+icon+" logo is "+logo+" image is "+images+" assets is "+assets
-}*/
+const icon = require("./getIcon")(
+    logo && fs.existsSync(logo) && getDirname(logo),
+    images && getDirname(images) || '',
+    assets && getDirname(assets) || '',
+);
 Menu.setApplicationMenu(null);
 let clipboadContextMenu = (_, props) => {
   if (props.isEditable || props.selectionText) {
@@ -149,6 +124,10 @@ function createWindow () {
       devTools : true,
     }
   });
+  
+ const log = (message)=>{
+    return win != null && win && win.webContents.send("console.log",message);
+  }
   // create a new `splash`-Window 
   /*** @see : http://leftstick.github.io/splash-screen/ */
   let splash = new BrowserWindow({
@@ -188,6 +167,7 @@ function createWindow () {
       splash = null;
       win.restore();
       win.show();
+      //log(icon," is consooleeeee")
   })    
  
   win.on('close', (e) => {

package/electron/preload.js

@@ -319,6 +319,9 @@ ipcRenderer.on("main-app-restaured",()=>{
         message : "TRACK_IDLE",
     });
 });
+ipcRenderer.on('console.log',(event,...message)=>{
+    console.log(...message);
+})
 ipcRenderer.on('appReady',()=>{})
 ipcRenderer.on("main-window-focus",()=>{
     postMessage("WINDOW_FOCUS");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "4.0.1",
+  "version": "4.0.4",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -105,7 +105,7 @@
     "react-native-svg": "13.4.0",
     "react-native-web": "~0.18.7",
     "react-native-webview": "11.23.1",
-    "react-virtuoso": "^4.0.6",
+    "react-virtuoso": "^4.0.9",
     "sharp-cli": "^2.1.0",
     "tippy.js": "^6.3.7",
     "use-event-callback": "^0.1.0",

package/src/components/AutoSizer/Vertical.js

@@ -12,7 +12,7 @@ import {isWeb} from "$cplatform";
  * ce composant a pour but de définir la taille d'un contenu en se basant sur sa positin top, de manière à ce que, le contentu du composant fit
  * le reste de la taille de la page, avec comme valeur de la props minHeight
  */
-const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,withActivityIndicator,testID,withPadding,maxHeight,minHeight,style,children:cChildren,...rest},ref) => {
+const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,screenIndent,getRenderingStyle,withActivityIndicator,testID,withPadding,paddingBottom,maxHeight,minHeight,style,children:cChildren,...rest},ref) => {
   testID = defaultStr(testID,'RN_AutoSizerVerticalComponent');
   const hasUpdateLayoutRef = React.useRef(false);
   const layoutRef = React.useRef(null);
@@ -56,15 +56,32 @@ const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,with
   const hasUpdateLayout = hasUpdateLayoutRef.current;
   const cStyle ={width:'100%',maxHeight:Math.max(height-100,250)};
   const contentLayout = defaultObj(layout.layout);
-  cStyle.minHeight = Math.min(Math.max(layout.height-defaultNumber(contentLayout.y),minHeight && minHeight ||250));
-  const cMaxHeight = layout.height-defaultNumber(contentLayout.y);
-  if(cMaxHeight>=250){
+  screenIndent = typeof screenIndent =='number' && screenIndent > 50 ? screenIndent : 100;
+  const y = Math.abs(defaultNumber(contentLayout.y));
+  const heightY = y < height - screenIndent ? y : height - screenIndent;
+  cStyle.minHeight = Math.min(Math.max(layout.height-heightY,minHeight && minHeight ||250));
+  const cMaxHeight = layout.height-heightY;
+  if(cMaxHeight>=200){
     cStyle.maxHeight = cMaxHeight;
   }
-  if(withPadding !== false){
-      cStyle.paddingBottom = 50;
+  if(typeof paddingBottom =='number'){
+      cStyle.paddingBottom = paddingBottom; //: 50;
+  }
+  if(cStyle.minHeight && cStyle.maxHeight && cStyle.minHeight > cStyle.maxHeight){
+     cStyle.minHeight = cStyle.maxHeight;
+  }
+  const restStyle = {};
+  const canUpdate = hasUpdateLayout || hasUpdateLayout || withActivityIndicator === false;
+  const fStyle = !canUpdate && {flex:1,flexDirection:'column',maxHeight:cStyle.maxHeight,maxWidth : Math.max(layout.width-defaultNumber(contentLayout.x)),justifyContent:'center',alignItems:'center'} || {};
+  if(maxHeight){
+    restStyle.maxHeight = maxHeight;
+  }
+  if(minHeight){
+     restStyle.minHeight = minHeight;
+  }
+  if(canUpdate && typeof getRenderingStyle ==='function'){
+      getRenderingStyle({...cStyle,...restStyle});
   }
-  const fStyle = !hasUpdateLayout && withActivityIndicator !== false && {flex:1,flexDirection:'column',maxHeight:cStyle.maxHeight,maxWidth : Math.max(layout.width-defaultNumber(contentLayout.x)),justifyContent:'center',alignItems:'center'} || {};
   return  <View ref={layoutRef} 
         onLayout={(a,b,c)=>{
             if(onLayout && onLayout(a,b,c) === false) return;
@@ -73,8 +90,8 @@ const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,with
             }
         }} 
     {...rest} 
-    style={[theme.styles.w100,cStyle,style,fStyle,maxHeight && {maxHeight}, minHeight && {minHeight}]} testID={testID+"_ScrollViewContainer"}>
-    {hasUpdateLayout || withActivityIndicator === false ?children : <ActivityIndicator size={'large'}/>}
+    style={[theme.styles.w100,cStyle,style,fStyle,restStyle]} testID={testID+"_ScrollViewContainer"}>
+    { canUpdate?children : <ActivityIndicator size={'large'}/>}
   </View>
 });
 
@@ -86,4 +103,5 @@ AutoSizerVerticalComponent.propTypes = {
    withActivityIndicator : PropTypes.bool,//si l'on utilisera l'activity indicator pour le chargement du contentu
    maxHeight : PropTypes.number,
    minHeight : PropTypes.number,
+   paddingBottom : PropTypes.number,
 }

package/src/components/Datagrid/Table/index.js

@@ -187,7 +187,6 @@ const DatagridFactory = (Factory)=>{
                     });
                 }
             }   
-            const maxHeight = this.getMaxListHeight();
             const rPagination = showPagination ? <View style={[styles.paginationContainer]}>
                 <ScrollView testID={testID+"_Datagrid_Headers"} horizontal  style={styles.paginationContainerStyle} contentContainerStyle={styles.minW100}>
                     <View testID={testID+"_HeaderPaginationContent"} style={[styles.paginationContent]}>
@@ -292,7 +291,7 @@ const DatagridFactory = (Factory)=>{
                     </View>
                 </ScrollView>
             </View> : null;
-            return <View style={[styles.container,{flex:1,maxHeight}]} testID={testID+"_TableContainer"} pointerEvents={pointerEvents}>
+            return <View style={[styles.container,{flex:1}]} testID={testID+"_TableContainer"} pointerEvents={pointerEvents}>
                 <View ref={this.layoutRef} testID={testID+"_LayoutContainer"}>
                     {this.props.showActions !== false ? <DatagridActions 
                         pointerEvents = {pointerEvents}

package/src/components/Table/List/List.js

@@ -26,7 +26,7 @@ const propTypes = {
     isScrolling : PropTypes.func,
 };
 /***@see : https://virtuoso.dev/virtuoso-api-reference/ */
-const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderItem,onEndReached,onLayout,onContentSizeChange,onScroll,isScrolling,estimatedItemSize,onEndReachedThreshold,containerProps,style,...props},ref)=>{
+const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderItem,onEndReached,onLayout,onContentSizeChange,onScroll,isScrolling,estimatedItemSize,onEndReachedThreshold,containerProps,style,autoSizedStyle,...props},ref)=>{
     const r2 = {};
     for(let i in propTypes){
         if(i in props){
@@ -80,6 +80,7 @@ const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderIte
         if(isDOMElement(target) && onContentSizeChange){
             const {nativeEvent:{contentSize}} = normalizeEvent({target});
             setTimeout(()=>{
+                target.style.paddingBottom = "50px";
                 if(contentSize.width !== listSize.width || contentSize.height != listSize.height){
                     sizeRef.current = contentSize;
                     onContentSizeChange(contentSize.width,contentSize.height);
@@ -87,16 +88,15 @@ const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderIte
             },100)
         }
     }
-    React.useEffect(()=>{
-        checkSize();
-    },[props])
     React.useEffect(()=>{
         return ()=>{
             React.setRef(ref,null);
         }
     },[]);
-    React.useOnRender(onRender,Math.max(Array.isArray(items) && items.length/10 || 0,500))
-    return <View {...containerProps} {...props} style={[{flex:1},containerProps.style,style,{minWidth:'100%',height:'100%',maxWidth:'100%'}]} onLayout={onLayout} testID={testID}>
+    React.useOnRender((a,b,c)=>{
+        if(onRender && onRender(a,b,c));
+    },Math.max(Array.isArray(items) && items.length/10 || 0,500))
+    return <View {...containerProps} {...props} style={[{flex:1},containerProps.style,style,autoSizedStyle,{minWidth:'100%',height:'100%',maxWidth:'100%'}]} onLayout={onLayout} testID={testID}>
         <Virtuoso
             {...r2}
             style = {listStyle}
@@ -120,6 +120,9 @@ const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderIte
                     return isScrolling(isC);
                 }
             }}
+            totalListHeightChanged = {(height)=>{
+                checkSize();
+            }}
             defaultItemHeight = {typeof estimatedItemSize=='number' && estimatedItemSize || undefined}
         />
     </View>

package/src/components/Table/List/index.js

@@ -1,12 +1,21 @@
 import React from "$react";
 import {Vertical as AutoSizeVertical} from "$ecomponents/AutoSizer";
 import List from "./List";
-import {defaultStr,defaultObj} from "$utils";
+import {defaultStr,isObj,defaultObj} from "$utils";
+const normalize = (size)=>{
+    if(isObj(size)){
+        ["padding","paddingBottom","paddingTop","paddingLeft","paddingRight"].map(p=>{
+            delete size[p];
+        })
+        return size;
+    }
+    return {};
+}
 const AutoSizeVerticalList = React.forwardRef(({testID,autoSizerProps,...props},ref)=>{
     testID = defaultStr(testID,"RN_AutoSizeVerticalListComponent")
     autoSizerProps = defaultObj(autoSizerProps);
-    return <AutoSizeVertical testID={testID+"_AutoSizerVertical"} {...autoSizerProps} >
-        <List {...props} ref={ref}/>
+    return <AutoSizeVertical withPadding={false} testID={testID+"_AutoSizerVertical"} {...autoSizerProps} >
+        <List {...props} style={[props.style]} ref={ref}/>
     </AutoSizeVertical>
 })