@fto-consult/expo-ui 2.41.0 → 2.42.1

package/package.json

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

package/src/components/Dropdown/utils.js

@@ -17,6 +17,6 @@ export const canAutoFocusSearchField = ({visible,items})=>{
     const count = typeof items =='number'? items : typeof (items) === 'object' ? Object.size(items) : 0;
     if(!visible) return false;
     const ret = count > MAX_AUTO_FOCUS_ITEMS && true || false;
-    if(!isNativeMobile() && !isTouchDevice()) return ret;
+    if(!isNativeMobile() && !isTouchDevice()) return true;
     return isNativeMobile()? ret : false;
 }

package/src/components/SimpleSelect/index.js

@@ -25,27 +25,15 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
     });
     const [state,setState] = React.useState({
         value : defaultValue !== undefined? defaultValue:undefined,
-        visible : controlled?undefined:false,
+        visible : controlled?controlledVisible:false,
         items : [],
     });
     contentContainerProps = defaultObj(contentContainerProps);
     const prevLayout = React.usePrevious(layout);
     filter = defaultFunc(filter,x=>true);
-    const value = state.value,
-    visible = controlled? controlledVisible : state.visible;
+    const {value,visible} = state;
     compare = defaultFunc(compare,(a,b)=> a === b);
     const prevValue = React.usePrevious(value,compare);
-    const setSelected = (node,update)=>{
-        if(update !== true && compare(value,node.value)) return;
-        selectedRef.current = node;
-        if(update === true){
-            const nState = {...state,value:node.value,visible:controlled?undefined:false};
-            if(controlled && onDismiss){
-                if(onDismiss(nState,defaultObj(selectedRef.current)) === false) return;
-            }
-            setState(nState);
-        }
-    }
     const selectedRef = React.useRef(undefined);
     const listRef = React.useRef(null);
     const isSelected = (itValue,index)=> {
@@ -65,13 +53,11 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
     renderText = typeof renderText ==='function'? renderText : ({item,content,index})=>{
         return React.getTextContent(content);
     }
-    const prevMenuItems = React.usePrevious(menuItems,stableHash);
-    const hasInitializedRef = React.useRef(false);
-    const areItemsEquals = hasInitializedRef.current && prevMenuItems == menuItems;//JSON.stringify(prevMenuItems) == JSON.stringify(menuItems);
-    const prepareItems = React.useCallback(()=>{
+    const menuItemsHash = stableHash(menuItems);
+    const items = React.useMemo(()=>{
         const items = [];
         selectedRef.current = null;
-        let currentSelectedValue = value;
+        //let currentSelectedValue = value;
         const isValueDifferent = !compare(defaultValue,value);
         Object.map(menuItems,(item,index,_index)=>{
             if(React.isValidElement(item) || !filter({items:menuItems,item,_index,index})) return null;
@@ -98,26 +84,30 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
             mItem.textContent = React.getTextContent(rText) || React.getTextContent(content);
             if(isValueDifferent && itValue !== undefined && compare(defaultValue,itValue)){
                 selectedRef.current = mItem;
-                currentSelectedValue = defaultValue;
-
+                //currentSelectedValue = defaultValue;
             } else if(isSelected(itValue,index)){
                 selectedRef.current = mItem;
             }
             items.push(mItem);
         });
-        hasInitializedRef.current = true;
-        setState({...state,value:currentSelectedValue,items});
-    },[stableHash(menuItems)])
-    const {items} = state;
+        return items;
+        //return ({...state,value:currentSelectedValue,items});
+    },[menuItemsHash])
     React.useEffect(()=>{
-        if(compare(defaultValue == value) && areItemsEquals) return;
-        if(!areItemsEquals){
-            prepareItems();
-        } else {
-            selectValue(defaultValue);
+        if(compare(defaultValue == value)) return;
+        selectValue(defaultValue);
+    },[defaultValue]);
+    const setSelected = (node,update)=>{
+        if(update !== true && compare(value,node.value)) return;
+        selectedRef.current = node;
+        if(update === true){
+            const nState = {...state,value:node.value,visible:controlled?undefined:false};
+            if(controlled && onDismiss){
+                if(onDismiss(nState,defaultObj(selectedRef.current)) === false) return;
+            }
+            setState(nState);
         }
-    },[menuItems,defaultValue]);
-    
+    }
     const context = {};
     const selectValue = context.selectValue = context.setValue = (defaultValue)=>{
         if(compare(defaultValue,value)) return;
@@ -133,7 +123,6 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
         }
     }
     context.getValue = ()=> value;
-    
     React.useEffect(()=>{
         if(compare(value,prevValue)) return;
         if(onChange){
@@ -178,9 +167,8 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
     }
     context.disabled = !isEditable;
     context.enabled = isEditable;
-
+    React.setRef(ref,context);
     React.useEffect(()=>{
-        React.setRef(ref,context);
         if(onMount ==='function'){
              onMount({context})
         }

package/src/components/Table/index.js

@@ -338,7 +338,7 @@ const TableComponent = React.forwardRef(({containerProps,listContainerStyle,onRe
                         numberOfLines = {1}
                         responsive = {false}
                         testID = {testID}
-                        preparedItems = {false}
+                        prepareItems = {false}
                         items = {items}
                         contentContainerStyle = {[styles.contentContainer,{with:listWidth,minWidth:totalWidths,position:'absolute',right:'0'}]}
                         style = {[styles.datagrid,{width:listWidth,minWidth:totalWidths}]}

package/src/navigation/utils.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 import {navigate,sanitizeName} from "$cnavigation";
-import {isNonNullString,defaultObj,isObj} from "$utils";
+import {isNonNullString,defaultStr,defaultObj,isObj} from "$utils";
 export const tableDataRouteName = 'TableData';
 
 export const navigateToTableData = function(tableName,params,actionType){
@@ -33,6 +33,9 @@ export const navigateToTableData = function(tableName,params,actionType){
 }
 
 export const buildScreenRoute = function(tableName,parent){
+    if(isObj(tableName)){
+        tableName = defaultStr(tableName.tableName,tableName.table);
+    }
     if(!isNonNullString(tableName)) return undefined;
     parent = defaultStr(parent,tableDataRouteName);
     if(parent){
@@ -45,11 +48,15 @@ export const getTableDataRouteName = function(tableName){
     return buildScreenRoute(tableName,tableDataRouteName);
 }
 
+export const getTableDataScreenName = getTableDataRouteName;
+
 /*** permet d'obtenir le lien vers l'écran table data permettant de lister les données de la table data */
 export const getTableDataListRouteName = function(tableName){
     return buildScreenRoute(tableName,tableDataRouteName+"/LIST/");
 }
 
+export const getTableDataListScreenName = getTableDataListRouteName;
+
 export const navigateToTableDataList = function (tableName,params){
     const route = getTableDataListRouteName(tableName);
     if(isNonNullString(route)){