This repository has been archived by the owner on Jan 16, 2023. It is now read-only.
feat: Separating header click action from toggle click action. #229
Conversation
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
maximilianoforlenza
suggested changes
Aug 19, 2019
| })(({style}) => style); | ||
|
|
||
| class TreeNode extends PureComponent { | ||
|
|
There was a problem hiding this comment.
remove blank line
| @@ -89,14 +124,16 @@ class TreeNode extends PureComponent { | |||
| } | |||
|
|
|||
| TreeNode.propTypes = { | |||
| separateToggleEvent: PropTypes.bool, | |||
There was a problem hiding this comment.
if you have props that are not required, you should add defaultProps
| style: PropTypes.object.isRequired, | ||
| node: PropTypes.object.isRequired, | ||
| decorators: PropTypes.object.isRequired, | ||
| animations: PropTypes.oneOfType([ | ||
| PropTypes.object, | ||
| PropTypes.bool | ||
| ]).isRequired | ||
| PropTypes.bool, |
| PropTypes.bool | ||
| ]).isRequired | ||
| PropTypes.bool, | ||
| ]).isRequired, |
| @@ -31,14 +31,16 @@ TreeBeard.propTypes = { | |||
| PropTypes.object, | |||
| PropTypes.bool | |||
| ]), | |||
| separateToggleEvent: PropTypes.bool, | |||
There was a problem hiding this comment.
add to defaultProps
| onToggle: PropTypes.func, | ||
| onClickHeader: PropTypes.func, |
There was a problem hiding this comment.
add to defaultProps
| decorators: PropTypes.object | ||
| }; | ||
|
|
||
| TreeBeard.defaultProps = { | ||
| style: defaultTheme, | ||
| animations: defaultAnimations, | ||
| decorators: defaultDecorators | ||
| decorators: defaultDecorators, |
| @@ -23,6 +23,7 @@ const Header = ({style, node}) => { | |||
| Header.propTypes = { | |||
| node: PropTypes.object, | |||
| style: PropTypes.object, | |||
| onClick: PropTypes.func, | |||
| const iconType = node.children ? 'folder' : 'file-text'; | ||
| const iconClass = `fa fa-${iconType}`; | ||
| const iconStyle = {marginRight: '5px'}; | ||
|
|
||
| return ( | ||
| <Div style={style.base}> | ||
| <Div style={style.base} onClick={() => onClick()}> |
There was a problem hiding this comment.
do onClick like this: onClick={onClick}
|
Please fix eslint errors. |
maximilianoforlenza
suggested changes
Aug 19, 2019
| onClick: PropTypes.func | ||
| onClick: PropTypes.func, | ||
| onClickToggle: PropTypes.func, | ||
| onClickHeader: PropTypes.func, |
| @@ -13,7 +13,8 @@ const Header = ({node, style}) => ( | |||
|
|
|||
| Header.propTypes = { | |||
| style: PropTypes.object, | |||
| node: PropTypes.object.isRequired | |||
| node: PropTypes.object.isRequired, | |||
| onClick: PropTypes.func, | |||
| ]).isRequired, | ||
| node: PropTypes.object.isRequired | ||
| node: PropTypes.object.isRequired, |
| animations: PropTypes.oneOfType([ | ||
| PropTypes.object, | ||
| PropTypes.bool | ||
| PropTypes.bool, |
| animations() { | ||
| const {animations, node} = this.props; | ||
| if (!animations) { | ||
| return { | ||
| toggle: defaultAnimations.toggle(this.props, 0) | ||
| toggle: defaultAnimations.toggle(this.props, 0), |
| }; | ||
| } | ||
| const animation = Object.assign({}, animations, node.animations); | ||
| return { | ||
| toggle: animation.toggle(this.props), | ||
| drawer: animation.drawer(this.props) | ||
| drawer: animation.drawer(this.props), |
| style, | ||
| separateToggleEvent, | ||
| onToggle, | ||
| onClickHeader, |
| <Ul style={{...defaultTheme.tree.base, ...style.tree.base}}> | ||
| {castArray(data).map(node => ( | ||
| <TreeNode | ||
| {...{decorators, node, onToggle, animations}} | ||
| {...{decorators, node, separateToggleEvent, onToggle, onClickHeader, animations}} |
There was a problem hiding this comment.
please create unit test when you press onClickHeader or when you have onClickHeader
|
I close this PR because it'll implement in version 4.2.4, in beta version already implement. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
#177
I've add
separateToggleEventandonClickHeaderto properties.To enable
onClickHeaderwe need to setseparateToggleEventto true.separateToggleEvent is to support the behavior we need without breaking change.