@pie-lib/graphing 2.4.7 → 2.4.10

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 (93) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/lib/axis/arrow.js +22 -18
  3. package/lib/axis/arrow.js.map +1 -1
  4. package/lib/axis/axes.js +74 -78
  5. package/lib/axis/axes.js.map +1 -1
  6. package/lib/axis/index.js +5 -1
  7. package/lib/axis/index.js.map +1 -1
  8. package/lib/bg.js +16 -14
  9. package/lib/bg.js.map +1 -1
  10. package/lib/container/index.js +21 -15
  11. package/lib/container/index.js.map +1 -1
  12. package/lib/coordinates-label.js +4 -4
  13. package/lib/coordinates-label.js.map +1 -1
  14. package/lib/graph-with-controls.js +29 -25
  15. package/lib/graph-with-controls.js.map +1 -1
  16. package/lib/graph.js +58 -45
  17. package/lib/graph.js.map +1 -1
  18. package/lib/grid.js +20 -14
  19. package/lib/grid.js.map +1 -1
  20. package/lib/index.js +5 -1
  21. package/lib/index.js.map +1 -1
  22. package/lib/labels.js +28 -24
  23. package/lib/labels.js.map +1 -1
  24. package/lib/mark-label.js +16 -8
  25. package/lib/mark-label.js.map +1 -1
  26. package/lib/toggle-bar.js +18 -16
  27. package/lib/toggle-bar.js.map +1 -1
  28. package/lib/tool-menu.js +22 -16
  29. package/lib/tool-menu.js.map +1 -1
  30. package/lib/tools/circle/bg-circle.js +26 -18
  31. package/lib/tools/circle/bg-circle.js.map +1 -1
  32. package/lib/tools/circle/component.js +30 -28
  33. package/lib/tools/circle/component.js.map +1 -1
  34. package/lib/tools/circle/index.js +4 -4
  35. package/lib/tools/circle/index.js.map +1 -1
  36. package/lib/tools/index.js +16 -15
  37. package/lib/tools/index.js.map +1 -1
  38. package/lib/tools/line/component.js +17 -7
  39. package/lib/tools/line/component.js.map +1 -1
  40. package/lib/tools/parabola/component.js.map +1 -1
  41. package/lib/tools/parabola/index.js +4 -4
  42. package/lib/tools/parabola/index.js.map +1 -1
  43. package/lib/tools/point/component.js +21 -17
  44. package/lib/tools/point/component.js.map +1 -1
  45. package/lib/tools/point/index.js +2 -2
  46. package/lib/tools/polygon/component.js +55 -47
  47. package/lib/tools/polygon/component.js.map +1 -1
  48. package/lib/tools/polygon/index.js +12 -8
  49. package/lib/tools/polygon/index.js.map +1 -1
  50. package/lib/tools/polygon/line.js +26 -18
  51. package/lib/tools/polygon/line.js.map +1 -1
  52. package/lib/tools/polygon/polygon.js +26 -18
  53. package/lib/tools/polygon/polygon.js.map +1 -1
  54. package/lib/tools/ray/component.js +17 -7
  55. package/lib/tools/ray/component.js.map +1 -1
  56. package/lib/tools/segment/component.js +4 -2
  57. package/lib/tools/segment/component.js.map +1 -1
  58. package/lib/tools/shared/arrow-head.js +4 -4
  59. package/lib/tools/shared/arrow-head.js.map +1 -1
  60. package/lib/tools/shared/line/index.js +46 -44
  61. package/lib/tools/shared/line/index.js.map +1 -1
  62. package/lib/tools/shared/line/line-path.js +28 -20
  63. package/lib/tools/shared/line/line-path.js.map +1 -1
  64. package/lib/tools/shared/line/with-root-edge.js +8 -6
  65. package/lib/tools/shared/line/with-root-edge.js.map +1 -1
  66. package/lib/tools/shared/point/arrow-point.js +21 -15
  67. package/lib/tools/shared/point/arrow-point.js.map +1 -1
  68. package/lib/tools/shared/point/arrow.js +21 -15
  69. package/lib/tools/shared/point/arrow.js.map +1 -1
  70. package/lib/tools/shared/point/base-point.js +22 -16
  71. package/lib/tools/shared/point/base-point.js.map +1 -1
  72. package/lib/tools/shared/point/index.js +8 -4
  73. package/lib/tools/shared/point/index.js.map +1 -1
  74. package/lib/tools/shared/styles.js +1 -1
  75. package/lib/tools/shared/types.js +1 -1
  76. package/lib/tools/sine/component.js.map +1 -1
  77. package/lib/tools/sine/index.js +4 -4
  78. package/lib/tools/sine/index.js.map +1 -1
  79. package/lib/tools/vector/component.js +4 -2
  80. package/lib/tools/vector/component.js.map +1 -1
  81. package/lib/undo-redo.js +20 -16
  82. package/lib/undo-redo.js.map +1 -1
  83. package/lib/use-debounce.js +7 -3
  84. package/lib/use-debounce.js.map +1 -1
  85. package/lib/utils.js +93 -5
  86. package/lib/utils.js.map +1 -1
  87. package/package.json +2 -2
  88. package/src/axis/arrow.jsx +5 -5
  89. package/src/axis/axes.jsx +25 -36
  90. package/src/graph.jsx +16 -10
  91. package/src/tools/line/component.jsx +4 -2
  92. package/src/tools/ray/component.jsx +4 -2
  93. package/src/utils.js +87 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,36 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [2.4.10](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@2.4.9...@pie-lib/graphing@2.4.10) (2022-03-07)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * **graphing:** Adjusted the thickness of the shapes when the distance between lines is too small PD-180 ([8ea20a6](https://github.com/pie-framework/pie-lib/commit/8ea20a61ea02d3e1084f3e10e645a76d580c39b5))
12
+ * **graphing:** Extended the range and domain axes and also the line and ray endings PD-1509 ([97e43c6](https://github.com/pie-framework/pie-lib/commit/97e43c6ab0ab85dd314cff97fb84a85113ab39a0))
13
+ * **graphing:** Increased the calculation accuracy and adjusted range labels PD-1596 ([7cc7570](https://github.com/pie-framework/pie-lib/commit/7cc75701fd759f7e7888e5cccc261978f6e036b0))
14
+ * **graphing:** Should not be possible to plot duplicate/identical objects and should be able to choose a point from an existing object when defining a new object PD-1599 PD-1586 ([ac8502d](https://github.com/pie-framework/pie-lib/commit/ac8502dbe3c7e1a4a663bbe56f7f5ff8bab04430))
15
+
16
+
17
+
18
+
19
+
20
+ ## [2.4.9](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@2.4.8...@pie-lib/graphing@2.4.9) (2022-02-04)
21
+
22
+ **Note:** Version bump only for package @pie-lib/graphing
23
+
24
+
25
+
26
+
27
+
28
+ ## [2.4.8](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@2.4.7...@pie-lib/graphing@2.4.8) (2022-02-03)
29
+
30
+ **Note:** Version bump only for package @pie-lib/graphing
31
+
32
+
33
+
34
+
35
+
6
36
  ## [2.4.7](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@2.4.6...@pie-lib/graphing@2.4.7) (2022-01-10)
7
37
 
8
38
  **Note:** Version bump only for package @pie-lib/graphing
package/lib/axis/arrow.js CHANGED
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
@@ -17,23 +19,25 @@ var _plot = require("@pie-lib/plot");
17
19
 
18
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
19
21
 
20
- function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
21
-
22
22
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
23
23
 
24
24
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
25
25
 
26
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
26
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
27
27
 
28
- function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
28
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
29
29
 
30
- function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
30
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
31
31
 
32
- function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
32
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
33
33
 
34
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
34
+ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
35
35
 
36
- function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
36
+ function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
37
+
38
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
39
+
40
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
37
41
 
38
42
  var style = {
39
43
  root: {
@@ -41,15 +45,15 @@ var style = {
41
45
  }
42
46
  };
43
47
 
44
- var Arrow =
45
- /*#__PURE__*/
46
- function (_React$Component) {
48
+ var Arrow = /*#__PURE__*/function (_React$Component) {
47
49
  _inherits(Arrow, _React$Component);
48
50
 
51
+ var _super = _createSuper(Arrow);
52
+
49
53
  function Arrow() {
50
54
  _classCallCheck(this, Arrow);
51
55
 
52
- return _possibleConstructorReturn(this, _getPrototypeOf(Arrow).apply(this, arguments));
56
+ return _super.apply(this, arguments);
53
57
  }
54
58
 
55
59
  _createClass(Arrow, [{
@@ -61,6 +65,7 @@ function (_React$Component) {
61
65
  classes = _this$props.classes,
62
66
  className = _this$props.className,
63
67
  scale = _this$props.scale;
68
+ var names = (0, _classnames["default"])(classes.root, className);
64
69
  var direction = this.props.direction || 'left';
65
70
  var xv = scale.x(x);
66
71
  var yv = scale.y(y);
@@ -71,23 +76,22 @@ function (_React$Component) {
71
76
  };
72
77
 
73
78
  if (direction === 'left') {
74
- transform = getTransform(xv - 7, yv, 0);
79
+ transform = getTransform(xv - 15, yv, 0);
75
80
  }
76
81
 
77
82
  if (direction === 'right') {
78
- transform = getTransform(xv + 7, yv, 180);
83
+ transform = getTransform(xv + 15, yv, 180);
79
84
  }
80
85
 
81
86
  if (direction === 'up') {
82
- transform = getTransform(xv, yv - 7, 90);
87
+ transform = getTransform(xv, yv - 15, 90);
83
88
  }
84
89
 
85
90
  if (direction === 'down') {
86
- transform = getTransform(xv, yv + 7, 270);
91
+ transform = getTransform(xv, yv + 15, 270);
87
92
  }
88
93
 
89
- var names = (0, _classnames["default"])(classes.root, className);
90
- return _react["default"].createElement("path", {
94
+ return /*#__PURE__*/_react["default"].createElement("path", {
91
95
  d: "m 0,0 8,-5 0,10 -8,-5",
92
96
  transform: transform,
93
97
  className: names
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/axis/arrow.jsx"],"names":["style","root","fill","Arrow","props","x","y","classes","className","scale","direction","xv","yv","transform","getTransform","rotate","names","React","Component","propTypes","PropTypes","number","oneOf","object","isRequired","string","types","ScaleType","defaultProps"],"mappings":";;;;;;;AAAA;;AACA;;AAEA;;AACA;;AACA;;;;;;;;;;;;;;;;;;;;;;AAEA,IAAMA,KAAK,GAAG;AACZC,EAAAA,IAAI,EAAE;AACJC,IAAAA,IAAI,EAAE;AADF;AADM,CAAd;;IAMaC,K;;;;;;;;;;;;;6BACF;AAAA,wBACqC,KAAKC,KAD1C;AAAA,UACCC,CADD,eACCA,CADD;AAAA,UACIC,CADJ,eACIA,CADJ;AAAA,UACOC,OADP,eACOA,OADP;AAAA,UACgBC,SADhB,eACgBA,SADhB;AAAA,UAC2BC,KAD3B,eAC2BA,KAD3B;AAEP,UAAIC,SAAS,GAAG,KAAKN,KAAL,CAAWM,SAAX,IAAwB,MAAxC;AAEA,UAAMC,EAAE,GAAGF,KAAK,CAACJ,CAAN,CAAQA,CAAR,CAAX;AACA,UAAMO,EAAE,GAAGH,KAAK,CAACH,CAAN,CAAQA,CAAR,CAAX;AAEA,UAAIO,SAAS,GAAG,EAAhB;;AAEA,UAAMC,YAAY,GAAG,SAAfA,YAAe,CAACT,CAAD,EAAIC,CAAJ,EAAOS,MAAP;AAAA,mCAA+BV,CAA/B,eAAqCC,CAArC,sBAAkDS,MAAlD;AAAA,OAArB;;AAEA,UAAIL,SAAS,KAAK,MAAlB,EAA0B;AACxBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAE,GAAG,CAAN,EAASC,EAAT,EAAa,CAAb,CAAxB;AACD;;AAED,UAAIF,SAAS,KAAK,OAAlB,EAA2B;AACzBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAE,GAAG,CAAN,EAASC,EAAT,EAAa,GAAb,CAAxB;AACD;;AAED,UAAIF,SAAS,KAAK,IAAlB,EAAwB;AACtBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAD,EAAKC,EAAE,GAAG,CAAV,EAAa,EAAb,CAAxB;AACD;;AAED,UAAIF,SAAS,KAAK,MAAlB,EAA0B;AACxBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAD,EAAKC,EAAE,GAAG,CAAV,EAAa,GAAb,CAAxB;AACD;;AAED,UAAMI,KAAK,GAAG,4BAAWT,OAAO,CAACN,IAAnB,EAAyBO,SAAzB,CAAd;AACA,aAAO;AAAM,QAAA,CAAC,EAAC,uBAAR;AAAgC,QAAA,SAAS,EAAEK,SAA3C;AAAsD,QAAA,SAAS,EAAEG;AAAjE,QAAP;AACD;;;;EA9BwBC,kBAAMC,S;;;AAiCjCf,KAAK,CAACgB,SAAN,GAAkB;AAChBb,EAAAA,CAAC,EAAEc,sBAAUC,MADG;AAEhBhB,EAAAA,CAAC,EAAEe,sBAAUC,MAFG;AAGhBX,EAAAA,SAAS,EAAEU,sBAAUE,KAAV,CAAgB,CAAC,MAAD,EAAS,OAAT,EAAkB,IAAlB,EAAwB,MAAxB,CAAhB,CAHK;AAIhBf,EAAAA,OAAO,EAAEa,sBAAUG,MAAV,CAAiBC,UAJV;AAKhBhB,EAAAA,SAAS,EAAEY,sBAAUK,MALL;AAMhBhB,EAAAA,KAAK,EAAEiB,YAAMC,SAAN,CAAgBH;AANP,CAAlB;AASArB,KAAK,CAACyB,YAAN,GAAqB;AACnBtB,EAAAA,CAAC,EAAE,CADgB;AAEnBD,EAAAA,CAAC,EAAE,CAFgB;AAGnBK,EAAAA,SAAS,EAAE;AAHQ,CAArB;;eAMe,wBAAWV,KAAX,EAAkBG,KAAlB,C","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport classNames from 'classnames';\nimport { withStyles } from '@material-ui/core/styles';\nimport { types } from '@pie-lib/plot';\n\nconst style = {\n root: {\n fill: 'var(--arrow-color, black)'\n }\n};\n\nexport class Arrow extends React.Component {\n render() {\n const { x, y, classes, className, scale } = this.props;\n let direction = this.props.direction || 'left';\n\n const xv = scale.x(x);\n const yv = scale.y(y);\n\n let transform = '';\n\n const getTransform = (x, y, rotate) => `translate(${x}, ${y}) rotate(${rotate})`;\n\n if (direction === 'left') {\n transform = getTransform(xv - 7, yv, 0);\n }\n\n if (direction === 'right') {\n transform = getTransform(xv + 7, yv, 180);\n }\n\n if (direction === 'up') {\n transform = getTransform(xv, yv - 7, 90);\n }\n\n if (direction === 'down') {\n transform = getTransform(xv, yv + 7, 270);\n }\n\n const names = classNames(classes.root, className);\n return <path d=\"m 0,0 8,-5 0,10 -8,-5\" transform={transform} className={names} />;\n }\n}\n\nArrow.propTypes = {\n y: PropTypes.number,\n x: PropTypes.number,\n direction: PropTypes.oneOf(['left', 'right', 'up', 'down']),\n classes: PropTypes.object.isRequired,\n className: PropTypes.string,\n scale: types.ScaleType.isRequired\n};\n\nArrow.defaultProps = {\n y: 0,\n x: 0,\n direction: 'left'\n};\n\nexport default withStyles(style)(Arrow);\n"],"file":"arrow.js"}
1
+ {"version":3,"sources":["../../src/axis/arrow.jsx"],"names":["style","root","fill","Arrow","props","x","y","classes","className","scale","names","direction","xv","yv","transform","getTransform","rotate","React","Component","propTypes","PropTypes","number","oneOf","object","isRequired","string","types","ScaleType","defaultProps"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEA;;AACA;;AACA;;;;;;;;;;;;;;;;;;;;;;;;AAEA,IAAMA,KAAK,GAAG;AACZC,EAAAA,IAAI,EAAE;AACJC,IAAAA,IAAI,EAAE;AADF;AADM,CAAd;;IAMaC,K;;;;;;;;;;;;;WACX,kBAAS;AACP,wBAA4C,KAAKC,KAAjD;AAAA,UAAQC,CAAR,eAAQA,CAAR;AAAA,UAAWC,CAAX,eAAWA,CAAX;AAAA,UAAcC,OAAd,eAAcA,OAAd;AAAA,UAAuBC,SAAvB,eAAuBA,SAAvB;AAAA,UAAkCC,KAAlC,eAAkCA,KAAlC;AACA,UAAMC,KAAK,GAAG,4BAAWH,OAAO,CAACN,IAAnB,EAAyBO,SAAzB,CAAd;AACA,UAAIG,SAAS,GAAG,KAAKP,KAAL,CAAWO,SAAX,IAAwB,MAAxC;AAEA,UAAMC,EAAE,GAAGH,KAAK,CAACJ,CAAN,CAAQA,CAAR,CAAX;AACA,UAAMQ,EAAE,GAAGJ,KAAK,CAACH,CAAN,CAAQA,CAAR,CAAX;AAEA,UAAIQ,SAAS,GAAG,EAAhB;;AAEA,UAAMC,YAAY,GAAG,SAAfA,YAAe,CAACV,CAAD,EAAIC,CAAJ,EAAOU,MAAP;AAAA,mCAA+BX,CAA/B,eAAqCC,CAArC,sBAAkDU,MAAlD;AAAA,OAArB;;AAEA,UAAIL,SAAS,KAAK,MAAlB,EAA0B;AACxBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAE,GAAG,EAAN,EAAUC,EAAV,EAAc,CAAd,CAAxB;AACD;;AAED,UAAIF,SAAS,KAAK,OAAlB,EAA2B;AACzBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAE,GAAG,EAAN,EAAUC,EAAV,EAAc,GAAd,CAAxB;AACD;;AAED,UAAIF,SAAS,KAAK,IAAlB,EAAwB;AACtBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAD,EAAKC,EAAE,GAAG,EAAV,EAAc,EAAd,CAAxB;AACD;;AAED,UAAIF,SAAS,KAAK,MAAlB,EAA0B;AACxBG,QAAAA,SAAS,GAAGC,YAAY,CAACH,EAAD,EAAKC,EAAE,GAAG,EAAV,EAAc,GAAd,CAAxB;AACD;;AAED,0BAAO;AAAM,QAAA,CAAC,EAAC,uBAAR;AAAgC,QAAA,SAAS,EAAEC,SAA3C;AAAsD,QAAA,SAAS,EAAEJ;AAAjE,QAAP;AACD;;;;EA9BwBO,kBAAMC,S;;;AAiCjCf,KAAK,CAACgB,SAAN,GAAkB;AAChBb,EAAAA,CAAC,EAAEc,sBAAUC,MADG;AAEhBhB,EAAAA,CAAC,EAAEe,sBAAUC,MAFG;AAGhBV,EAAAA,SAAS,EAAES,sBAAUE,KAAV,CAAgB,CAAC,MAAD,EAAS,OAAT,EAAkB,IAAlB,EAAwB,MAAxB,CAAhB,CAHK;AAIhBf,EAAAA,OAAO,EAAEa,sBAAUG,MAAV,CAAiBC,UAJV;AAKhBhB,EAAAA,SAAS,EAAEY,sBAAUK,MALL;AAMhBhB,EAAAA,KAAK,EAAEiB,YAAMC,SAAN,CAAgBH;AANP,CAAlB;AASArB,KAAK,CAACyB,YAAN,GAAqB;AACnBtB,EAAAA,CAAC,EAAE,CADgB;AAEnBD,EAAAA,CAAC,EAAE,CAFgB;AAGnBM,EAAAA,SAAS,EAAE;AAHQ,CAArB;;eAMe,wBAAWX,KAAX,EAAkBG,KAAlB,C","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport classNames from 'classnames';\nimport { withStyles } from '@material-ui/core/styles';\nimport { types } from '@pie-lib/plot';\n\nconst style = {\n root: {\n fill: 'var(--arrow-color, black)'\n }\n};\n\nexport class Arrow extends React.Component {\n render() {\n const { x, y, classes, className, scale } = this.props;\n const names = classNames(classes.root, className);\n let direction = this.props.direction || 'left';\n\n const xv = scale.x(x);\n const yv = scale.y(y);\n\n let transform = '';\n\n const getTransform = (x, y, rotate) => `translate(${x}, ${y}) rotate(${rotate})`;\n\n if (direction === 'left') {\n transform = getTransform(xv - 15, yv, 0);\n }\n\n if (direction === 'right') {\n transform = getTransform(xv + 15, yv, 180);\n }\n\n if (direction === 'up') {\n transform = getTransform(xv, yv - 15, 90);\n }\n\n if (direction === 'down') {\n transform = getTransform(xv, yv + 15, 270);\n }\n\n return <path d=\"m 0,0 8,-5 0,10 -8,-5\" transform={transform} className={names} />;\n }\n}\n\nArrow.propTypes = {\n y: PropTypes.number,\n x: PropTypes.number,\n direction: PropTypes.oneOf(['left', 'right', 'up', 'down']),\n classes: PropTypes.object.isRequired,\n className: PropTypes.string,\n scale: types.ScaleType.isRequired\n};\n\nArrow.defaultProps = {\n y: 0,\n x: 0,\n direction: 'left'\n};\n\nexport default withStyles(style)(Arrow);\n"],"file":"arrow.js"}
package/lib/axis/axes.js CHANGED
@@ -1,9 +1,11 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
- exports["default"] = exports.RawYAxis = exports.RawXAxis = exports.firstNegativeValue = exports.sharedValues = exports.AxisPropTypes = void 0;
8
+ exports.sharedValues = exports.firstNegativeValue = exports["default"] = exports.RawYAxis = exports.RawXAxis = exports.AxisPropTypes = void 0;
7
9
 
8
10
  var _react = _interopRequireDefault(require("react"));
9
11
 
@@ -21,39 +23,45 @@ var _utils = require("../utils");
21
23
 
22
24
  var _renderUi = require("@pie-lib/render-ui");
23
25
 
24
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
-
26
- function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
26
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
27
 
28
28
  function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
29
29
 
30
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
30
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
31
+
32
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
31
33
 
32
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
34
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
33
35
 
34
- function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
36
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
35
37
 
36
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
38
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
37
39
 
38
- function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
40
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
39
41
 
40
- function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
42
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
43
+
44
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
41
45
 
42
46
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
43
47
 
44
48
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
45
49
 
46
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
50
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
47
51
 
48
- function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
52
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
49
53
 
50
- function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
54
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
51
55
 
52
- function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
56
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
53
57
 
54
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
58
+ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
55
59
 
56
- function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
60
+ function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
61
+
62
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
63
+
64
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
57
65
 
58
66
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
59
67
 
@@ -108,10 +116,10 @@ var tickLabelStyles = {
108
116
  cursor: 'inherit'
109
117
  };
110
118
 
111
- var sharedValues = function sharedValues(firstNegativeX, firstNegativeY, distantceFromOriginToFirstNegativeX, distantceFromOriginToFirstNegativeY, deltaAllowance, dy) {
119
+ var sharedValues = function sharedValues(firstNegativeX, firstNegativeY, distanceFromOriginToFirstNegativeX, distanceFromOriginToFirstNegativeY, deltaAllowance, dy) {
112
120
  var result = [];
113
121
 
114
- if (firstNegativeX === firstNegativeY && distantceFromOriginToFirstNegativeX - deltaAllowance < distantceFromOriginToFirstNegativeY && distantceFromOriginToFirstNegativeY < distantceFromOriginToFirstNegativeX + deltaAllowance && distantceFromOriginToFirstNegativeX - deltaAllowance < dy && dy < distantceFromOriginToFirstNegativeX + deltaAllowance) {
122
+ if (firstNegativeX === firstNegativeY && distanceFromOriginToFirstNegativeX - deltaAllowance < distanceFromOriginToFirstNegativeY && distanceFromOriginToFirstNegativeY < distanceFromOriginToFirstNegativeX + deltaAllowance && distanceFromOriginToFirstNegativeX - deltaAllowance < dy && dy < distanceFromOriginToFirstNegativeX + deltaAllowance) {
115
123
  result.push(firstNegativeX);
116
124
  }
117
125
 
@@ -128,15 +136,15 @@ var firstNegativeValue = function firstNegativeValue(interval) {
128
136
 
129
137
  exports.firstNegativeValue = firstNegativeValue;
130
138
 
131
- var RawXAxis =
132
- /*#__PURE__*/
133
- function (_React$Component) {
139
+ var RawXAxis = /*#__PURE__*/function (_React$Component) {
134
140
  _inherits(RawXAxis, _React$Component);
135
141
 
142
+ var _super = _createSuper(RawXAxis);
143
+
136
144
  function RawXAxis() {
137
145
  _classCallCheck(this, RawXAxis);
138
146
 
139
- return _possibleConstructorReturn(this, _getPrototypeOf(RawXAxis).apply(this, arguments));
147
+ return _super.apply(this, arguments);
140
148
  }
141
149
 
142
150
  _createClass(RawXAxis, [{
@@ -148,7 +156,7 @@ function (_React$Component) {
148
156
  graphProps = _this$props.graphProps,
149
157
  columnTicksValues = _this$props.columnTicksValues,
150
158
  skipValues = _this$props.skipValues,
151
- distantceFromOriginToFirstNegativeY = _this$props.distantceFromOriginToFirstNegativeY,
159
+ distanceFromOriginToFirstNegativeY = _this$props.distanceFromOriginToFirstNegativeY,
152
160
  dy = _this$props.dy;
153
161
 
154
162
  var _ref = graphProps || {},
@@ -162,13 +170,8 @@ function (_React$Component) {
162
170
  var tickValues = (domain.labelStep || range.labelStep) && domain.min <= 0 ? ['0'].concat(_toConsumableArray(columnTicksValues)) : columnTicksValues; // However, the '0' has to be displayed only if other tick labels (y-axis or x-axis) are displayed
163
171
 
164
172
  var labelProps = function labelProps(label) {
165
- var y = dy;
166
-
167
- if (skipValues && skipValues[0] === label) {
168
- y = distantceFromOriginToFirstNegativeY + 4;
169
- }
170
-
171
- return _objectSpread({}, tickLabelStyles, {
173
+ var y = skipValues && skipValues[0] === label ? distanceFromOriginToFirstNegativeY + 4 : dy;
174
+ return _objectSpread(_objectSpread({}, tickLabelStyles), {}, {
172
175
  textAnchor: 'middle',
173
176
  y: y,
174
177
  dx: label === '0' ? -10 : 0,
@@ -179,36 +182,37 @@ function (_React$Component) {
179
182
  var necessaryRows = (0, _utils.countWords)(domain.axisLabel);
180
183
  var longestWord = (0, _utils.findLongestWord)(domain.axisLabel);
181
184
  var necessaryWidth = (0, _utils.amountToIncreaseWidth)(longestWord);
182
- return _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_axis.Axis, {
185
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_axis.Axis, {
183
186
  axisLineClassName: classes.line,
184
187
  scale: scale.x,
185
188
  top: scale.y(0),
186
189
  left: 0,
187
190
  label: domain.label,
191
+ rangePadding: 8,
188
192
  tickClassName: classes.tick,
189
193
  tickFormat: function tickFormat(value) {
190
194
  return value;
191
195
  },
192
196
  tickLabelProps: labelProps,
193
197
  tickValues: tickValues
194
- }), includeArrows && includeArrows.left && _react["default"].createElement(_arrow["default"], {
198
+ }), includeArrows && includeArrows.left && /*#__PURE__*/_react["default"].createElement(_arrow["default"], {
195
199
  direction: "left",
196
200
  x: domain.min,
197
201
  y: 0,
198
202
  className: classes.arrow,
199
203
  scale: scale
200
- }), includeArrows && includeArrows.right && _react["default"].createElement(_arrow["default"], {
204
+ }), includeArrows && includeArrows.right && /*#__PURE__*/_react["default"].createElement(_arrow["default"], {
201
205
  direction: "right",
202
206
  x: domain.max,
203
207
  y: 0,
204
208
  className: classes.arrow,
205
209
  scale: scale
206
- }), domain.axisLabel && _react["default"].createElement("foreignObject", {
207
- x: size.width + 10,
210
+ }), domain.axisLabel && /*#__PURE__*/_react["default"].createElement("foreignObject", {
211
+ x: size.width + 15,
208
212
  y: scale.y(0) - 10,
209
213
  width: necessaryWidth,
210
214
  height: 20 * necessaryRows
211
- }, _react["default"].createElement("div", {
215
+ }, /*#__PURE__*/_react["default"].createElement("div", {
212
216
  dangerouslySetInnerHTML: {
213
217
  __html: domain.axisLabel
214
218
  },
@@ -222,7 +226,7 @@ function (_React$Component) {
222
226
 
223
227
  exports.RawXAxis = RawXAxis;
224
228
 
225
- _defineProperty(RawXAxis, "propTypes", _objectSpread({}, AxisPropTypes, {
229
+ _defineProperty(RawXAxis, "propTypes", _objectSpread(_objectSpread({}, AxisPropTypes), {}, {
226
230
  classes: _propTypes["default"].object,
227
231
  graphProps: _plot.types.GraphPropsType.isRequired
228
232
  }));
@@ -231,15 +235,15 @@ _defineProperty(RawXAxis, "defaultProps", AxisDefaultProps);
231
235
 
232
236
  var XAxis = (0, _core.withStyles)(axisStyles)(RawXAxis);
233
237
 
234
- var RawYAxis =
235
- /*#__PURE__*/
236
- function (_React$Component2) {
238
+ var RawYAxis = /*#__PURE__*/function (_React$Component2) {
237
239
  _inherits(RawYAxis, _React$Component2);
238
240
 
241
+ var _super2 = _createSuper(RawYAxis);
242
+
239
243
  function RawYAxis() {
240
244
  _classCallCheck(this, RawYAxis);
241
245
 
242
- return _possibleConstructorReturn(this, _getPrototypeOf(RawYAxis).apply(this, arguments));
246
+ return _super2.apply(this, arguments);
243
247
  }
244
248
 
245
249
  _createClass(RawYAxis, [{
@@ -260,14 +264,10 @@ function (_React$Component2) {
260
264
  var necessaryWidth = range.axisLabel ? (0, _utils.amountToIncreaseWidth)(range.axisLabel.length) : 0;
261
265
 
262
266
  var customTickFormat = function customTickFormat(value) {
263
- if (skipValues && skipValues.indexOf(value) >= 0) {
264
- return '';
265
- }
266
-
267
- return value;
267
+ return skipValues && skipValues.indexOf(value) >= 0 ? '' : value;
268
268
  };
269
269
 
270
- return _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_axis.Axis, {
270
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_axis.Axis, {
271
271
  axisLineClassName: classes.line,
272
272
  orientation: 'left',
273
273
  scale: scale.y,
@@ -278,40 +278,41 @@ function (_React$Component2) {
278
278
  labelProps: {
279
279
  'data-pie-readable': false
280
280
  },
281
+ rangePadding: 8,
281
282
  tickLength: 10,
282
283
  tickClassName: classes.tick,
283
284
  tickFormat: customTickFormat,
284
285
  tickLabelProps: function tickLabelProps(value) {
285
286
  var digits = value.toLocaleString().length || 1;
286
- return _objectSpread({}, tickLabelStyles, {
287
+ return _objectSpread(_objectSpread({}, tickLabelStyles), {}, {
287
288
  dy: 4,
288
- dx: -8 - digits * 5,
289
+ dx: -4 - digits * 8,
289
290
  'data-pie-readable': false
290
291
  });
291
292
  },
292
293
  hideZero: true,
293
294
  tickTextAnchor: 'bottom',
294
295
  tickValues: rowTickValues
295
- }), includeArrows && includeArrows.down && _react["default"].createElement(_arrow["default"], {
296
+ }), includeArrows && includeArrows.down && /*#__PURE__*/_react["default"].createElement(_arrow["default"], {
296
297
  direction: "down",
297
298
  x: 0,
298
299
  y: range.min,
299
300
  className: classes.arrow,
300
301
  scale: scale
301
- }), includeArrows && includeArrows.up && _react["default"].createElement(_arrow["default"], {
302
+ }), includeArrows && includeArrows.up && /*#__PURE__*/_react["default"].createElement(_arrow["default"], {
302
303
  direction: "up",
303
304
  x: 0,
304
305
  y: range.max,
305
306
  className: classes.arrow,
306
307
  scale: scale
307
- }), range.axisLabel && _react["default"].createElement("foreignObject", {
308
+ }), range.axisLabel && /*#__PURE__*/_react["default"].createElement("foreignObject", {
308
309
  x: scale.x(0) - necessaryWidth / 2,
309
- y: -25,
310
+ y: -30,
310
311
  width: necessaryWidth,
311
312
  height: "20"
312
- }, _react["default"].createElement(_renderUi.Readable, {
313
+ }, /*#__PURE__*/_react["default"].createElement(_renderUi.Readable, {
313
314
  "false": true
314
- }, _react["default"].createElement("div", {
315
+ }, /*#__PURE__*/_react["default"].createElement("div", {
315
316
  dangerouslySetInnerHTML: {
316
317
  __html: range.axisLabel
317
318
  },
@@ -325,7 +326,7 @@ function (_React$Component2) {
325
326
 
326
327
  exports.RawYAxis = RawYAxis;
327
328
 
328
- _defineProperty(RawYAxis, "propTypes", _objectSpread({}, AxisPropTypes, {
329
+ _defineProperty(RawYAxis, "propTypes", _objectSpread(_objectSpread({}, AxisPropTypes), {}, {
329
330
  graphProps: _plot.types.GraphPropsType.isRequired
330
331
  }));
331
332
 
@@ -333,14 +334,12 @@ _defineProperty(RawYAxis, "defaultProps", AxisDefaultProps);
333
334
 
334
335
  var YAxis = (0, _core.withStyles)(axisStyles)(RawYAxis);
335
336
 
336
- var Axes =
337
- /*#__PURE__*/
338
- function (_React$Component3) {
337
+ var Axes = /*#__PURE__*/function (_React$Component3) {
339
338
  _inherits(Axes, _React$Component3);
340
339
 
341
- function Axes() {
342
- var _getPrototypeOf2;
340
+ var _super3 = _createSuper(Axes);
343
341
 
342
+ function Axes() {
344
343
  var _this;
345
344
 
346
345
  _classCallCheck(this, Axes);
@@ -349,7 +348,7 @@ function (_React$Component3) {
349
348
  args[_key] = arguments[_key];
350
349
  }
351
350
 
352
- _this = _possibleConstructorReturn(this, (_getPrototypeOf2 = _getPrototypeOf(Axes)).call.apply(_getPrototypeOf2, [this].concat(args)));
351
+ _this = _super3.call.apply(_super3, [this].concat(args));
353
352
 
354
353
  _defineProperty(_assertThisInitialized(_this), "xValues", function () {
355
354
  var graphProps = _this.props.graphProps;
@@ -362,14 +361,14 @@ function (_React$Component3) {
362
361
  return;
363
362
  }
364
363
 
365
- var ticks = (0, _utils.getTickValues)(_objectSpread({}, domain, {
364
+ var ticks = (0, _utils.getTickValues)(_objectSpread(_objectSpread({}, domain), {}, {
366
365
  step: domain.labelStep
367
366
  }));
368
367
  var negative = firstNegativeValue(ticks);
369
368
  return {
370
369
  columnTicksValues: ticks,
371
370
  firstNegativeX: negative,
372
- distantceFromOriginToFirstNegativeX: Math.abs(scale.y(0) - scale.y(negative))
371
+ distanceFromOriginToFirstNegativeX: Math.abs(scale.y(0) - scale.y(negative))
373
372
  };
374
373
  });
375
374
 
@@ -384,14 +383,14 @@ function (_React$Component3) {
384
383
  return;
385
384
  }
386
385
 
387
- var ticks = (0, _utils.getTickValues)(_objectSpread({}, range, {
386
+ var ticks = (0, _utils.getTickValues)(_objectSpread(_objectSpread({}, range), {}, {
388
387
  step: range.labelStep
389
388
  }));
390
389
  var negative = firstNegativeValue(ticks);
391
390
  return {
392
391
  rowTickValues: ticks,
393
392
  firstNegativeY: negative,
394
- distantceFromOriginToFirstNegativeY: Math.abs(scale.x(0) - scale.x(negative))
393
+ distanceFromOriginToFirstNegativeY: Math.abs(scale.x(0) - scale.x(negative))
395
394
  };
396
395
  });
397
396
 
@@ -405,34 +404,31 @@ function (_React$Component3) {
405
404
 
406
405
  var _ref5 = graphProps || {},
407
406
  domain = _ref5.domain,
408
- range = _ref5.range; // x
409
-
407
+ range = _ref5.range;
410
408
 
411
409
  var _this$xValues = this.xValues(),
412
410
  columnTicksValues = _this$xValues.columnTicksValues,
413
411
  firstNegativeX = _this$xValues.firstNegativeX,
414
- distantceFromOriginToFirstNegativeX = _this$xValues.distantceFromOriginToFirstNegativeX;
415
-
416
- var result = this.xValues(); // y
412
+ distanceFromOriginToFirstNegativeX = _this$xValues.distanceFromOriginToFirstNegativeX;
417
413
 
418
414
  var _this$yValues = this.yValues(),
419
415
  rowTickValues = _this$yValues.rowTickValues,
420
416
  firstNegativeY = _this$yValues.firstNegativeY,
421
- distantceFromOriginToFirstNegativeY = _this$yValues.distantceFromOriginToFirstNegativeY;
417
+ distanceFromOriginToFirstNegativeY = _this$yValues.distanceFromOriginToFirstNegativeY;
422
418
 
423
419
  var deltaAllowance = 6;
424
420
  var dy = 25;
425
- var skipValues = sharedValues(firstNegativeX, firstNegativeY, distantceFromOriginToFirstNegativeX, distantceFromOriginToFirstNegativeY, deltaAllowance, dy); // each axis has to be displayed only if the domain & range include it
421
+ var skipValues = sharedValues(firstNegativeX, firstNegativeY, distanceFromOriginToFirstNegativeX, distanceFromOriginToFirstNegativeY, deltaAllowance, dy); // each axis has to be displayed only if the domain & range include it
426
422
 
427
- return _react["default"].createElement(_react["default"].Fragment, null, range.min <= 0 ? _react["default"].createElement(XAxis, _extends({}, this.props, {
423
+ return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, range.min <= 0 ? /*#__PURE__*/_react["default"].createElement(XAxis, _extends({}, this.props, {
428
424
  skipValues: skipValues,
429
425
  columnTicksValues: columnTicksValues,
430
- distantceFromOriginToFirstNegativeY: distantceFromOriginToFirstNegativeY,
426
+ distanceFromOriginToFirstNegativeY: distanceFromOriginToFirstNegativeY,
431
427
  dy: dy
432
- })) : null, domain.min <= 0 ? _react["default"].createElement(YAxis, _extends({}, this.props, {
428
+ })) : null, domain.min <= 0 ? /*#__PURE__*/_react["default"].createElement(YAxis, _extends({}, this.props, {
433
429
  skipValues: skipValues,
434
430
  rowTickValues: rowTickValues,
435
- distantceFromOriginToFirstNegativeX: distantceFromOriginToFirstNegativeX
431
+ distanceFromOriginToFirstNegativeX: distanceFromOriginToFirstNegativeX
436
432
  })) : null);
437
433
  }
438
434
  }]);
@@ -442,7 +438,7 @@ function (_React$Component3) {
442
438
 
443
439
  exports["default"] = Axes;
444
440
 
445
- _defineProperty(Axes, "propTypes", _objectSpread({}, AxisPropTypes, {
441
+ _defineProperty(Axes, "propTypes", _objectSpread(_objectSpread({}, AxisPropTypes), {}, {
446
442
  classes: _propTypes["default"].object,
447
443
  graphProps: _plot.types.GraphPropsType.isRequired
448
444
  }));