@fto-consult/expo-ui 6.9.0 → 6.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.9.0",
+  "version": "6.10.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -73,11 +73,11 @@
     "@react-navigation/native-stack": "^6.9.13",
     "@shopify/flash-list": "1.4.3",
     "apexcharts": "^3.41.0",
-    "expo": "^49.0.4",
+    "expo": "^49.0.5",
     "expo-camera": "~13.4.2",
     "expo-clipboard": "~4.3.0",
     "expo-font": "~11.4.0",
-    "expo-image-picker": "~14.3.1",
+    "expo-image-picker": "~14.3.2",
     "expo-linking": "~5.0.2",
     "expo-sqlite": "~11.3.1",
     "expo-status-bar": "~1.6.0",
@@ -94,7 +94,7 @@
     "react-dom": "^18.2.0",
     "react-native": "0.72.3",
     "react-native-big-list": "^1.6.1",
-    "react-native-blob-util": "^0.18.4",
+    "react-native-blob-util": "^0.18.6",
     "react-native-gesture-handler": "^2.12.0",
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
@@ -102,11 +102,11 @@
     "react-native-paper-dates": "^0.18.12",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
-    "react-native-screens": "^3.22.1",
+    "react-native-screens": "~3.22.0",
     "react-native-svg": "13.9.0",
     "react-native-web": "~0.19.6",
     "react-native-webview": "13.2.2",
-    "react-virtuoso": "^4.4.1",
+    "react-virtuoso": "^4.4.2",
     "sharp-cli": "^4.1.1",
     "tippy.js": "^6.3.7",
     "websql": "^2.0.3",

package/src/components/Datagrid/utils.js

