@fto-consult/expo-ui 6.32.4 → 6.32.5

package/package.json

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

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

@@ -2934,7 +2934,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 rowStyle.push(style);
             }
         }
-        let cells = null;
+        const cells = [];
         const Cell = React.isComponent(args.Cell) ? args.Cell : View;
         const isA = this.isAccordion();
         const sectionListHeaderProps = defaultObj(args.sectionListHeaderProps);

package/src/components/List/Virtuoso/index.js

@@ -286,9 +286,9 @@ const normalizeEvent = (e)=>{
     document.body.appendChild(style);
 }
 
-export const TableRowComponent = ({testID,style,...props}) => {
+export const TableRowComponent = ({testID,style,children,isSectionListHeader,rowData,...props}) => {
     const index = props['data-index'];
     const isOdd = typeof index =='number' ? index%2 > 0 : false;
     testID = defaultStr(testID,"_VirtuosoTableRow_"+index);
-    return <tr data-test-id={testID} {...props} style={StyleSheet.flatten(style)} className={classNames(props.className,"virtuoso-table-row",`table-row-${isOdd?"odd":"even"}`)}/>
+    return <tr data-test-id={testID} {...props} children={children} style={StyleSheet.flatten(style)} className={classNames(props.className,"virtuoso-table-row",`table-row-${isOdd?"odd":"even"}`)}/>
 };

package/src/components/Table/Row/Cell/index.js

@@ -14,6 +14,9 @@ const TableRowCellComponent = React.forwardRef(({children,columnDef,className,co
     const {renderCell,colsWidths} = useTable();
     const width = colsWidths && columnField ? colsWidths[columnField] : undefined;
     const {content,containerProps} = React.useMemo(()=>{
+        if(!isObj(rowData)){
+            return  {content:null};
+        }
         const rArgs = {...rest,columnDef,columnField,rowData,width,rowIndex,containerProps : {}};
         const r = typeof renderCell =='function' && renderCell (rArgs) ||  children;
         return {

package/src/components/Table/Row/RowWrapper.js

@@ -1,6 +1,8 @@
 import { forwardRef } from "react";
 
-const TableRowWrapperComponent = forwardRef(({children},ref)=>children);
+const TableRowWrapperComponent = forwardRef(({children,...rest},ref)=>{
+    return children;
+});
 
 TableRowWrapperComponent.displayName = "TableRowWrapperComponent";
 

package/src/components/Table/Row/SectionListHeaderRow.js

@@ -1,3 +1,10 @@
-export default function SectionListHeaderRow ({cells,rowIndex,headerContent}){
+import {useTable} from "../hooks";
+export default function SectionListHeaderRow ({cells,rowIndex,rowData,headerContent}){
+    const {visibleColsNames} = useTable();
+    if(!Array.isArray(cells) || !cells.length){
+        return visibleColsNames.map((c,i)=>{
+            return <td key={i}/>
+        })
+    }
     return cells;
 }

package/src/components/Table/Row/index.js

@@ -15,12 +15,9 @@ const isNative = isMobileNative();
 const nativeProps = isNative ? {} : {Cell,Row:SectionListHeaderRow};
 export default function TableRowComponent({cells,rowKey,rowData,index,...rest}){
     const {visibleColsNames,visibleColsNamesStr,renderSectionHeader,colsWidths,columns} = useTable();
-    if(!isObj(rowData)) {
-        return null;
-    };
     const content = React.useMemo(()=>{
-        if(rowData.isSectionListHeader){
-            if(typeof renderSectionHeader !='function'){
+        if(rowData?.isSectionListHeader){
+           if(typeof renderSectionHeader !='function'){
                 throw "Vous devez définir la fonction renderSectionListHeader, utile pour le rendu du contenu de section header de la table de données";
             }
             return renderSectionHeader({isSectionListHeader:true,renderSectionListHeaderOnFirstCell:true,
@@ -33,7 +30,7 @@ export default function TableRowComponent({cells,rowKey,rowData,index,...rest}){
         return visibleColsNames.map((columnField,cIndex)=>{
             const columnDef = columns[columnField];
             if(!isObj(columnDef)) return null;
-            return <Cell rowData={rowData} width={columnField ? colsWidths[columnField] : 0} rowKey={rowKey} children={rowData[columnField]} rowIndex={index} columnDef={columnDef} index={cIndex} key={columnField} columnField={columnField}/>
+            return <Cell rowData={rowData} width={columnField ? colsWidths[columnField] : 0} rowKey={rowKey} children={rowData && rowData[columnField]||null} rowIndex={index} columnDef={columnDef} index={cIndex} key={columnField} columnField={columnField}/>
         });
     },[rowKey,index,visibleColsNamesStr]);
     return <RowWrapper {...rest} rowKey={rowKey} rowData={rowData} rowIndex={index} style={[styles.row]}>

package/src/components/Table/index.js

@@ -257,7 +257,7 @@ const TableComponent = React.forwardRef(({containerProps,listContainerStyle,onRe
                                 if(!item) return null;
                                  const args = {rowData:item,rowIndex:index,index,bordered,isTable:true};
                                 args.selected = withDatagridContext ? useIsRowSelected(item,index) : false;
-                                return <TableRowComponent {...props} className={classNames(props.className,"table-row-tr")} style={[getRowStyle(args),styles.tr,props.style]}/>
+                                return <TableRowComponent rowData={item} isSectionListHeader={item?.isSectionListHeader} {...props} className={classNames(props.className,"table-row-tr")} style={[getRowStyle(args),styles.tr,props.style]}/>
                             },
                             Table: VirtuosoTableComponent,
                             EmptyPlaceholder : (props)=>{