victory-errorbar 30.6.1 → 31.2.0

package/es/helper-methods.js

@@ -1,3 +1,4 @@
+import _isNil from "lodash/isNil";
 import { Helpers, LabelHelpers, Scale, Domain, Data, Collection } from "victory-core";
 
 var getErrors = function (datum, scale, axis) {
@@ -158,7 +159,7 @@ var getBaseProps = function (props, fallbackProps) {
     }
   };
   return data.reduce(function (childProps, datum, index) {
-    var eventKey = datum.eventKey || index;
+    var eventKey = !_isNil(datum.eventKey) ? datum.eventKey : index;
     var x = scale.x(datum._x1 !== undefined ? datum._x1 : datum._x);
     var y = scale.y(datum._y1 !== undefined ? datum._y1 : datum._y);
     var dataProps = {

package/es/victory-errorbar.js

@@ -45,7 +45,6 @@ var defaultData = [{
   errorX: 0.4,
   errorY: 0.4
 }];
-var animationWhitelist = ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"];
 
 var VictoryErrorBar =
 /*#__PURE__*/
@@ -67,7 +66,8 @@ function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var role = this.constructor.role;
+      var animationWhitelist = VictoryErrorBar.animationWhitelist,
+          role = VictoryErrorBar.role;
       var props = Helpers.modifyProps(this.props, fallbackProps, role);
 
       if (this.shouldAnimate()) {
@@ -82,6 +82,12 @@ function (_React$Component) {
   return VictoryErrorBar;
 }(React.Component);
 
+Object.defineProperty(VictoryErrorBar, "animationWhitelist", {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  value: ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"]
+});
 Object.defineProperty(VictoryErrorBar, "displayName", {
   configurable: true,
   enumerable: true,

package/lib/helper-methods.js

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getData = exports.getDomain = exports.getBaseProps = void 0;
 
+var _isNil2 = _interopRequireDefault(require("lodash/isNil"));
+
 var _victoryCore = require("victory-core");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var getErrors = function (datum, scale, axis) {
   /**
    * check if it is asymmetric error or symmetric error, asymmetric error should be an array
@@ -172,7 +176,7 @@ var getBaseProps = function (props, fallbackProps) {
     }
   };
   return data.reduce(function (childProps, datum, index) {
-    var eventKey = datum.eventKey || index;
+    var eventKey = !(0, _isNil2.default)(datum.eventKey) ? datum.eventKey : index;
     var x = scale.x(datum._x1 !== undefined ? datum._x1 : datum._x);
     var y = scale.y(datum._y1 !== undefined ? datum._y1 : datum._y);
     var dataProps = {

package/lib/victory-errorbar.js

@@ -59,7 +59,6 @@ var defaultData = [{
   errorX: 0.4,
   errorY: 0.4
 }];
-var animationWhitelist = ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"];
 
 var VictoryErrorBar =
 /*#__PURE__*/
@@ -81,7 +80,8 @@ function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var role = this.constructor.role;
+      var animationWhitelist = VictoryErrorBar.animationWhitelist,
+          role = VictoryErrorBar.role;
 
       var props = _victoryCore.Helpers.modifyProps(this.props, fallbackProps, role);
 
@@ -97,6 +97,12 @@ function (_React$Component) {
   return VictoryErrorBar;
 }(_react.default.Component);
 
+Object.defineProperty(VictoryErrorBar, "animationWhitelist", {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  value: ["data", "domain", "height", "padding", "samples", "style", "width", "errorX", "errorY", "borderWidth"]
+});
 Object.defineProperty(VictoryErrorBar, "displayName", {
   configurable: true,
   enumerable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-errorbar",
-  "version": "30.6.1",
+  "version": "31.2.0",
   "description": "Error Bar Component for Victory",
   "keywords": [
     "data visualization",
@@ -21,7 +21,7 @@
   "dependencies": {
     "lodash": "^4.17.5",
     "prop-types": "^15.5.8",
-    "victory-core": "^30.6.1"
+    "victory-core": "^31.2.0"
   },
   "scripts": {
     "version": "nps build-libs && nps build-dists"

package/src/error-bar.js

@@ -9,16 +9,8 @@ export default class ErrorBar extends React.Component {
     ...CommonProps.primitiveProps,
     borderWidth: PropTypes.number,
     datum: PropTypes.object,
-    errorX: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.array,
-      PropTypes.bool
-    ]),
-    errorY: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.array,
-      PropTypes.bool
-    ]),
+    errorX: PropTypes.oneOfType([PropTypes.number, PropTypes.array, PropTypes.bool]),
+    errorY: PropTypes.oneOfType([PropTypes.number, PropTypes.array, PropTypes.bool]),
     groupComponent: PropTypes.element,
     lineComponent: PropTypes.element,
     x: PropTypes.number,
@@ -26,9 +18,9 @@ export default class ErrorBar extends React.Component {
   };
 
   static defaultProps = {
-    groupComponent: <g/>,
-    lineComponent: <Line/>
-  }
+    groupComponent: <g />,
+    lineComponent: <Line />
+  };
 
   getStyle(props) {
     const { style, datum, active } = props;
@@ -37,12 +29,26 @@ export default class ErrorBar extends React.Component {
 
   renderBorder(props, error, type) {
     const {
-      x, y, borderWidth, events, style, role, shapeRendering,
-      className, lineComponent, transform, id
+      x,
+      y,
+      borderWidth,
+      events,
+      style,
+      role,
+      shapeRendering,
+      className,
+      lineComponent,
+      transform,
+      id
     } = props;
     const vertical = type === "right" || type === "left";
     const borderProps = {
-      role, shapeRendering, className, events, style, transform,
+      role,
+      shapeRendering,
+      className,
+      events,
+      style,
+      transform,
       key: `${id}-border-${type}`,
       x1: vertical ? error[type] : x - borderWidth,
       x2: vertical ? error[type] : x + borderWidth,
@@ -54,11 +60,25 @@ export default class ErrorBar extends React.Component {
 
   renderCross(props, error, type) {
     const {
-      x, y, events, style, role, shapeRendering, className, lineComponent, transform, id
+      x,
+      y,
+      events,
+      style,
+      role,
+      shapeRendering,
+      className,
+      lineComponent,
+      transform,
+      id
     } = props;
     const vertical = type === "top" || type === "bottom";
     const borderProps = {
-      role, shapeRendering, className, events, style, transform,
+      role,
+      shapeRendering,
+      className,
+      events,
+      style,
+      transform,
       key: `${id}-cross-${type}`,
       x1: x,
       x2: vertical ? x : error[type],

package/src/helper-methods.js

@@ -1,3 +1,4 @@
+import { isNil } from "lodash";
 import { Helpers, LabelHelpers, Scale, Domain, Data, Collection } from "victory-core";
 
 const getErrors = (datum, scale, axis) => {
@@ -14,13 +15,14 @@ const getErrors = (datum, scale, axis) => {
     return false;
   }
 
-  return Array.isArray(errors) ?
-    [ errors[0] === 0 ? false : scale[axis](errors[0] + datum[`_${axis}`]),
-      errors[1] === 0 ? false : scale[axis](datum[`_${axis}`] - errors[1]) ] :
-    [ scale[axis](errors + datum[`_${axis}`]), scale[axis](datum[`_${axis}`] - errors) ];
+  return Array.isArray(errors)
+    ? [
+        errors[0] === 0 ? false : scale[axis](errors[0] + datum[`_${axis}`]),
+        errors[1] === 0 ? false : scale[axis](datum[`_${axis}`] - errors[1])
+      ]
+    : [scale[axis](errors + datum[`_${axis}`]), scale[axis](datum[`_${axis}`] - errors)];
 };
 
-
 const getData = (props) => {
   const accessorTypes = ["x", "y", "errorX", "errorY"];
   if (props.data) {
@@ -48,11 +50,11 @@ const getDomainFromData = (props, axis) => {
     const errorIndex = type === "min" ? 1 : 0;
     const sign = type === "min" ? -1 : 1;
     return dataset.reduce((memo, datum) => {
-      const currentError = Array.isArray(datum[error]) ?
-        datum[error][errorIndex] : datum[error];
+      const currentError = Array.isArray(datum[error]) ? datum[error][errorIndex] : datum[error];
       const current = datum[`_${currentAxis}`] + sign * (currentError || 0);
-      return (memo < current && type === "min") || (memo > current && type === "max") ?
-        memo : current;
+      return (memo < current && type === "min") || (memo > current && type === "max")
+        ? memo
+        : current;
     }, baseCondition);
   };
 
@@ -66,8 +68,10 @@ const getDomain = (props, axis) => {
 };
 
 const getCalculatedValues = (props) => {
-  const defaultStyles = props.theme && props.theme.errorbar && props.theme.errorbar.style ?
-    props.theme.errorbar.style : {};
+  const defaultStyles =
+    props.theme && props.theme.errorbar && props.theme.errorbar.style
+      ? props.theme.errorbar.style
+      : {};
   const style = Helpers.getStyles(props.style, defaultStyles) || {};
   const data = getData(props);
   const range = {
@@ -79,8 +83,12 @@ const getCalculatedValues = (props) => {
     y: getDomain(props, "y")
   };
   const scale = {
-    x: Scale.getBaseScale(props, "x").domain(domain.x).range(range.x),
-    y: Scale.getBaseScale(props, "y").domain(domain.y).range(range.y)
+    x: Scale.getBaseScale(props, "x")
+      .domain(domain.x)
+      .range(range.x),
+    y: Scale.getBaseScale(props, "y")
+      .domain(domain.y)
+      .range(range.y)
   };
   const origin = props.polar ? props.origin || Helpers.getPolarOrigin(props) : undefined;
   return { domain, data, scale, style, origin };
@@ -110,21 +118,50 @@ const getBaseProps = (props, fallbackProps) => {
   props = Helpers.modifyProps(props, fallbackProps, "errorbar");
   const { data, style, scale, domain, origin } = getCalculatedValues(props, fallbackProps);
   const {
-    groupComponent, height, width, borderWidth, standalone, theme, polar, padding,
-    labels, events, sharedEvents, name
+    groupComponent,
+    height,
+    width,
+    borderWidth,
+    standalone,
+    theme,
+    polar,
+    padding,
+    labels,
+    events,
+    sharedEvents,
+    name
   } = props;
-  const initialChildProps = { parent: {
-    domain, scale, data, height, width, standalone, theme, polar, origin, name,
-    padding, style: style.parent
-  } };
+  const initialChildProps = {
+    parent: {
+      domain,
+      scale,
+      data,
+      height,
+      width,
+      standalone,
+      theme,
+      polar,
+      origin,
+      name,
+      padding,
+      style: style.parent
+    }
+  };
 
   return data.reduce((childProps, datum, index) => {
-    const eventKey = datum.eventKey || index;
+    const eventKey = !isNil(datum.eventKey) ? datum.eventKey : index;
     const x = scale.x(datum._x1 !== undefined ? datum._x1 : datum._x);
     const y = scale.y(datum._y1 !== undefined ? datum._y1 : datum._y);
 
     const dataProps = {
-      x, y, scale, datum, data, index, groupComponent, borderWidth,
+      x,
+      y,
+      scale,
+      datum,
+      data,
+      index,
+      groupComponent,
+      borderWidth,
       style: style.data,
       errorX: getErrors(datum, scale, "x"),
       errorY: getErrors(datum, scale, "y")
@@ -134,7 +171,7 @@ const getBaseProps = (props, fallbackProps) => {
       data: dataProps
     };
     const text = LabelHelpers.getText(props, datum, index);
-    if (text !== undefined && text !== null || (labels && (events || sharedEvents))) {
+    if ((text !== undefined && text !== null) || (labels && (events || sharedEvents))) {
       childProps[eventKey].labels = getLabelProps(dataProps, text, style);
     }
 

package/src/victory-errorbar.js

@@ -1,8 +1,14 @@
 import PropTypes from "prop-types";
 import React from "react";
 import {
-  PropTypes as CustomPropTypes, Helpers, VictoryLabel, addEvents,
-  VictoryContainer, VictoryTheme, DefaultTransitions, CommonProps
+  PropTypes as CustomPropTypes,
+  Helpers,
+  VictoryLabel,
+  addEvents,
+  VictoryContainer,
+  VictoryTheme,
+  DefaultTransitions,
+  CommonProps
 } from "victory-core";
 import ErrorBar from "./error-bar";
 import { getBaseProps, getDomain, getData } from "./helper-methods";
@@ -20,12 +26,20 @@ const defaultData = [
   { x: 4, y: 4, errorX: 0.4, errorY: 0.4 }
 ];
 
-const animationWhitelist = [
-  "data", "domain", "height", "padding", "samples",
-  "style", "width", "errorX", "errorY", "borderWidth"
-];
-
 class VictoryErrorBar extends React.Component {
+  static animationWhitelist = [
+    "data",
+    "domain",
+    "height",
+    "padding",
+    "samples",
+    "style",
+    "width",
+    "errorX",
+    "errorY",
+    "borderWidth"
+  ];
+
   static displayName = "VictoryErrorBar";
   static role = "errorbar";
   static defaultTransitions = DefaultTransitions.discreteTransitions();
@@ -50,11 +64,11 @@ class VictoryErrorBar extends React.Component {
   };
 
   static defaultProps = {
-    containerComponent: <VictoryContainer/>,
+    containerComponent: <VictoryContainer />,
     data: defaultData,
-    dataComponent: <ErrorBar/>,
-    labelComponent: <VictoryLabel/>,
-    groupComponent: <g role="presentation"/>,
+    dataComponent: <ErrorBar />,
+    labelComponent: <VictoryLabel />,
+    groupComponent: <g role="presentation" />,
     samples: 50,
     scale: "linear",
     sortOrder: "ascending",
@@ -66,7 +80,10 @@ class VictoryErrorBar extends React.Component {
   static getData = getData;
   static getBaseProps = (props) => getBaseProps(props, fallbackProps);
   static expectedComponents = [
-    "dataComponent", "labelComponent", "groupComponent", "containerComponent"
+    "dataComponent",
+    "labelComponent",
+    "groupComponent",
+    "containerComponent"
   ];
 
   // Overridden in native versions
@@ -75,11 +92,13 @@ class VictoryErrorBar extends React.Component {
   }
 
   render() {
-    const { role } = this.constructor;
+    const { animationWhitelist, role } = VictoryErrorBar;
     const props = Helpers.modifyProps(this.props, fallbackProps, role);
+
     if (this.shouldAnimate()) {
       return this.animateComponent(props, animationWhitelist);
     }
+
     const children = this.renderData(props);
     return props.standalone ? this.renderContainer(props.containerComponent, children) : children;
   }