@fto-consult/expo-ui 6.55.2 → 6.55.4

package/package.json

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

package/src/components/Datagrid/Common/Common.js

@@ -42,6 +42,7 @@ import * as XLSX from "xlsx";
 import {convertToSQL} from "$ecomponents/Filter";
 import events from "../events";
 import {MORE_ICON} from "$ecomponents/Icon"
+import ActivityIndicator from "$ecomponents/ActivityIndicator";
 
 export const TIMEOUT = 100;
 
@@ -3648,7 +3649,7 @@ export default class CommonDatagridComponent extends AppComponent {
         },0);
     }
     getDefaultPreloader(props){
-        return CommonDatagridComponent.getDefaultPreloader();
+        return CommonDatagridComponent.getDefaultPreloader({isDashboard:this.isDashboard()});
     }
     isLoading (){
         if(this.state.isReady === false) return true;
@@ -3842,8 +3843,9 @@ export default class CommonDatagridComponent extends AppComponent {
 
 export const ProgressBar = CommonDatagridComponent.LinesProgressBar;
 
-CommonDatagridComponent.getDefaultPreloader = (props)=>{
-    return <Preloader {...defaultObj(props)}/>
+CommonDatagridComponent.getDefaultPreloader = (r)=>{
+    const {isDashboard,...props} = defaultObj(r);
+    return isDashboard? <ActivityIndicator size={"large"} {...props} style={[theme.styles.pb10,props.style]}/> : <Preloader {...props}/>
 }
 
 const chartDisplayType = PropTypes.oneOf(Object.keys(displayTypes).filter(type=>{

package/src/components/Dialog/DialogContent.js

@@ -5,7 +5,6 @@ import { useWindowDimensions } from "react-native";
 const DialogContentComponent = ({isPreloader,title,children,isFullScreen,...props})=>{
     const isFull = isFullScreen();
     const content = React.useMemo(()=>children,[isPreloader,title,children]);
-    return content;
     return isPreloader || !isFull ? content : <KeyboardAvoidingView testID="RN_DialogKeybaordAvoidingView">{content}</KeyboardAvoidingView>
 }
 export default DialogContentComponent;

package/src/components/Dropdown/index.js

@@ -21,6 +21,7 @@ import Menu from "$ecomponents/Menu/Menu";
 import Chip from "$ecomponents/Chip";
 import {Content as BottomSheet,Menu as BottomSheetMenu,getContentHeight} from "$ecomponents/BottomSheet";
 import {isWeb} from "$cplatform";
+import Tooltip from "$ecomponents/Tooltip";
 
 const _isIos = isIos();
 
@@ -1102,8 +1103,13 @@ class DropdownComponent extends AppComponent {
                                 self.selectItem({value,valueKey,select:!multiple?true:select});
                             };
                             return (
-                                <Fragment key={key}>
-                                    <TouchableRipple
+                                <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",
@@ -1119,7 +1125,7 @@ class DropdownComponent extends AppComponent {
                                         </View>
                                     </TouchableRipple>
                                     <Divider disabled={isDisabled}/>
-                            </Fragment>
+                            </Tooltip>
                         )}}
                     />
                 </View>

package/src/components/List/Common.js

@@ -40,7 +40,7 @@ const CommonListComponent = React.forwardRef((props,ref)=>{
             }
             let ret = renderItem({item,numColumns,index,section,numColumns,itemContainerWidth:itemWindowWidth,itemWindowWidth,...rest,isScrolling:listRef.current?.isScrolling?true:false,items:defaultArray(context.items)});
             if(typeof ret =='string' || typeof ret =='number'){
-                return <Label children = {ret}/>
+                return <Label testID={testID+"_ListItemLabel"} children = {ret}/>
             } 
             return (React.isValidElement(ret)) ? ret : null; 
         },

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

@@ -9,7 +9,8 @@ import {isDOMElement} from "$cutils/dom";
 import {uniqid,defaultStr,defaultObj} from "$cutils";
 
 const TippyTooltipComponent  = React.forwardRef((props,ref)=>{
-    let {children,content,...rest} = props;
+    let {children,content,testID,...rest} = props;
+    testID = defaultStr(testID,"RN_TooltipPopoverComponent")
     const instanceIdRef = React.useRef(uniqid("tippy-instance-id")); 
     const buttonRef = React.useRef(null);
     const innerRef = React.useMergeRefs(ref,buttonRef);
@@ -48,7 +49,7 @@ const TippyTooltipComponent  = React.forwardRef((props,ref)=>{
     if(typeof children =='function'){
         return children(cProps,innerRef);
     }
-    return  <Label {...cProps} ref={innerRef}>
+    return  <Label {...cProps} testID={testID} ref={innerRef}>
         {children}
     </Label>
 });