Added ESC note to JSON editor.

This commit is contained in:
orangemug 2020-05-19 12:21:12 +01:00
parent e3e6647e03
commit 7db675e0d1
2 changed files with 56 additions and 8 deletions

View file

@ -54,6 +54,7 @@ class JSONEditor extends React.Component {
super(props) super(props)
this.state = { this.state = {
isEditing: false, isEditing: false,
showMessage: false,
prevValue: this.props.getValue(this.props.layer), prevValue: this.props.getValue(this.props.layer),
}; };
} }
@ -82,17 +83,24 @@ class JSONEditor extends React.Component {
this._doc.on('blur', this.onBlur); this._doc.on('blur', this.onBlur);
} }
onFocus = () => { onPointerDown = (cm, e) => {
this._keyEvent = "pointer";
}
onFocus = (cm, e) => {
this.props.onFocus(); this.props.onFocus();
this.setState({ this.setState({
isEditing: true isEditing: true,
showMessage: (this._keyEvent === "keyboard"),
}); });
} }
onBlur = () => { onBlur = () => {
this._keyEvent = "keyboard";
this.props.onBlur(); this.props.onBlur();
this.setState({ this.setState({
isEditing: false isEditing: false,
showMessage: false,
}); });
} }
@ -145,16 +153,22 @@ class JSONEditor extends React.Component {
} }
render() { render() {
const {showMessage} = this.state;
const style = {}; const style = {};
if (this.props.maxHeight) { if (this.props.maxHeight) {
style.maxHeight = this.props.maxHeight; style.maxHeight = this.props.maxHeight;
} }
return <div return <div className="JSONEditor" onPointerDown={this.onPointerDown}>
className={classnames("codemirror-container", this.props.className)} <div class={classnames("JSONEditor__message", {"JSONEditor__message--on": showMessage})}>
ref={(el) => this._el = el} Press <kbd>ESC</kbd> to lose focus
style={style} </div>
/> <div
className={classnames("codemirror-container", this.props.className)}
ref={(el) => this._el = el}
style={style}
/>
</div>
} }
} }

View file

@ -62,3 +62,37 @@
background-color: #bb0000; background-color: #bb0000;
color: white !important; color: white !important;
} }
@keyframes JSONEditor__animation-fade {
from {
opacity: 1;
}
to {
opacity: 0;
}
}
.JSONEditor__message {
position: absolute;
right: 0;
font-size: 0.85em;
z-index: 99999;
padding: 0.3em 0.5em;
background: hsla(0, 0%, 0%, 0.3);
color: $color-lowgray;
border-bottom-left-radius: 2px;
transition: opacity 320ms ease;
opacity: 0;
pointer-events: none;
&--on {
opacity: 1;
animation: 320ms ease 0s JSONEditor__animation-fade;
animation-delay: 2000ms;
animation-fill-mode: forwards;
}
kbd {
font-family: monospace;
}
}