@fto-consult/expo-ui 7.12.3 → 7.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.12.3",
+  "version": "7.13.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.75.2",
+    "@fto-consult/common": "^4.0.0",
     "@fto-consult/electron-gen": "^2.2.0",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

package/src/components/Datagrid/Common/Common.js

@@ -2040,6 +2040,7 @@ export default class CommonDatagridComponent extends AppComponent {
                         divider : true,
                         text : "Configurer les graphes",
                         icon :"material-settings",
+                        tooltip : "Cliquez pour configurer les graphes",
                         onPress : ()=>{
                             this.configureChart(false).then((config)=>{
                                 this.setIsLoading(true,()=>{
@@ -2208,7 +2209,7 @@ export default class CommonDatagridComponent extends AppComponent {
         }
    }
    getDefaultChartHeight(){
-        return defaultNumber(this.props.chartProps?.height,this.isDashboard()?80:350);
+        return defaultNumber(this.props.chartProps?.height,this.props.chartConfig?.height,this.isDashboard()?90:350);
    }
    getDefaultChartWidth(){
         return defaultNumber(this.props.chartProps?.width);
@@ -2414,10 +2415,12 @@ export default class CommonDatagridComponent extends AppComponent {
         //const spackLine = chartOptions.chart.sparkline;
         chartOptions.xaxis = defaultObj(chartOptions.xaxis);
         chartOptions.xaxis.labels = defaultObj(chartOptions.xaxis.labels);
-        chartOptions.xaxis.labels.show  = ("showXaxis" in config) ? !!config.showXaxis : !this.isDashboard();
+        chartOptions.xaxis.labels.show  = ("showXaxis" in config) ? !!config.showXaxis : this.isDashboard();
+        
+        console.log("rendering char ",chartOptions,config);
         
         chartOptions.yaxis.labels = defaultObj(chartOptions.yaxis.labels);
-        chartOptions.yaxis.labels.show = ("showYaxis" in config) ? !!config.showYaxis : !this.isDashboard();
+        chartOptions.yaxis.labels.show = ("showYaxis" in config) ? !!config.showYaxis : this.isDashboard();
         
         chartOptions.legend = defaultObj(chartOptions.legend);
         chartOptions.legend.show = ("showLegend" in config) ? !!config.showLegend : !this.isDashboard();
@@ -3777,7 +3780,7 @@ export default class CommonDatagridComponent extends AppComponent {
     }
     renderTitle (){
         const testID = this.getTestID();
-        const title = typeof this.props.title =="function"? this.props.title({context:this}) : this.props.title;
+        const title = typeof this.props.title =="function"? this.props.title({context:this,config:this.getConfig()}) : this.props.title;
         const titleProps = defaultObj(this.props.titleProps);
         return React.isValidElement(title) ? <Label testID={testID+"_Title"} {...titleProps} style={[theme.styles.w100,titleProps.style]}>
             {title}

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

@@ -108,7 +108,7 @@ export default class DatagridDashboard extends TableData {
                     items = {this.renderMenu()}
                 />
             </View> : null}
-            {<View testID={testID+"_ChartContainer"} {...chartContainerProps} style={[theme.styles.w100,chartContainerProps.style]}>
+            {<View testID={testID+"_ChartContainer"} {...chartContainerProps} style={[theme.styles.w100,styles.chartContainer,chartContainerProps.style]}>
                 {this.renderProgressBar()}
                 {this.renderChart()}
             </View>}
@@ -140,4 +140,7 @@ const styles = StyleSheet.create({
         width : '100%',
         //flex:1,
     },
+    chartContainer : {
+        //minHeight : 200,
+    }
 })

package/src/components/Filter/index.js

@@ -91,7 +91,7 @@ export default class Filter extends AppComponent {
       this.manualRunRef.current = value;
   }
   getSessionManualRunValue(){
-    if(this.manualRunRef.current === undefined && this.isFilterSelect()){
+    if(false && this.manualRunRef.current === undefined && this.isFilterSelect()){
       this.manualRunRef.current = true;
     }
     return this.manualRunRef.current;

package/src/components/Swiper/index.js

@@ -378,7 +378,7 @@ SwiperComponent.propTypes = {
   autoHeight : PropTypes.bool,//si la valeur de la taille des éléments sera automatiquement réajusté
   loop: PropTypes.bool,
   timeout: PropTypes.number,
-  gesturesEnabled: PropTypes.func,
+  gesturesEnabled: PropTypes.func, //pour permettre les gestures
   withScrollView : PropTypes.oneOfType([
     PropTypes.bool,
     PropTypes.func,

package/src/components/Tab/TabContent.js

@@ -4,6 +4,7 @@ import {defaultStr} from "$cutils";
 import Swiper from "$ecomponents/Swiper";
 import PropTypes from "prop-types";
 import { StylePropTypes } from '$theme';
+import {isTouchDevice} from "$cplatform";
 
 const TabContentBase = ({
   children,
@@ -14,6 +15,7 @@ const TabContentBase = ({
 }) => {
   return (
     <Swiper
+      gesturesEnabled ={x=>!isTouchDevice()}
       {...rest}
       children = {children}
       testId = {defaultStr(testId,'RN_SwiperTabComponent')}

package/src/context/Provider.js

@@ -7,14 +7,12 @@ import {colorsAlias,Colors} from "$theme";
 import {isObj,isNonNullString,defaultStr,extendObj,defaultNumber} from "$cutils";
 import {getMainScreens} from "$escreens/mainScreens";
 import {ExpoUIContext} from "./hooks";
-import {enableAuth,disableAuth} from "$cauth/perms";
 import Login from "$eauth/Login";
 import {modes} from "$ecomponents/TextField";
 import {isMobileMedia} from "$cdimensions";
 import { prepareScreens } from "./TableData";
 import {extendFormFields} from "$ecomponents/Form/Fields";
-import {AuthProvider} from '$cauth';
-import { signInRef } from "$cauth/authSignIn2SignOut";
+import Auth,{AuthProvider,enableAuth,disableAuth} from '$cauth';
 import APP from "$capp/instance";
 import { AppState } from 'react-native'
 import {canFetchOffline} from "$capi/utils";
@@ -101,7 +99,7 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
         return extendProps(cAuth?.loginPropsMutator,props);
       },
     }
-    extendObj(signInRef.current,auth);
+    Auth.setRef(auth);
     extendFormFields(customFormFields);
     structsData = isObj(structsData)? structsData : null;
     appConfig.tablesData = tablesData;

package/src/layouts/DatabaseStatistics/DatabaseStatistic.js

@@ -104,6 +104,8 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
         return fetchFields;
     },[columns]);
     const counUpStyle = {fontSize:20,fontWeight:'bold',color:theme.colors.secondaryOnSurface};
+    title = defaultVal(title,table.label,table.text);
+    icon = defaultVal(icon,table.icon);
     title =  React.isValidElement(title,true)?<Label splitText numberOfLines={1} color={theme.colors.primaryOnSurface} style={[{fontSize:15}]}>{title}</Label>: null;
     const titleText = title && React.getTextContent(title) || null;
     const titleItem = titleText && {text:titleText,icon,divider:true} || null;
@@ -120,22 +122,23 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
         sessionName = {tableName+"-database-statistics"}
         {...props}
         {...dbStatistics}
-        style = {[theme.styles.pr1,props.style]}
+        style = {[theme.styles.pr1,props.style,dbStatistics.style]}
         columns = {columns}
         ref = {datagridRef}
         progressBar = {isLoading?<View/>:<View style={[theme.styles.w100,theme.styles.alignItemsCenter,theme.styles.justifyContentCenter]}>{progressBar}</View>}
         tableName = {tableName}
         table = {table}
         fetchData = {(options)=>{
-            return fetchData({...defaultObj(fetchDataProps),fields:fetchFields,table,tableName,fetch,Auth,...options});
+            return fetchData({...defaultObj(fetchDataProps),fields:fetchFields,table,tableName,...options});
         }}
-        title = {({context})=>{
+        title = {({context,config:chartConfig})=>{
             if(!context || !context.state) return null;
             const {state} = context;
-            const footers = context.getFooters && context.getFooters() || {};
+            //const footers = context.getFooters && context.getFooters() || {};
             const dataSize = context.getStateDataSize && context.getStateDataSize() || 0;
             const footersValues = context.getFooterValues && context.getFooterValues() || {};
-            const y = defaultStr(state.chartConfig?.y);
+            const config = Object.assign({},chartConfig,(typeof context.getConfig =="function"? context.getConfig() : state.config));
+            const y = defaultStr(config.y);
             const footerValue = y && isObj(footersValues) && footersValues[y] || null;
             const format = defaultStr(isObj(footerValue) && isNonNullString(footerValue.format) && footerValue.format || undefined).toLowerCase();
             const aggregatorFunction = isNonNullString(state.aggregatorFunction)? state.aggregatorFunction : undefined;

package/src/layouts/DatabaseStatistics/index.js

@@ -89,4 +89,6 @@ const styles = StyleSheet.create({
     itemContainer : {
         minHeight : 80,
     },
-})
+});
+
+export {DatabaseStatistic};