@fto-consult/expo-ui 8.81.1 → 8.82.0

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

@@ -138,10 +138,11 @@ export default class DrawerLayout extends React.PureComponent {
                 icon = {this.state.portalProps?.closeIcon || !this.isPositionRight() == 'left'? 'chevron-left' : 'chevron-right'}
                 {...defaultObj(this.state.portalProps.closeIconProps)}
             />;
+            const titleContainerProps = defaultObj(this.state.portalProps?.titleContainerProps);
             return <>
-                <HStack style={[styles.portalTitle]} testID={testID+"_TitleContainer"}>
+                <HStack  testID={testID+"_TitleContainer"} {...titleContainerProps} style={[styles.portalTitle,titleContainerProps.style]}>
                     {isPositionRight? icon : null}
-                    <Label {...titleProps} style={[styles.portalTitleText]} testID={testID+"_DrawerLayoutTitle"}>
+                    <Label testID={testID+"_DrawerLayoutTitle"} {...titleProps} style={[styles.portalTitleText,titleProps.style]} >
                         {title}
                     </Label>
                     {!isPositionRight ? icon : null}
@@ -516,7 +517,12 @@ const styles = StyleSheet.create({
         justifyContent : 'space-between',
         alignItems : 'center',
         paddingHorizontal : 10,
-    }
+        flexWrap : 'nowrap',
+    },
+    portalTitleText : {
+        fontSize : 16,
+        fontWeight : 'bold',
+    },
 });
 const posPropType = PropTypes.oneOf(['left', 'right']);
 DrawerLayout.propTypes = {
@@ -563,6 +569,9 @@ DrawerLayout.propTypes = {
     drawerPosition : posPropType,
     position : posPropType,
     drawerWidth : PropTypes.number,
+    titleContainerProps : PropTypes.shape({
+        ...defaultObj(HStack.propTypes),
+    }),
   }),
 }
 

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)=>{