victory-histogram 36.3.2 → 36.5.0

package/lib/victory-histogram.js

@@ -17,7 +17,9 @@ var _helperMethods = require("./helper-methods");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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; }
+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; }
+
+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; }
 
 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; }
 
@@ -25,13 +27,21 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 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); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+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); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+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); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+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); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-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; }
+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; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var fallbackProps = {
   width: 450,
@@ -40,21 +50,21 @@ var fallbackProps = {
 };
 var defaultData = [];
 
-var VictoryHistogram =
-/*#__PURE__*/
-function (_React$Component) {
+var VictoryHistogram = /*#__PURE__*/function (_React$Component) {
   _inherits(VictoryHistogram, _React$Component);
 
+  var _super = _createSuper(VictoryHistogram);
+
   function VictoryHistogram() {
     _classCallCheck(this, VictoryHistogram);
 
-    return _possibleConstructorReturn(this, (VictoryHistogram.__proto__ || Object.getPrototypeOf(VictoryHistogram)).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
 
   _createClass(VictoryHistogram, [{
     key: "shouldAnimate",
-    // Overridden in native versions
-    value: function shouldAnimate() {
+    value: // Overridden in native versions
+    function shouldAnimate() {
       return !!this.props.animate;
     }
   }, {
@@ -70,10 +80,8 @@ function (_React$Component) {
       }
 
       var children = this.renderData(props);
-
-      var container = _react.default.cloneElement(props.containerComponent, _victoryCore.UserProps.getSafeUserProps(this.props));
-
-      return props.standalone ? this.renderContainer(container, children) : children;
+      var component = props.standalone ? this.renderContainer(props.containerComponent, children) : children;
+      return _victoryCore.UserProps.withSafeUserProps(component, props);
     }
   }]);
 
@@ -81,143 +89,90 @@ function (_React$Component) {
 }(_react.default.Component);
 
 exports.VictoryHistogram = VictoryHistogram;
-Object.defineProperty(VictoryHistogram, "animationWhitelist", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: ["data", "domain", "height", "padding", "style", "width"]
-});
-Object.defineProperty(VictoryHistogram, "displayName", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "VictoryHistogram"
-});
-Object.defineProperty(VictoryHistogram, "role", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: "histogram"
-});
-Object.defineProperty(VictoryHistogram, "defaultTransitions", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    onLoad: {
-      duration: 2000,
-      before: function () {
-        return {
-          _y: 0,
-          _y1: 0,
-          _y0: 0
-        };
-      },
-      after: function (datum) {
-        return {
-          _y: datum._y,
-          _y1: datum._y1,
-          _y0: datum._y0
-        };
-      }
+VictoryHistogram.animationWhitelist = ["data", "domain", "height", "padding", "style", "width"];
+VictoryHistogram.displayName = "VictoryHistogram";
+VictoryHistogram.role = "histogram";
+VictoryHistogram.defaultTransitions = {
+  onLoad: {
+    duration: 2000,
+    before: function () {
+      return {
+        _y: 0,
+        _y1: 0,
+        _y0: 0
+      };
     },
-    onExit: {
-      duration: 500,
-      before: function () {
-        return {
-          _y: 0,
-          yOffset: 0
-        };
-      }
+    after: function (datum) {
+      return {
+        _y: datum._y,
+        _y1: datum._y1,
+        _y0: datum._y0
+      };
+    }
+  },
+  onExit: {
+    duration: 500,
+    before: function () {
+      return {
+        _y: 0,
+        yOffset: 0
+      };
+    }
+  },
+  onEnter: {
+    duration: 500,
+    before: function () {
+      return {
+        _y: 0,
+        _y1: 0,
+        _y0: 0
+      };
     },
-    onEnter: {
-      duration: 500,
-      before: function () {
-        return {
-          _y: 0,
-          _y1: 0,
-          _y0: 0
-        };
-      },
-      after: function (datum) {
-        return {
-          _y: datum._y,
-          _y1: datum._y1,
-          _y0: datum._y0
-        };
-      }
+    after: function (datum) {
+      return {
+        _y: datum._y,
+        _y1: datum._y1,
+        _y0: datum._y0
+      };
     }
   }
+};
+VictoryHistogram.getFormattedData = _helperMethods.getFormattedData;
+VictoryHistogram.propTypes = _objectSpread(_objectSpread(_objectSpread({}, _victoryCore.CommonProps.baseProps), _victoryCore.CommonProps.dataProps), {}, {
+  binSpacing: _victoryCore.PropTypes.nonNegative,
+  bins: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.instanceOf(Date)])), _victoryCore.PropTypes.nonNegative]),
+  cornerRadius: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func, _propTypes.default.shape({
+    top: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+    topLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+    topRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+    bottom: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+    bottomLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
+    bottomRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func])
+  })]),
+  getPath: _propTypes.default.func,
+  horizontal: _propTypes.default.bool
 });
