mirror of
https://github.com/maputnik/editor.git
synced 2025-12-06 06:10:00 +00:00
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.8.3 to 5.9.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/microsoft/TypeScript/releases">typescript's releases</a>.</em></p> <blockquote> <h2>TypeScript 5.9</h2> <p>Release notes pending.</p> <!-- raw HTML omitted --> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> <li>[[No specific changes for TypeScript 5.9.2 (Stable)]]</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 RC</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-rc/">release announcement</a></p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 Beta</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-beta/">release announcement</a>.</p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="be86783155"><code>be86783</code></a> Give more specific errors for <code>verbatimModuleSyntax</code> (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62113">#62113</a>)</li> <li><a href="22ef57786f"><code>22ef577</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250714...</li> <li><a href="d5a414cd1d"><code>d5a414c</code></a> Don't use <code>noErrorTruncation</code> when printing types with <code>maximumLength</code> set (#...</li> <li><a href="f14b5c8a2f"><code>f14b5c8</code></a> Remove unused and confusing dom.iterable.d.ts file (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62037">#62037</a>)</li> <li><a href="2778e84ed8"><code>2778e84</code></a> Restore AbortSignal.abort (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62086">#62086</a>)</li> <li><a href="65cb4bd2d5"><code>65cb4bd</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250710...</li> <li><a href="9e20e032ef"><code>9e20e03</code></a> Clear out checker-level stacks on pop (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62016">#62016</a>)</li> <li><a href="87740bc7fe"><code>87740bc</code></a> Fix for Issue 61081 (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61221">#61221</a>)</li> <li><a href="833a8d492c"><code>833a8d4</code></a> Fix Symbol completion priority and cursor positioning (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61945">#61945</a>)</li> <li><a href="0018c9ff12"><code>0018c9f</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250702...</li> <li>Additional commits viewable in <a href="https://github.com/microsoft/TypeScript/compare/v5.8.3...v5.9.2">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Harel M <harel.mazor@gmail.com>
186 lines
4.9 KiB
TypeScript
186 lines
4.9 KiB
TypeScript
import React from "react";
|
|
import classnames from "classnames";
|
|
import CodeMirror, { type ModeSpec } from "codemirror";
|
|
import { Trans, type WithTranslation, withTranslation } from "react-i18next";
|
|
|
|
import "codemirror/mode/javascript/javascript";
|
|
import "codemirror/addon/lint/lint";
|
|
import "codemirror/addon/edit/matchbrackets";
|
|
import "codemirror/lib/codemirror.css";
|
|
import "codemirror/addon/lint/lint.css";
|
|
import stringifyPretty from "json-stringify-pretty-compact";
|
|
import "../libs/codemirror-mgl";
|
|
import type { LayerSpecification } from "maplibre-gl";
|
|
|
|
|
|
export type InputJsonProps = {
|
|
layer: LayerSpecification
|
|
maxHeight?: number
|
|
onChange?(...args: unknown[]): unknown
|
|
lineNumbers?: boolean
|
|
lineWrapping?: boolean
|
|
getValue?(data: any): string
|
|
gutters?: string[]
|
|
className?: string
|
|
onFocus?(...args: unknown[]): unknown
|
|
onBlur?(...args: unknown[]): unknown
|
|
onJSONValid?(...args: unknown[]): unknown
|
|
onJSONInvalid?(...args: unknown[]): unknown
|
|
mode?: ModeSpec<any>
|
|
lint?: boolean | object
|
|
};
|
|
type InputJsonInternalProps = InputJsonProps & WithTranslation;
|
|
|
|
type InputJsonState = {
|
|
isEditing: boolean
|
|
showMessage: boolean
|
|
prevValue: string
|
|
};
|
|
|
|
class InputJsonInternal extends React.Component<InputJsonInternalProps, InputJsonState> {
|
|
static defaultProps = {
|
|
lineNumbers: true,
|
|
lineWrapping: false,
|
|
gutters: ["CodeMirror-lint-markers"],
|
|
getValue: (data: any) => {
|
|
return stringifyPretty(data, {indent: 2, maxLength: 40});
|
|
},
|
|
onFocus: () => {},
|
|
onBlur: () => {},
|
|
onJSONInvalid: () => {},
|
|
onJSONValid: () => {},
|
|
};
|
|
_keyEvent: string;
|
|
_doc: CodeMirror.Editor | undefined;
|
|
_el: HTMLDivElement | null = null;
|
|
_cancelNextChange: boolean = false;
|
|
|
|
constructor(props: InputJsonInternalProps) {
|
|
super(props);
|
|
this._keyEvent = "keyboard";
|
|
this.state = {
|
|
isEditing: false,
|
|
showMessage: false,
|
|
prevValue: this.props.getValue!(this.props.layer),
|
|
};
|
|
}
|
|
|
|
componentDidMount () {
|
|
this._doc = CodeMirror(this._el!, {
|
|
value: this.props.getValue!(this.props.layer),
|
|
mode: this.props.mode || {
|
|
name: "mgl",
|
|
},
|
|
lineWrapping: this.props.lineWrapping,
|
|
tabSize: 2,
|
|
theme: "maputnik",
|
|
viewportMargin: Infinity,
|
|
lineNumbers: this.props.lineNumbers,
|
|
lint: this.props.lint || {
|
|
context: "layer"
|
|
},
|
|
matchBrackets: true,
|
|
gutters: this.props.gutters,
|
|
scrollbarStyle: "null",
|
|
});
|
|
|
|
this._doc.on("change", this.onChange);
|
|
this._doc.on("focus", this.onFocus);
|
|
this._doc.on("blur", this.onBlur);
|
|
}
|
|
|
|
onPointerDown = () => {
|
|
this._keyEvent = "pointer";
|
|
};
|
|
|
|
onFocus = () => {
|
|
if (this.props.onFocus) this.props.onFocus();
|
|
this.setState({
|
|
isEditing: true,
|
|
showMessage: (this._keyEvent === "keyboard"),
|
|
});
|
|
};
|
|
|
|
onBlur = () => {
|
|
this._keyEvent = "keyboard";
|
|
if (this.props.onBlur) this.props.onBlur();
|
|
this.setState({
|
|
isEditing: false,
|
|
showMessage: false,
|
|
});
|
|
};
|
|
|
|
componentWillUnMount () {
|
|
this._doc!.off("change", this.onChange);
|
|
this._doc!.off("focus", this.onFocus);
|
|
this._doc!.off("blur", this.onBlur);
|
|
}
|
|
|
|
componentDidUpdate(prevProps: InputJsonProps) {
|
|
if (!this.state.isEditing && prevProps.layer !== this.props.layer) {
|
|
this._cancelNextChange = true;
|
|
this._doc!.setValue(
|
|
this.props.getValue!(this.props.layer),
|
|
);
|
|
}
|
|
}
|
|
|
|
onChange = (_e: unknown) => {
|
|
if (this._cancelNextChange) {
|
|
this._cancelNextChange = false;
|
|
this.setState({
|
|
prevValue: this._doc!.getValue(),
|
|
});
|
|
return;
|
|
}
|
|
const newCode = this._doc!.getValue();
|
|
|
|
if (this.state.prevValue !== newCode) {
|
|
let parsedLayer, err;
|
|
try {
|
|
parsedLayer = JSON.parse(newCode);
|
|
} catch(_err) {
|
|
err = _err;
|
|
console.warn(_err);
|
|
}
|
|
|
|
if (err && this.props.onJSONInvalid) {
|
|
this.props.onJSONInvalid();
|
|
}
|
|
else {
|
|
if (this.props.onChange) this.props.onChange(parsedLayer);
|
|
if (this.props.onJSONValid) this.props.onJSONValid();
|
|
}
|
|
}
|
|
|
|
this.setState({
|
|
prevValue: newCode,
|
|
});
|
|
};
|
|
|
|
render() {
|
|
const t = this.props.t;
|
|
const {showMessage} = this.state;
|
|
const style = {} as {maxHeight?: number};
|
|
if (this.props.maxHeight) {
|
|
style.maxHeight = this.props.maxHeight;
|
|
}
|
|
|
|
return <div className="JSONEditor" onPointerDown={this.onPointerDown} aria-hidden="true">
|
|
<div className={classnames("JSONEditor__message", {"JSONEditor__message--on": showMessage})}>
|
|
<Trans t={t}>
|
|
Press <kbd>ESC</kbd> to lose focus
|
|
</Trans>
|
|
</div>
|
|
<div
|
|
className={classnames("codemirror-container", this.props.className)}
|
|
ref={(el) => {this._el = el;}}
|
|
style={style}
|
|
/>
|
|
</div>;
|
|
}
|
|
}
|
|
|
|
const InputJson = withTranslation()(InputJsonInternal);
|
|
export default InputJson;
|