@fto-consult/expo-ui 7.15.0 → 7.15.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fto-consult/expo-ui",
3
- "version": "7.15.0",
3
+ "version": "7.15.1",
4
4
  "description": "Bibliothèque de composants UI Expo,react-native",
5
5
  "scripts": {
6
6
  "clear-npx-cache": "npx clear-npx-cache",
@@ -2431,7 +2431,9 @@ export default class CommonDatagridComponent extends AppComponent {
2431
2431
 
2432
2432
  chartOptions.legend = defaultObj(chartOptions.legend);
2433
2433
  chartOptions.legend.show = ("showLegend" in config) ? !!config.showLegend : !this.isDashboard();
2434
-
2434
+ chartOptions.legend.labels = Object.assign({},chartOptions.legend.labels);
2435
+ const legendLabels = chartOptions.legend.labels;
2436
+ chartOptions.legend.labels.colors = (Array.isArray(legendLabels.colors) && legendLabels.colors.length || theme.Colors.isValid(legendLabels.colors)) ? legendLabels.colors : labelColor;
2435
2437
  if("dataLabels" in config){
2436
2438
  chartOptions.dataLabels.enabled = !!config.dataLabels;
2437
2439
  }
@@ -97,6 +97,7 @@ export default class DatagridDashboard extends TableData {
97
97
  rest = defaultObj(rest);
98
98
  const pointerEvents = this.getPointerEvents();
99
99
  const maxHeight = 300;
100
+ const chartData = this.renderChart();
100
101
  return <View {...rest} testID={testID} style={[styles.container,{maxHeight},rest.style]} pointerEvents={pointerEvents}>
101
102
  {this.renderTitle()}
102
103
  {showPagination ? <View style={[styles.paginationContainer]}>
@@ -110,7 +111,7 @@ export default class DatagridDashboard extends TableData {
110
111
  </View> : null}
111
112
  {<View testID={testID+"_ChartContainer"} {...chartContainerProps} style={[theme.styles.w100,styles.chartContainer,chartContainerProps.style]}>
112
113
  {this.renderProgressBar()}
113
- {this.renderChart()}
114
+ {chartData}
114
115
  </View>}
115
116
  </View>
116
117
  }