Skip to content

Fix tooltip colours #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
awesomephant merged 1 commit into from
Sep 25, 2025
Merged

Fix tooltip colours #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/src/DesignTokens/Tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ const semantics: ColourMap = {
light: '#ffffff'
},
surfaceBorder: {
dark: '#3e3e3e',
dark: 'hsl(0, 0%, 35%)',
light: shades.gray.base
},
pageFill: {
Expand Down
94 changes: 93 additions & 1 deletion components/src/maplibre/Tooltip/Tooltip.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import VectorLayer from '../VectorLayer/VectorLayer.svelte';
import AttributionControl from '../AttributionControl/AttributionControl.svelte';
import Tooltip from './Tooltip.svelte';
import { SWRDataLabLight } from '../MapStyle';
import { SWRDataLabDark, SWRDataLabLight } from '../MapStyle';

const { Story } = defineMeta({
title: 'Maplibre/Extras/Tooltip',
Expand Down Expand Up @@ -177,6 +177,98 @@
</DesignTokens>
</Story>

<Story asChild name="fix/172">
<DesignTokens theme="dark">
<div class="container">
<Map
style={SWRDataLabDark()}
initialLocation={{ lat: 51, lng: 10, zoom: 8 }}
allowZoom={false}
>
<VectorTileSource
id="ev-infra-source"
url={`https://static.datenhub.net/data/p108_e_auto_check/ev_infra_merged.versatiles?tiles/{z}/{x}/{y}`}
/>
<VectorLayer
sourceId="ev-infra-source"
type="fill"
id="coverage-fill"
sourceLayer="coverage"
placeBelow="street-residential"
onmousemove={(e) => {
hovered2 = e.features?.[0];
}}
onmouseleave={() => (hovered2 = undefined)}
onclick={(e) => {
selected = e.features?.[0];
selectCoords = e.lngLat;
}}
paint={{
'fill-color': [
'step',
['get', 'coverage_2025'],
'#393636',
1,
'#262b38',
1.3,
'#6d4a77'
]
}}
/>
<VectorLayer
hovered={hovered2}
{selected}
sourceId="ev-infra-source"
sourceLayer="coverage"
id="ev-infra-outline"
type="line"
layout={{
'line-join': 'round'
}}
paint={{
'line-width': [
'case',
[
'any',
['boolean', ['feature-state', 'hovered'], false],
['boolean', ['feature-state', 'selected'], false]
],
2,
0.5
],
'line-color': [
'case',
[
'any',
['boolean', ['feature-state', 'hovered'], false],
['boolean', ['feature-state', 'selected'], false]
],
'#dfdbdb',
'#6d6d6d'
],
'line-opacity': 1
}}
/>
{#if selected}
<Tooltip
position={selectCoords}
mouseEvents={true}
showCloseButton={true}
onClose={() => {
selected = undefined;
}}
>
<pre class="padRight">{Object.entries(selected.properties)
.map(([key, val]) => `${key}: ${val}`)
.join('\n')}</pre>
</Tooltip>
{/if}
<AttributionControl position="bottom-left" />
</Map>
</div>
</DesignTokens>
</Story>

<style>
.container {
width: 100%;
Expand Down
25 changes: 12 additions & 13 deletions components/src/maplibre/Tooltip/Tooltip.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
background: var(--color-surfaceFill);
color: var(--color-textPrimary);
padding: 0.75em;
border: 1px solid rgba(0, 0, 0, 0.75);
filter: drop-shadow(2px 2px 1px rgba(0, 0, 0, 0.1));
border: 1px solid var(--color-surfaceBorder);
pointer-events: none;
filter: drop-shadow(2px 2px 1px rgba(0, 0, 0, 0.1));
}

.mouseEvents {
Expand Down Expand Up @@ -147,35 +147,34 @@

.maplibregl-popup-close-button {
position: absolute;
top: 0.35em;
right: 0.35em;
top: 0.4em;
right: 0.4em;
cursor: pointer;
border-radius: 2px;
display: flex;
justify-content: center;
align-items: center;
padding-bottom: 0.15em;
font-size: 1.2rem;
width: 1.1em;
height: 1.1em;
width: 1.15em;
height: 1.15em;
z-index: 100;
background: white;
color: var(--gray-dark-5);
border: 1px solid var(--gray-dark-5);
background: var(--color-surfaceFill);
color: var(--color-textPrimary);
border: 1px solid var(--color-textSecondary);
}

.maplibregl-popup-close-button:hover,
.maplibregl-popup-close-button:focus-visible {
background: var(--gray-light-5);
background: var(--color-surfaceFill);
}

.maplibregl-popup-tip {
width: 0.65rem;
height: 0.65rem;
background: var(--color-surfaceFill);
position: absolute;
border-right: 1px solid var(--gray-dark-5);
border-bottom: 1px solid var(--gray-dark-5);
border-right: 1px solid var(--color-surfaceBorder);
border-bottom: 1px solid var(--color-surfaceBorder);
z-index: 10;
}
}
Expand Down