victory-candlestick
Advanced tools
Comparing version 34.3.6 to 34.3.7
@@ -79,3 +79,12 @@ import _isFunction from "lodash/isFunction"; | ||
var evaluateProps = function (props) { | ||
// Potential evaluated props are 1) `style`, 2) `candleWidth` | ||
/** | ||
* Potential evaluated props of following must be evaluated in this order: | ||
* 1) `style` | ||
* 2) `cornerRadius` | ||
* | ||
* Everything else does not have to be evaluated in a particular order: | ||
* `desc` | ||
* `id` | ||
* `tabIndex` | ||
*/ | ||
var style = Helpers.evaluateStyle(_assign({ | ||
@@ -87,5 +96,11 @@ stroke: "black" | ||
})); | ||
var desc = Helpers.evaluateProp(props.desc, props); | ||
var id = Helpers.evaluateProp(props.id, props); | ||
var tabIndex = Helpers.evaluateProp(props.tabIndex, props); | ||
return _assign({}, props, { | ||
style: style, | ||
candleWidth: candleWidth | ||
candleWidth: candleWidth, | ||
desc: desc, | ||
id: id, | ||
tabIndex: tabIndex | ||
}); | ||
@@ -107,3 +122,5 @@ }; | ||
transform = _props.transform, | ||
style = _props.style; | ||
style = _props.style, | ||
desc = _props.desc, | ||
tabIndex = _props.tabIndex; | ||
@@ -120,4 +137,4 @@ var wickStyle = _defaults({ | ||
clipPath: clipPath, | ||
desc: Helpers.evaluateProp(props.desc, props), | ||
tabIndex: Helpers.evaluateProp(props.tabIndex, props) | ||
desc: desc, | ||
tabIndex: tabIndex | ||
}); | ||
@@ -124,0 +141,0 @@ |
@@ -7,2 +7,3 @@ import * as React from "react"; | ||
VictoryCommonProps, | ||
VictoryCommonPrimitiveProps, | ||
VictoryDatableProps, | ||
@@ -87,1 +88,19 @@ VictoryStyleObject, | ||
export class VictoryCandlestick extends React.Component<VictoryCandlestickProps, any> {} | ||
export interface CandleProps extends VictoryCommonPrimitiveProps { | ||
candleRatio?: number; | ||
candleWidth?: number | Function; | ||
close?: number; | ||
datum?: any; | ||
groupComponent?: React.ReactElement; | ||
high?: number; | ||
lineComponent?: React.ReactElement; | ||
low?: number; | ||
open?: number; | ||
rectComponent?: React.ReactElement; | ||
wickStrokeWidth?: number; | ||
width?: number; | ||
x?: number; | ||
} | ||
export class Candle extends React.Component<CandleProps, any> {} |
@@ -91,3 +91,12 @@ "use strict"; | ||
var evaluateProps = function (props) { | ||
// Potential evaluated props are 1) `style`, 2) `candleWidth` | ||
/** | ||
* Potential evaluated props of following must be evaluated in this order: | ||
* 1) `style` | ||
* 2) `cornerRadius` | ||
* | ||
* Everything else does not have to be evaluated in a particular order: | ||
* `desc` | ||
* `id` | ||
* `tabIndex` | ||
*/ | ||
var style = _victoryCore.Helpers.evaluateStyle((0, _assign2.default)({ | ||
@@ -100,5 +109,15 @@ stroke: "black" | ||
})); | ||
var desc = _victoryCore.Helpers.evaluateProp(props.desc, props); | ||
var id = _victoryCore.Helpers.evaluateProp(props.id, props); | ||
var tabIndex = _victoryCore.Helpers.evaluateProp(props.tabIndex, props); | ||
return (0, _assign2.default)({}, props, { | ||
style: style, | ||
candleWidth: candleWidth | ||
candleWidth: candleWidth, | ||
desc: desc, | ||
id: id, | ||
tabIndex: tabIndex | ||
}); | ||
@@ -120,3 +139,5 @@ }; | ||
transform = _props.transform, | ||
style = _props.style; | ||
style = _props.style, | ||
desc = _props.desc, | ||
tabIndex = _props.tabIndex; | ||
var wickStyle = (0, _defaults2.default)({ | ||
@@ -132,4 +153,4 @@ strokeWidth: wickStrokeWidth | ||
clipPath: clipPath, | ||
desc: _victoryCore.Helpers.evaluateProp(props.desc, props), | ||
tabIndex: _victoryCore.Helpers.evaluateProp(props.tabIndex, props) | ||
desc: desc, | ||
tabIndex: tabIndex | ||
}); | ||
@@ -136,0 +157,0 @@ |
@@ -7,2 +7,3 @@ import * as React from "react"; | ||
VictoryCommonProps, | ||
VictoryCommonPrimitiveProps, | ||
VictoryDatableProps, | ||
@@ -87,1 +88,19 @@ VictoryStyleObject, | ||
export class VictoryCandlestick extends React.Component<VictoryCandlestickProps, any> {} | ||
export interface CandleProps extends VictoryCommonPrimitiveProps { | ||
candleRatio?: number; | ||
candleWidth?: number | Function; | ||
close?: number; | ||
datum?: any; | ||
groupComponent?: React.ReactElement; | ||
high?: number; | ||
lineComponent?: React.ReactElement; | ||
low?: number; | ||
open?: number; | ||
rectComponent?: React.ReactElement; | ||
wickStrokeWidth?: number; | ||
width?: number; | ||
x?: number; | ||
} | ||
export class Candle extends React.Component<CandleProps, any> {} |
{ | ||
"name": "victory-candlestick", | ||
"version": "34.3.6", | ||
"version": "34.3.7", | ||
"description": "Candlestick Component for Victory", | ||
@@ -24,3 +24,3 @@ "keywords": [ | ||
"prop-types": "^15.5.8", | ||
"victory-core": "^34.3.6" | ||
"victory-core": "^34.3.7" | ||
}, | ||
@@ -27,0 +27,0 @@ "scripts": { |
@@ -55,6 +55,20 @@ /*eslint no-magic-numbers: ["error", { "ignore": [0, 0.5, 1, 2] }]*/ | ||
const evaluateProps = (props) => { | ||
// Potential evaluated props are 1) `style`, 2) `candleWidth` | ||
/** | ||
* Potential evaluated props of following must be evaluated in this order: | ||
* 1) `style` | ||
* 2) `cornerRadius` | ||
* | ||
* Everything else does not have to be evaluated in a particular order: | ||
* `desc` | ||
* `id` | ||
* `tabIndex` | ||
*/ | ||
const style = Helpers.evaluateStyle(assign({ stroke: "black" }, props.style), props); | ||
const candleWidth = getCandleWidth(props.candleWidth, assign({}, props, { style })); | ||
return assign({}, props, { style, candleWidth }); | ||
const desc = Helpers.evaluateProp(props.desc, props); | ||
const id = Helpers.evaluateProp(props.id, props); | ||
const tabIndex = Helpers.evaluateProp(props.tabIndex, props); | ||
return assign({}, props, { style, candleWidth, desc, id, tabIndex }); | ||
}; | ||
@@ -75,3 +89,5 @@ | ||
transform, | ||
style | ||
style, | ||
desc, | ||
tabIndex | ||
} = props; | ||
@@ -86,4 +102,4 @@ const wickStyle = defaults({ strokeWidth: wickStrokeWidth }, style); | ||
clipPath, | ||
desc: Helpers.evaluateProp(props.desc, props), | ||
tabIndex: Helpers.evaluateProp(props.tabIndex, props) | ||
desc, | ||
tabIndex | ||
}; | ||
@@ -90,0 +106,0 @@ const candleProps = assign(getCandleProps(props, style), sharedProps); |
@@ -7,2 +7,3 @@ import * as React from "react"; | ||
VictoryCommonProps, | ||
VictoryCommonPrimitiveProps, | ||
VictoryDatableProps, | ||
@@ -87,1 +88,19 @@ VictoryStyleObject, | ||
export class VictoryCandlestick extends React.Component<VictoryCandlestickProps, any> {} | ||
export interface CandleProps extends VictoryCommonPrimitiveProps { | ||
candleRatio?: number; | ||
candleWidth?: number | Function; | ||
close?: number; | ||
datum?: any; | ||
groupComponent?: React.ReactElement; | ||
high?: number; | ||
lineComponent?: React.ReactElement; | ||
low?: number; | ||
open?: number; | ||
rectComponent?: React.ReactElement; | ||
wickStrokeWidth?: number; | ||
width?: number; | ||
x?: number; | ||
} | ||
export class Candle extends React.Component<CandleProps, any> {} |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1382247
9587
Updatedvictory-core@^34.3.7