victory-polar-axis - npm Package Compare versions

Comparing version 34.3.12 to 35.0.0

es/helper-methods.js

@@ -33,7 +33,9 @@ import _defaults from "lodash/defaults";
 var getStyleObject = function (props) {
-  var theme = props.theme,
+  var _props$theme = props.theme,
+      theme = _props$theme === void 0 ? {} : _props$theme,
       dependentAxis = props.dependentAxis;
-  var generalAxisStyle = theme && theme.axis && theme.axis.style;
-  var axisType = dependentAxis ? "dependentAxis" : "independentAxis";
-  var specificAxisStyle = theme && theme[axisType] && theme[axisType].style;
+  var generalAxisStyle = theme.polarAxis && theme.polarAxis.style || theme.axis && theme.axis.style;
+  var polarAxisType = dependentAxis ? "polarDependentAxis" : "polarIndependentAxis";
+  var standardAxisType = dependentAxis ? "dependentAxis" : "independentAxis";
+  var specificAxisStyle = theme[polarAxisType] && theme[polarAxisType].style || theme[standardAxisType] && theme[standardAxisType].style;
 
@@ -133,3 +135,4 @@ var mergeStyles = function () {
       ticks = calculatedValues.ticks,
-      tickFormat = calculatedValues.tickFormat;
+      tickFormat = calculatedValues.tickFormat,
+      origin = calculatedValues.origin;
   var text = tickFormat(tickValue, index, ticks);
@@ -151,6 +154,7 @@ var tick = stringTicks ? stringTicks[index] : tickValue;
 
-  var tickPadding = tickStyle.padding || 0;
-  var angularPadding = tickPadding; // TODO: do some geometry
-
   var axisAngle = axisType === "radial" ? getAxisAngle(props, scale) : undefined;
+  var tickPadding = tickStyle.padding || tickStyle.size || 0;
+  var padAngle = Helpers.degreesToRadians(90 - axisAngle);
+  var tickAngle = axisType === "angular" ? scale(tickValue) : Helpers.degreesToRadians(-1 * axisAngle);
+  var tickRadius = axisType === "angular" ? radius : scale(tickValue);
   return axisType === "angular" ? {
@@ -160,14 +164,14 @@ index: index,
     style: tickStyle,
-    x1: radius * Math.cos(scale(tickValue)),
-    y1: -radius * Math.sin(scale(tickValue)),
-    x2: (radius + tickPadding) * Math.cos(scale(tickValue)),
-    y2: -(radius + tickPadding) * Math.sin(scale(tickValue))
+    x1: getPosition(tickRadius, tickAngle, "x") + origin.x,
+    y1: getPosition(tickRadius, tickAngle, "y") + origin.y,
+    x2: getPosition(tickRadius + tickPadding, tickAngle, "x") + origin.x,
+    y2: getPosition(tickRadius + tickPadding, tickAngle, "y") + origin.y
   } : {
-    style: style,
     index: index,
     datum: tick,
-    x1: scale(tickValue) / 2 * Math.cos(axisAngle - angularPadding),
-    x2: scale(tickValue) / 2 * Math.cos(axisAngle + angularPadding),
-    y1: -(scale(tickValue) / 2) * Math.sin(axisAngle - angularPadding),
-    y2: -(scale(tickValue) / 2) * Math.sin(axisAngle + angularPadding)
+    style: tickStyle,
+    x1: tickRadius * Math.cos(tickAngle) + Math.cos(padAngle) * tickPadding + origin.x,
+    x2: tickRadius * Math.cos(tickAngle) - Math.cos(padAngle) * tickPadding + origin.x,
+    y1: tickRadius * Math.sin(tickAngle) + Math.sin(padAngle) * tickPadding + origin.y,
+    y2: tickRadius * Math.sin(tickAngle) - Math.sin(padAngle) * tickPadding + origin.y
   };
@@ -184,3 +188,4 @@ }; //eslint-disable-next-line max-params
       ticks = calculatedValues.ticks,
-      stringTicks = calculatedValues.stringTicks;
+      stringTicks = calculatedValues.stringTicks,
+      origin = calculatedValues.origin;
   var text = tickFormat(tickValue, index, ticks);
@@ -223,4 +228,4 @@ var tick = stringTicks ? stringTicks[index] : tickValue;
     text: text,
-    x: labelRadius * Math.cos(Helpers.degreesToRadians(labelAngle)),
-    y: -labelRadius * Math.sin(Helpers.degreesToRadians(labelAngle))
+    x: labelRadius * Math.cos(Helpers.degreesToRadians(labelAngle)) + origin.x,
+    y: -labelRadius * Math.sin(Helpers.degreesToRadians(labelAngle)) + origin.y
   };