@@ -185,4 +185,4 @@ export const getRowStyle = ({row,bordered,numColumns,rowData,isAccordion,isTable
     return style;
 }
 
-export const willConvertFiltersToSQL = x=>!!appConfig.get("convertDatagridFiltersToSQL");
+export const willConvertFiltersToSQL = x=>!!appConfig.get("convertFiltersToSQL");

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

@@ -19,9 +19,9 @@ import useApp from "$econtext/hooks";
  *  foreignKeyTable : la tableData dans laquelle effectuer les donées de la requêtes
  *  foreignKeyLabel : Le libélé dans la table étrangère
  */
-const TableDataSelectField = React.forwardRef(({foreignKeyColumn,prepareFilters:cPrepareFilters,bindUpsert2RemoveEvents,onAdd,showAdd:customShowAdd,canShowAdd,foreignKeyTable,fetchItemsPath,foreignKeyLabel,foreignKeyLabelIndex,dropdownActions,fields,fetchItems:customFetchItem,convertFiltersToSQL,mutateFetchedItems,onFetchItems,isFilter,isUpdate,isDocEditing,items,onAddProps,fetchOptions,...props},ref)=>{
+const TableDataSelectField = React.forwardRef(({foreignKeyColumn,isStructData,getForeignKeyTable:cGetForeignKeyTable,prepareFilters:cPrepareFilters,bindUpsert2RemoveEvents,onAdd,showAdd:customShowAdd,canShowAdd,foreignKeyTable,fetchItemsPath,foreignKeyLabel,foreignKeyLabelIndex,dropdownActions,fields,fetchItems:customFetchItem,convertFiltersToSQL,mutateFetchedItems,onFetchItems,isFilter,isUpdate,isDocEditing,items,onAddProps,fetchOptions,...props},ref)=>{
     props.data = defaultObj(props.data);
-    const {getTableData:getForeignKeyTable} = useApp();
+    const {getTableData:appGetForeignKeyTable,getStructData} = useApp();
     if(!foreignKeyColumn && isNonNullString(props.field)){
         foreignKeyColumn = props.field;
     }
@@ -32,6 +32,7 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,prepareFilters:
         foreignKeyLabel = foreignKeyLabel.trim();
         foreignKeyLabel = foreignKeyLabel.ltrim("[").rtrim("]").split(",");
     }
+    const getForeignKeyTable = typeof cGetForeignKeyTable =='function'? cGetForeignKeyTable : isStructData ? getStructData: appGetForeignKeyTable;
     convertFiltersToSQL = defaultVal(convertFiltersToSQL,willConvertFiltersToSQL());
     const foreignKeyTableStr = defaultStr(foreignKeyTable,props.tableName,props.table);
     if(typeof getForeignKeyTable !=='function'){

package/src/components/Form/List/List.js

@@ -462,7 +462,7 @@ export default class FormListComponent extends AppComponent {
         renderAvatar = defaultFunc(renderAvatar,x=>null);
         /*** les props de chaque items de la liste */
         itemProps= {...defaultObj(itemProps)}
-        const descriptionNumberOfLines = typeof itemProps.numberOfLines ==='number' && itemProps.numberOfLines ? itemProps.numberOfLines : 3;
+        const descriptionNumberOfLines = typeof itemProps.rows ==='number' && itemProps.rows ? itemProps.rows : 3;
         let counter = -1;
         let is_o = this.isHandlingObject;
         let addIconObj = null;

package/src/components/Swiper/index.js

@@ -288,7 +288,6 @@ class SwiperComponent extends React.Component {
     const autoHeight = !!this.props.autoHeight;
     const height = autoHeight ? undefined : !isReady ? WIDTH_HEIGHT : customHeight;
     if(withScrollView){
-      wrapperProps.nestedScrollEnabled = typeof wrapperProps.nestedScrollEnabled ==="boolean"? wrapperProps.nestedScrollEnabled : isNative;
       if(typeof wrapperProps.showsVerticalScrollIndicator !=='boolean'){
         wrapperProps.showsVerticalScrollIndicator = !isNative;
       }

package/src/components/TextField/index.js

@@ -367,7 +367,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
         formattedValue,
         displayText,
         parsedValue,
-        numberOfLines,
+        rows:numberOfLines,
         onChange : ({ nativeEvent: {target, text:text2} }) => {
             if(canValueBeDecimal && (text2 && !text2.isNumber() && !text2.endsWith(".") && !text2.endsWith(","))) {
                 return;
@@ -376,12 +376,23 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
                 text2 = "0"+text2;
             }
             if(multiline){
-                if(!text2 || text2.length < 30){
-                    heightRef.current = MULTIPLE_HEIGHT;
-                    setToggle(!toggle);
-                } else  if(target.scrollHeight > heightRef.current){
-                    heightRef.current = Math.max(target.scrollHeight,MULTIPLE_HEIGHT); 
-                    setToggle(!toggle);
+                let hasS = false;
+                if(text2){
+                    const spl = text2.trim().split('\n');
+                    if(spl.length>1){
+                        heightRef.current+=MULTIPLE_HEIGHT+(10*(spl.length-1));
+                        hasS = true;
+                        setToggle(!toggle);
+                    }
+                }
+                if(!hasS){
+                    if(!text2 || text2.length < 30){
+                        heightRef.current = MULTIPLE_HEIGHT;
+                        setToggle(!toggle);
+                    } else  if(target.scrollHeight > heightRef.current){
+                        heightRef.current = Math.max(target.scrollHeight,MULTIPLE_HEIGHT); 
+                        setToggle(!toggle);
+                    }
                 }
             }
             const tVal = toCase(text2);

package/src/context/Provider.js

@@ -17,6 +17,7 @@ import Login from "$eauth/Login";
     getStructData : ()=>{object|array}
     tablesData : {object}, la liste des tables de données
     strucsData : {object}, la liste des données de structures
+    convertFiltersToSQL : {boolean}, si les filtres de datagrid ou filtres seront convertis au format SQL
     components : {
         logo : {
             object |
@@ -31,7 +32,7 @@ import Login from "$eauth/Login";
       drawerItems : {object|array|function}, la fonction permettant d'obtenir les items du drawer principal de l'application
     }
 */
-const Provider = ({children,getTableData,navigation,components,getStructData,tablesData,structsData,...props})=>{
+const Provider = ({children,getTableData,navigation,components,convertFiltersToSQL,getStructData,tablesData,structsData,...props})=>{
     const {extendAppTheme} = appConfig;
     const { theme : pTheme } = useMaterial3Theme();
     navigation = defaultObj(navigation);
@@ -44,6 +45,9 @@ const Provider = ({children,getTableData,navigation,components,getStructData,tab
     getTableData = appConfig.getTable = appConfig.getTableData = getTableOrStructDataCall(tablesData,getTableData);
     getStructData = appConfig.getStructData = getTableOrStructDataCall(structsData,getStructData);
     appConfig.LoginComponent = Login;
+    if(convertFiltersToSQL !== undefined){
+      appConfig.set("convertFiltersToSQL",convertFiltersToSQL);
+    }
     //const colorScheme = useColorScheme();
     appConfig.extendAppTheme = (theme)=>{
         if(!isObj(theme)) return;
@@ -77,6 +81,7 @@ const Provider = ({children,getTableData,navigation,components,getStructData,tab
       value={{
         ...props,
         navigation,
+        convertFiltersToSQL,
         components : {
             ...components,
             loginPropsMutator : (props)=>{

package/src/layouts/Screen/TableData.js

@@ -377,11 +377,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
         const isMobile = isMobileOrTabletMedia();
         const contentProps = restProps.contentProps;
         const elevation = restProps.elevation;
-        const renderingTabsProps = {tabs,data:this.getCurrentData(),tabsPropsMutator:({tabs,tabsProps})=>{
-            if(!isMobileOrTabletMedia()){
-                tabsProps.withScrollView = false;
-            }
-        },isMobile,sessionName:this.getSessionName(),props:restProps,tabProps,tabsProps,context,tabKey};
+        const renderingTabsProps = {tabs,data:this.getCurrentData(),isMobile,sessionName:this.getSessionName(),props:restProps,tabProps,tabsProps,context,tabKey};
         const hasTabs = Object.size(tabs,true);
         let mainContent = undefined;
         testID = defaultStr(testID,"RN_TableDataScreenItem_"+restProps.tableName);
@@ -430,7 +426,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             appBarProps.elevation = 0;
             restProps.elevation = 0;
         }
-        return <ScreenContainer  {...restProps} withScrollView={false} appBarProps = {appBarProps} testID={testID}>
+        return <ScreenContainer  {...restProps} appBarProps = {appBarProps} testID={testID}>
             {this.wrapRenderingContent(mainContent,{testID})}
         </ScreenContainer>
     }

package/src/layouts/Screen/utils.js

@@ -8,7 +8,7 @@ import {getTableDataRouteName} from "$enavigation/utils";
 //@seee : https://github.com/typeorm/typeorm/blob/master/src/entity-schema/EntitySchemaColumnOptions.ts
 export const generatedColumnsProperties = ["createDate","updateDate","deleteDate","createBy","updateBy","deleteBy"]
 
-export const renderTabsContent = ({tabs,context,data,sessionName,tabsPropsMutator,isMobile,props,firstTab,tabKey,tabProps,tabsProps})=>{
+export const renderTabsContent = ({tabs,context,data,sessionName,isMobile,props,firstTab,tabKey,tabProps,tabsProps})=>{
     let tabsArr = [],hasFirstTab = false; 
     if(React.isValidElement(firstTab)){
         tabsArr.push(firstTab);
@@ -52,9 +52,6 @@ export const renderTabsContent = ({tabs,context,data,sessionName,tabsPropsMutato
         })
     }
     if(tabsArr.length> (hasFirstTab ? 1 : 0)){
-        if(typeof tabsPropsMutator =='function' && tabsPropsMutator({tabsProps,tabs:tabsArr,hasFirstTab}) === false){
-            return null;
-        }
         return <Tab testID={testID}
              {...tabsProps} 
             onChange={(args)=>{