victory-core 36.0.0 → 36.2.2

package/es/index.d.ts

@@ -565,6 +565,7 @@ export interface AnimatePropTypeInterface {
     after?: (datum: any) => AnimationStyle;
   };
   easing?: AnimationEasing;
+  animationWhitelist?: string[];
 }
 
 export interface EventCallbackInterface<TTarget, TEventKey> {

package/es/index.js

@@ -63,4 +63,9 @@ import * as _Axis from "./victory-util/axis";
 export { _Axis as Axis };
 export { default as TimerContext } from "./victory-util/timer-context";
 export { default as PortalContext } from "./victory-portal/portal-context";
-export * from "./victory-util/hooks";
+import * as _Hooks from "./victory-util/hooks";
+export { _Hooks as Hooks };
+import * as _LineHelpers from "./victory-util/line-helpers";
+export { _LineHelpers as LineHelpers }; // TODO: Fix this default export
+
+export { default as PointPathHelpers } from "./victory-util/point-path-helpers";

package/es/victory-primitives/point.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from "react";
 import PropTypes from "prop-types";
 import * as Helpers from "../victory-util/helpers";
-import pathHelpers from "./path-helpers";
+import pathHelpers from "../victory-util/point-path-helpers";
 import * as CommonProps from "../victory-util/common-props";
 import Path from "./path";
 

package/es/victory-util/hooks/index.js

@@ -0,0 +1,2 @@
+export { usePreviousProps } from "./use-previous-props";
+export { useAnimationState } from "./use-animation-state";

package/es/victory-util/{hooks.js → hooks/use-animation-state.js}

@@ -14,15 +14,8 @@ function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d =
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React from "react";
-import * as Collection from "./collection";
-import * as Transitions from "./transitions";
-export var usePreviousProps = function (props) {
-  var ref = React.useRef();
-  React.useEffect(function () {
-    ref.current = props;
-  });
-  return ref.current || {};
-};
+import * as Collection from "../collection";
+import * as Transitions from "../transitions";
 var INITIAL_STATE = {
   nodesShouldLoad: false,
   nodesDoneLoad: false,

package/es/victory-util/hooks/use-previous-props.js

@@ -0,0 +1,8 @@
+import React from "react";
+export var usePreviousProps = function (props) {
+  var ref = React.useRef();
+  React.useEffect(function () {
+    ref.current = props;
+  });
+  return ref.current || {};
+};

package/es/victory-util/line-helpers.js

@@ -0,0 +1,45 @@
+import * as d3Shape from "d3-shape";
+
+var defined = function (d) {
+  var y = d._y1 !== undefined ? d._y1 : d._y;
+  return y !== null && y !== undefined && d._y0 !== null;
+};
+
+var getXAccessor = function (scale) {
+  return function (d) {
+    return scale.x(d._x1 !== undefined ? d._x1 : d._x);
+  };
+};
+
+var getYAccessor = function (scale) {
+  return function (d) {
+    return scale.y(d._y1 !== undefined ? d._y1 : d._y);
+  };
+};
+
+var getAngleAccessor = function (scale) {
+  return function (d) {
+    var x = scale.x(d._x1 !== undefined ? d._x1 : d._x);
+    return -1 * x + Math.PI / 2;
+  };
+};
+
+var toNewName = function (interpolation) {
+  // d3 shape changed the naming scheme for interpolators from "basis" -> "curveBasis" etc.
+  var capitalize = function (s) {
+    return s && s[0].toUpperCase() + s.slice(1);
+  };
+
+  return "curve".concat(capitalize(interpolation));
+};
+
+export var getLineFunction = function (props) {
+  var polar = props.polar,
+      scale = props.scale,
+      horizontal = props.horizontal;
+  var defaultOpenCurve = polar ? false : true;
+  var openCurve = props.openCurve === undefined ? defaultOpenCurve : props.openCurve;
+  var interpolationFunction = typeof props.interpolation === "function" && props.interpolation;
+  var interpolationName = typeof props.interpolation === "string" && (!openCurve ? "".concat(toNewName(props.interpolation), "Closed") : toNewName(props.interpolation));
+  return polar ? d3Shape.lineRadial().defined(defined).curve(interpolationFunction || d3Shape[interpolationName]).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(interpolationFunction || d3Shape[interpolationName]).x(horizontal ? getYAccessor(scale) : getXAccessor(scale)).y(horizontal ? getXAccessor(scale) : getYAccessor(scale));
+};

package/lib/index.d.ts

@@ -565,6 +565,7 @@ export interface AnimatePropTypeInterface {
     after?: (datum: any) => AnimationStyle;
   };
   easing?: AnimationEasing;
+  animationWhitelist?: string[];
 }
 
 export interface EventCallbackInterface<TTarget, TEventKey> {

package/lib/index.js

@@ -3,53 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  VictoryAccessibleGroup: true,
-  VictoryAnimation: true,
-  VictoryContainer: true,
-  VictoryLabel: true,
-  VictoryTransition: true,
-  VictoryClipContainer: true,
-  VictoryTheme: true,
-  VictoryPortal: true,
-  Portal: true,
-  Arc: true,
-  Background: true,
-  Border: true,
-  Box: true,
-  Circle: true,
-  ClipPath: true,
-  Line: true,
-  LineSegment: true,
-  Path: true,
-  Point: true,
-  Rect: true,
-  Text: true,
-  TSpan: true,
-  Whisker: true,
-  addEvents: true,
-  Collection: true,
-  Data: true,
-  DefaultTransitions: true,
-  Domain: true,
-  Events: true,
-  Helpers: true,
-  Immutable: true,
-  LabelHelpers: true,
-  Log: true,
-  PropTypes: true,
-  Scale: true,
-  Selection: true,
-  Style: true,
-  TextSize: true,
-  Timer: true,
-  Transitions: true,
-  CommonProps: true,
-  Wrapper: true,
-  Axis: true,
-  TimerContext: true,
-  PortalContext: true
-};
 Object.defineProperty(exports, "VictoryAccessibleGroup", {
   enumerable: true,
   get: function () {
@@ -212,7 +165,13 @@ Object.defineProperty(exports, "PortalContext", {
     return _portalContext.default;
   }
 });
-exports.Axis = exports.Wrapper = exports.CommonProps = exports.Transitions = exports.TextSize = exports.Style = exports.Selection = exports.Scale = exports.PropTypes = exports.Log = exports.LabelHelpers = exports.Immutable = exports.Helpers = exports.Events = exports.Domain = exports.DefaultTransitions = exports.Data = exports.Collection = void 0;
+Object.defineProperty(exports, "PointPathHelpers", {
+  enumerable: true,
+  get: function () {
+    return _pointPathHelpers.default;
+  }
+});
+exports.LineHelpers = exports.Hooks = exports.Axis = exports.Wrapper = exports.CommonProps = exports.Transitions = exports.TextSize = exports.Style = exports.Selection = exports.Scale = exports.PropTypes = exports.Log = exports.LabelHelpers = exports.Immutable = exports.Helpers = exports.Events = exports.Domain = exports.DefaultTransitions = exports.Data = exports.Collection = void 0;
 
 var _victoryAccessibleGroup = _interopRequireDefault(require("./victory-accessible-group/victory-accessible-group"));
 
@@ -338,18 +297,15 @@ var _timerContext = _interopRequireDefault(require("./victory-util/timer-context
 
 var _portalContext = _interopRequireDefault(require("./victory-portal/portal-context"));
 
-var _hooks = require("./victory-util/hooks");
-
-Object.keys(_hooks).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _hooks[key];
-    }
-  });
-});
+var _Hooks = _interopRequireWildcard(require("./victory-util/hooks"));
+
+exports.Hooks = _Hooks;
+
+var _LineHelpers = _interopRequireWildcard(require("./victory-util/line-helpers"));
+
+exports.LineHelpers = _LineHelpers;
+
+var _pointPathHelpers = _interopRequireDefault(require("./victory-util/point-path-helpers"));
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
 

