victory-core 36.0.0 → 36.1.0

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/lib/victory-util/timer.js

@@ -13,9 +13,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var Timer =
-/*#__PURE__*/
-function () {
+var Timer = /*#__PURE__*/function () {
   function Timer() {
     _classCallCheck(this, Timer);
 

package/package.json

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

package/src/index.js

@@ -45,3 +45,6 @@ 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 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/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));
+};