@fto-consult/expo-ui 6.27.0 → 6.27.1

package/package.json

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

package/src/components/BottomSheet/Provider.js

@@ -43,10 +43,15 @@ const Provider = React.forwardRef((props,innerRef)=>{
         }
     };
     React.setRef(ref,context);        
-    return <Menu {...props} {...state} visible={visible} sheet controlled onDismiss = {(e)=>{
+    return <Menu {...props} {...state} visible={visible} sheet controlled onDismiss = {(...args)=>{
         if(visible){
             setVisible(false);
         }
+        if(typeof state.onDismiss =='function'){
+            state.onDismiss(...args)
+        } else if(typeof props.onDismiss =='function'){
+            props.onDismiss(...args);
+        }
     }}/>
 });
 

package/src/components/Datagrid/Accordion/Row.js

@@ -6,7 +6,6 @@ import Label from "$ecomponents/Label";
 import PropTypes from "prop-types";
 import React from "$react";
 import theme from "$theme"
-import {isMobileNative} from "$cplatform";
 import {styles as rStyles,getRowStyle} from "../utils";
 import Swipeable from 'react-native-gesture-handler/Swipeable';
 import { useIsRowSelected,useDatagrid} from "../hooks";
@@ -30,7 +29,7 @@ const DatagridAccordionRow = React.forwardRef((props,ref)=>{
         callArgs,
     } = props;
     const {context} = useDatagrid();
-    let {wrapperStyle,title,right,rightProps,description,avatarContent,rowProps} = props;
+    let {title,right,rightProps,description,avatarContent,rowProps} = props;
     rightProps = defaultObj(rightProps);
     if(!isObj(item)) {
         return null;
@@ -108,6 +107,11 @@ const DatagridAccordionRow = React.forwardRef((props,ref)=>{
     } 
     right = typeof right === 'function'? right ({color:theme.colors.primaryOnSurface,selectable:true,style:[rStyles.lineHeight,styles.right]}) : right;
     const swipeableRef = React.useRef(null);
+    React.useEffect(()=>{
+        return ()=>{
+            React.setRef(swipeableRef,null);
+        }
+    },[])
     return  <Pressable
                 disabled = {selectable===false?true : false}
                 {...rowProps}
@@ -125,7 +129,15 @@ const DatagridAccordionRow = React.forwardRef((props,ref)=>{
                     selectable !== false && theme.styles.cursorPointer,
                     //style,
                 ]}
-                ref = {React.useMergeRefs(ref,innerRef)}
+                ref = {(el)=>{
+                    if(el){
+                        el.toggleExpand = (expand)=>{
+                            setExpanded(typeof expand =='boolean'? expand : !expanded);
+                        }
+                    }
+                    React.setRef(ref,el);
+                    React.setRef(innerRef,el);
+                }}
         >
         <Swipeable
             ref = {swipeableRef}
@@ -168,7 +180,9 @@ const DatagridAccordionRow = React.forwardRef((props,ref)=>{
                 style={[styles.renderedContent,viewWrapperStyle]} 
                 testID={testID+'_ContentContainer'}
             >
-                {avatarContent}
+                {hasAvatar?<View testID={testID+"_AvatarContentContainer"} style={[styles.avatarContent]}>
+                    {avatarContent}
+                </View> : avatarContent}
                 <View testID={testID+"_Content"} style={[styles.content,styles.wrap]}>
                     {title}
                     {description}

package/src/components/Datagrid/Accordion/index.js

@@ -201,9 +201,9 @@ const DatagridFactory = (Factory)=>{
                 numColumns = {numColumns}
                 key = {index}
                 ref = {(el)=>{
-                    if(isObj(this.renderingItemsProps) && isObj(this.renderingItemsProps[rowKey]) ){
-                        this.renderingItemsProps[rowKey].ref = el;
-                    }
+                    this.renderingItemsProps = defaultObj(this.renderingItemsProps);
+                    this.renderingItemsProps[rowKey] = defaultObj(this.renderingItemsProps[rowKey]);
+                    this.renderingItemsProps[rowKey].ref = el;
                 }}
                 style = {style}
                 callArgs = {this.getItemCallArgs({item,index})}
@@ -263,9 +263,14 @@ const DatagridFactory = (Factory)=>{
         /*** affiche les infos de l'item */
         onToggleExpandItem({item,index,rowIndex,rowKey,...rest}){
             if(!isObj(this.bottomSheetContext) || typeof this.bottomSheetContext.open !=='function') return;
+            if(!isObj(this.renderingItemsProps) || !isObj(this.renderingItemsProps[rowKey])) return;
             const callArgs = this.getItemCallArgs({item,index})
             return this.bottomSheetContext.open({
                 ...rest,
+                onDismiss : ()=>{
+                    const ref = this.renderingItemsProps[rowKey].ref;
+                    ref?.toggleExpand && ref?.toggleExpand(false);
+                },
                 children : <View style={[styles.expandedItemContent]} testID={'RN_DatagridAccordionExpanded'}>
                     {Object.mapToArray(this.state.columns,(columnDef,columnField,index)=>{
                         callArgs.columnDef = columnDef;
@@ -552,7 +557,7 @@ const DatagridFactory = (Factory)=>{
                         items = {this.state.data}
                         isLoading = {isLoading}
                         ref = {this.listRef}
-                        style = {styles.list}
+                        style = {[styles.list,rest.style]}
                         backToTopRef = {backToTopRef?(e)=>{
                             return this.backToTopRef.current;
                         }:false}
@@ -607,7 +612,7 @@ const styles = StyleSheet.create({
         maxHeight : 60
     },
     list : {
-        paddingHorizontal : 5,
+        paddingHorizontal : isNativeMobile()?10:0,
     },
     container : {
         position : 'relative',
@@ -628,7 +633,7 @@ const styles = StyleSheet.create({
         flexDirection:'row',
         alignItems : 'center',
         flex:1,
-        paddingHorizontal : 10,
+        paddingHorizontal : 0,
     },
     pullRight : {
         flexDirection : 'row',

package/src/components/Swiper/index.js

@@ -458,7 +458,6 @@ const styles = {
     left: 0,
     width:vertical ? width : width * count,
     flexDirection: vertical ? 'column' : 'row',
-    height : '100%',
   }),typeof height ==='number'? (vertical ? height * count : height) : undefiend,autoHeight),
   scrollViewContentContainer : {
     paddingBottom : 40,