mirror of
https://github.com/maputnik/editor.git
synced 2026-08-30 08:57:27 +00:00
5fe38bb6ff
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="https://github.com/microsoft/TypeScript/commit/be8678315541e814da14316848a9468e8f90ab11"><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="https://github.com/microsoft/TypeScript/commit/22ef57786f5ca99837c430439bc6003c068fe1d2"><code>22ef577</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250714...</li> <li><a href="https://github.com/microsoft/TypeScript/commit/d5a414cd1dceb209fd2569e89d1096812218e8c5"><code>d5a414c</code></a> Don't use <code>noErrorTruncation</code> when printing types with <code>maximumLength</code> set (#...</li> <li><a href="https://github.com/microsoft/TypeScript/commit/f14b5c8a2f0be503ac455054a91573c63f0e5088"><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="https://github.com/microsoft/TypeScript/commit/2778e84ed88894156e2c5a17d74a25c73cc96ffe"><code>2778e84</code></a> Restore AbortSignal.abort (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62086">#62086</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/65cb4bd2d52cd882f2c3a503681479eb2ed291ca"><code>65cb4bd</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250710...</li> <li><a href="https://github.com/microsoft/TypeScript/commit/9e20e032effad965567d4a1e1c30d5433b0a3332"><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="https://github.com/microsoft/TypeScript/commit/87740bc7fe3d8d2af47d767db081491f40b8a90d"><code>87740bc</code></a> Fix for Issue 61081 (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61221">#61221</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/833a8d492c728d606454865e8c0fee84842f9f10"><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="https://github.com/microsoft/TypeScript/commit/0018c9ff12e657b84997dc1843818fea0a2ce850"><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>
406 lines
10 KiB
TypeScript
406 lines
10 KiB
TypeScript
import React from "react";
|
|
|
|
import SpecProperty from "./_SpecProperty";
|
|
import DataProperty, { type Stop } from "./_DataProperty";
|
|
import ZoomProperty from "./_ZoomProperty";
|
|
import ExpressionProperty from "./_ExpressionProperty";
|
|
import {function as styleFunction} from "@maplibre/maplibre-gl-style-spec";
|
|
import {findDefaultFromSpec} from "../libs/spec-helper";
|
|
|
|
|
|
function isLiteralExpression(value: any) {
|
|
return (Array.isArray(value) && value.length === 2 && value[0] === "literal");
|
|
}
|
|
|
|
function isGetExpression(value: any) {
|
|
return (
|
|
Array.isArray(value) &&
|
|
value.length === 2 &&
|
|
value[0] === "get"
|
|
);
|
|
}
|
|
|
|
function isZoomField(value: any) {
|
|
return (
|
|
typeof(value) === "object" &&
|
|
value.stops &&
|
|
typeof(value.property) === "undefined" &&
|
|
Array.isArray(value.stops) &&
|
|
value.stops.length > 1 &&
|
|
value.stops.every((stop: Stop) => {
|
|
return (
|
|
Array.isArray(stop) &&
|
|
stop.length === 2
|
|
);
|
|
})
|
|
);
|
|
}
|
|
|
|
function isIdentityProperty(value: any) {
|
|
return (
|
|
typeof(value) === "object" &&
|
|
value.type === "identity" &&
|
|
Object.prototype.hasOwnProperty.call(value, "property")
|
|
);
|
|
}
|
|
|
|
function isDataStopProperty(value: any) {
|
|
return (
|
|
typeof(value) === "object" &&
|
|
value.stops &&
|
|
typeof(value.property) !== "undefined" &&
|
|
value.stops.length > 1 &&
|
|
Array.isArray(value.stops) &&
|
|
value.stops.every((stop: Stop) => {
|
|
return (
|
|
Array.isArray(stop) &&
|
|
stop.length === 2 &&
|
|
typeof(stop[0]) === "object"
|
|
);
|
|
})
|
|
);
|
|
}
|
|
|
|
function isDataField(value: any) {
|
|
return (
|
|
isIdentityProperty(value) ||
|
|
isDataStopProperty(value)
|
|
);
|
|
}
|
|
|
|
function isPrimative(value: any): value is string | boolean | number {
|
|
const valid = ["string", "boolean", "number"];
|
|
return valid.includes(typeof(value));
|
|
}
|
|
|
|
function isArrayOfPrimatives(values: any): values is Array<string | boolean | number> {
|
|
if (Array.isArray(values)) {
|
|
return values.every(isPrimative);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function getDataType(value: any, fieldSpec={} as any) {
|
|
if (value === undefined) {
|
|
return "value";
|
|
}
|
|
else if (isPrimative(value)) {
|
|
return "value";
|
|
}
|
|
else if (fieldSpec.type === "array" && isArrayOfPrimatives(value)) {
|
|
return "value";
|
|
}
|
|
else if (fieldSpec.type === "numberArray" && isArrayOfPrimatives(value)) {
|
|
return "value";
|
|
}
|
|
else if (fieldSpec.type === "colorArray") {
|
|
return "value";
|
|
}
|
|
else if (fieldSpec.type === "padding") {
|
|
return "value";
|
|
}
|
|
else if (fieldSpec.type === "variableAnchorOffsetCollection") {
|
|
return "value";
|
|
}
|
|
else if (isZoomField(value)) {
|
|
return "zoom_function";
|
|
}
|
|
else if (isDataField(value)) {
|
|
return "data_function";
|
|
}
|
|
else {
|
|
return "expression";
|
|
}
|
|
}
|
|
|
|
|
|
type FieldFunctionProps = {
|
|
onChange(fieldName: string, value: any): unknown
|
|
fieldName: string
|
|
fieldType: string
|
|
fieldSpec: any
|
|
errors?: {[key: string]: {message: string}}
|
|
value?: any
|
|
};
|
|
|
|
|
|
/** Supports displaying spec field for zoom function objects
|
|
* https://www.mapbox.com/mapbox-gl-style-spec/#types-function-zoom-property
|
|
*/
|
|
const FieldFunction: React.FC<FieldFunctionProps> = (props) => {
|
|
const [dataType, setDataType] = React.useState(
|
|
getDataType(props.value, props.fieldSpec)
|
|
);
|
|
const [isEditing, setIsEditing] = React.useState(false);
|
|
|
|
React.useEffect(() => {
|
|
if (!isEditing) {
|
|
setDataType(getDataType(props.value, props.fieldSpec));
|
|
}
|
|
}, [props.value, props.fieldSpec, isEditing]);
|
|
|
|
const getFieldFunctionType = (fieldSpec: any) => {
|
|
if (fieldSpec.expression.interpolated) {
|
|
return "exponential";
|
|
}
|
|
if (fieldSpec.type === "number") {
|
|
return "interval";
|
|
}
|
|
return "categorical";
|
|
};
|
|
|
|
const addStop = () => {
|
|
const stops = props.value.stops.slice(0);
|
|
const lastStop = stops[stops.length - 1];
|
|
if (typeof lastStop[0] === "object") {
|
|
stops.push([
|
|
{ zoom: lastStop[0].zoom + 1, value: lastStop[0].value },
|
|
lastStop[1],
|
|
]);
|
|
} else {
|
|
stops.push([lastStop[0] + 1, lastStop[1]]);
|
|
}
|
|
|
|
const changedValue = {
|
|
...props.value,
|
|
stops: stops,
|
|
};
|
|
|
|
props.onChange(props.fieldName, changedValue);
|
|
};
|
|
|
|
const deleteExpression = () => {
|
|
const { fieldSpec, fieldName } = props;
|
|
props.onChange(fieldName, fieldSpec.default);
|
|
setDataType("value");
|
|
};
|
|
|
|
const deleteStop = (stopIdx: number) => {
|
|
const stops = props.value.stops.slice(0);
|
|
stops.splice(stopIdx, 1);
|
|
|
|
let changedValue: any = {
|
|
...props.value,
|
|
stops: stops,
|
|
};
|
|
|
|
if (stops.length === 1) {
|
|
changedValue = stops[0][1];
|
|
}
|
|
|
|
props.onChange(props.fieldName, changedValue);
|
|
};
|
|
|
|
const makeZoomFunction = () => {
|
|
const { value } = props;
|
|
|
|
let zoomFunc: any;
|
|
if (typeof value === "object") {
|
|
if (value.stops) {
|
|
zoomFunc = {
|
|
base: value.base,
|
|
stops: value.stops.map((stop: Stop) => {
|
|
return [stop[0].zoom, stop[1] || findDefaultFromSpec(props.fieldSpec)];
|
|
}),
|
|
};
|
|
} else {
|
|
zoomFunc = {
|
|
base: value.base,
|
|
stops: [
|
|
[6, findDefaultFromSpec(props.fieldSpec)],
|
|
[10, findDefaultFromSpec(props.fieldSpec)],
|
|
],
|
|
};
|
|
}
|
|
} else {
|
|
zoomFunc = {
|
|
stops: [
|
|
[6, value || findDefaultFromSpec(props.fieldSpec)],
|
|
[10, value || findDefaultFromSpec(props.fieldSpec)],
|
|
],
|
|
};
|
|
}
|
|
|
|
props.onChange(props.fieldName, zoomFunc);
|
|
};
|
|
|
|
const undoExpression = () => {
|
|
const { value, fieldName } = props;
|
|
|
|
if (isGetExpression(value)) {
|
|
props.onChange(fieldName, {
|
|
type: "identity",
|
|
property: value[1],
|
|
});
|
|
setDataType("value");
|
|
} else if (isLiteralExpression(value)) {
|
|
props.onChange(fieldName, value[1]);
|
|
setDataType("value");
|
|
}
|
|
};
|
|
|
|
const canUndo = () => {
|
|
const { value, fieldSpec } = props;
|
|
return (
|
|
isGetExpression(value) ||
|
|
isLiteralExpression(value) ||
|
|
isPrimative(value) ||
|
|
(Array.isArray(value) && fieldSpec.type === "array")
|
|
);
|
|
};
|
|
|
|
const makeExpression = () => {
|
|
const { value, fieldSpec } = props;
|
|
let expression;
|
|
|
|
if (typeof value === "object" && "stops" in value) {
|
|
expression = styleFunction.convertFunction(value, fieldSpec);
|
|
} else if (isIdentityProperty(value)) {
|
|
expression = ["get", value.property];
|
|
} else {
|
|
expression = ["literal", value || props.fieldSpec.default];
|
|
}
|
|
props.onChange(props.fieldName, expression);
|
|
};
|
|
|
|
const makeDataFunction = () => {
|
|
const functionType = getFieldFunctionType(props.fieldSpec);
|
|
const stopValue = functionType === "categorical" ? "" : 0;
|
|
const { value } = props;
|
|
let dataFunc;
|
|
|
|
if (typeof value === "object") {
|
|
if (value.stops) {
|
|
dataFunc = {
|
|
property: "",
|
|
type: functionType,
|
|
base: value.base,
|
|
stops: value.stops.map((stop: Stop) => {
|
|
return [{ zoom: stop[0], value: stopValue }, stop[1] || findDefaultFromSpec(props.fieldSpec)];
|
|
}),
|
|
};
|
|
} else {
|
|
dataFunc = {
|
|
property: "",
|
|
type: functionType,
|
|
base: value.base,
|
|
stops: [
|
|
[{ zoom: 6, value: stopValue }, findDefaultFromSpec(props.fieldSpec)],
|
|
[{ zoom: 10, value: stopValue }, findDefaultFromSpec(props.fieldSpec)],
|
|
],
|
|
};
|
|
}
|
|
} else {
|
|
dataFunc = {
|
|
property: "",
|
|
type: functionType,
|
|
base: value.base,
|
|
stops: [
|
|
[{ zoom: 6, value: stopValue }, props.value || findDefaultFromSpec(props.fieldSpec)],
|
|
[{ zoom: 10, value: stopValue }, props.value || findDefaultFromSpec(props.fieldSpec)],
|
|
],
|
|
};
|
|
}
|
|
|
|
props.onChange(props.fieldName, dataFunc);
|
|
};
|
|
|
|
const makeElevationFunction = () => {
|
|
const expression = [
|
|
"interpolate",
|
|
["linear"],
|
|
["elevation"],
|
|
0,
|
|
"black",
|
|
2000,
|
|
"white"
|
|
];
|
|
|
|
props.onChange(props.fieldName, expression);
|
|
};
|
|
|
|
const onMarkEditing = () => {
|
|
setIsEditing(true);
|
|
};
|
|
|
|
const onUnmarkEditing = () => {
|
|
setIsEditing(false);
|
|
};
|
|
|
|
const propClass =
|
|
props.fieldSpec.default === props.value ? "maputnik-default-property" : "maputnik-modified-property";
|
|
|
|
let specField;
|
|
|
|
if (dataType === "expression") {
|
|
specField = (
|
|
<ExpressionProperty
|
|
errors={props.errors}
|
|
onChange={props.onChange.bind(null, props.fieldName)}
|
|
canUndo={canUndo}
|
|
onUndo={undoExpression}
|
|
onDelete={deleteExpression}
|
|
fieldType={props.fieldType}
|
|
fieldName={props.fieldName}
|
|
fieldSpec={props.fieldSpec}
|
|
value={props.value}
|
|
onFocus={onMarkEditing}
|
|
onBlur={onUnmarkEditing}
|
|
/>
|
|
);
|
|
} else if (dataType === "zoom_function") {
|
|
specField = (
|
|
<ZoomProperty
|
|
errors={props.errors}
|
|
onChange={props.onChange.bind(null)}
|
|
fieldType={props.fieldType}
|
|
fieldName={props.fieldName}
|
|
fieldSpec={props.fieldSpec}
|
|
value={props.value}
|
|
onDeleteStop={deleteStop}
|
|
onAddStop={addStop}
|
|
onChangeToDataFunction={makeDataFunction}
|
|
onExpressionClick={makeExpression}
|
|
/>
|
|
);
|
|
} else if (dataType === "data_function") {
|
|
specField = (
|
|
<DataProperty
|
|
errors={props.errors}
|
|
onChange={props.onChange.bind(null)}
|
|
fieldType={props.fieldType}
|
|
fieldName={props.fieldName}
|
|
fieldSpec={props.fieldSpec}
|
|
value={props.value}
|
|
onDeleteStop={deleteStop}
|
|
onAddStop={addStop}
|
|
onChangeToZoomFunction={makeZoomFunction}
|
|
onExpressionClick={makeExpression}
|
|
/>
|
|
);
|
|
} else {
|
|
specField = (
|
|
<SpecProperty
|
|
errors={props.errors}
|
|
onChange={props.onChange.bind(null)}
|
|
fieldType={props.fieldType}
|
|
fieldName={props.fieldName}
|
|
fieldSpec={props.fieldSpec}
|
|
value={props.value}
|
|
onZoomClick={makeZoomFunction}
|
|
onDataClick={makeDataFunction}
|
|
onExpressionClick={makeExpression}
|
|
onElevationClick={makeElevationFunction}
|
|
/>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className={propClass} data-wd-key={"spec-field-container:" + props.fieldName}>
|
|
{specField}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default FieldFunction;
|