@fto-consult/expo-ui 6.67.4 → 6.67.5

package/package.json

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

package/src/components/Dropdown/index.js

@@ -1103,29 +1103,27 @@ class DropdownComponent extends AppComponent {
                                 self.selectItem({value,valueKey,select:!multiple?true:select});
                             };
                             return (
-                                <Tooltip key={key} 
-                                    title = {content}
-                                    testID = {testID+"_DropdownTooltipContainer"}
-                                    style = {[[theme.styles.h100]]}
-                                    tooltipProps = {{style:[theme.styles.h100],testID:testID+"_DropdownTooltipPopoverContainer"}}
-                                >
-                                    <TouchableRipple   
-                                        testID={testID+"Container"}
-                                        style={{
-                                            flexDirection: "row",
-                                            height : '100%',
-                                            fontWeight : _isSelected ? 'bold' : 'normal',
-                                            alignItems: "center",
-                                        }}
+                                <>
+                                    <Tooltip key={key} 
+                                        title = {content}
+                                        testID = {testID+"_DropdownTooltipContainer"}
+                                        //style = {[[theme.styles.h100]]}
+                                        tooltipProps = {{style:[theme.styles.h100,theme.styles.w100],testID:testID+"_DropdownTooltipPopoverContainer"}}
                                         onPress={onItemPress}
+                                        Component={TouchableRipple}
+                                        //testID={testID+"Container"}
+                                        style={[
+                                            styles.itemContainer,{minHeight:!isBigList?MIN_HEIGHT:undefined},
+                                            _isSelected && styles.itemContainerBold
+                                        ]}
                                     >
-                                        <View testID={testID+"contentContainer"} {...itemContainerProps} style={[styles.itemContainer,{minHeight:!isBigList?MIN_HEIGHT:undefined},itemContainerProps.style]}>
+                                        <>
                                             {_isSelected ? <Icon onPress={onItemPress} name={isNonNullString(checkedIcon)?checkedIcon : (multiple || _isIos?"check":'radiobox-marked')} style={[styles.checkedIcon]} color={selectedColor} /> : null}
                                             {content}
-                                        </View>
-                                    </TouchableRipple>
-                                    <Divider disabled={isDisabled}/>
-                            </Tooltip>
+                                        </>
+                                </Tooltip>
+                                <Divider disabled={isDisabled}/>
+                                </>
                         )}}
                     />
                 </View>
@@ -1151,6 +1149,10 @@ const styles = StyleSheet.create({
         flex : 1,
         alignItems : 'center',
         paddingHorizontal : 8,
+        fontWeight : "normal",
+    },
+    itemContainerBold : {
+        fontWeight : "bold",
     },
     left : {
         paddingHorizontal:0,

package/src/components/Tooltip/Popover/index.web.js

@@ -7,9 +7,10 @@ import Label from "$ecomponents/Label";
 import { TIPPY_THEME } from '$theme/updateNative/utils';
 import {isDOMElement} from "$cutils/dom";
 import {uniqid,defaultStr,defaultObj} from "$cutils";
+import {Pressable} from "react-native";
 
-const TippyTooltipComponent  = React.forwardRef((props,ref)=>{
-    let {children,content,testID,...rest} = props;
+const TippyTooltipComponent  = React.forwardRef(({children,onPress,onPressOut,content,onPressIn,onLongPress,testID,...rest},ref)=>{
+    const hasPress = onPress || onPressOut || onPressIn || onLongPress;
     testID = defaultStr(testID,"RN_TooltipPopoverComponent")
     const instanceIdRef = React.useRef(uniqid("tippy-instance-id")); 
     const buttonRef = React.useRef(null);
@@ -46,12 +47,21 @@ const TippyTooltipComponent  = React.forwardRef((props,ref)=>{
         ...defaultObj(rest),
         id:instanceIdRef.current,
     }
-    if(typeof children =='function'){
-        return children(cProps,innerRef);
+    const isChildF = typeof children =='function';
+    children = isChildF ? children(cProps,innerRef) : children;
+    if(!hasPress){
+        if(isChildF) return children;
+        return <Label {...cProps} testID={testID} ref={innerRef}>
+            {children}
+        </Label>
     }
-    return  <Label {...cProps} testID={testID} ref={innerRef}>
+    if(!React.isValidElement(children)){
+        return null;
+    }
+    return <Pressable {...{onPress,onLongPress,onPressIn,onPressOut}} {...cProps} testID={testID} ref={innerRef}>
         {children}
-    </Label>
+    </Pressable>
+    return  
 });
 TippyTooltipComponent.propTypes = {
     content: PropTypes.any, //le contenu du tooltip