package/lib/victory-primitives/point.js

@@ -13,7 +13,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var Helpers = _interopRequireWildcard(require("../victory-util/helpers"));
 
-var _pathHelpers = _interopRequireDefault(require("./path-helpers"));
+var _pointPathHelpers = _interopRequireDefault(require("../victory-util/point-path-helpers"));
 
 var CommonProps = _interopRequireWildcard(require("../victory-util/common-props"));
 
@@ -38,15 +38,15 @@ var getPath = function (props) {
   }
 
   var pathFunctions = {
-    circle: _pathHelpers.default.circle,
-    square: _pathHelpers.default.square,
-    diamond: _pathHelpers.default.diamond,
-    triangleDown: _pathHelpers.default.triangleDown,
-    triangleUp: _pathHelpers.default.triangleUp,
-    plus: _pathHelpers.default.plus,
-    minus: _pathHelpers.default.minus,
-    star: _pathHelpers.default.star,
-    cross: _pathHelpers.default.cross
+    circle: _pointPathHelpers.default.circle,
+    square: _pointPathHelpers.default.square,
+    diamond: _pointPathHelpers.default.diamond,
+    triangleDown: _pointPathHelpers.default.triangleDown,
+    triangleUp: _pointPathHelpers.default.triangleUp,
+    plus: _pointPathHelpers.default.plus,
+    minus: _pointPathHelpers.default.minus,
+    star: _pointPathHelpers.default.star,
+    cross: _pointPathHelpers.default.cross
   };
   var symbolFunction = typeof pathFunctions[symbol] === "function" ? pathFunctions[symbol] : pathFunctions.circle;
   return symbolFunction(x, y, size);

