This repository was archived by the owner on Feb 7, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 68
Added Root Options #21
Open
elizabeth-young
wants to merge
1
commit into
Lapple:master
Choose a base branch
from
elizabeth-young:root-options
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,10 +20,12 @@ var Leaf = React.createClass({ | |
getDefaultProps: function() { | ||
return { | ||
root: false, | ||
//rootExpanded: true, | ||
prefix: '' | ||
}; | ||
}, | ||
render: function() { | ||
console.log(this.props); | ||
var id = 'id_' + uid(); | ||
var p = this.props; | ||
|
||
|
@@ -34,20 +36,28 @@ var Leaf = React.createClass({ | |
}; | ||
|
||
var onLabelClick = this._onClick.bind(this, d); | ||
|
||
return D.div({ className: this.getClassName(), id: 'leaf-' + this._rootPath() }, | ||
D.input({ className: 'json-inspector__radio', type: 'radio', name: p.id, id: id, tabIndex: -1 }), | ||
D.label({ className: 'json-inspector__line', htmlFor: id, onClick: onLabelClick }, | ||
D.div({ className: 'json-inspector__flatpath' }, | ||
d.path), | ||
D.span({ className: 'json-inspector__key' }, | ||
this.format(d.key), | ||
':', | ||
this.renderInteractiveLabel(d.key, true)), | ||
this.renderLabel(d.key), | ||
this.renderTitle(), | ||
this.renderShowOriginalButton()), | ||
this.renderChildren()); | ||
}, | ||
renderLabel: function(key){ | ||
var leafLabel = D.span({ className: 'json-inspector__key' }, | ||
this.format(key), | ||
':', | ||
this.renderInteractiveLabel(key, true)); | ||
if(this.props.root && !this.props.showRootLabel){ | ||
leafLabel = D.span({ className: 'json-inspector__key' }, | ||
this.renderInteractiveLabel(key, true)); | ||
} | ||
return leafLabel; | ||
}, | ||
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. I propose to split this to two methods, one would render static label (e.g. 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. Sounds great. Thanks for looking at my changes and thanks for the great library :-) |
||
renderTitle: function() { | ||
var data = this.data(); | ||
var t = type(data); | ||
|
@@ -184,9 +194,8 @@ var Leaf = React.createClass({ | |
}, | ||
_isInitiallyExpanded: function(p) { | ||
var keypath = this.keypath(); | ||
|
||
if (p.root) { | ||
return true; | ||
return p.rootExpanded; | ||
} | ||
|
||
if (p.query === '') { | ||
|
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.
Not sure about this option, since there already exists a
isExpanded
predicate, I would like to rework it to be applied to root node as well. What do you think?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.
Hi,
That sounds great. It didn't occur to me to update the existing
isExpanded
predicate.