DX-6569 dont allow extracting from nested list children #2
Conversation
This file contains hidden or 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
mclin
suggested changes
May 3, 2017
src/index.js
Outdated
| @@ -54,6 +55,7 @@ export default class JSONTree extends React.Component { | |||
| PropTypes.object | |||
| ]).isRequired, | |||
| hideRoot: PropTypes.bool, | |||
| isNotAllowExtractNestedItemOfList: PropTypes.bool, | |||
There was a problem hiding this comment.
This is a generic library. It shouldn't know about our use case.
Instead, change this to maxClickableNodeDepth.
We will set it to 1 in our code if the data is a list.
src/index.js
Outdated
| @@ -97,6 +99,8 @@ export default class JSONTree extends React.Component { | |||
| <JSONNode | |||
| {...{ postprocessValue, hideRoot, styling, ...rest }} | |||
| keyPath={hideRoot ? [] : keyPath} | |||
| isRootTypeOfNodeIsArray={objType(value) === 'Array'} | |||
There was a problem hiding this comment.
Don't do this here. We should check this in our code, and set maxClickableNodeDepth.
remove isRootTypeOfNodeIsArray
src/JSONNestedNode.js
Outdated
| @@ -106,6 +108,16 @@ export default class JSONNestedNode extends React.Component { | |||
|
|
|||
| shouldComponentUpdate = shouldPureComponentUpdate; | |||
|
|
|||
| isShouldExtract = () => { | |||
There was a problem hiding this comment.
Instead of this, make handleNodeClick and handleMouseOver do nothing and not stopPropagation if their keypath is deeper than maxClickableNodeDepth.
mclin
suggested changes
May 4, 2017
src/JSONNestedNode.js
Outdated
| @@ -147,8 +137,10 @@ export default class JSONNestedNode extends React.Component { | |||
| itemType, | |||
| createItemString(data, collectionLimit) | |||
| ); | |||
|
|
|||
| const stylingArgs = [keyPath, nodeType, expanded, expandable, this.isShouldExtract()]; | |||
| const hover = maxClickableNodeDepth && keyPath.length > maxClickableNodeDepth | |||
There was a problem hiding this comment.
I think you can just use this.state.hover, because if keyPath.length > maxClickableNodeDepth, then state.hover will never be set.
mclin
approved these changes
May 4, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.