This repository has been archived by the owner on Feb 19, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 76
Support for a wickStrokeWidth style prop #330
Merged
Merged
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
9124ba0
separate render of topWick and lowWick
b3d7078
clean up
d12c4ee
troubleshooting eslint
9c4d99b
still troubleshooting...
923398f
lint success!
bb50252
merge!Merge branch 'master' of https://github.com/FormidableLabs/vict…
3d79358
moved wickStrokeWidth off the style prop
fa7c70d
y1 → `high`, y2 → `low`
540acc6
linted
4fec0e6
wickStrokeWidth tests
72f96f7
remove all instances of `y`
ab3e6a2
staging my failing tests
4b5be62
passing specs
boygirl 1e360cd
successfully testing new `renderWick` method
0883545
switch defaults
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
lint success!
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -89,9 +89,9 @@ export default class Candle extends React.Component { | |
const role = props.role || "presentation"; | ||
const wickStyle = assign( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This would be better written as:
the |
||
{}, 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); | ||
} | ||
|
||
|
@@ -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) | ||
); | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 thanassign
with a conditional