@@ -237,3 +242,4 @@ }; //eslint-disable-next-line max-params
       ticks = calculatedValues.ticks,
-      tickFormat = calculatedValues.tickFormat;
+      tickFormat = calculatedValues.tickFormat,
+      origin = calculatedValues.origin;
   var text = tickFormat(tickValue, index, ticks);
@@ -264,6 +270,6 @@ var startAngle = props.startAngle,
     style: gridStyle,
-    x1: getPosition(radius, angle, "x"),
-    y1: getPosition(radius, angle, "y"),
-    x2: getPosition(innerRadius, angle, "x"),
-    y2: getPosition(innerRadius, angle, "y")
+    x1: getPosition(radius, angle, "x") + origin.x,
+    y1: getPosition(radius, angle, "y") + origin.y,
+    x2: getPosition(innerRadius, angle, "x") + origin.x,
+    y2: getPosition(innerRadius, angle, "y") + origin.y
   } : {
@@ -273,4 +279,4 @@ style: gridStyle,
     datum: tick,
-    cx: 0,
-    cy: 0,
+    cx: origin.x,
+    cy: origin.y,
     r: scale(tickValue),
@@ -286,3 +292,4 @@ startAngle: startAngle,
       style = calculatedValues.style,
-      scale = calculatedValues.scale;
+      scale = calculatedValues.scale,
+      origin = calculatedValues.origin;
   var axisLabelComponent = props.axisLabelComponent;
@@ -313,4 +320,4 @@
     text: props.label,
-    x: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "x"),
-    y: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "y")
+    x: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "x") + origin.x,
+    y: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "y") + origin.y
   };
@@ -323,3 +330,4 @@ };
       radius = calculatedValues.radius,
-      scale = calculatedValues.scale;
+      scale = calculatedValues.scale,
+      origin = calculatedValues.origin;
   var startAngle = modifiedProps.startAngle,
@@ -332,10 +340,10 @@ endAngle = modifiedProps.endAngle,
     style: style.axis,
-    x1: getPosition(innerRadius, axisAngle, "x"),
-    x2: getPosition(radius, axisAngle, "x"),
-    y1: getPosition(innerRadius, axisAngle, "y"),
-    y2: getPosition(radius, axisAngle, "y")
+    x1: getPosition(innerRadius, axisAngle, "x") + origin.x,
+    x2: getPosition(radius, axisAngle, "x") + origin.x,
+    y1: getPosition(innerRadius, axisAngle, "y") + origin.y,
+    y2: getPosition(radius, axisAngle, "y") + origin.y
   } : {
     style: style.axis,
-    cx: 0,
-    cy: 0,
+    cx: origin.x,
+    cy: origin.y,
     r: radius,
@@ -364,2 +372,3 @@ startAngle: startAngle,
   var radius = getRadius(props);
+  var origin = Helpers.getPolarOrigin(props);
   return {
@@ -376,3 +385,4 @@ axis: axis,
     range: range,
-    radius: radius
+    radius: radius,
+    origin: origin
   };
@@ -379,0 +389,0 @@ };

es/victory-polar-axis.js

