@fto-consult/expo-ui 2.11.1 → 2.11.2

package/package.json

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

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

@@ -1510,7 +1510,7 @@ export default class CommonDatagridComponent extends AppComponent {
     }
     UNSAFE_componentWillReceiveProps(nextProps){
         if(!isObjOrArray(nextProps.data) || nextProps.data == this.props.data || stableHash(nextProps.data) == stableHash(this.props.data)) {
-            if(nextProps.isLoading !== this.props.isLoading && typeof nextProps.isLoading =='boolean'){
+            if( typeof this.props.isLoading=='boolean' && nextProps.isLoading !== this.props.isLoading && typeof nextProps.isLoading =='boolean'){
                 this.setIsLoading(nextProps.isLoading)
             }
             return;
@@ -1536,6 +1536,7 @@ export default class CommonDatagridComponent extends AppComponent {
     renderHeaderCell({columnDef,columnField}){
         if(this.isSelectableColumn(columnDef,columnField)){
             return <Checkbox
+                testID = "RN_SelectColumnHeaderCell"
                 checked  ={this.isAllRowsSelected()?true:false}
                 key = {this.getSelectableColumName()}
                 secondaryOnCheck

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

@@ -404,7 +404,7 @@ const styles = StyleSheet.create({
     selectableColumn : {
         width : SELECTABLE_COLUMN_WIDTH,
         //justifyContent:'center',
-        alignItems : 'flex-start',
+        alignItems : 'center',
         paddingVertical : 0,
         marginVertical : 0,
         paddingHorizontal : 0,

package/src/components/Datagrid/utils.js

@@ -65,27 +65,27 @@ export const getImputedBackgroundStyle = (rowData)=>{
 
 
 export const ROW_APPROVED_STYLE = {
-    borderRightColor : APPROVED_COLOR,
-    borderRightWidth : 4,
-    marginRight : MARGIN_HORIZONTAL
+    //borderRightColor : APPROVED_COLOR,
+    //borderRightWidth : 4,
+    //marginRight : MARGIN_HORIZONTAL
 }
 
 export const ROW_ARCHIVED_STYLE = {
-    borderBottomColor : ARCHIVED_COLOR,
-    borderBottomWidth :4,
+    //borderBottomColor : ARCHIVED_COLOR,
+    //borderBottomWidth :4,
     //marginBottom : MARGIN_VERTICAL,
 }
 
 export const ROW_PAID_STYLE = {
-    borderLeftColor : PAID_COLOR,
-    borderLeftWidth : 5,
-    marginLeft : MARGIN_HORIZONTAL
+    //borderLeftColor : PAID_COLOR,
+    //borderLeftWidth : 5,
+    //marginLeft : MARGIN_HORIZONTAL
 }
 
 export const ROW_IMPUTED_STYLE = {
-    borderLeftColor : IMPUTED_COLOR,
-    borderLeftWidth : 5,
-    marginLeft : MARGIN_HORIZONTAL
+    //borderLeftColor : IMPUTED_COLOR,
+    //borderLeftWidth : 5,
+    //marginLeft : MARGIN_HORIZONTAL
 }
 
 export const ROW_ODD_STYLE = {
@@ -110,7 +110,7 @@ export const ROW_BORDER_STYLE = {
     borderRightColor : ROW_BORDER_COLOR,
     borderRightWidth : 0,
     borderTopColor : ROW_BORDER_COLOR,
-    borderTopWidth : 0,
+    borderTopWidth : 0
 }
 
 
@@ -166,7 +166,7 @@ export const getRowStyle = ({row,bordered,numColumns,rowData,isAccordion,isTable
     if(rowIndex !== undefined){
         style.push(rowIndex%2===0?styles.even : theme.isDark()?styles.oddDark : styles.odd)
     }
-    if(selected){
+    if(false && selected){
         style.push(styles.selected,{borderBottomWidth:1,borderBottomColor:theme.colors.primary})
     }
     if(paid || row.paid){