victory-polar-axis
Advanced tools
Comparing version 33.1.0 to 33.1.2
@@ -334,23 +334,2 @@ import _defaults from "lodash/defaults"; | ||
var getRole = function (props) { | ||
if (props.dependentAxis) { | ||
return props.theme && props.theme.dependentAxis ? "dependentAxis" : "axis"; | ||
} | ||
return props.theme && props.theme.independentAxis ? "independentAxis" : "axis"; | ||
}; | ||
var getShallowMergedThemeProps = function (props, role) { | ||
var axisTheme = props.theme.axis || {}; | ||
return _defaults({}, props.theme[role], axisTheme); | ||
}; | ||
var modifyProps = function (props, fallbackProps, role) { | ||
if (role !== "axis") { | ||
props.theme[role] = getShallowMergedThemeProps(props, role); | ||
} | ||
return Helpers.modifyProps(props, fallbackProps, role); | ||
}; | ||
var getCalculatedValues = function (props) { | ||
@@ -389,4 +368,3 @@ props = _assign({ | ||
var getBaseProps = function (props, fallbackProps) { | ||
var role = getRole(props); | ||
props = modifyProps(props, fallbackProps, role); | ||
props = Axis.modifyProps(props, fallbackProps); | ||
var calculatedValues = getCalculatedValues(props); | ||
@@ -393,0 +371,0 @@ var style = calculatedValues.style, |
@@ -157,5 +157,4 @@ import _isEmpty from "lodash/isEmpty"; | ||
value: function render() { | ||
var animationWhitelist = VictoryPolarAxis.animationWhitelist, | ||
role = VictoryPolarAxis.role; | ||
var props = Helpers.modifyProps(this.props, fallbackProps, role); | ||
var animationWhitelist = VictoryPolarAxis.animationWhitelist; | ||
var props = Axis.modifyProps(this.props, fallbackProps); | ||
@@ -162,0 +161,0 @@ if (this.shouldAnimate()) { |
@@ -361,23 +361,2 @@ "use strict"; | ||
var getRole = function (props) { | ||
if (props.dependentAxis) { | ||
return props.theme && props.theme.dependentAxis ? "dependentAxis" : "axis"; | ||
} | ||
return props.theme && props.theme.independentAxis ? "independentAxis" : "axis"; | ||
}; | ||
var getShallowMergedThemeProps = function (props, role) { | ||
var axisTheme = props.theme.axis || {}; | ||
return (0, _defaults2.default)({}, props.theme[role], axisTheme); | ||
}; | ||
var modifyProps = function (props, fallbackProps, role) { | ||
if (role !== "axis") { | ||
props.theme[role] = getShallowMergedThemeProps(props, role); | ||
} | ||
return _victoryCore.Helpers.modifyProps(props, fallbackProps, role); | ||
}; | ||
var getCalculatedValues = function (props) { | ||
@@ -425,4 +404,3 @@ props = (0, _assign2.default)({ | ||
var getBaseProps = function (props, fallbackProps) { | ||
var role = getRole(props); | ||
props = modifyProps(props, fallbackProps, role); | ||
props = _victoryCore.Axis.modifyProps(props, fallbackProps); | ||
var calculatedValues = getCalculatedValues(props); | ||
@@ -429,0 +407,0 @@ var style = calculatedValues.style, |
@@ -174,6 +174,5 @@ "use strict"; | ||
value: function render() { | ||
var animationWhitelist = VictoryPolarAxis.animationWhitelist, | ||
role = VictoryPolarAxis.role; | ||
var animationWhitelist = VictoryPolarAxis.animationWhitelist; | ||
var props = _victoryCore.Helpers.modifyProps(this.props, fallbackProps, role); | ||
var props = _victoryCore.Axis.modifyProps(this.props, fallbackProps); | ||
@@ -180,0 +179,0 @@ if (this.shouldAnimate()) { |
{ | ||
"name": "victory-polar-axis", | ||
"version": "33.1.0", | ||
"version": "33.1.2", | ||
"description": "Polar Axis Component for Victory", | ||
@@ -24,3 +24,3 @@ "keywords": [ | ||
"prop-types": "^15.5.8", | ||
"victory-core": "^33.1.0" | ||
"victory-core": "^33.1.2" | ||
}, | ||
@@ -27,0 +27,0 @@ "scripts": { |
@@ -291,22 +291,2 @@ import { assign, uniqBy, defaults } from "lodash"; | ||
const getRole = (props) => { | ||
if (props.dependentAxis) { | ||
return props.theme && props.theme.dependentAxis ? "dependentAxis" : "axis"; | ||
} | ||
return props.theme && props.theme.independentAxis ? "independentAxis" : "axis"; | ||
}; | ||
const getShallowMergedThemeProps = (props, role) => { | ||
const axisTheme = props.theme.axis || {}; | ||
return defaults({}, props.theme[role], axisTheme); | ||
}; | ||
const modifyProps = (props, fallbackProps, role) => { | ||
if (role !== "axis") { | ||
props.theme[role] = getShallowMergedThemeProps(props, role); | ||
} | ||
return Helpers.modifyProps(props, fallbackProps, role); | ||
}; | ||
const getCalculatedValues = (props) => { | ||
@@ -343,4 +323,3 @@ props = assign({ polar: true }, props); | ||
const getBaseProps = (props, fallbackProps) => { | ||
const role = getRole(props); | ||
props = modifyProps(props, fallbackProps, role); | ||
props = Axis.modifyProps(props, fallbackProps); | ||
const calculatedValues = getCalculatedValues(props); | ||
@@ -347,0 +326,0 @@ const { style, scale, ticks, domain } = calculatedValues; |
@@ -226,4 +226,4 @@ import React from "react"; | ||
render() { | ||
const { animationWhitelist, role } = VictoryPolarAxis; | ||
const props = Helpers.modifyProps(this.props, fallbackProps, role); | ||
const { animationWhitelist } = VictoryPolarAxis; | ||
const props = Axis.modifyProps(this.props, fallbackProps); | ||
@@ -230,0 +230,0 @@ if (this.shouldAnimate()) { |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
18
1180492
22080
Updatedvictory-core@^33.1.2