@@ -30,3 +30,3 @@ import _isEmpty from "lodash/isEmpty";
 import PropTypes from "prop-types";
-import { PropTypes as CustomPropTypes, Helpers, VictoryLabel, CommonProps, VictoryContainer, VictoryTheme, LineSegment, addEvents, Arc, Axis } from "victory-core";
+import { PropTypes as CustomPropTypes, VictoryLabel, CommonProps, VictoryContainer, VictoryTheme, LineSegment, addEvents, Arc, Axis } from "victory-core";
 import { getScale, getStyles, getBaseProps } from "./helper-methods";
@@ -143,8 +143,3 @@ var fallbackProps = {
       var groupComponent = props.groupComponent;
-      var groupComponentProps = groupComponent.props || {};
-      var origin = Helpers.getPolarOrigin(props);
-      var transform = groupComponentProps.transform || "translate(".concat(origin.x, ", ").concat(origin.y, ")");
-      return React.cloneElement(groupComponent, {
-        transform: transform
-      }, children);
+      return React.cloneElement(groupComponent, {}, children);
     }
@@ -151,0 +146,0 @@ }, {

lib/helper-methods.js

@@ -45,7 +45,9 @@ "use strict";
 var getStyleObject = function (props) {
-  var theme = props.theme,
+  var _props$theme = props.theme,
+      theme = _props$theme === void 0 ? {} : _props$theme,
       dependentAxis = props.dependentAxis;
-  var generalAxisStyle = theme && theme.axis && theme.axis.style;
-  var axisType = dependentAxis ? "dependentAxis" : "independentAxis";
-  var specificAxisStyle = theme && theme[axisType] && theme[axisType].style;
+  var generalAxisStyle = theme.polarAxis && theme.polarAxis.style || theme.axis && theme.axis.style;
+  var polarAxisType = dependentAxis ? "polarDependentAxis" : "polarIndependentAxis";
+  var standardAxisType = dependentAxis ? "dependentAxis" : "independentAxis";
+  var specificAxisStyle = theme[polarAxisType] && theme[polarAxisType].style || theme[standardAxisType] && theme[standardAxisType].style;
 
@@ -155,3 +157,4 @@ var mergeStyles = function () {
       ticks = calculatedValues.ticks,
-      tickFormat = calculatedValues.tickFormat;
+      tickFormat = calculatedValues.tickFormat,
+      origin = calculatedValues.origin;
   var text = tickFormat(tickValue, index, ticks);
@@ -173,6 +176,9 @@ var tick = stringTicks ? stringTicks[index] : tickValue;
 
-  var tickPadding = tickStyle.padding || 0;
-  var angularPadding = tickPadding; // TODO: do some geometry
+  var axisAngle = axisType === "radial" ? getAxisAngle(props, scale) : undefined;
+  var tickPadding = tickStyle.padding || tickStyle.size || 0;
 
-  var axisAngle = axisType === "radial" ? getAxisAngle(props, scale) : undefined;
+  var padAngle = _victoryCore.Helpers.degreesToRadians(90 - axisAngle);
+
+  var tickAngle = axisType === "angular" ? scale(tickValue) : _victoryCore.Helpers.degreesToRadians(-1 * axisAngle);
+  var tickRadius = axisType === "angular" ? radius : scale(tickValue);
   return axisType === "angular" ? {
@@ -182,14 +188,14 @@ index: index,
     style: tickStyle,
-    x1: radius * Math.cos(scale(tickValue)),
-    y1: -radius * Math.sin(scale(tickValue)),
-    x2: (radius + tickPadding) * Math.cos(scale(tickValue)),
-    y2: -(radius + tickPadding) * Math.sin(scale(tickValue))
+    x1: getPosition(tickRadius, tickAngle, "x") + origin.x,
+    y1: getPosition(tickRadius, tickAngle, "y") + origin.y,
+    x2: getPosition(tickRadius + tickPadding, tickAngle, "x") + origin.x,
+    y2: getPosition(tickRadius + tickPadding, tickAngle, "y") + origin.y
   } : {
-    style: style,
     index: index,
     datum: tick,
-    x1: scale(tickValue) / 2 * Math.cos(axisAngle - angularPadding),
-    x2: scale(tickValue) / 2 * Math.cos(axisAngle + angularPadding),
-    y1: -(scale(tickValue) / 2) * Math.sin(axisAngle - angularPadding),
-    y2: -(scale(tickValue) / 2) * Math.sin(axisAngle + angularPadding)
+    style: tickStyle,
+    x1: tickRadius * Math.cos(tickAngle) + Math.cos(padAngle) * tickPadding + origin.x,
+    x2: tickRadius * Math.cos(tickAngle) - Math.cos(padAngle) * tickPadding + origin.x,
+    y1: tickRadius * Math.sin(tickAngle) + Math.sin(padAngle) * tickPadding + origin.y,
+    y2: tickRadius * Math.sin(tickAngle) - Math.sin(padAngle) * tickPadding + origin.y
   };
@@ -206,3 +212,4 @@ }; //eslint-disable-next-line max-params
       ticks = calculatedValues.ticks,
-      stringTicks = calculatedValues.stringTicks;
+      stringTicks = calculatedValues.stringTicks,
+      origin = calculatedValues.origin;
   var text = tickFormat(tickValue, index, ticks);
@@ -247,4 +254,4 @@ var tick = stringTicks ? stringTicks[index] : tickValue;
     text: text,
-    x: labelRadius * Math.cos(_victoryCore.Helpers.degreesToRadians(labelAngle)),
-    y: -labelRadius * Math.sin(_victoryCore.Helpers.degreesToRadians(labelAngle))
+    x: labelRadius * Math.cos(_victoryCore.Helpers.degreesToRadians(labelAngle)) + origin.x,
+    y: -labelRadius * Math.sin(_victoryCore.Helpers.degreesToRadians(labelAngle)) + origin.y
   };
@@ -261,3 +268,4 @@ }; //eslint-disable-next-line max-params
       ticks = calculatedValues.ticks,
