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>
247 lines
6.7 KiB
TypeScript
247 lines
6.7 KiB
TypeScript
import React, { type BaseSyntheticEvent } from "react";
|
|
import generateUniqueId from "../libs/document-uid";
|
|
|
|
export type InputNumberProps = {
|
|
value?: number
|
|
default?: number
|
|
min?: number
|
|
max?: number
|
|
onChange?(value: number | undefined): unknown
|
|
allowRange?: boolean
|
|
rangeStep?: number
|
|
"data-wd-key"?: string
|
|
required?: boolean
|
|
"aria-label"?: string
|
|
};
|
|
|
|
type InputNumberState = {
|
|
uuid: number
|
|
editing: boolean
|
|
editingRange?: boolean
|
|
value?: number
|
|
/**
|
|
* This is the value that is currently being edited. It can be an invalid value.
|
|
*/
|
|
dirtyValue?: number | string | undefined
|
|
};
|
|
|
|
export default class InputNumber extends React.Component<InputNumberProps, InputNumberState> {
|
|
static defaultProps = {
|
|
rangeStep: 1
|
|
};
|
|
_keyboardEvent: boolean = false;
|
|
|
|
constructor(props: InputNumberProps) {
|
|
super(props);
|
|
this.state = {
|
|
uuid: +generateUniqueId(),
|
|
editing: false,
|
|
value: props.value,
|
|
dirtyValue: props.value,
|
|
};
|
|
}
|
|
|
|
static getDerivedStateFromProps(props: Readonly<InputNumberProps>, state: InputNumberState) {
|
|
if (!state.editing && props.value !== state.value) {
|
|
return {
|
|
value: props.value,
|
|
dirtyValue: props.value,
|
|
};
|
|
}
|
|
return null;
|
|
}
|
|
|
|
changeValue(newValue: number | string | undefined) {
|
|
const value = (newValue === "" || newValue === undefined) ?
|
|
undefined : +newValue;
|
|
|
|
const hasChanged = this.props.value !== value;
|
|
if(this.isValid(value) && hasChanged) {
|
|
if (this.props.onChange) this.props.onChange(value);
|
|
this.setState({
|
|
value: value,
|
|
});
|
|
}
|
|
else if (!this.isValid(value) && hasChanged) {
|
|
this.setState({
|
|
value: undefined,
|
|
});
|
|
}
|
|
|
|
this.setState({
|
|
dirtyValue: newValue === "" ? undefined : newValue,
|
|
});
|
|
}
|
|
|
|
isValid(v: number | string | undefined) {
|
|
if (v === undefined) {
|
|
return true;
|
|
}
|
|
|
|
const value = +v;
|
|
if(isNaN(value)) {
|
|
return false;
|
|
}
|
|
|
|
if(!isNaN(this.props.min!) && value < this.props.min!) {
|
|
return false;
|
|
}
|
|
|
|
if(!isNaN(this.props.max!) && value > this.props.max!) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
resetValue = () => {
|
|
this.setState({editing: false});
|
|
// Reset explicitly to default value if value has been cleared
|
|
if(!this.state.value) {
|
|
return;
|
|
}
|
|
|
|
// If set value is invalid fall back to the last valid value from props or at last resort the default value
|
|
if (!this.isValid(this.state.value)) {
|
|
if(this.isValid(this.props.value)) {
|
|
this.changeValue(this.props.value);
|
|
this.setState({dirtyValue: this.props.value});
|
|
} else {
|
|
this.changeValue(undefined);
|
|
this.setState({dirtyValue: undefined});
|
|
}
|
|
}
|
|
};
|
|
|
|
onChangeRange = (e: BaseSyntheticEvent<Event, HTMLInputElement, HTMLInputElement>) => {
|
|
let value = parseFloat(e.target.value);
|
|
const step = this.props.rangeStep;
|
|
let dirtyValue = value;
|
|
|
|
if(step) {
|
|
// Can't do this with the <input/> range step attribute else we won't be able to set a high precision value via the text input.
|
|
const snap = value % step;
|
|
|
|
// Round up/down to step
|
|
if (this._keyboardEvent) {
|
|
// If it's keyboard event we might get a low positive/negative value,
|
|
// for example we might go from 13 to 13.23, however because we know
|
|
// that came from a keyboard event we always want to increase by a
|
|
// single step value.
|
|
if (value < +this.state.dirtyValue!) {
|
|
value = this.state.value! - step;
|
|
}
|
|
else {
|
|
value = this.state.value! + step;
|
|
}
|
|
dirtyValue = value;
|
|
}
|
|
else {
|
|
if (snap < step/2) {
|
|
value = value - snap;
|
|
}
|
|
else {
|
|
value = value + (step - snap);
|
|
}
|
|
}
|
|
}
|
|
|
|
this._keyboardEvent = false;
|
|
|
|
// Clamp between min/max
|
|
value = Math.max(this.props.min!, Math.min(this.props.max!, value));
|
|
|
|
this.setState({value, dirtyValue});
|
|
if (this.props.onChange) this.props.onChange(value);
|
|
};
|
|
|
|
render() {
|
|
if(
|
|
Object.prototype.hasOwnProperty.call(this.props, "min") &&
|
|
Object.prototype.hasOwnProperty.call(this.props, "max") &&
|
|
this.props.min !== undefined && this.props.max !== undefined &&
|
|
this.props.allowRange
|
|
) {
|
|
const value = this.state.editing ? this.state.dirtyValue : this.state.value;
|
|
const defaultValue = this.props.default === undefined ? "" : this.props.default;
|
|
let inputValue;
|
|
if (this.state.editingRange) {
|
|
inputValue = this.state.value;
|
|
}
|
|
else {
|
|
inputValue = value;
|
|
}
|
|
|
|
return <div className="maputnik-number-container">
|
|
<input
|
|
className="maputnik-number-range"
|
|
key="range"
|
|
type="range"
|
|
max={this.props.max}
|
|
min={this.props.min}
|
|
step="any"
|
|
spellCheck="false"
|
|
value={value === undefined ? defaultValue : value}
|
|
onChange={this.onChangeRange}
|
|
onKeyDown={() => {
|
|
this._keyboardEvent = true;
|
|
}}
|
|
onPointerDown={() => {
|
|
this.setState({editing: true, editingRange: true});
|
|
}}
|
|
onPointerUp={() => {
|
|
// Safari doesn't get onBlur event
|
|
this.setState({editing: false, editingRange: false});
|
|
}}
|
|
onBlur={() => {
|
|
this.setState({
|
|
editing: false,
|
|
editingRange: false,
|
|
dirtyValue: this.state.value,
|
|
});
|
|
}}
|
|
data-wd-key={this.props["data-wd-key"] + "-range"}
|
|
/>
|
|
<input
|
|
key="text"
|
|
type="text"
|
|
spellCheck="false"
|
|
className="maputnik-number"
|
|
placeholder={this.props.default?.toString()}
|
|
value={inputValue === undefined ? "" : inputValue}
|
|
onFocus={_e => {
|
|
this.setState({editing: true});
|
|
}}
|
|
onChange={e => {
|
|
this.changeValue(e.target.value);
|
|
}}
|
|
onBlur={_e => {
|
|
this.setState({editing: false});
|
|
this.resetValue();
|
|
}}
|
|
data-wd-key={this.props["data-wd-key"] + "-text"}
|
|
|
|
/>
|
|
</div>;
|
|
}
|
|
else {
|
|
const value = this.state.editing ? this.state.dirtyValue : this.state.value;
|
|
|
|
return <input
|
|
aria-label={this.props["aria-label"]}
|
|
spellCheck="false"
|
|
className="maputnik-number"
|
|
placeholder={this.props.default?.toString()}
|
|
value={value === undefined ? "" : value}
|
|
onChange={e => this.changeValue(e.target.value)}
|
|
onFocus={() => {
|
|
this.setState({editing: true});
|
|
}}
|
|
onBlur={this.resetValue}
|
|
required={this.props.required}
|
|
data-wd-key={this.props["data-wd-key"]}
|
|
/>;
|
|
}
|
|
}
|
|
}
|