-Object.defineProperty(VictoryHistogram, "getFormattedData", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: _helperMethods.getFormattedData
-});
-Object.defineProperty(VictoryHistogram, "propTypes", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: _objectSpread({}, _victoryCore.CommonProps.baseProps, _victoryCore.CommonProps.dataProps, {
-    binSpacing: _victoryCore.PropTypes.nonNegative,
-    bins: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.instanceOf(Date)])), _victoryCore.PropTypes.nonNegative]),
-    cornerRadius: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func, _propTypes.default.shape({
-      top: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-      topLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-      topRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-      bottom: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-      bottomLeft: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func]),
-      bottomRight: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.func])
-    })]),
-    getPath: _propTypes.default.func,
-    horizontal: _propTypes.default.bool
-  })
-});
-Object.defineProperty(VictoryHistogram, "defaultProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: {
-    containerComponent: _react.default.createElement(_victoryCore.VictoryContainer, null),
-    data: defaultData,
-    dataComponent: _react.default.createElement(_victoryBar.Bar, null),
-    groupComponent: _react.default.createElement("g", {
-      role: "presentation"
-    }),
-    labelComponent: _react.default.createElement(_victoryCore.VictoryLabel, null),
-    samples: 50,
-    sortOrder: "ascending",
-    standalone: true,
-    theme: _victoryCore.VictoryTheme.grayscale
-  }
-});
-Object.defineProperty(VictoryHistogram, "getDomain", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: _helperMethods.getDomain
-});
-Object.defineProperty(VictoryHistogram, "getData", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: _helperMethods.getData
-});
-Object.defineProperty(VictoryHistogram, "getBaseProps", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: function (props) {
-    return (0, _helperMethods.getBaseProps)(props, fallbackProps);
-  }
-});
-Object.defineProperty(VictoryHistogram, "expectedComponents", {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  value: ["dataComponent", "labelComponent", "groupComponent", "containerComponent"]
-});
+VictoryHistogram.defaultProps = {
+  containerComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryContainer, null),
+  data: defaultData,
+  dataComponent: /*#__PURE__*/_react.default.createElement(_victoryBar.Bar, null),
+  groupComponent: /*#__PURE__*/_react.default.createElement("g", {
+    role: "presentation"
+  }),
+  labelComponent: /*#__PURE__*/_react.default.createElement(_victoryCore.VictoryLabel, null),
+  samples: 50,
+  sortOrder: "ascending",
+  standalone: true,
+  theme: _victoryCore.VictoryTheme.grayscale
+};
+VictoryHistogram.getDomain = _helperMethods.getDomain;
+VictoryHistogram.getData = _helperMethods.getData;
+
+VictoryHistogram.getBaseProps = function (props) {
+  return (0, _helperMethods.getBaseProps)(props, fallbackProps);
+};
+
+VictoryHistogram.expectedComponents = ["dataComponent", "labelComponent", "groupComponent", "containerComponent"];
 
 var _default = (0, _victoryCore.addEvents)(VictoryHistogram);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-histogram",
-  "version": "36.3.2",
+  "version": "36.5.0",
   "description": "Histogram Component for Victory",
   "keywords": [
     "data visualization",
@@ -19,20 +19,19 @@
   "author": "Formidable",
   "license": "MIT",
   "dependencies": {
-    "d3-array": "~2.3.0",
-    "d3-scale": "^1.0.0",
     "lodash": "^4.17.19",
-    "prop-types": "^15.5.8",
-    "react-fast-compare": "^2.0.0",
-    "victory-bar": "^36.3.2",
-    "victory-core": "^36.3.2"
+    "prop-types": "^15.8.1",
+    "react-fast-compare": "^3.2.0",
+    "victory-bar": "^36.5.0",
+    "victory-core": "^36.5.0",
+    "victory-vendor": "^36.5.0"
   },
   "peerDependencies": {
-    "react": "^16.6.0 || ^17.0.0"
+    "react": ">=16.6.0"
   },
   "scripts": {
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "18895d1290245732d14332bbbda10336032c9aab"
+  "gitHead": "7cecba921f751c3decc8215f7e866f51d11203c1"
 }

package/src/helper-methods.js

@@ -2,8 +2,8 @@ import { assign, isNil } from "lodash";
 import { Helpers, LabelHelpers, Data, Domain, Scale } from "victory-core";
 import { getBarPosition } from "victory-bar";
 import isEqual from "react-fast-compare";
-import * as d3Array from "d3-array";
-import * as d3Scale from "d3-scale";
+import * as d3Array from "victory-vendor/d3-array";
+import * as d3Scale from "victory-vendor/d3-scale";
 
 const cacheLastValue = (func) => {
   let called = false;

package/src/victory-histogram.js

@@ -122,14 +122,11 @@ export class VictoryHistogram extends React.Component {
 
     const children = this.renderData(props);
 
-    const container = React.cloneElement(
-      props.containerComponent,
-      UserProps.getSafeUserProps(this.props)
-    );
-
-    return props.standalone
-      ? this.renderContainer(container, children)
+    const component = props.standalone
+      ? this.renderContainer(props.containerComponent, children)
       : children;
+
+    return UserProps.withSafeUserProps(component, props);
   }
 }