@pie-lib/charting 5.48.0-mui-update.1 → 6.0.0-next.0

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.
Files changed (96) hide show
  1. package/CHANGELOG.md +19 -117
  2. package/lib/axes.js +14 -10
  3. package/lib/axes.js.map +1 -1
  4. package/lib/bars/common/bars.js +11 -16
  5. package/lib/bars/common/bars.js.map +1 -1
  6. package/lib/bars/common/correct-check-icon.js +4 -0
  7. package/lib/bars/common/correct-check-icon.js.map +1 -1
  8. package/lib/chart-setup.js +8 -10
  9. package/lib/chart-setup.js.map +1 -1
  10. package/lib/chart-type.js +14 -0
  11. package/lib/chart-type.js.map +1 -1
  12. package/lib/chart.js +2 -8
  13. package/lib/chart.js.map +1 -1
  14. package/lib/common/correctness-indicators.js +37 -2
  15. package/lib/common/correctness-indicators.js.map +1 -1
  16. package/lib/common/drag-handle.js +3 -8
  17. package/lib/common/drag-handle.js.map +1 -1
  18. package/lib/common/drag-icon.js +6 -0
  19. package/lib/common/drag-icon.js.map +1 -1
  20. package/lib/grid.js +2 -5
  21. package/lib/grid.js.map +1 -1
  22. package/lib/line/common/drag-handle.js +3 -0
  23. package/lib/line/common/drag-handle.js.map +1 -1
  24. package/lib/line/common/line.js +8 -5
  25. package/lib/line/common/line.js.map +1 -1
  26. package/lib/line/line-cross.js +2 -2
  27. package/lib/line/line-cross.js.map +1 -1
  28. package/lib/line/line-dot.js +17 -23
  29. package/lib/line/line-dot.js.map +1 -1
  30. package/lib/mark-label.js +10 -3
  31. package/lib/mark-label.js.map +1 -1
  32. package/lib/plot/common/plot.js +15 -5
  33. package/lib/plot/common/plot.js.map +1 -1
  34. package/lib/plot/dot.js +1 -1
  35. package/lib/plot/dot.js.map +1 -1
  36. package/lib/plot/line.js +2 -2
  37. package/lib/plot/line.js.map +1 -1
  38. package/lib/tool-menu.js +1 -5
  39. package/lib/tool-menu.js.map +1 -1
  40. package/lib/utils.js +11 -9
  41. package/lib/utils.js.map +1 -1
  42. package/package.json +24 -13
  43. package/src/__tests__/axes.test.jsx +85 -100
  44. package/src/__tests__/chart-type.test.jsx +5 -11
  45. package/src/__tests__/chart.test.jsx +41 -50
  46. package/src/__tests__/grid.test.jsx +23 -11
  47. package/src/__tests__/mark-label.test.jsx +13 -11
  48. package/src/__tests__/utils.js +8 -2
  49. package/src/axes.jsx +7 -7
  50. package/src/bars/__tests__/bar.test.jsx +19 -11
  51. package/src/bars/__tests__/histogram.test.jsx +19 -12
  52. package/src/bars/common/__tests__/bars.test.jsx +23 -24
  53. package/src/bars/common/bars.jsx +37 -49
  54. package/src/bars/common/correct-check-icon.jsx +5 -0
  55. package/src/chart-setup.jsx +6 -9
  56. package/src/chart-type.js +16 -0
  57. package/src/chart.jsx +12 -15
  58. package/src/common/__tests__/drag-handle.test.jsx +16 -45
  59. package/src/common/correctness-indicators.jsx +42 -2
  60. package/src/common/drag-handle.jsx +1 -6
  61. package/src/common/drag-icon.jsx +7 -0
  62. package/src/grid.jsx +3 -3
  63. package/src/line/__tests__/line-cross.test.jsx +16 -13
  64. package/src/line/__tests__/line-dot.test.jsx +16 -13
  65. package/src/line/__tests__/utils.js +8 -2
  66. package/src/line/common/__tests__/drag-handle.test.jsx +20 -45
  67. package/src/line/common/__tests__/line.test.jsx +27 -30
  68. package/src/line/common/drag-handle.jsx +4 -0
  69. package/src/line/common/line.jsx +6 -3
  70. package/src/line/line-cross.js +2 -2
  71. package/src/line/line-dot.js +3 -27
  72. package/src/mark-label.jsx +8 -3
  73. package/src/plot/__tests__/dot.test.jsx +19 -12
  74. package/src/plot/__tests__/line.test.jsx +19 -12
  75. package/src/plot/common/__tests__/plot.test.jsx +23 -24
  76. package/src/plot/common/plot.jsx +13 -3
  77. package/src/plot/dot.js +1 -1
  78. package/src/plot/line.js +2 -2
  79. package/src/tool-menu.jsx +10 -11
  80. package/src/utils.js +13 -9
  81. package/src/__tests__/__snapshots__/axes.test.jsx.snap +0 -569
  82. package/src/__tests__/__snapshots__/chart-type.test.jsx.snap +0 -14
  83. package/src/__tests__/__snapshots__/chart.test.jsx.snap +0 -595
  84. package/src/__tests__/__snapshots__/grid.test.jsx.snap +0 -72
  85. package/src/__tests__/__snapshots__/mark-label.test.jsx.snap +0 -73
  86. package/src/bars/__tests__/__snapshots__/bar.test.jsx.snap +0 -43
  87. package/src/bars/__tests__/__snapshots__/histogram.test.jsx.snap +0 -45
  88. package/src/bars/common/__tests__/__snapshots__/bars.test.jsx.snap +0 -110
  89. package/src/common/__tests__/__snapshots__/drag-handle.test.jsx.snap +0 -48
  90. package/src/line/__tests__/__snapshots__/line-cross.test.jsx.snap +0 -45
  91. package/src/line/__tests__/__snapshots__/line-dot.test.jsx.snap +0 -45
  92. package/src/line/common/__tests__/__snapshots__/drag-handle.test.jsx.snap +0 -49
  93. package/src/line/common/__tests__/__snapshots__/line.test.jsx.snap +0 -143
  94. package/src/plot/__tests__/__snapshots__/dot.test.jsx.snap +0 -45
  95. package/src/plot/__tests__/__snapshots__/line.test.jsx.snap +0 -45
  96. package/src/plot/common/__tests__/__snapshots__/plot.test.jsx.snap +0 -97
