Skip to content
This repository has been archived by the owner on Feb 19, 2022. It is now read-only.

Support for a wickStrokeWidth style prop #330

Merged
merged 16 commits into from
Jan 29, 2018
Merged

Support for a wickStrokeWidth style prop #330

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e4c4602
fallback props strokeWidth to wickStrokeWidth
Jan 19, 2018
9124ba0
separate render of topWick and lowWick
Jan 19, 2018
b3d7078
clean up
Jan 19, 2018
d12c4ee
troubleshooting eslint
Jan 22, 2018
9c4d99b
still troubleshooting...
Jan 23, 2018
923398f
lint success!
Jan 23, 2018
bb50252
merge!Merge branch 'master' of https://github.com/FormidableLabs/vict…
Jan 24, 2018
3d79358
moved wickStrokeWidth off the style prop
Jan 25, 2018
fa7c70d
y1 → `high`, y2 → `low`
Jan 25, 2018
540acc6
linted
Jan 25, 2018
4fec0e6
wickStrokeWidth tests
Jan 26, 2018
72f96f7
remove all instances of `y`
Jan 26, 2018
ab3e6a2
staging my failing tests
Jan 26, 2018
4b5be62
passing specs
boygirl Jan 26, 2018
1e360cd
successfully testing new `renderWick` method
Jan 29, 2018
0883545
switch defaults
Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lint success!
  • Loading branch information
Kylie Stewart committed Jan 23, 2018
commit 923398f5501c691614cf1949ad1e75806a5ca7bc
14 changes: 7 additions & 7 deletions src/victory-primitives/candle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ export default class Candle extends React.Component {
const role = props.role || "presentation";
const wickStyle = assign(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be refactored to use defaults rather than assign with a conditional

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be better written as:

const wickStyle = defaults({}, this.style, { strokeWidth: widthStrokeWidth })

the defaults method doesn't overwrite values with undefined

{}, this.style, { strokeWidth: props.style.wickStrokeWidth || props.style.strokeWidth });
return assign({
x1: x, x2: x, y1: wickType === "low" ? lowWick : y1, y2: wickType === "high" ? highWick : y2,
style: wickStyle, role, shapeRendering, className
return assign({
x1: x, x2: x, y1: wickType === "low" ? lowWick : y1, y2: wickType === "high" ? highWick : y2,
style: wickStyle, role, shapeRendering, className
}, events);
}

Expand All @@ -100,10 +100,10 @@ export default class Candle extends React.Component {
const highWickProps = this.getWickProps(this.props, "high");
const lowWickProps = this.getWickProps(this.props, "low");
return React.cloneElement(
this.props.groupComponent,
{},
this.renderWick(highWickProps),
this.renderWick(lowWickProps),
this.props.groupComponent,
{},
this.renderWick(highWickProps),
this.renderWick(lowWickProps),
this.renderCandle(candleProps)
);
}
Expand Down