@fto-consult/expo-ui 8.81.2 → 8.82.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.81.2",
+  "version": "8.82.1",
   "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.1",
+    "@fto-consult/common": "^4.51.2",
     "@fto-consult/expo-ui": "^8.73.1",
     "apexcharts": "^3.49.0",
     "file-saver": "^2.0.5",

package/src/components/Drawer/DrawerLayout/index.js

@@ -163,8 +163,11 @@ export default class DrawerLayout extends React.PureComponent {
         {this.props.children}
     </View>;
     }
+    /***
+     * retourne le min entre la dimension de l'écran et la prop drawerWidth passée en paramètre
+     */
     getDrawerWidth() { 
-        return defaultNumber(this.isPortal()? this.state.portalProps?.drawerWidth : 0,this.props.drawerWidth);
+        return Math.min(defaultNumber(this.isPortal()? this.state.portalProps?.drawerWidth : 0,this.props.drawerWidth),Dimensions.get("window").width);
     }
     render() {
         const { accessibilityViewIsModal, drawerShown, openValue } = this.state;

package/src/components/Dropdown/index.js

@@ -229,12 +229,16 @@ class DropdownComponent extends AppComponent {
         }
         this.updateSelected({...nState,data:!this.isBigList?[...this.state.data]: this.state.data,selected,selectedValuesKeys});
     }
-    compare (value,currentValue,avoidNullOrEmpty){
+    compare (value,currentValue){
         if(this.getValueKey(value) === this.getValueKey(currentValue)) return true;
         if(typeof this.props.compare =='function'){
             return this.props.compare(value,currentValue,{context:this,items:this.state.data})
         }
-        return NCompare(value,currentValue,defaultBool(avoidNullOrEmpty,true));
+        if(value === null || value ===""){
+            value  = "";
+        }
+        if(currentValue === null || currentValue =="") currentValue = "";
+        return NCompare(value,currentValue);
     }
     getCallArgs ({item,items,index,_index,...rest}) {
         return ({...rest,item,index,_index,counterIndex:_index,index,itemIndex:index,context:this,isDropdown:true,props:this.props,items,selectedColor:this.selectedColor,unselectedColor:theme.colors.text});

package/src/components/SimpleSelect/index.js

@@ -1,5 +1,6 @@
 import React from "$react";
 import {defaultObj,isDecimal,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";
 import { TouchableRipple} from "react-native-paper";
@@ -29,7 +30,7 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
     contentContainerProps = defaultObj(contentContainerProps);
     const prevLayout = React.usePrevious(layout);
     filter = defaultFunc(filter,x=>true);
-    compare = defaultFunc(compare,(a,b)=> a === b);
+    compare = defaultFunc(compare,compareUtil);
     const prevValue = React.usePrevious(value,compare);
     const selectedRef = React.useRef(undefined);
     const listRef = React.useRef(null);
@@ -89,7 +90,7 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
         return items;
     },[menuItems])
     React.useEffect(()=>{
-        if(compare(defaultValue == value)) return;
+        if(compare(defaultValue,value)) return;
         selectValue(defaultValue);
     },[defaultValue]);
     const setSelected = (node,update)=>{