@fto-consult/expo-ui 2.33.1 → 2.34.1

package/index.js

@@ -16,11 +16,12 @@ const isWeb = Platform.OS === "web";
  */
 export default function ExpoUIApp (options){
     options = options && typeof options =='object' && !Array.isArray(options)? options : {};
+    const {initConfig,...opts} = options;
     appConfig.current = options.config;
-    if(typeof options.initConfig ==='function'){
-        options.initConfig({appConfig});
+    if(typeof initConfig ==='function'){
+        initConfig({appConfig});
     }
-    const App = require('./src/App').default(options);
+    const App = require('./src/App').default(opts);
     if (false) {
         const root = createRoot(document.getElementById("root") || document.getElementById("main"));
     } else {

package/package.json

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

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

@@ -12,7 +12,6 @@ import BottomSheet from "$ecomponents/BottomSheet/Provider";
 import {isMobileMedia} from "$cplatform/dimensions";
 import {isNativeMobile} from "$cplatform";
 import Icon,{MENU_ICON} from "$ecomponents/Icon";
-import SimpleSelect from "$ecomponents/SimpleSelect";
 import Dropdown from "$ecomponents/Dropdown";
 import React from "$react";
 import Footer from "../Footer/Footer";
@@ -21,13 +20,14 @@ import CommonTableDatagrid from "../Common/TableData";
 import BackToTop from "$ecomponents/BackToTop";
 import FiltersAccordionComponent from "./Filters";
 import RenderType from "../RenderType";
-import { flatMode,HEIGHT} from "$ecomponents/TextField";
-import List,{FlatList,FlashList} from "$ecomponents/List";
+import { flatMode} from "$ecomponents/TextField";
+import {FlashList} from "$ecomponents/List";
 import theme,{Colors} from "$theme";
 import {getRowStyle,styles as rStyles} from "../utils";
 import Avatar from "$ecomponents/Avatar";
 import {defaultObj,isOb,isNonNullString} from "$utils";
 import PropTypes from "prop-types";
+import {isTouchDevice} from "$platform";
 
 const DatagridFactory = (Factory)=>{
     Factory = Factory || CommonDatagrid;
@@ -125,6 +125,7 @@ const DatagridFactory = (Factory)=>{
                 } else if(isObj(renderedContent.contentProps)){
                     descriptionProps = {...descriptionProps,...renderedContent.contentProps,style:[descriptionProps.style,renderedContent.contentProps.style]}
                 }
+                //
                 rowProps = defaultObj(renderedContent.rowProps);
                 avatarProps.color = color;
                 if(typeof avatarContent =='function'){
@@ -430,7 +431,7 @@ const DatagridFactory = (Factory)=>{
             } = this.preparedColumns;
             const hasFootersFields = this.hasFootersFields();
             const datagridHeader = <View testID={testID+"_HeaderContainer"} pointerEvents={pointerEvents} style={[styles.datagridHeader]}>
-                <ScrollView testID={testID+"_HeaderScrollView"} horizontal contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
+                <ScrollView testID={testID+"_HeaderScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()} contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
                     <View testID={testID+"_HeaderContentCntainer"} style={[styles.table,styles.pullRight]}>
                         {dbSelector}
                         <View testID={testID+"_HeaderQueryLimit"} style={[styles.paginationItem]}>
@@ -567,8 +568,8 @@ const DatagridFactory = (Factory)=>{
                         {!canRenderChart && showFooters ? (
                             <View  testID={testID+"_FooterContainer"} pointerEvents={pointerEvents} style={[theme.styles.justifyContentCenter,theme.styles.pv1]}>
                                 <View  testID={testID+"_FooterContentContainer"} style={[styles.footersContainer]}>
-                                    <ScrollView testID={testID+"_FooterScrollView"} horizontal contentContainerStyle={[styles.contentContainerStyle]}>
-                                        <View testID={testID+"_FooterContent"} style={[styles.table]}>
+                                    <ScrollView testID={testID+"_FooterScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()}  contentContainerStyle={[styles.contentContainerStyle]}>
+                                        <View testID={testID+"_FooterContent"} style={[styles.table,theme.styles.p1]}>
                                             {Object.mapToArray(this.getFooterValues(),(footer,field)=>{
                                                 return <Footer
                                                     key = {field}
@@ -675,7 +676,6 @@ const styles = StyleSheet.create({
         alignItems : 'center',
         flex:1,
         paddingHorizontal : 10,
-        paddingVertical : 0,
     },
     pullRight : {
         flexDirection : 'row',

package/src/components/Datagrid/Footer/Footer.js

@@ -127,7 +127,7 @@ export default function DGGridFooterValue (props){
             return <Pressable {...anchorProps} {...p} testID={testID} style={[styles.anchor,anchorProps.style,label?styles.row:null]} title={title}>
                 {label ?
                     <>
-                        <View testID={testID+"_Label"}><Label style={[styles.label]}>{label}</Label></View>
+                        <View testID={testID+"_Label"}><Label fontSize={15} textBold style={[styles.label]}>{label}</Label></View>
                         <View testID={testID+"_LabelPoint"}><Label style = {styles.label}> : </Label></View>
                     </>
                 : null}

package/src/components/Datagrid/SWRDatagrid.js

@@ -91,6 +91,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         beforeFetchData,
         sort,
         defaultSortColumn,
+        defaultSortOrder,
         ...rest
     } = props;
     rest = defaultObj(rest);
@@ -98,10 +99,14 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const firstPage = 1;
     const tableName = defaultStr(table.tableName,table.table).trim().toUpperCase();
     defaultSortColumn = defaultStr(defaultSortColumn,table.defaultSortColumn);
+    defaultSortOrder = defaultStr(defaultSortOrder,table.defaultSortOrder).toLowerCase().trim();
     sort = isNonNullString(sort)? {column:sort} : isObj(sort)?sort : {};
     const sColumn = defaultStr(sort.column,defaultSortColumn);
     if(sColumn){
         sort.column = sColumn;
+        if(defaultSortOrder =='asc' || defaultSortOrder =='desc'){
+            sort.dir = defaultSortOrder;
+        }
     } else {
         delete sort.column;
     }

package/src/components/Form/Fields/SelectTableData/Component.js

@@ -20,12 +20,12 @@ import appConfig from "$appConfig";
  *  foreignKeyLabel : Le libélé dans la table étrangère
  */
 const TableDataSelectField = React.forwardRef((_props,ref)=>{
-    let {foreignKeyColumn,foreignKeyTable,foreignKeyLabel,dropdownActions,fields,fetchItems,convertFiltersToSQL,mutateFetchedItems,getForeignKeyTable,onFetchItems,isFilter,isUpdate,isDocEditing,items,onAddProps,fetchDataOpts,...props} = _props;
+    let {foreignKeyColumn,foreignKeyTable,foreignKeyLabel,dropdownActions,fields,fetchItems:customFetchItem,convertFiltersToSQL,mutateFetchedItems,getForeignKeyTable,onFetchItems,isFilter,isUpdate,isDocEditing,items,onAddProps,fetchDataOpts,...props} = _props;
     props = defaultObj(props);
     props.data = defaultObj(props.data);
     foreignKeyColumn = foreignKeyColumn.trim();
     convertFiltersToSQL = defaultVal(convertFiltersToSQL,willConvertFiltersToSQL());
-    getForeignKeyTable = getForeignKeyTable || appConfig.get("getTableData");
+    getForeignKeyTable = getForeignKeyTable || appConfig.getDatabaseTableData;
     const fKeyTable = typeof getForeignKeyTable =='function' ? getForeignKeyTable(foreignKeyTable,props) : undefined
     if(!isObj(fKeyTable) || !(defaultStr(fKeyTable.tableName,fKeyTable.table))){
         console.error("type de données invalide pour la fKeyTable ",fKeyTable," composant SelectTableData",_props);
@@ -38,7 +38,7 @@ const TableDataSelectField = React.forwardRef((_props,ref)=>{
         items : [],isLoading : true,
     });
     fetchDataOpts = Object.clone(defaultObj(fetchDataOpts));
-    fetchItems = typeof fetchItems =='function' ? fetchItems : typeof fKeyTable.queryPath =='string' ?  (opts)=>{
+    const fetchItems = typeof customFetchItem =='function' ? customFetchItem : typeof fKeyTable.queryPath =='string' ?  (opts)=>{
         return fetch(fKeyTable.queryPath,opts);
     } : undefined;
     isUpdate = defaultBool(isUpdate,typeof isDocEditing ==='function' && isDocEditing({data:props.data,fKeyTable,foreignKeyTable}));

package/src/components/Form/FormData/componentsTypes.js

@@ -1,4 +1,4 @@
-import {defaultStr,defaultObj,defaultVal,isObj} from "$utils";
+import {defaultStr,isNonNullString,defaultObj,defaultVal,isObj} from "$utils";
 import Fields from "../Fields";
 //import dataFileManager from "$dataFileManager";
 import i18n from "$i18n";
@@ -106,7 +106,9 @@ export const getFilterComponentProps = (_props)=>{
         component = componentTypes[type];
     } else if(React.isComponent(componentTypes[type.replaceAll("_","")])){
         component = componentTypes[type.replaceAll("_","")];
-    } else {
+    } else if(isNonNullString(props.foreignKeyColumn) && isNonNullString(props.foreignKeyTable)) {
+        component = Fields.SelectTableData;
+    }else {
         const tt = type.replaceAll("_","").toLowerCase();
         if(React.isComponent(componentTypes[tt])){
             component = componentTypes[tt];

package/src/components/ScrollView/index.js

@@ -27,6 +27,7 @@ const ScrollViewComponent = React.forwardRef((props,ref) => {
   },[])
   return  virtualized ? <FlatList
     {...rest}
+    showsHorizontalScrollIndicator = {!isTouchDevice()}  showsVerticalScrollIndicator={!isTouchDevice()} 
     ref = {ref}
     testID = {testID}
     data={[]}
@@ -36,7 +37,7 @@ const ScrollViewComponent = React.forwardRef((props,ref) => {
     contentContainerStyle = {[!isNative && {flex:1,flexGrow: 1,maxHeight:Math.max(height-100,250)},rest.contentContainerStyle]}
     ListHeaderComponent={() => <View testID={testID+'_FlatListContent'} {...cProps} mediaQueryUpdateNativeProps = {mediaQueryUpdateNativeProps}
     >{children}</View>}
-    /> : <ScrollView ref={ref} {...rest} testID={testID} children={children}/>
+    /> : <ScrollView showsHorizontalScrollIndicator = {!isTouchDevice()}  showsVerticalScrollIndicator={!isTouchDevice()} ref={ref} {...rest} testID={testID} children={children}/>
 });
 
 ScrollViewComponent.displayName = "ScrollViewComponent";

package/src/layouts/DatabaseStatistics/index.js

@@ -7,7 +7,7 @@ import theme from "$theme";
 import PropTypes from "prop-types";
 
 export const title = 'Statistiques en BD';
-export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tableFilter,getTable,fetchCount,fetchData,title:customTitle,contentProps,containerProps,tables,Component,...props}){
+export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tableFilter,fetchCount,fetchData,title:customTitle,contentProps,containerProps,tables,Component,...props}){
         Component = React.isComponent(Component)? Component : Grid;
         containerProps = defaultObj(containerProps);
         const title = containerProps.title = defaultStr(containerProps.title,DatabaseStatisticScreen.title);