package/src/plot/dot.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { Circle } from '@vx/shape';
3
+ import { Circle } from '@visx/shape';
4
4
 
5
5
  import { types } from '@pie-lib/plot';
6
6
  import { dataToXBand } from '../utils';
package/src/plot/line.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import { LinePath } from '@vx/shape';
4
- import { Group } from '@vx/group';
3
+ import { LinePath } from '@visx/shape';
4
+ import { Group } from '@visx/group';
5
5
  import { styled } from '@mui/material/styles';
6
6
 
7
7
  import { types } from '@pie-lib/plot';
package/src/tool-menu.jsx CHANGED
@@ -1,6 +1,5 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
- import classNames from 'classnames';
4
3
  import { color } from '@pie-lib/render-ui';
5
4
 
6
5
  import { styled } from '@mui/material/styles';
@@ -19,12 +18,13 @@ const StyledMiniButton = styled(Button)(({ theme, selected, disabled }) => ({
19
18
  color: color.primaryDark(),
20
19
  },
21
20
  }),
22
- ...(!selected && !disabled && {
23
- '& span': {
24
- color: color.primary(),
25
- },
26
- backgroundColor: color.background(),
27
- }),
21
+ ...(!selected &&
22
+ !disabled && {
23
+ '& span': {
24
+ color: color.primary(),
25
+ },
26
+ backgroundColor: color.background(),
27
+ }),
28
28
  ...(disabled && {
29
29
  '& span': {
30
30
  color: color.primary(),
@@ -34,14 +34,14 @@ const StyledMiniButton = styled(Button)(({ theme, selected, disabled }) => ({
34
34
  }));
35
35
 
36
36
  export const MiniButton = (props) => {
37
- const { disabled, className, selected, value, onClick } = props;
37
+ const { disabled, selected, value, onClick } = props;
38
+
38
39
  return (
39
40
  <StyledMiniButton
40
41
  size="small"
41
42
  disabled={disabled}
42
43
  selected={selected}
43
44
  color={selected ? 'secondary' : 'default'}
44
- className={className}
45
45
  value={value}
46
46
  key={value}
47
47
  variant="outlined"
@@ -54,7 +54,6 @@ export const MiniButton = (props) => {
54
54
  MiniButton.propTypes = {
55
55
  disabled: PropTypes.bool,
56
56
  className: PropTypes.string,
57
- disabledClassName: PropTypes.string,
58
57
  selected: PropTypes.bool,
59
58
  value: PropTypes.string,
60
59
  onClick: PropTypes.func,
@@ -74,7 +73,7 @@ export class ToolMenu extends React.Component {
74
73
  const { className, disabled, addCategory, language } = this.props;
75
74
 
76
75
  return (
77
- <div className={classNames(className)}>
76
+ <div className={className}>
78
77
  {!disabled && (
79
78
  <MiniButton value={translator.t('charting.addCategory', { lng: language })} onClick={addCategory} />
80
79
  )}
package/src/utils.js CHANGED
@@ -1,4 +1,4 @@
1
- import { scaleBand, scalePoint } from '@vx/scale';
1
+ import { scaleBand, scalePoint } from '@visx/scale';
2
2
  import { utils } from '@pie-lib/plot';
3
3
 
4
4
  export const tickCount = utils.tickCount;
@@ -8,39 +8,43 @@ export const point = utils.point;
8
8
  export const bandKey = (d, index) => `${index}-${d.label || '-'}`;
9
9
 
10
10
  export const dataToXBand = (scaleX, data, width, type) => {
11
+ const chartWidth = width || 400; // fallback
12
+ const domain = data && data.length ? data.map(bandKey) : ['default'];
13
+
11
14
  switch (type) {
12
15
  case 'bar':
13
16
  case 'dotPlot':
14
17
  case 'linePlot':
15
18
  return scaleBand({
16
- rangeRound: [0, width],
17
- domain: data && data.map(bandKey),
19
+ range: [0, chartWidth],
20
+ domain,
18
21
  padding: 0.2,
19
22
  });
20
23
 
21
24
  case 'histogram':
22
25
  return scaleBand({
23
- rangeRound: [0, width],
24
- domain: data && data.map(bandKey),
26
+ range: [0, chartWidth],
27
+ domain,
25
28
  padding: 0,
26
29
  });
27
30
 
28
31
  case 'lineCross':
29
32
  case 'lineDot':
30
33
  return scalePoint({
31
- domain: data && data.map(bandKey),
32
- rangeRound: [0, width],
34
+ domain,
35
+ range: [0, chartWidth],
33
36
  });
34
37
 
35
38
  default:
36
39
  return scaleBand({
37
- range: [0, width],
38
- domain: data && data.map(bandKey),
40
+ range: [0, chartWidth],
41
+ domain,
39
42
  padding: 0,
40
43
  });
41
44
  }
42
45
  };
43
46
 
47
+
44
48
  export const getTickValues = (prop = {}) => {
45
49
  const tickValues = [];
46
50
  let tickVal = prop.min;