-      tickFormat = calculatedValues.tickFormat;
+      tickFormat = calculatedValues.tickFormat,
+      origin = calculatedValues.origin;
   var text = tickFormat(tickValue, index, ticks);
@@ -288,6 +296,6 @@ var startAngle = props.startAngle,
     style: gridStyle,
-    x1: getPosition(radius, angle, "x"),
-    y1: getPosition(radius, angle, "y"),
-    x2: getPosition(innerRadius, angle, "x"),
-    y2: getPosition(innerRadius, angle, "y")
+    x1: getPosition(radius, angle, "x") + origin.x,
+    y1: getPosition(radius, angle, "y") + origin.y,
+    x2: getPosition(innerRadius, angle, "x") + origin.x,
+    y2: getPosition(innerRadius, angle, "y") + origin.y
   } : {
@@ -297,4 +305,4 @@ style: gridStyle,
     datum: tick,
-    cx: 0,
-    cy: 0,
+    cx: origin.x,
+    cy: origin.y,
     r: scale(tickValue),
@@ -310,3 +318,4 @@ startAngle: startAngle,
       style = calculatedValues.style,
-      scale = calculatedValues.scale;
+      scale = calculatedValues.scale,
+      origin = calculatedValues.origin;
   var axisLabelComponent = props.axisLabelComponent;
@@ -340,4 +349,4 @@
     text: props.label,
-    x: getPosition(labelRadius, _victoryCore.Helpers.degreesToRadians(axisAngle), "x"),
-    y: getPosition(labelRadius, _victoryCore.Helpers.degreesToRadians(axisAngle), "y")
+    x: getPosition(labelRadius, _victoryCore.Helpers.degreesToRadians(axisAngle), "x") + origin.x,
+    y: getPosition(labelRadius, _victoryCore.Helpers.degreesToRadians(axisAngle), "y") + origin.y
   };
