@fto-consult/expo-ui 6.15.4 → 6.16.0

package/babel.config.alias.js

@@ -82,7 +82,7 @@ module.exports = (opts)=>{
     const outputPath = path.resolve(HelpScreen,"openLibraries.js");
     r.$nodeModulesPath = r.$enodeModulesPath= nodeModulesPath;
     require("./find-licenses")({
-        paths : [root,r["$expo-ui-root-path"]],
+        paths : [root,r["$expo-ui-root-path",path.resolve(process.cwd())]],
         nodeModulesPath : nodeModulesPath,
         outputPath
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.15.4",
+  "version": "6.16.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -62,7 +62,7 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.23.1",
+    "@fto-consult/common": "^3.23.13",
     "@gorhom/portal": "^1.0.14",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

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

@@ -45,7 +45,7 @@ export const renderRowCell = (arg)=>{
         } else if(typeof columnDef.render === "function"){
             _render = columnDef.render.call(context,renderArgs);
         } else if(arrayValueExists( _type,["date","datetime","time"])){
-            const sqlFormat =_type === 'time'?DateLib.isoTimeFormat : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
+            const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
             let _dd =DateLib.parse(rowData[columnField],sqlFormat);
             if(DateLib.isDateObj(_dd)){
                 const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));

package/src/components/ErrorBoundary/ErrorMessage.js

@@ -2,7 +2,7 @@ import * as React from 'react'
 import Types from 'prop-types';
 import {StyleSheet,ScrollView,View,useWindowDimensions} from "react-native";
 import {Paragraph,Button,List } from "react-native-paper";
-import Portal from "$ecomponents/Portal";
+import {Portal} from "react-native-paper";
 import theme from "$theme";
 import {navigationRef,sanitizeName} from "$cnavigation";
 import Expandable from "$ecomponents/Expandable";

package/src/components/ErrorBoundary/Provider.js

@@ -1,5 +1,5 @@
 import ErrorMessage from "./ErrorMessage";
-import Portal from "$ecomponents/Portal";
+import {Portal} from "react-native-paper";
 let providerRef = null;
 import * as React from "react";
 import useForceRender from "$react/useForceRender";

package/src/components/Fab/Group.js

@@ -6,7 +6,7 @@ import PropTypes from "prop-types";
 import {MENU_ICON} from "$ecomponents/Icon";
 import theme,{Colors} from "$theme";
 import Group from "./GroupComponent";
-import Portal from "$ecomponents/Portal";
+import {Portal} from "react-native-paper";
 import {isAllowedFromStr} from "$cauth/perms";
 
 const activeRef = {current:null};

package/src/components/Table/AbsoluteScrollView.js

@@ -5,7 +5,7 @@
 import { ScrollView,StyleSheet,View,useWindowDimensions,Dimensions} from "react-native";
 import React from "$react";
 import {defaultStr,defaultObj,isObj,isNumber} from "$cutils";
-import Portal from "$ecomponents/Portal";
+import {Portal} from "react-native-paper";
 import {isMobileNative,isTouchDevice} from "$platform";
 
 const isNative = isMobileNative() || isTouchDevice();

package/src/components/TableLink/index.js

@@ -11,7 +11,7 @@ import {defaultStr,isPromise,defaultObj} from "$cutils";
 import {open as openPreloader,close as closePreloader} from "$preloader";
 import {styles as _styles} from "$theme";
 import Tooltip from "$ecomponents/Tooltip";
-import {navigateToTableData} from "$enavigation/utils";
+import {navigateToTableData,navigateToStructData} from "$enavigation/utils";
 import Auth from "$cauth";
 import fetch from "$capi/fetch";
 import useContext from "$econtext/hooks";
@@ -46,8 +46,9 @@ const TableLinKComponent = React.forwardRef((props,ref)=>{
             const r2 = typeof fetchForeignData === 'function'? fetchForeignData({...args,...defaultObj(a)}) : undefined;
             if(isPromise(r2)){
                 return r2.then((data)=>{
+                    const nav = isStructData ? navigateToStructData : navigateToTableData;
                     if(isObj(data) && (isNonNullString(foreignKeyColumn) ? data[foreignKeyColumn] !== undefined:true)){
-                        navigateToTableData({tableName:foreignKeyTable,data});
+                        nav({tableName:foreignKeyTable,isStructData,data});
                     }
                 });
             }

package/src/components/TextField/index.js

@@ -52,6 +52,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
         lower,
         dynamicBackgroundColor,
         lowerCase,
+        onContentSizeChange,
         handleOpacity,
         ...props} = componentProps;
     upper = defaultBool(upper,upperCase,false);
@@ -294,7 +295,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
     const currentDefaultValue = alwaysUseLabel && displayText == emptyValue ? "" : displayText;
     const withAutoHeight = typeof autoHeight === 'boolean'? autoHeight : false;
     const height = withAutoHeight || multiline ? undefined : tHeight;
-    const inputStyle2 = withAutoHeight || multiline ? {minHeight : heightRef.current} : null;
+    const inputStyle2 = withAutoHeight || multiline ? {height : heightRef.current} : null;
     const containerStyle = StyleSheet.flatten(containerProps.style) || {};
     const inputProps= {
         caretHidden : false,
@@ -356,7 +357,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
             inputStyle2,
             isNormalMode && styles.inputNormalMode,
             isShadowMode && styles.inputShadowMode,
-            isShadowMode && multiline && {minHeight:heightRef.current},
+            //isShadowMode && multiline && {minHeight:heightRef.current},
             multiline && {paddingTop : isFlatMode? 12 : 7},
         ],
         secureTextEntry,
@@ -368,6 +369,13 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
         displayText,
         parsedValue,
         rows:numberOfLines,
+        onContentSizeChange : (e,...rest) => {
+            if(typeof onContentSizeChange ==='function' && onContentSizeChange(e,...rest) === false)  return;
+            if(multiline){
+                heightRef.current = e.nativeEvent.contentSize.height;
+                setToggle(!toggle);
+            }
+        },
         onChange : ({ nativeEvent: {target, text:text2} }) => {
             if(canValueBeDecimal && (text2 && !text2.isNumber() && !text2.endsWith(".") && !text2.endsWith(","))) {
                 return;
@@ -375,28 +383,11 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
             if(canValueBeDecimal && isFocused && (text2 ==='.'|| text2 =='.')){
                 text2 = "0"+text2;
             }
-            if(multiline){
-                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);
             if(tVal !== text){
+                if(multiline && tVal.toLowerCase()+"\n" === text.toLowerCase()){
+                    heightRef.current = Math.max(heightRef.current - 16,MULTIPLE_HEIGHT);
+                }
                 setText(text2,true);
                 callOnChange(tVal);
             }

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -8,7 +8,6 @@ import { useNavigation} from '$cnavigation';
 import Fab from "$layouts/Fab";
 import APP from "$capp";
 import AppBar,{createAppBarRef} from "$elayouts/AppBar";
-import Portal from "$ecomponents/Portal";
 import {Portal as RNPortal} from "react-native-paper";
 import theme,{StyleProp} from "$theme";
 import StatusBar from "$ecomponents/StatusBar";