Skip to content
This repository has been archived by the owner on May 14, 2020. It is now read-only.

Hover stylings #54

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions src/JSONNestedNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ export default class JSONNestedNode extends React.Component {
// calculate individual node expansion if necessary
const expanded = props.shouldExpandNode && !props.isCircular ?
props.shouldExpandNode(props.keyPath, props.data, props.level) : false;

this.state = {
expanded,
createdChildNodes: false
createdChildNodes: false,
hover: false
};
}

Expand All @@ -114,7 +116,7 @@ export default class JSONNestedNode extends React.Component {
labelRenderer,
expandable
} = this.props;
const expanded = this.state.expanded;
const { expanded, hover } = this.state;
const renderedChildren = expanded || (hideRoot && this.props.level === 0) ?
renderChildNodes({ ...this.props, level: this.props.level + 1 }) : null;

Expand All @@ -129,7 +131,7 @@ export default class JSONNestedNode extends React.Component {
itemType,
createItemString(data, collectionLimit)
);
const stylingArgs = [keyPath, nodeType, expanded, expandable];
const stylingArgs = [keyPath, nodeType, expanded, expandable, hover];

return hideRoot ? (
<li {...styling('rootNode', ...stylingArgs)}>
Expand All @@ -138,7 +140,11 @@ export default class JSONNestedNode extends React.Component {
</ul>
</li>
) : (
<li {...styling('nestedNode', ...stylingArgs)}>
<li
{...styling('nestedNode', ...stylingArgs)}
onMouseOver={this.handleMouseOver}
onMouseOut={this.handleMouseOut}
>
Copy link
Owner

Choose a reason for hiding this comment

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

Maybe mouseEnter/mouseLeave are more appropriate here?

{expandable &&
<JSONArrow
styling={styling}
Expand Down Expand Up @@ -167,4 +173,11 @@ export default class JSONNestedNode extends React.Component {
}

handleClick = () => this.setState({ expanded: !this.state.expanded });

handleMouseOver = (e) => {
e.stopPropagation();
Copy link
Owner

Choose a reason for hiding this comment

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

Why do we need to stop propagation?

this.setState({ hover: true });
};

handleMouseOut = () => this.setState({ hover: false });
}
79 changes: 44 additions & 35 deletions src/JSONValueNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,50 @@ import React, { PropTypes } from 'react';
* Renders simple values (eg. strings, numbers, booleans, etc)
*/

const JSONValueNode = ({
nodeType,
styling,
labelRenderer,
keyPath,
valueRenderer,
value,
valueGetter
}) => (
<li
{...styling('value', nodeType, keyPath)}
>
<label {...styling(['label', 'valueLabel'], nodeType, keyPath)}>
{labelRenderer(keyPath, nodeType, false, false)}
</label>
<span {...styling('valueText', nodeType, keyPath)}>
{valueRenderer(valueGetter(value), value, ...keyPath)}
</span>
</li>
);
export default class JSONValueNode extends React.Component {
static propTypes = {
nodeType: PropTypes.string.isRequired,
styling: PropTypes.func.isRequired,
labelRenderer: PropTypes.func.isRequired,
keyPath: PropTypes.arrayOf(
PropTypes.oneOfType([PropTypes.string, PropTypes.number])
).isRequired,
valueRenderer: PropTypes.func.isRequired,
value: PropTypes.any,
valueGetter: PropTypes.func
};

JSONValueNode.propTypes = {
nodeType: PropTypes.string.isRequired,
styling: PropTypes.func.isRequired,
labelRenderer: PropTypes.func.isRequired,
keyPath: PropTypes.arrayOf(
PropTypes.oneOfType([PropTypes.string, PropTypes.number])
).isRequired,
valueRenderer: PropTypes.func.isRequired,
value: PropTypes.any,
valueGetter: PropTypes.func
};
static defaultProps = {
valueGetter: value => value
};

JSONValueNode.defaultProps = {
valueGetter: value => value
};
state = { hover: false };

export default JSONValueNode;
render() {
const { hover } = this.state;
const {
nodeType, styling, labelRenderer, keyPath, valueRenderer, value, valueGetter
} = this.props;
return (
<li
{...styling('value', nodeType, keyPath, hover)}
onMouseOver={this.handleMouseOver}
onMouseOut={this.handleMouseOut}
>
<label {...styling(['label', 'valueLabel'], nodeType, keyPath)}>
{labelRenderer(keyPath, nodeType, false, false)}
</label>
<span {...styling('valueText', nodeType, keyPath)}>
{valueRenderer(valueGetter(value), value, ...keyPath)}
</span>
</li>
);
}

handleMouseOver = (e) => {
e.stopPropagation();
this.setState({ hover: true });
};

handleMouseOut = () => this.setState({ hover: false });
}