victory-histogram 36.3.0 → 36.4.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.
@@ -17,21 +17,31 @@ var _helperMethods = require("./helper-methods");
17
17
 
18
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
19
 
20
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
20
+ 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; }
21
21
 
22
- 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; }
22
+ 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; }
23
23
 
24
24
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
25
25
 
26
26
  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); } }
27
27
 
28
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
28
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
29
+
30
+ 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); }
31
+
32
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
33
+
34
+ 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); }; }
29
35
 
30
- function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
36
+ 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); }
31
37
 
32
38
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
33
39
 
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, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
40
+ 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; } }
41
+
42
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
43
+
44
+ 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; }
35
45
 
36
46
  var fallbackProps = {
37
47
  width: 450,
@@ -40,21 +50,21 @@ var fallbackProps = {
40
50
  };
41
51
  var defaultData = [];
42
52
 
43
- var VictoryHistogram =
44
- /*#__PURE__*/
45
- function (_React$Component) {
53
+ var VictoryHistogram = /*#__PURE__*/function (_React$Component) {
46
54
  _inherits(VictoryHistogram, _React$Component);
47
55
 
56
+ var _super = _createSuper(VictoryHistogram);
57
+
48
58
  function VictoryHistogram() {
49
59
  _classCallCheck(this, VictoryHistogram);
50
60
 
51
- return _possibleConstructorReturn(this, (VictoryHistogram.__proto__ || Object.getPrototypeOf(VictoryHistogram)).apply(this, arguments));
61
+ return _super.apply(this, arguments);
52
62
  }
53
63
 
54
64
  _createClass(VictoryHistogram, [{
55
65
  key: "shouldAnimate",
56
- // Overridden in native versions
57
- value: function shouldAnimate() {
66
+ value: // Overridden in native versions
67
+ function shouldAnimate() {
58
68
  return !!this.props.animate;
59
69
  }
60
70
  }, {
@@ -70,7 +80,8 @@ function (_React$Component) {
70
80
  }
71
81
 
72
82
  var children = this.renderData(props);
73
- return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
83
+ var component = props.standalone ? this.renderContainer(props.containerComponent, children) : children;
84
+ return _victoryCore.UserProps.withSafeUserProps(component, props);
74
85
  }
75
86
  }]);
76
87
 
@@ -78,144 +89,100 @@ function (_React$Component) {
78
89
  }(_react.default.Component);
79
90
 
80
91
  exports.VictoryHistogram = VictoryHistogram;
81
- Object.defineProperty(VictoryHistogram, "animationWhitelist", {
82
- configurable: true,
83
- enumerable: true,
84
- writable: true,
85
- value: ["data", "domain", "height", "padding", "style", "width"]
86
- });
87
- Object.defineProperty(VictoryHistogram, "displayName", {
88
- configurable: true,
89
- enumerable: true,
90
- writable: true,
91
- value: "VictoryHistogram"
92
- });
93
- Object.defineProperty(VictoryHistogram, "role", {
94
- configurable: true,
95
- enumerable: true,
96
- writable: true,
97
- value: "histogram"
98
- });
99
- Object.defineProperty(VictoryHistogram, "defaultTransitions", {
100
- configurable: true,
101
- enumerable: true,
102
- writable: true,
103
- value: {
104
- onLoad: {
105
- duration: 2000,
106
- before: function () {
107
- return {
108
- _y: 0,
109
- _y1: 0,
110
- _y0: 0
111
- };
112
- },
113
- after: function (datum) {
114
- return {
115
- _y: datum._y,
116
- _y1: datum._y1,
117
- _y0: datum._y0
118
- };
119
- }
92
+
93
+ _defineProperty(VictoryHistogram, "animationWhitelist", ["data", "domain", "height", "padding", "style", "width"]);
94
+
95
+ _defineProperty(VictoryHistogram, "displayName", "VictoryHistogram");
96
+
97
+ _defineProperty(VictoryHistogram, "role", "histogram");
98
+
99
+ _defineProperty(VictoryHistogram, "defaultTransitions", {
100
+ onLoad: {
101
+ duration: 2000,
102
+ before: function () {
103
+ return {
104
+ _y: 0,
105
+ _y1: 0,
106
+ _y0: 0
107
+ };
120
108
  },
121
- onExit: {
122
- duration: 500,
123
- before: function () {
124
- return {
125
- _y: 0,
126
- yOffset: 0
127
- };
128
- }
109
+ after: function (datum) {
110
+ return {
111
+ _y: datum._y,
112
+ _y1: datum._y1,
113
+ _y0: datum._y0
114
+ };
115
+ }
116
+ },
117
+ onExit: {
118
+ duration: 500,
119
+ before: function () {
120
+ return {
121
+ _y: 0,
122
+ yOffset: 0
123
+ };
124
+ }
125
+ },
126
+ onEnter: {
127
+ duration: 500,
128
+ before: function () {
129
+ return {
130
+ _y: 0,
131
+ _y1: 0,
132
+ _y0: 0
133
+ };
129
134
  },
130
- onEnter: {
131
- duration: 500,
132
- before: function () {
133
- return {
134
- _y: 0,
135
- _y1: 0,
136
- _y0: 0
137
- };
138
- },
139
- after: function (datum) {
140
- return {
141
- _y: datum._y,
142
- _y1: datum._y1,
143
- _y0: datum._y0
144
- };
145
- }
135
+ after: function (datum) {
136
+ return {
137
+ _y: datum._y,
138
+ _y1: datum._y1,
139
+ _y0: datum._y0
140
+ };
146
141
  }
147
142
  }
148
143
  });
149
- Object.defineProperty(VictoryHistogram, "getFormattedData", {
150
- configurable: true,
151
- enumerable: true,
152
- writable: true,
153
- value: _helperMethods.getFormattedData
154
- });
155
- Object.defineProperty(VictoryHistogram, "propTypes", {
156
- configurable: true,
157
- enumerable: true,
158
- writable: true,
159
- value: _objectSpread({}, _victoryCore.CommonProps.baseProps, _victoryCore.CommonProps.dataProps, {
160
- binSpacing: _victoryCore.PropTypes.nonNegative,
161
- bins: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.instanceOf(Date)])), _victoryCore.PropTypes.nonNegative]),
162
- cornerRadius: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func, _propTypes.default.shape({
163
- top: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
164
- topLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
165
- topRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
166
- bottom: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
167
- bottomLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
168
- bottomRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func])
169
- })]),
170
- getPath: _propTypes.default.func,
171
- horizontal: _propTypes.default.bool
172
- })
173
- });
174
- Object.defineProperty(VictoryHistogram, "defaultProps", {
175
- configurable: true,
176
- enumerable: true,
177
- writable: true,
178
- value: {
179
- containerComponent: _react.default.createElement(_victoryCore.VictoryContainer, null),
180
- data: defaultData,
181
- dataComponent: _react.default.createElement(_victoryBar.Bar, null),
182
- groupComponent: _react.default.createElement("g", {
183
- role: "presentation"
184
- }),
185
- labelComponent: _react.default.createElement(_victoryCore.VictoryLabel, null),
186
- samples: 50,
187
- sortOrder: "ascending",
188
- standalone: true,
189
- theme: _victoryCore.VictoryTheme.grayscale
190
- }
191
- });
192
- Object.defineProperty(VictoryHistogram, "getDomain", {
193
- configurable: true,
194
- enumerable: true,
195
- writable: true,
196
- value: _helperMethods.getDomain
197
- });
198
- Object.defineProperty(VictoryHistogram, "getData", {
199
- configurable: true,
200
- enumerable: true,
201
- writable: true,
202
- value: _helperMethods.getData
203
- });
204
- Object.defineProperty(VictoryHistogram, "getBaseProps", {
205
- configurable: true,
206
- enumerable: true,
207
- writable: true,
208
- value: function (props) {
209
- return (0, _helperMethods.getBaseProps)(props, fallbackProps);
210
- }
144
+
145
+ _defineProperty(VictoryHistogram, "getFormattedData", _helperMethods.getFormattedData);
146
+
147
+ _defineProperty(VictoryHistogram, "propTypes", _objectSpread(_objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), _victoryCore.CommonProps.dataProps), {}, {
148
+ binSpacing: _victoryCore.PropTypes.nonNegative,
149
+ bins: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.instanceOf(Date)])), _victoryCore.PropTypes.nonNegative]),
150
+ cornerRadius: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func, _propTypes.default.shape({
151
+ top: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
152
+ topLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
153
+ topRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
154
+ bottom: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
155
+ bottomLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
156
+ bottomRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func])
157
+ })]),
158
+ getPath: _propTypes.default.func,
159
+ horizontal: _propTypes.default.bool
160
+ }));
161
+
162
+ _defineProperty(VictoryHistogram, "defaultProps", {
163
+ containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
164
+ data: defaultData,
165
+ dataComponent: /*#__PURE__*/_react.default.createElement(_victoryBar.Bar, null),
166
+ groupComponent: /*#__PURE__*/_react.default.createElement("g", {
167
+ role: "presentation"
168
+ }),
169
+ labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
170
+ samples: 50,
171
+ sortOrder: "ascending",
172
+ standalone: true,
173
+ theme: _victoryCore.VictoryTheme.grayscale
211
174
  });
