@fto-consult/expo-ui 8.83.1 → 8.83.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.83.1",
+  "version": "8.83.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {
@@ -70,7 +70,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.51.2",
+    "@fto-consult/common": "^4.52.0",
     "@fto-consult/expo-ui": "^8.73.1",
     "apexcharts": "^3.49.0",
     "file-saver": "^2.0.5",

package/src/components/SimpleSelect/index.js

@@ -1,5 +1,5 @@
 import React from "$react";
-import {defaultObj,isDecimal,defaultStr,debounce,extendObj,defaultVal,defaultFunc} from "$cutils";
+import {defaultObj,defaultStr,debounce,extendObj,defaultVal,defaultFunc} from "$cutils";
 import {compare as compareUtil} from "$cutils";
 import TextField,{flatMode} from "$ecomponents/TextField";
 import {Pressable,Dimensions,StyleSheet} from "react-native";
@@ -16,6 +16,8 @@ import {isDesktopMedia} from "$cplatform/dimensions";
 import { matchOperators,getSearchTimeout,canAutoFocusSearchField} from "$ecomponents/Dropdown/utils";
 import Dialog from "$ecomponents/Dialog";
 
+const isValidValue =(value)=> typeof value === "string" || typeof value === "number" || typeof value =="boolean" || isObj(value) || Array.isArray(value);
+
 const  SimpleSelect = React.forwardRef((props,ref)=>{
     let {style : customStyle,onMount,mode,showSearch,anchorContainerProps,renderText,contentContainerProps,withCheckedIcon,testID,selectionColor,dialogProps,onShow,anchor,onUnmont,controlled:cr,onDismiss,visible:controlledVisible,selectedColor,inputProps,itemProps,itemContainerProps,label,listProps,readOnly,text,filter,renderItem,itemValue,getItemValue,defaultValue,items:menuItems,onPress,onChange,disabled,...rest} = props;
     const flattenStyle = StyleSheet.flatten(customStyle) || {};
@@ -42,8 +44,8 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
             return index;
         }
         if(isObj(item)) {
-            if(isNonNullString(item._id)) return item._id;
-            if(isNonNullString(item.code)) return item.code;
+            if(isNonNullString(item._id) || typeof item._id =="number") return item._id;
+            if(isNonNullString(item.code) || typeof item.code =="number") return item.code;
             return index;
         }
         return index;
@@ -58,16 +60,16 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
         const isValueDifferent = !compare(defaultValue,value);
         Object.map(menuItems,(item,index,_index)=>{
             if(React.isValidElement(item) || !filter({items:menuItems,item,_index,index})) return null;
-            const backupItem = item;
             if(!isObj(item)) {
-                if(isDecimal(item) || isNonNullString(item)){
-                    item = {label:item+""};
+                if(isValidValue(item)){
+                    item = {label:String(item),code:item};
                 } else return null;
             }
+            const backupItem = item;
             const {code,label,text} = item;
             let itValue = itemValue({item:backupItem,index,_index});
             if(itValue === undefined){
-                itValue = isNonNullString(code)? code : index;
+                itValue = isValidValue(code)? code : index;
             }
             const mItem = {item:backupItem,value:itValue,index,_index};
             let content = renderItem ? renderItem({item:backupItem,index,_index,value:itValue}) : defaultVal(label,text,code);
@@ -75,8 +77,11 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
             if(!content && typeof content != "number"){
                 content = rText;
             }
-            if(isDecimal(content)) content+="";
-            if(!React.isValidElement(content,true)) return null;
+            if(typeof content !="string") content = String(content);
+            if(!React.isValidElement(content,true)) {
+                console.warn("Simple select, invalid meuitem content: ",content,mItem,props);
+                return null;
+            }
             mItem.content = content;
             mItem.textContent = React.getTextContent(rText) || React.getTextContent(content);
             if(isValueDifferent && itValue !== undefined && compare(defaultValue,itValue)){
@@ -88,9 +93,11 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
             items.push(mItem);
         });
         return items;
-    },[menuItems])
+    },[menuItems,defaultValue,value]);
     React.useEffect(()=>{
-        if(compare(defaultValue,value)) return;
+        if(compare(defaultValue,value)) {
+            return;
+        }
         selectValue(defaultValue);
     },[defaultValue]);
     const setSelected = (node,update)=>{