bento-charts 2.8.0 → 2.9.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.
|
@@ -25,7 +25,7 @@ var tickFormatter = function (tickLabel) {
|
|
|
25
25
|
};
|
|
26
26
|
var BAR_CHART_MARGINS = { top: 10, bottom: 100, right: 20 };
|
|
27
27
|
var BaseBarChart = function (_a) {
|
|
28
|
-
var height = _a.height, width = _a.width, units = _a.units, title = _a.title, onClick = _a.onClick, chartFill = _a.chartFill, otherFill = _a.otherFill, params = __rest(_a, ["height", "width", "units", "title", "onClick", "chartFill", "otherFill"]);
|
|
28
|
+
var height = _a.height, width = _a.width, units = _a.units, title = _a.title, onClick = _a.onClick, onChartClick = _a.onChartClick, chartFill = _a.chartFill, otherFill = _a.otherFill, params = __rest(_a, ["height", "width", "units", "title", "onClick", "onChartClick", "chartFill", "otherFill"]);
|
|
29
29
|
var t = useChartTranslation();
|
|
30
30
|
var fill = function (entry, index) {
|
|
31
31
|
return entry.x === 'missing' ? otherFill : chartFill[index % chartFill.length];
|
|
@@ -45,7 +45,7 @@ var BaseBarChart = function (_a) {
|
|
|
45
45
|
// Basically, if data is empty, Recharts will default to a domain of [0, "auto"] and our tickFormatter trips up
|
|
46
46
|
// on formatting a non-string. This hack manually overrides the ticks for the axis and blanks it out.
|
|
47
47
|
// - David L, 2023-01-03
|
|
48
|
-
return (_jsxs(ChartWrapper, { responsive: typeof width !== 'number', children: [_jsx("div", { style: TITLE_STYLE, children: title }), _jsx(ResponsiveContainer, { width: width !== null && width !== void 0 ? width : '100%', height: height, children: _jsxs(BarChart, { data: data, margin: BAR_CHART_MARGINS, children: [_jsx(XAxis, { dataKey: "x", height: 20, angle: -45, ticks: data.length ? undefined : [''], tickFormatter: tickFormatter, tickMargin: TICK_MARGIN, textAnchor: "end", interval: data.length < TICKS_SHOW_ALL_LABELS_BELOW ? 0 : 'preserveStartEnd', children: _jsx(Label, { value: units, offset: UNITS_LABEL_OFFSET, position: "insideBottom" }) }), _jsx(YAxis, { children: _jsx(Label, { value: t[COUNT_KEY], offset: -10, position: "left", angle: 270 }) }), _jsx(CartesianGrid, { strokeDasharray: "3 3", vertical: false }), _jsx(Tooltip, { content: _jsx(BarTooltip, { totalCount: totalCount }) }), _jsx(Bar, { dataKey: "y", isAnimationActive: false, onClick: onClick, onMouseEnter: onHover, maxBarSize: 70, children: data.map(function (entry, index) { return (_jsx(Cell, { fill: fill(entry, index) }, entry.x)); }) })] }) })] }));
|
|
48
|
+
return (_jsxs(ChartWrapper, { responsive: typeof width !== 'number', children: [_jsx("div", { style: TITLE_STYLE, children: title }), _jsx(ResponsiveContainer, { width: width !== null && width !== void 0 ? width : '100%', height: height, children: _jsxs(BarChart, { data: data, margin: BAR_CHART_MARGINS, onClick: onChartClick, children: [_jsx(XAxis, { dataKey: "x", height: 20, angle: -45, ticks: data.length ? undefined : [''], tickFormatter: tickFormatter, tickMargin: TICK_MARGIN, textAnchor: "end", interval: data.length < TICKS_SHOW_ALL_LABELS_BELOW ? 0 : 'preserveStartEnd', children: _jsx(Label, { value: units, offset: UNITS_LABEL_OFFSET, position: "insideBottom" }) }), _jsx(YAxis, { children: _jsx(Label, { value: t[COUNT_KEY], offset: -10, position: "left", angle: 270 }) }), _jsx(CartesianGrid, { strokeDasharray: "3 3", vertical: false }), _jsx(Tooltip, { content: _jsx(BarTooltip, { totalCount: totalCount }) }), _jsx(Bar, { dataKey: "y", isAnimationActive: false, onClick: onClick, onMouseEnter: onHover, maxBarSize: 70, children: data.map(function (entry, index) { return (_jsx(Cell, { fill: fill(entry, index) }, entry.x)); }) })] }) })] }));
|
|
49
49
|
};
|
|
50
50
|
var BarTooltip = function (_a) {
|
|
51
51
|
var _b, _c, _d;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseBarChart.js","sourceRoot":"","sources":["../../../src/Components/Charts/BaseBarChart.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAc,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EACL,GAAG,EACH,QAAQ,EAER,aAAa,EACb,IAAI,EACJ,KAAK,EACL,mBAAmB,EACnB,OAAO,EACP,KAAK,EACL,KAAK,GACN,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,aAAa,EACb,WAAW,EACX,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,2BAA2B,EAC3B,kBAAkB,EAClB,WAAW,EACX,SAAS,GACV,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,IAAM,aAAa,GAAG,UAAC,SAAiB;IACtC,IAAI,SAAS,CAAC,MAAM,IAAI,oBAAoB,EAAE,CAAC;QAC7C,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,UAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,oBAAoB,CAAC,QAAK,CAAC;AAC9D,CAAC,CAAC;AAEF,IAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAE9D,IAAM,YAAY,GAAgC,UAAC,
|
|
1
|
+
{"version":3,"file":"BaseBarChart.js","sourceRoot":"","sources":["../../../src/Components/Charts/BaseBarChart.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { PieProps, BarProps } from 'recharts';
|
|
2
|
+
import type { BarChartProps as RechartsBarChartProps } from 'recharts/index.d.ts';
|
|
2
3
|
import { COUNT_KEY, OTHER_KEY } from '../constants/chartConstants';
|
|
3
4
|
export type CategoricalChartDataType = CategoricalChartDataItem[];
|
|
4
5
|
export interface CategoricalChartDataItem {
|
|
@@ -66,6 +67,7 @@ export interface BaseBarChartProps extends BaseCategoricalChartProps {
|
|
|
66
67
|
title?: string;
|
|
67
68
|
units: string;
|
|
68
69
|
onClick?: BarProps['onClick'];
|
|
70
|
+
onChartClick?: RechartsBarChartProps['onClick'];
|
|
69
71
|
}
|
|
70
72
|
export interface BarChartProps extends Omit<BaseBarChartProps, 'chartFill' | 'otherFill'> {
|
|
71
73
|
colorTheme?: keyof ChartTheme['bar'];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bento-charts",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.1",
|
|
4
4
|
"description": "Charts library for Bento-platform",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -80,36 +80,36 @@
|
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
82
|
"@commitlint/cli": "^18.6.1",
|
|
83
|
-
"@commitlint/config-conventional": "^18.6.
|
|
83
|
+
"@commitlint/config-conventional": "^18.6.3",
|
|
84
84
|
"@semantic-release/git": "^10.0.1",
|
|
85
|
-
"@types/leaflet": "^1.9.
|
|
86
|
-
"@types/react": "^18.
|
|
87
|
-
"@types/react-dom": "^18.
|
|
85
|
+
"@types/leaflet": "^1.9.12",
|
|
86
|
+
"@types/react": "^18.3.5",
|
|
87
|
+
"@types/react-dom": "^18.3.0",
|
|
88
88
|
"@types/react-leaflet": "^3.0.0",
|
|
89
89
|
"@types/recharts": "^1.8.25",
|
|
90
|
-
"@typescript-eslint/eslint-plugin": "^7.
|
|
91
|
-
"@typescript-eslint/parser": "^7.0
|
|
90
|
+
"@typescript-eslint/eslint-plugin": "^7.18.0",
|
|
91
|
+
"@typescript-eslint/parser": "^7.18.0",
|
|
92
92
|
"@webpack-cli/serve": "^2.0.5",
|
|
93
|
-
"antd": "^5.
|
|
94
|
-
"css-loader": "^
|
|
95
|
-
"eslint": "^8.
|
|
93
|
+
"antd": "^5.20.6",
|
|
94
|
+
"css-loader": "^7.1.2",
|
|
95
|
+
"eslint": "^8.57.0",
|
|
96
96
|
"eslint-config-prettier": "^9.1.0",
|
|
97
|
-
"eslint-plugin-prettier": "^5.1
|
|
98
|
-
"eslint-plugin-react": "^7.
|
|
97
|
+
"eslint-plugin-prettier": "^5.2.1",
|
|
98
|
+
"eslint-plugin-react": "^7.36.1",
|
|
99
99
|
"eslint-plugin-react-hooks": "^4.6.2",
|
|
100
100
|
"file-loader": "^6.2.0",
|
|
101
101
|
"geojson": "^0.5.0",
|
|
102
102
|
"html-webpack-plugin": "^5.5.3",
|
|
103
103
|
"husky": "^8.0.3",
|
|
104
|
-
"prettier": "^3.
|
|
105
|
-
"react-router-dom": "^6.
|
|
104
|
+
"prettier": "^3.3.3",
|
|
105
|
+
"react-router-dom": "^6.26.2",
|
|
106
106
|
"semantic-release": "^23.0.2",
|
|
107
|
-
"style-loader": "^
|
|
107
|
+
"style-loader": "^4.0.0",
|
|
108
108
|
"ts-loader": "^9.4.4",
|
|
109
|
-
"typescript": "
|
|
110
|
-
"webpack": "^5.
|
|
109
|
+
"typescript": "~5.6.2",
|
|
110
|
+
"webpack": "^5.94.0",
|
|
111
111
|
"webpack-cli": "^5.1.4",
|
|
112
|
-
"webpack-dev-server": "^5.0
|
|
112
|
+
"webpack-dev-server": "^5.1.0"
|
|
113
113
|
},
|
|
114
114
|
"prettier": {
|
|
115
115
|
"trailingComma": "es5",
|
|
@@ -44,6 +44,7 @@ const BaseBarChart: React.FC<BaseBarChartProps> = ({
|
|
|
44
44
|
units,
|
|
45
45
|
title,
|
|
46
46
|
onClick,
|
|
47
|
+
onChartClick,
|
|
47
48
|
chartFill,
|
|
48
49
|
otherFill,
|
|
49
50
|
...params
|
|
@@ -78,7 +79,7 @@ const BaseBarChart: React.FC<BaseBarChartProps> = ({
|
|
|
78
79
|
<ChartWrapper responsive={typeof width !== 'number'}>
|
|
79
80
|
<div style={TITLE_STYLE}>{title}</div>
|
|
80
81
|
<ResponsiveContainer width={width ?? '100%'} height={height}>
|
|
81
|
-
<BarChart data={data} margin={BAR_CHART_MARGINS}>
|
|
82
|
+
<BarChart data={data} margin={BAR_CHART_MARGINS} onClick={onChartClick}>
|
|
82
83
|
<XAxis
|
|
83
84
|
dataKey="x"
|
|
84
85
|
height={20}
|
package/src/types/chartTypes.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { PieProps, BarProps } from 'recharts';
|
|
2
|
+
import type { BarChartProps as RechartsBarChartProps } from 'recharts/index.d.ts';
|
|
2
3
|
import { COUNT_KEY, OTHER_KEY } from '../constants/chartConstants';
|
|
3
4
|
|
|
4
5
|
export type CategoricalChartDataType = CategoricalChartDataItem[];
|
|
@@ -83,6 +84,7 @@ export interface BaseBarChartProps extends BaseCategoricalChartProps {
|
|
|
83
84
|
title?: string;
|
|
84
85
|
units: string;
|
|
85
86
|
onClick?: BarProps['onClick'];
|
|
87
|
+
onChartClick?: RechartsBarChartProps['onClick'];
|
|
86
88
|
}
|
|
87
89
|
|
|
88
90
|
export interface BarChartProps extends Omit<BaseBarChartProps, 'chartFill' | 'otherFill'> {
|