@@ -350,3 +359,4 @@ };
       radius = calculatedValues.radius,
-      scale = calculatedValues.scale;
+      scale = calculatedValues.scale,
+      origin = calculatedValues.origin;
   var startAngle = modifiedProps.startAngle,
@@ -359,10 +369,10 @@ endAngle = modifiedProps.endAngle,
     style: style.axis,
-    x1: getPosition(innerRadius, axisAngle, "x"),
-    x2: getPosition(radius, axisAngle, "x"),
-    y1: getPosition(innerRadius, axisAngle, "y"),
-    y2: getPosition(radius, axisAngle, "y")
+    x1: getPosition(innerRadius, axisAngle, "x") + origin.x,
+    x2: getPosition(radius, axisAngle, "x") + origin.x,
+    y1: getPosition(innerRadius, axisAngle, "y") + origin.y,
+    y2: getPosition(radius, axisAngle, "y") + origin.y
   } : {
     style: style.axis,
-    cx: 0,
-    cy: 0,
+    cx: origin.x,
+    cy: origin.y,
     r: radius,
@@ -400,2 +410,5 @@ startAngle: startAngle,
   var radius = getRadius(props);
+
+  var origin = _victoryCore.Helpers.getPolarOrigin(props);
+
   return {
@@ -412,3 +425,4 @@ axis: axis,
     range: range,
-    radius: radius
+    radius: radius,
+    origin: origin
   };
@@ -415,0 +429,0 @@ };

lib/victory-polar-axis.js

@@ -157,10 +157,3 @@ "use strict";
       var groupComponent = props.groupComponent;
-      var groupComponentProps = groupComponent.props || {};
-
-      var origin = _victoryCore.Helpers.getPolarOrigin(props);
-
-      var transform = groupComponentProps.transform || "translate(".concat(origin.x, ", ").concat(origin.y, ")");
-      return _react.default.cloneElement(groupComponent, {
-        transform: transform
-      }, children);
+      return _react.default.cloneElement(groupComponent, {}, children);
     }
