@fto-consult/expo-ui 6.13.0 → 6.13.1

package/babel.config.js

@@ -117,7 +117,7 @@ const generateTableOrStructDataStr = (tableDataPath)=>{
           if(!indexContent || (!indexContent.includes("table") && !indexContent.includes("tableName"))){
               return;
           }
-           getTableJSContent+=`\t\tif(tableName === "${tableName}"){return require("./${table}").default;}\n`;
+           getTableJSContent+=`\t\t\tif(tableName === "${tableName}"){return require("./${table}").default;}\n`;
         });
         //on génère le fichier getTable des tables data de l'application
         if(getTableJSContent){
@@ -125,7 +125,7 @@ const generateTableOrStructDataStr = (tableDataPath)=>{
 module.exports = function(tableName){
 \tif(!tableName || typeof tableName !=="string") return null;
 \ttableName = tableName.toUpperCase().trim();
-\t${getTableJSContent}\treturn null;
+${getTableJSContent}\treturn null;
 }
             `);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.13.0",
+  "version": "6.13.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

package/src/components/AppBar/Content.js

@@ -36,8 +36,7 @@ const AppbarContent = ({
    const webStyle = isWeb() && theme.styles.webFontFamilly;
    const content = (
     <View
-      pointerEvents="box-none"
-      style={[styles.container, style]}
+      style={[styles.container,{pointerEvents:"box-none"}, style]}
       testID={testID}
       {...rest}
     >

package/src/components/Logo/Logo.js

@@ -34,7 +34,7 @@ export default function Logo (props) {
         </View>
 }   
 
-const getStyle = ({style,color,height:customHeight,smallStyle,mediumStyle,largeStyle})=>{
+export const getStyle = ({style,color,height:customHeight,smallStyle,mediumStyle,largeStyle})=>{
     const cColor = flattenStyle([{color:Colors.isValid(color)? color : theme.colors.primaryOnSurface}]);
     let size = 5;
     if(typeof customHeight =='number' && customHeight <= customHeight){

package/src/components/Logo/Progress.js

@@ -8,9 +8,8 @@ import appConfig from "$capp/config";
 
 export default function LogoProgress (props){
     let containerStyle = {width:(Logo.width?Logo.width:undefined),height:(Logo.height?(Logo.height+100):undefined),flex:1,alignItems:"center",justifyContent:"center"};
-    const isLight = theme.isLight();
-    let primaryColor = isLight?theme.colors.primaryOnSurface : defaultDarkTheme.colors.primary, 
-    secondaryColor = isLight ? theme.colors.secondaryOnSurface : defaultDarkTheme.colors.secondary;
+    const primaryColor = theme.colors.primaryOnSurface,
+    secondaryColor = theme.colors.secondaryOnSurface;
     return <View style={[containerStyle]}>
             <Logo key='logo' style={{marginBottom:0}} color={primaryColor}/>
             <ActivityIndicator size = {isIos()?'large':40} animating={true} color={secondaryColor} />

package/src/components/View/index.js

@@ -1,12 +1,12 @@
-import {View} from "react-native";
+import {View,StyleSheet} from "react-native";
 import PropTypes from "prop-types";
 import React from "$react";
 import {isMobileNative} from "$cplatform";
-import {debounce,isNumber} from "$cutils";
+import {debounce,isNumber,isNonNullString} from "$cutils";
 import {useMediaQueryUpdateStyle} from "$context/hooks";
 
 
-const ViewComponent = React.forwardRef(({onRender,onLayoutTimeout,onLayout,autoHeight,autoWidth,elevation,...props},ref)=>{
+const ViewComponent = React.forwardRef(({onRender,onLayoutTimeout,pointerEvents,onLayout,autoHeight,autoWidth,elevation,...props},ref)=>{
     const style = useMediaQueryUpdateStyle(props);
     const autoSize = autoHeight||autoWidth ? true : false;
     const [state,setState] = autoSize ? React.useState({}) : [{}];
@@ -26,7 +26,8 @@ const ViewComponent = React.forwardRef(({onRender,onLayoutTimeout,onLayout,autoH
     React.useOnRender(onRender);
     return <View
          {...props} 
-         style = {[style,
+         style = {[isNonNullString(pointerEvents) && pointerEventsStyles[pointerEvents] ||null,
+         style,
             autoSize && [
                 autoHeight && isNumber(height) && height > 10 && {height},
                 autoWidth && isNumber(width) && width > 10 && {width}
@@ -47,4 +48,16 @@ ViewComponent.propTypes = {
     autoHeight : PropTypes.bool,//si la taille de 
     onLayout : PropTypes.func,
     ///si useCurrentMedia est à true, alors la mise à jour sera opérée uniquement lorsque le current media change
-}
+}
+
+const pointerEventsStyles = StyleSheet.create({
+    auto : {
+        pointerEvents : "auto",
+    },
+    none : {
+        pointerEvents : "none",
+    },
+    "box-none" : {
+        pointerEvents : "box-none",
+    },
+})

package/src/layouts/DatabaseStatistics/index.js

@@ -33,7 +33,7 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tabl
             const chartAllowedPerm =  defaultStr(table.chartAllowedPerm);
             const testID = "RN_DatabaseStatisticsCell_"+index;
             if((chartAllowedPerm && !Auth.isAllowedFromStr(chartAllowedPerm)) || (!Auth.isTableDataAllowed({table:tableName}))) return null;
-            content.push(<Cell elevation = {5} withSurface mobileSize={12} desktopSize={3} tabletSize={4} {...contentProps} testID={testID} key = {index} >
+            content.push(<Cell elevation = {5} withSurface mobileSize={12} desktopSize={3} tabletSize={6} {...contentProps} testID={testID} key = {index} >
                 <Surface testID = {testID+"_Surface"} elevation = {5} style={[theme.styles.w100]}>
                     <DatabaseStatistic
                         icon = {table.icon}