212
- Object.defineProperty(VictoryHistogram, "expectedComponents", {
213
- configurable: true,
214
- enumerable: true,
215
- writable: true,
216
- value: ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]
175
+
176
+ _defineProperty(VictoryHistogram, "getDomain", _helperMethods.getDomain);
177
+
178
+ _defineProperty(VictoryHistogram, "getData", _helperMethods.getData);
179
+
180
+ _defineProperty(VictoryHistogram, "getBaseProps", function (props) {
181
+ return (0, _helperMethods.getBaseProps)(props, fallbackProps);
217
182
  });
218
183
 
184
+ _defineProperty(VictoryHistogram, "expectedComponents", ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]);
185
+
219
186
  var _default = (0, _victoryCore.addEvents)(VictoryHistogram);
220
187
 
221
188
  exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "victory-histogram",
3
- "version": "36.3.0",
3
+ "version": "36.4.1",
4
4
  "description": "Histogram Component for Victory",
5
5
  "keywords": [
6
6
  "data visualization",
@@ -19,13 +19,12 @@
19
19
  "author": "Formidable",
20
20
  "license": "MIT",
21
21
  "dependencies": {
22
- "d3-array": "~2.3.0",
23
- "d3-scale": "^1.0.0",
24
22
  "lodash": "^4.17.19",
25
- "prop-types": "^15.5.8",
26
- "react-fast-compare": "^2.0.0",
27
- "victory-bar": "^36.3.0",
28
- "victory-core": "^36.3.0"
23
+ "prop-types": "^15.8.1",
24
+ "react-fast-compare": "^3.2.0",
25
+ "victory-bar": "^36.4.1",
26
+ "victory-core": "^36.4.1",
27
+ "victory-vendor": "^36.4.0"
29
28
  },
30
29
  "peerDependencies": {
31
30
  "react": "^16.6.0 || ^17.0.0"
@@ -34,5 +33,5 @@
34
33
  "version": "yarn run nps build-libs && nps build-dists"
35
34
  },
36
35
  "sideEffects": false,
37
- "gitHead": "ebafd849d2ded3f1d2aabf0d6e64dcbd48e4c9d6"
36
+ "gitHead": "aa44a22e5a93989773a560f765f83ac151f44c46"
38
37
  }