@@ -167,0 +160,0 @@ }, {

package.json

 {
   "name": "victory-polar-axis",
-  "version": "34.3.12",
+  "version": "35.0.0",
   "description": "Polar Axis Component for Victory",
@@ -24,3 +24,3 @@ "keywords": [
     "prop-types": "^15.5.8",
-    "victory-core": "^34.3.12"
+    "victory-core": "^35.0.0"
   },
@@ -27,0 +27,0 @@ "scripts": {

src/helper-methods.js

@@ -28,6 +28,10 @@ import { assign, uniqBy, defaults } from "lodash";
 const getStyleObject = (props) => {
-  const { theme, dependentAxis } = props;
-  const generalAxisStyle = theme && theme.axis && theme.axis.style;
-  const axisType = dependentAxis ? "dependentAxis" : "independentAxis";
-  const specificAxisStyle = theme && theme[axisType] && theme[axisType].style;
+  const { theme = {}, dependentAxis } = props;
+  const generalAxisStyle =
+    (theme.polarAxis && theme.polarAxis.style) || (theme.axis && theme.axis.style);
+  const polarAxisType = dependentAxis ? "polarDependentAxis" : "polarIndependentAxis";
+  const standardAxisType = dependentAxis ? "dependentAxis" : "independentAxis";
+  const specificAxisStyle =
+    (theme[polarAxisType] && theme[polarAxisType].style) ||
+    (theme[standardAxisType] && theme[standardAxisType].style);
 
@@ -107,3 +111,12 @@ const mergeStyles = () => {
 const getTickProps = (props, calculatedValues, tickValue, index) => {
-  const { axisType, radius, scale, style, stringTicks, ticks, tickFormat } = calculatedValues;
+  const {
+    axisType,
+    radius,
+    scale,
+    style,
+    stringTicks,
+    ticks,
+    tickFormat,
+    origin
+  } = calculatedValues;
   const text = tickFormat(tickValue, index, ticks);
@@ -122,5 +135,9 @@ const tick = stringTicks ? stringTicks[index] : tickValue;
   });
-  const tickPadding = tickStyle.padding || 0;
-  const angularPadding = tickPadding; // TODO: do some geometry
   const axisAngle = axisType === "radial" ? getAxisAngle(props, scale) : undefined;
+  const tickPadding = tickStyle.padding || tickStyle.size || 0;
+  const padAngle = Helpers.degreesToRadians(90 - axisAngle);
+  const tickAngle =
+    axisType === "angular" ? scale(tickValue) : Helpers.degreesToRadians(-1 * axisAngle);
+  const tickRadius = axisType === "angular" ? radius : scale(tickValue);
+
   return axisType === "angular"
@@ -131,15 +148,15 @@ ? {
         style: tickStyle,
-        x1: radius * Math.cos(scale(tickValue)),
-        y1: -radius * Math.sin(scale(tickValue)),
-        x2: (radius + tickPadding) * Math.cos(scale(tickValue)),
-        y2: -(radius + tickPadding) * Math.sin(scale(tickValue))
+        x1: getPosition(tickRadius, tickAngle, "x") + origin.x,
+        y1: getPosition(tickRadius, tickAngle, "y") + origin.y,
+        x2: getPosition(tickRadius + tickPadding, tickAngle, "x") + origin.x,
+        y2: getPosition(tickRadius + tickPadding, tickAngle, "y") + origin.y
       }
     : {
-        style,
         index,
         datum: tick,
-        x1: (scale(tickValue) / 2) * Math.cos(axisAngle - angularPadding),
-        x2: (scale(tickValue) / 2) * Math.cos(axisAngle + angularPadding),
-        y1: -(scale(tickValue) / 2) * Math.sin(axisAngle - angularPadding),
-        y2: -(scale(tickValue) / 2) * Math.sin(axisAngle + angularPadding)
+        style: tickStyle,
+        x1: tickRadius * Math.cos(tickAngle) + Math.cos(padAngle) * tickPadding + origin.x,
+        x2: tickRadius * Math.cos(tickAngle) - Math.cos(padAngle) * tickPadding + origin.x,
+        y1: tickRadius * Math.sin(tickAngle) + Math.sin(padAngle) * tickPadding + origin.y,
+        y2: tickRadius * Math.sin(tickAngle) - Math.sin(padAngle) * tickPadding + origin.y
       };
@@ -150,3 +167,12 @@ };
 const getTickLabelProps = (props, calculatedValues, tickValue, index) => {
-  const { axisType, radius, tickFormat, style, scale, ticks, stringTicks } = calculatedValues;
+  const {
+    axisType,
+    radius,
+    tickFormat,
+    style,
+    scale,
+    ticks,
+    stringTicks,
+    origin
+  } = calculatedValues;
   const text = tickFormat(tickValue, index, ticks);
@@ -192,4 +218,4 @@ const tick = stringTicks ? stringTicks[index] : tickValue;
     text,
-    x: labelRadius * Math.cos(Helpers.degreesToRadians(labelAngle)),
-    y: -labelRadius * Math.sin(Helpers.degreesToRadians(labelAngle))
+    x: labelRadius * Math.cos(Helpers.degreesToRadians(labelAngle)) + origin.x,
+    y: -labelRadius * Math.sin(Helpers.degreesToRadians(labelAngle)) + origin.y
   };
@@ -200,3 +226,12 @@ };
 const getGridProps = (props, calculatedValues, tickValue, index) => {
-  const { axisType, radius, style, scale, stringTicks, ticks, tickFormat } = calculatedValues;
+  const {
+    axisType,
+    radius,
+    style,
+    scale,
+    stringTicks,
+    ticks,
+    tickFormat,
+    origin
+  } = calculatedValues;
   const text = tickFormat(tickValue, index, ticks);
@@ -222,6 +257,6 @@ const { startAngle, endAngle, innerRadius = 0 } = props;
         style: gridStyle,
-        x1: getPosition(radius, angle, "x"),
-        y1: getPosition(radius, angle, "y"),
-        x2: getPosition(innerRadius, angle, "x"),
-        y2: getPosition(innerRadius, angle, "y")
+        x1: getPosition(radius, angle, "x") + origin.x,
+        y1: getPosition(radius, angle, "y") + origin.y,
+        x2: getPosition(innerRadius, angle, "x") + origin.x,
+        y2: getPosition(innerRadius, angle, "y") + origin.y
       }
@@ -232,4 +267,4 @@ : {
         datum: tick,
-        cx: 0,
-        cy: 0,
+        cx: origin.x,
+        cy: origin.y,
         r: scale(tickValue),
@@ -242,3 +277,3 @@ startAngle,
 const getAxisLabelProps = (props, calculatedValues) => {
-  const { axisType, radius, style, scale } = calculatedValues;
+  const { axisType, radius, style, scale, origin } = calculatedValues;
   const { axisLabelComponent } = props;
@@ -271,4 +306,4 @@ if (axisType !== "radial") {
     text: props.label,
-    x: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "x"),
-    y: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "y")
+    x: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "x") + origin.x,
+    y: getPosition(labelRadius, Helpers.degreesToRadians(axisAngle), "y") + origin.y
   };
@@ -278,3 +313,3 @@ };
 const getAxisProps = (modifiedProps, calculatedValues) => {
-  const { style, axisType, radius, scale } = calculatedValues;
+  const { style, axisType, radius, scale, origin } = calculatedValues;
   const { startAngle, endAngle, innerRadius = 0 } = modifiedProps;
@@ -288,11 +323,11 @@ const axisAngle =
         style: style.axis,
-        x1: getPosition(innerRadius, axisAngle, "x"),
-        x2: getPosition(radius, axisAngle, "x"),
-        y1: getPosition(innerRadius, axisAngle, "y"),
-        y2: getPosition(radius, axisAngle, "y")
+        x1: getPosition(innerRadius, axisAngle, "x") + origin.x,
+        x2: getPosition(radius, axisAngle, "x") + origin.x,
+        y1: getPosition(innerRadius, axisAngle, "y") + origin.y,
+        y2: getPosition(radius, axisAngle, "y") + origin.y
       }
     : {
         style: style.axis,
-        cx: 0,
-        cy: 0,
+        cx: origin.x,
+        cy: origin.y,
         r: radius,
@@ -319,2 +354,3 @@ startAngle,
   const radius = getRadius(props);
+  const origin = Helpers.getPolarOrigin(props);
   return {
@@ -331,3 +367,4 @@ axis,
     range,
-    radius
+    radius,
+    origin
   };
@@ -334,0 +371,0 @@ };

src/victory-polar-axis.js

@@ -6,3 +6,2 @@ import React from "react";
   PropTypes as CustomPropTypes,
-  Helpers,
   VictoryLabel,
@@ -216,6 +215,3 @@ CommonProps,
     const { groupComponent } = props;
-    const groupComponentProps = groupComponent.props || {};
-    const origin = Helpers.getPolarOrigin(props);
-    const transform = groupComponentProps.transform || `translate(${origin.x}, ${origin.y})`;
-    return React.cloneElement(groupComponent, { transform }, children);
+    return React.cloneElement(groupComponent, {}, children);
   }
@@ -222,0 +218,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1393682

increased by4.23%

Lines of code

9039

increased by2.74%

Dependency changes

• + Addedreact@17.0.2(transitive)

• + Addedvictory-core@35.11.4(transitive)

• - Removedvictory-core@34.3.12(transitive)

• Updatedvictory-core@^35.0.0