package/lib/victory-util/hooks/index.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "usePreviousProps", {
+  enumerable: true,
+  get: function () {
+    return _usePreviousProps.usePreviousProps;
+  }
+});
+Object.defineProperty(exports, "useAnimationState", {
+  enumerable: true,
+  get: function () {
+    return _useAnimationState.useAnimationState;
+  }
+});
+
+var _usePreviousProps = require("./use-previous-props");
+
+var _useAnimationState = require("./use-animation-state");

package/lib/victory-util/{hooks.js → hooks/use-animation-state.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useAnimationState = exports.usePreviousProps = void 0;
+exports.useAnimationState = void 0;
 
 var _some2 = _interopRequireDefault(require("lodash/some"));
 
@@ -11,9 +11,9 @@ var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var Collection = _interopRequireWildcard(require("./collection"));
+var Collection = _interopRequireWildcard(require("../collection"));
 
-var Transitions = _interopRequireWildcard(require("./transitions"));
+var Transitions = _interopRequireWildcard(require("../transitions"));
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
 
@@ -31,17 +31,6 @@ function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d =
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var usePreviousProps = function (props) {
-  var ref = _react.default.useRef();
-
-  _react.default.useEffect(function () {
-    ref.current = props;
-  });
-
-  return ref.current || {};
-};
-
-exports.usePreviousProps = usePreviousProps;
 var INITIAL_STATE = {
   nodesShouldLoad: false,
   nodesDoneLoad: false,

package/lib/victory-util/hooks/use-previous-props.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.usePreviousProps = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var usePreviousProps = function (props) {
+  var ref = _react.default.useRef();
+
+  _react.default.useEffect(function () {
+    ref.current = props;
+  });
+
+  return ref.current || {};
+};
+
+exports.usePreviousProps = usePreviousProps;

package/lib/victory-util/line-helpers.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLineFunction = void 0;
+
+var d3Shape = _interopRequireWildcard(require("d3-shape"));
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+
+var defined = function (d) {
+  var y = d._y1 !== undefined ? d._y1 : d._y;
+  return y !== null && y !== undefined && d._y0 !== null;
+};
+
+var getXAccessor = function (scale) {
+  return function (d) {
+    return scale.x(d._x1 !== undefined ? d._x1 : d._x);
+  };
+};
+
+var getYAccessor = function (scale) {
+  return function (d) {
+    return scale.y(d._y1 !== undefined ? d._y1 : d._y);
+  };
+};
+
+var getAngleAccessor = function (scale) {
+  return function (d) {
+    var x = scale.x(d._x1 !== undefined ? d._x1 : d._x);
+    return -1 * x + Math.PI / 2;
+  };
+};
+
+var toNewName = function (interpolation) {
+  // d3 shape changed the naming scheme for interpolators from "basis" -> "curveBasis" etc.
+  var capitalize = function (s) {
+    return s && s[0].toUpperCase() + s.slice(1);
+  };
+
+  return "curve".concat(capitalize(interpolation));
+};
+
+var getLineFunction = function (props) {
+  var polar = props.polar,
+      scale = props.scale,
+      horizontal = props.horizontal;
+  var defaultOpenCurve = polar ? false : true;
+  var openCurve = props.openCurve === undefined ? defaultOpenCurve : props.openCurve;
+  var interpolationFunction = typeof props.interpolation === "function" && props.interpolation;
+  var interpolationName = typeof props.interpolation === "string" && (!openCurve ? "".concat(toNewName(props.interpolation), "Closed") : toNewName(props.interpolation));
+  return polar ? d3Shape.lineRadial().defined(defined).curve(interpolationFunction || d3Shape[interpolationName]).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(interpolationFunction || d3Shape[interpolationName]).x(horizontal ? getYAccessor(scale) : getXAccessor(scale)).y(horizontal ? getXAccessor(scale) : getYAccessor(scale));
+};
+
+exports.getLineFunction = getLineFunction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "victory-core",
-  "version": "36.0.0",
+  "version": "36.2.2",
   "description": "Victory Core",
   "keywords": [
     "data visualization",
@@ -38,5 +38,5 @@
     "version": "yarn run nps build-libs && nps build-dists"
   },
   "sideEffects": false,
-  "gitHead": "0f9e0825ddbae3287022cb4cd59c56f9993a4b77"
+  "gitHead": "e09146d4bede80e27ed095fcd7e1167c00fba864"
 }

package/src/index.d.ts

@@ -565,6 +565,7 @@ export interface AnimatePropTypeInterface {
     after?: (datum: any) => AnimationStyle;
   };
   easing?: AnimationEasing;
+  animationWhitelist?: string[];
 }
 
 export interface EventCallbackInterface<TTarget, TEventKey> {

package/src/index.js

@@ -44,4 +44,7 @@ export * as Wrapper from "./victory-util/wrapper";
 export * as Axis from "./victory-util/axis";
 export { default as TimerContext } from "./victory-util/timer-context";
 export { default as PortalContext } from "./victory-portal/portal-context";
-export * from "./victory-util/hooks";
+export * as Hooks from "./victory-util/hooks";
+export * as LineHelpers from "./victory-util/line-helpers";
+// TODO: Fix this default export
+export { default as PointPathHelpers } from "./victory-util/point-path-helpers";

package/src/victory-primitives/point.js

@@ -2,7 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { assign } from "lodash";
 import * as Helpers from "../victory-util/helpers";
-import pathHelpers from "./path-helpers";
+import pathHelpers from "../victory-util/point-path-helpers";
 import * as CommonProps from "../victory-util/common-props";
 import Path from "./path";
 

package/src/victory-util/hooks/index.js

@@ -0,0 +1,2 @@
+export { usePreviousProps } from "./use-previous-props";
+export { useAnimationState } from "./use-animation-state";

package/src/victory-util/{hooks.js → hooks/use-animation-state.js}

@@ -1,16 +1,8 @@
 import React from "react";
 import { defaults, some } from "lodash";
 
-import * as Collection from "./collection";
-import * as Transitions from "./transitions";
-
-export const usePreviousProps = (props) => {
-  const ref = React.useRef();
-  React.useEffect(() => {
-    ref.current = props;
-  });
-  return ref.current || {};
-};
+import * as Collection from "../collection";
+import * as Transitions from "../transitions";
 
 const INITIAL_STATE = {
   nodesShouldLoad: false,

package/src/victory-util/hooks/use-previous-props.js

@@ -0,0 +1,9 @@
+import React from "react";
+
+export const usePreviousProps = (props) => {
+  const ref = React.useRef();
+  React.useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current || {};
+};

package/src/victory-util/line-helpers.js

@@ -0,0 +1,54 @@
+import * as d3Shape from "d3-shape";
+
+const defined = (d) => {
+  const y = d._y1 !== undefined ? d._y1 : d._y;
+  return y !== null && y !== undefined && d._y0 !== null;
+};
+
+const getXAccessor = (scale) => {
+  return (d) => scale.x(d._x1 !== undefined ? d._x1 : d._x);
+};
+
+const getYAccessor = (scale) => {
+  return (d) => scale.y(d._y1 !== undefined ? d._y1 : d._y);
+};
+
+const getAngleAccessor = (scale) => {
+  return (d) => {
+    const x = scale.x(d._x1 !== undefined ? d._x1 : d._x);
+    return -1 * x + Math.PI / 2;
+  };
+};
+
+const toNewName = (interpolation) => {
+  // d3 shape changed the naming scheme for interpolators from "basis" -> "curveBasis" etc.
+  const capitalize = (s) => s && s[0].toUpperCase() + s.slice(1);
+  return `curve${capitalize(interpolation)}`;
+};
+
+export const getLineFunction = (props) => {
+  const { polar, scale, horizontal } = props;
+  const defaultOpenCurve = polar ? false : true;
+  const openCurve =
+    props.openCurve === undefined ? defaultOpenCurve : props.openCurve;
+  const interpolationFunction =
+    typeof props.interpolation === "function" && props.interpolation;
+  const interpolationName =
+    typeof props.interpolation === "string" &&
+    (!openCurve
+      ? `${toNewName(props.interpolation)}Closed`
+      : toNewName(props.interpolation));
+  return polar
+    ? d3Shape
+        .lineRadial()
+        .defined(defined)
+        .curve(interpolationFunction || d3Shape[interpolationName])
+        .angle(getAngleAccessor(scale))
+        .radius(getYAccessor(scale))
+    : d3Shape
+        .line()
+        .defined(defined)
+        .curve(interpolationFunction || d3Shape[interpolationName])
+        .x(horizontal ? getYAccessor(scale) : getXAccessor(scale))
+        .y(horizontal ? getXAccessor(scale) : getYAccessor(scale));
+};