@bbl-digital/snorre 2.4.16 → 2.4.18

Sign up to get free protection for your applications and to get access to all the features.
package/dist/bundle.js CHANGED
@@ -25005,6 +25005,7 @@
25005
25005
  active,
25006
25006
  payload,
25007
25007
  label,
25008
+ allowDecimals,
25008
25009
  ...rest
25009
25010
  }) => {
25010
25011
  const {
@@ -25059,7 +25060,7 @@
25059
25060
  children: [getTooltipItemName(item), ":"]
25060
25061
  })]
25061
25062
  }), /*#__PURE__*/jsxRuntime.jsx(Text, {
25062
- children: formatter ? formatter(getFormattedPrice(item.value, 2), getTooltipItemName(item), payload[index], index) : getFormattedPrice(item.value, 2)
25063
+ children: allowDecimals ? formatter ? formatter(getFormattedPrice(item.value, 2), getTooltipItemName(item), payload[index], index) : getFormattedPrice(item.value, 2) : Math.round(item.value)
25063
25064
  })]
25064
25065
  }, item.name));
25065
25066
  };
@@ -25155,6 +25156,12 @@
25155
25156
  allowDecimals = true,
25156
25157
  ...rest
25157
25158
  }) => {
25159
+ const getTickFormatter = () => {
25160
+ if (defaultFormatter && !tickFormatter) return undefined;
25161
+ if (tickFormatter) return tickFormatter;
25162
+ return formatAxisPrice;
25163
+ };
25164
+
25158
25165
  return /*#__PURE__*/jsxRuntime.jsx(BarChartContainer, {
25159
25166
  width: width && width,
25160
25167
  height: height && height,
@@ -25181,7 +25188,7 @@
25181
25188
  tickMargin: 5,
25182
25189
  minTickGap: minTickGapX,
25183
25190
  allowDecimals: allowDecimals,
25184
- tickFormatter: !defaultFormatter || !tickFormatter ? formatAxisPrice : tickFormatter
25191
+ tickFormatter: getTickFormatter()
25185
25192
  }), /*#__PURE__*/jsxRuntime.jsx(recharts.YAxis, {
25186
25193
  dataKey: yAxisDataKey && yAxisDataKey,
25187
25194
  axisLine: yAxisLine && yAxisLine,
@@ -25189,7 +25196,7 @@
25189
25196
  type: layout === 'vertical' ? 'category' : 'number',
25190
25197
  minTickGap: minTickGapY,
25191
25198
  allowDecimals: allowDecimals,
25192
- tickFormatter: !defaultFormatter || !tickFormatter ? formatAxisPrice : tickFormatter
25199
+ tickFormatter: getTickFormatter()
25193
25200
  }), /*#__PURE__*/jsxRuntime.jsx(recharts.Tooltip, {
25194
25201
  content: /*#__PURE__*/jsxRuntime.jsx(CustomTooltip, {})
25195
25202
  }), /*#__PURE__*/jsxRuntime.jsx(recharts.Legend, {
@@ -30,6 +30,12 @@ const SimpleBarChart = ({
30
30
  allowDecimals = true,
31
31
  ...rest
32
32
  }) => {
33
+ const getTickFormatter = () => {
34
+ if (defaultFormatter && !tickFormatter) return undefined;
35
+ if (tickFormatter) return tickFormatter;
36
+ return formatAxisPrice;
37
+ };
38
+
33
39
  return /*#__PURE__*/_jsx(BarChartContainer, {
34
40
  width: width && width,
35
41
  height: height && height,
@@ -56,7 +62,7 @@ const SimpleBarChart = ({
56
62
  tickMargin: 5,
57
63
  minTickGap: minTickGapX,
58
64
  allowDecimals: allowDecimals,
59
- tickFormatter: !defaultFormatter || !tickFormatter ? formatAxisPrice : tickFormatter
65
+ tickFormatter: getTickFormatter()
60
66
  }), /*#__PURE__*/_jsx(YAxis, {
61
67
  dataKey: yAxisDataKey && yAxisDataKey,
62
68
  axisLine: yAxisLine && yAxisLine,
@@ -64,7 +70,7 @@ const SimpleBarChart = ({
64
70
  type: layout === 'vertical' ? 'category' : 'number',
65
71
  minTickGap: minTickGapY,
66
72
  allowDecimals: allowDecimals,
67
- tickFormatter: !defaultFormatter || !tickFormatter ? formatAxisPrice : tickFormatter
73
+ tickFormatter: getTickFormatter()
68
74
  }), /*#__PURE__*/_jsx(Tooltip, {
69
75
  content: /*#__PURE__*/_jsx(CustomTooltip, {})
70
76
  }), /*#__PURE__*/_jsx(Legend, {
@@ -12,6 +12,7 @@ const CustomTooltip = ({
12
12
  active,
13
13
  payload,
14
14
  label,
15
+ allowDecimals,
15
16
  ...rest
16
17
  }) => {
17
18
  const {
@@ -66,7 +67,7 @@ const CustomTooltip = ({
66
67
  children: [getTooltipItemName(item), ":"]
67
68
  })]
68
69
  }), /*#__PURE__*/_jsx(Text, {
69
- children: formatter ? formatter(getFormattedPrice(item.value, 2), getTooltipItemName(item), payload[index], index) : getFormattedPrice(item.value, 2)
70
+ children: allowDecimals ? formatter ? formatter(getFormattedPrice(item.value, 2), getTooltipItemName(item), payload[index], index) : getFormattedPrice(item.value, 2) : Math.round(item.value)
70
71
  })]
71
72
  }, item.name));
72
73
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/packages/core/SimpleBarChart/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EACL,GAAG,EAQH,MAAM,EACN,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAMjB,UAAU,MAAO,SAAQ,OAAO,CAAC,GAAG,CAAC;IACnC,wFAAwF;IACxF,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,wMAAwM;IACxM,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACvD,iHAAiH;IACjH,YAAY,EAAE,MAAM,CAAA;IACpB,gHAAgH;IAChH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,+BAA+B;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,sEAAsE;IACtE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,qEAAqE;IACrE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,wDAAwD;IACxD,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,wDAAwD;IACxD,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;IAC1C,uFAAuF;IACvF,YAAY,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;IAC1C,6FAA6F;IAC7F,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,wGAAwG;IACxG,aAAa,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5E,sEAAsE;IACtE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IAClC,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,+BAA+B;IAC/B,aAAa,CAAC,EAAE,qBAAqB,CAAA;CACtC;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAyFpC,CAAA;AACD,eAAe,cAAc,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/packages/core/SimpleBarChart/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EACL,GAAG,EAQH,MAAM,EACN,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAMjB,UAAU,MAAO,SAAQ,OAAO,CAAC,GAAG,CAAC;IACnC,wFAAwF;IACxF,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,wMAAwM;IACxM,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACvD,iHAAiH;IACjH,YAAY,EAAE,MAAM,CAAA;IACpB,gHAAgH;IAChH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,+BAA+B;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,sEAAsE;IACtE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,qEAAqE;IACrE,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,wDAAwD;IACxD,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,wDAAwD;IACxD,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,uFAAuF;IACvF,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;IAC1C,uFAAuF;IACvF,YAAY,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;IAC1C,6FAA6F;IAC7F,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,wGAAwG;IACxG,aAAa,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IAC5E,sEAAsE;IACtE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAA;IAClC,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,+BAA+B;IAC/B,aAAa,CAAC,EAAE,qBAAqB,CAAA;CACtC;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CA4FpC,CAAA;AACD,eAAe,cAAc,CAAA"}
@@ -30,6 +30,12 @@ const SimpleBarChart = ({
30
30
  allowDecimals = true,
31
31
  ...rest
32
32
  }) => {
33
+ const getTickFormatter = () => {
34
+ if (defaultFormatter && !tickFormatter) return undefined;
35
+ if (tickFormatter) return tickFormatter;
36
+ return formatAxisPrice;
37
+ };
38
+
33
39
  return /*#__PURE__*/_jsx(BarChartContainer, {
34
40
  width: width && width,
35
41
  height: height && height,
@@ -56,7 +62,7 @@ const SimpleBarChart = ({
56
62
  tickMargin: 5,
57
63
  minTickGap: minTickGapX,
58
64
  allowDecimals: allowDecimals,
59
- tickFormatter: !defaultFormatter || !tickFormatter ? formatAxisPrice : tickFormatter
65
+ tickFormatter: getTickFormatter()
60
66
  }), /*#__PURE__*/_jsx(YAxis, {
61
67
  dataKey: yAxisDataKey && yAxisDataKey,
62
68
  axisLine: yAxisLine && yAxisLine,
@@ -64,7 +70,7 @@ const SimpleBarChart = ({
64
70
  type: layout === 'vertical' ? 'category' : 'number',
65
71
  minTickGap: minTickGapY,
66
72
  allowDecimals: allowDecimals,
67
- tickFormatter: !defaultFormatter || !tickFormatter ? formatAxisPrice : tickFormatter
73
+ tickFormatter: getTickFormatter()
68
74
  }), /*#__PURE__*/_jsx(Tooltip, {
69
75
  content: /*#__PURE__*/_jsx(CustomTooltip, {})
70
76
  }), /*#__PURE__*/_jsx(Legend, {
@@ -3,6 +3,7 @@ import { TooltipProps } from 'recharts';
3
3
  interface IProps extends TooltipProps {
4
4
  lineConfig?: any[];
5
5
  barConfig?: any[];
6
+ allowDecimals?: boolean;
6
7
  }
7
8
  declare const CustomTooltip: React.FC<IProps>;
8
9
  export default CustomTooltip;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/packages/shared/recharts/CustomTooltip/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAIvC,UAAU,MAAO,SAAQ,YAAY;IACnC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,EAAE,CAAA;CAClB;AACD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAyFnC,CAAA;AAED,eAAe,aAAa,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/packages/shared/recharts/CustomTooltip/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAIvC,UAAU,MAAO,SAAQ,YAAY;IACnC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,GAAG,EAAE,CAAA;IACjB,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;AAED,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CA4FnC,CAAA;AAED,eAAe,aAAa,CAAA"}
@@ -12,6 +12,7 @@ const CustomTooltip = ({
12
12
  active,
13
13
  payload,
14
14
  label,
15
+ allowDecimals,
15
16
  ...rest
16
17
  }) => {
17
18
  const {
@@ -66,7 +67,7 @@ const CustomTooltip = ({
66
67
  children: [getTooltipItemName(item), ":"]
67
68
  })]
68
69
  }), /*#__PURE__*/_jsx(Text, {
69
- children: formatter ? formatter(getFormattedPrice(item.value, 2), getTooltipItemName(item), payload[index], index) : getFormattedPrice(item.value, 2)
70
+ children: allowDecimals ? formatter ? formatter(getFormattedPrice(item.value, 2), getTooltipItemName(item), payload[index], index) : getFormattedPrice(item.value, 2) : Math.round(item.value)
70
71
  })]
71
72
  }, item.name));
72
73
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bbl-digital/snorre",
3
- "version": "2.4.16",
3
+ "version": "2.4.18",
4
4
  "description": "Design library for BBL Digital",
5
5
  "license": "MIT",
6
6
  "main": "./lib/index.js",