victory-line
Advanced tools
Comparing version 31.2.0 to 32.0.0
@@ -64,7 +64,8 @@ import _assign from "lodash/assign"; | ||
var polar = props.polar, | ||
scale = props.scale; | ||
scale = props.scale, | ||
horizontal = props.horizontal; | ||
var defaultOpenCurve = polar ? false : true; | ||
var openCurve = props.openCurve === undefined ? defaultOpenCurve : props.openCurve; | ||
var interpolation = !openCurve ? "".concat(this.toNewName(props.interpolation), "Closed") : this.toNewName(props.interpolation); | ||
return polar ? d3Shape.lineRadial().defined(defined).curve(d3Shape[interpolation]).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(d3Shape[interpolation]).x(getXAccessor(scale)).y(getYAccessor(scale)); | ||
return polar ? d3Shape.lineRadial().defined(defined).curve(d3Shape[interpolation]).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(d3Shape[interpolation]).x(horizontal ? getYAccessor(scale) : getXAccessor(scale)).y(horizontal ? getXAccessor(scale) : getYAccessor(scale)); | ||
} | ||
@@ -71,0 +72,0 @@ }, { |
@@ -21,4 +21,4 @@ import _isNil from "lodash/isNil"; | ||
var 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(props.horizontal ? range.y : range.x), | ||
y: Scale.getBaseScale(props, "y").domain(domain.y).range(props.horizontal ? range.x : range.y) | ||
}; | ||
@@ -46,2 +46,3 @@ var origin = props.polar ? props.origin || Helpers.getPolarOrigin(props) : undefined; | ||
height = _props.height, | ||
horizontal = _props.horizontal, | ||
interpolation = _props.interpolation, | ||
@@ -71,6 +72,8 @@ origin = _props.origin, | ||
origin: origin, | ||
padding: padding | ||
padding: padding, | ||
horizontal: horizontal | ||
}, | ||
all: { | ||
data: { | ||
horizontal: horizontal, | ||
polar: polar, | ||
@@ -77,0 +80,0 @@ origin: origin, |
@@ -133,3 +133,2 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; } | ||
samples: 50, | ||
scale: "linear", | ||
sortKey: "x", | ||
@@ -136,0 +135,0 @@ sortOrder: "ascending", |
@@ -77,7 +77,8 @@ "use strict"; | ||
var polar = props.polar, | ||
scale = props.scale; | ||
scale = props.scale, | ||
horizontal = props.horizontal; | ||
var defaultOpenCurve = polar ? false : true; | ||
var openCurve = props.openCurve === undefined ? defaultOpenCurve : props.openCurve; | ||
var interpolation = !openCurve ? "".concat(this.toNewName(props.interpolation), "Closed") : this.toNewName(props.interpolation); | ||
return polar ? d3Shape.lineRadial().defined(defined).curve(d3Shape[interpolation]).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(d3Shape[interpolation]).x(getXAccessor(scale)).y(getYAccessor(scale)); | ||
return polar ? d3Shape.lineRadial().defined(defined).curve(d3Shape[interpolation]).angle(getAngleAccessor(scale)).radius(getYAccessor(scale)) : d3Shape.line().defined(defined).curve(d3Shape[interpolation]).x(horizontal ? getYAccessor(scale) : getXAccessor(scale)).y(horizontal ? getXAccessor(scale) : getYAccessor(scale)); | ||
} | ||
@@ -84,0 +85,0 @@ }, { |
@@ -32,4 +32,4 @@ "use strict"; | ||
var scale = { | ||
x: _victoryCore.Scale.getBaseScale(props, "x").domain(domain.x).range(range.x), | ||
y: _victoryCore.Scale.getBaseScale(props, "y").domain(domain.y).range(range.y) | ||
x: _victoryCore.Scale.getBaseScale(props, "x").domain(domain.x).range(props.horizontal ? range.y : range.x), | ||
y: _victoryCore.Scale.getBaseScale(props, "y").domain(domain.y).range(props.horizontal ? range.x : range.y) | ||
}; | ||
@@ -60,2 +60,3 @@ var origin = props.polar ? props.origin || _victoryCore.Helpers.getPolarOrigin(props) : undefined; | ||
height = _props.height, | ||
horizontal = _props.horizontal, | ||
interpolation = _props.interpolation, | ||
@@ -85,6 +86,8 @@ origin = _props.origin, | ||
origin: origin, | ||
padding: padding | ||
padding: padding, | ||
horizontal: horizontal | ||
}, | ||
all: { | ||
data: { | ||
horizontal: horizontal, | ||
polar: polar, | ||
@@ -91,0 +94,0 @@ origin: origin, |
@@ -148,3 +148,2 @@ "use strict"; | ||
samples: 50, | ||
scale: "linear", | ||
sortKey: "x", | ||
@@ -151,0 +150,0 @@ sortOrder: "ascending", |
{ | ||
"name": "victory-line", | ||
"version": "31.2.0", | ||
"version": "32.0.0", | ||
"description": "Line Component for Victory", | ||
@@ -25,3 +25,3 @@ "keywords": [ | ||
"prop-types": "^15.5.8", | ||
"victory-core": "^31.2.0" | ||
"victory-core": "^32.0.0" | ||
}, | ||
@@ -28,0 +28,0 @@ "scripts": { |
@@ -43,3 +43,3 @@ /*eslint no-magic-numbers: ["error", { "ignore": [-1, 0, 1, 2] }]*/ | ||
getLineFunction(props) { | ||
const { polar, scale } = props; | ||
const { polar, scale, horizontal } = props; | ||
const defaultOpenCurve = polar ? false : true; | ||
@@ -61,4 +61,4 @@ const openCurve = props.openCurve === undefined ? defaultOpenCurve : props.openCurve; | ||
.curve(d3Shape[interpolation]) | ||
.x(getXAccessor(scale)) | ||
.y(getYAccessor(scale)); | ||
.x(horizontal ? getYAccessor(scale) : getXAccessor(scale)) | ||
.y(horizontal ? getXAccessor(scale) : getYAccessor(scale)); | ||
} | ||
@@ -65,0 +65,0 @@ |
@@ -22,6 +22,6 @@ import { assign, isNil } from "lodash"; | ||
.domain(domain.x) | ||
.range(range.x), | ||
.range(props.horizontal ? range.y : range.x), | ||
y: Scale.getBaseScale(props, "y") | ||
.domain(domain.y) | ||
.range(range.y) | ||
.range(props.horizontal ? range.x : range.y) | ||
}; | ||
@@ -45,2 +45,3 @@ const origin = props.polar ? props.origin || Helpers.getPolarOrigin(props) : undefined; | ||
height, | ||
horizontal, | ||
interpolation, | ||
@@ -71,6 +72,17 @@ origin, | ||
origin, | ||
padding | ||
padding, | ||
horizontal | ||
}, | ||
all: { | ||
data: { polar, origin, scale, data, interpolation, groupComponent, theme, style: style.data } | ||
data: { | ||
horizontal, | ||
polar, | ||
origin, | ||
scale, | ||
data, | ||
interpolation, | ||
groupComponent, | ||
theme, | ||
style: style.data | ||
} | ||
} | ||
@@ -77,0 +89,0 @@ }; |
@@ -71,3 +71,2 @@ import PropTypes from "prop-types"; | ||
samples: 50, | ||
scale: "linear", | ||
sortKey: "x", | ||
@@ -74,0 +73,0 @@ sortOrder: "ascending", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1339207
23999
+ Addedvictory-core@32.3.7(transitive)
- Removedvictory-core@31.2.0(transitive)
Updatedvictory-core@^32.0.0