mirror of
https://github.com/maputnik/editor.git
synced 2026-07-14 09:57:29 +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>
115 lines
3.5 KiB
TypeScript
115 lines
3.5 KiB
TypeScript
import React from "react";
|
||
import IconLayer from "./IconLayer";
|
||
import type {InspectFeature} from "./MapMaplibreGlFeaturePropertyPopup";
|
||
|
||
function groupFeaturesBySourceLayer(features: InspectFeature[]) {
|
||
const sources: {[key: string]: InspectFeature[]} = {};
|
||
|
||
const returnedFeatures: {[key: string]: number} = {};
|
||
|
||
features.forEach(feature => {
|
||
const sourceKey = feature.layer["source-layer"] as string;
|
||
if(Object.prototype.hasOwnProperty.call(returnedFeatures, feature.layer.id)) {
|
||
returnedFeatures[feature.layer.id]++;
|
||
|
||
const featureObject = sources[sourceKey].find((f: InspectFeature) => f.layer.id === feature.layer.id);
|
||
|
||
featureObject!.counter = returnedFeatures[feature.layer.id];
|
||
} else {
|
||
sources[sourceKey] = sources[sourceKey] || [];
|
||
sources[sourceKey].push(feature);
|
||
|
||
returnedFeatures[feature.layer.id] = 1;
|
||
}
|
||
});
|
||
|
||
return sources;
|
||
}
|
||
|
||
type FeatureLayerPopupProps = {
|
||
onLayerSelect(layerId: string): unknown
|
||
features: InspectFeature[]
|
||
zoom?: number
|
||
};
|
||
|
||
class FeatureLayerPopup extends React.Component<FeatureLayerPopupProps> {
|
||
_getFeatureColor(feature: InspectFeature, _zoom?: number) {
|
||
// Guard because openlayers won't have this
|
||
if (!feature.layer.paint) {
|
||
return;
|
||
}
|
||
|
||
try {
|
||
const paintProps = feature.layer.paint;
|
||
|
||
if("text-color" in paintProps && paintProps["text-color"]) {
|
||
return String(paintProps["text-color"]);
|
||
}
|
||
if ("fill-color" in paintProps && paintProps["fill-color"]) {
|
||
return String(paintProps["fill-color"]);
|
||
}
|
||
if ("line-color" in paintProps && paintProps["line-color"]) {
|
||
return String(paintProps["line-color"]);
|
||
}
|
||
if ("fill-extrusion-color" in paintProps && paintProps["fill-extrusion-color"]) {
|
||
return String(paintProps["fill-extrusion-color"]);
|
||
}
|
||
// Default color
|
||
return "black";
|
||
}
|
||
// This is quite complex, just incase there's an edgecase we're missing
|
||
// always return black if we get an unexpected error.
|
||
catch (err) {
|
||
console.warn("Unable to get feature color, error:", err);
|
||
return "black";
|
||
}
|
||
}
|
||
|
||
render() {
|
||
const sources = groupFeaturesBySourceLayer(this.props.features);
|
||
|
||
const items = Object.keys(sources).map(vectorLayerId => {
|
||
const layers = sources[vectorLayerId].map((feature: InspectFeature, idx: number) => {
|
||
const featureColor = this._getFeatureColor(feature, this.props.zoom);
|
||
|
||
return <div
|
||
key={idx}
|
||
className="maputnik-popup-layer"
|
||
>
|
||
<div
|
||
className="maputnik-popup-layer__swatch"
|
||
style={{background: featureColor}}
|
||
></div>
|
||
<label
|
||
className="maputnik-popup-layer__label"
|
||
onClick={() => {
|
||
this.props.onLayerSelect(feature.layer.id);
|
||
}}
|
||
>
|
||
{feature.layer.type &&
|
||
<IconLayer type={feature.layer.type} style={{
|
||
width: 14,
|
||
height: 14,
|
||
paddingRight: 3
|
||
}}/>
|
||
}
|
||
{feature.layer.id}
|
||
{feature.counter && <span> × {feature.counter}</span>}
|
||
</label>
|
||
</div>;
|
||
});
|
||
return <div key={vectorLayerId}>
|
||
<div className="maputnik-popup-layer-id">{vectorLayerId}</div>
|
||
{layers}
|
||
</div>;
|
||
});
|
||
|
||
return <div className="maputnik-feature-layer-popup" data-wd-key="feature-layer-popup" dir="ltr">
|
||
{items}
|
||
</div>;
|
||
}
|
||
}
|
||
|
||
|
||
export default FeatureLayerPopup;
|