@@ -2,8 +2,8 @@ import { assign, isNil } from "lodash";
2
2
  import { Helpers, LabelHelpers, Data, Domain, Scale } from "victory-core";
3
3
  import { getBarPosition } from "victory-bar";
4
4
  import isEqual from "react-fast-compare";
5
- import * as d3Array from "d3-array";
6
- import * as d3Scale from "d3-scale";
5
+ import * as d3Array from "victory-vendor/d3-array";
6
+ import * as d3Scale from "victory-vendor/d3-scale";
7
7
 
8
8
  const cacheLastValue = (func) => {
9
9
  let called = false;
@@ -8,7 +8,8 @@ import {
8
8
  VictoryTheme,
9
9
  CommonProps,
10
10
  addEvents,
11
- PropTypes as CustomPropTypes
11
+ PropTypes as CustomPropTypes,
12
+ UserProps
12
13
  } from "victory-core";
13
14
  import {
14
15
  getBaseProps,
@@ -120,9 +121,12 @@ export class VictoryHistogram extends React.Component {
120
121
  }
121
122
 
122
123
  const children = this.renderData(props);
123
- return props.standalone
124
+
125
+ const component = props.standalone
124
126
  ? this.renderContainer(props.containerComponent, children)
125
127
  : children;
128
+
129
+ return UserProps.withSafeUserProps(component, props);
126
130
  }
127
131
  }
128
132