From 6c2b0f0f50bedbc91ca972596bebf4252f3e35b8 Mon Sep 17 00:00:00 2001
From: Max Kohler <hello@maxkohler.com>
Date: Wed, 22 Oct 2025 17:06:22 +0200
Subject: [PATCH 1/2] apply fix

---
 components/src/maplibre/Tooltip/Tooltip.svelte | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/src/maplibre/Tooltip/Tooltip.svelte b/components/src/maplibre/Tooltip/Tooltip.svelte
index a46c1866..153df1a6 100644
--- a/components/src/maplibre/Tooltip/Tooltip.svelte
+++ b/components/src/maplibre/Tooltip/Tooltip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onDestroy, type Snippet } from 'svelte';
+	import { onDestroy, tick, type Snippet } from 'svelte';
 	import maplibre, { type Listener, type LngLatLike } from 'maplibre-gl';
 	import { getMapContext } from '../context.svelte.js';
 	import { resetPopupEventListener } from '../utils';
@@ -50,7 +50,11 @@
 
 	$effect(() => {
 		if (position && el && map) {
-			tooltip.setLngLat(position).setDOMContent(el).addTo(map);
+			tooltip.addTo(map).setDOMContent(el).setLngLat(position);
+			// Ensure tooltip doesn't extend beyond the map canvas, see #223
+			tick().then(() => {
+				tooltip._update();
+			});
 		} else {
 			tooltip.remove();
 		}

From 56df6b46f311425ea70300a465032fc5681487c1 Mon Sep 17 00:00:00 2001
From: Max Kohler <hello@maxkohler.com>
Date: Wed, 22 Oct 2025 17:09:12 +0200
Subject: [PATCH 2/2] Set order of operations according to docs

See https://maplibre.org/maplibre-gl-js/docs/API/classes/Popup/\#setdomcontent
---
 components/src/maplibre/Tooltip/Tooltip.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/src/maplibre/Tooltip/Tooltip.svelte b/components/src/maplibre/Tooltip/Tooltip.svelte
index 153df1a6..ece7927b 100644
--- a/components/src/maplibre/Tooltip/Tooltip.svelte
+++ b/components/src/maplibre/Tooltip/Tooltip.svelte
@@ -50,7 +50,7 @@
 
 	$effect(() => {
 		if (position && el && map) {
-			tooltip.addTo(map).setDOMContent(el).setLngLat(position);
+			tooltip.setLngLat(position).setDOMContent(el).addTo(map);
 			// Ensure tooltip doesn't extend beyond the map canvas, see #223
 			tick().then(() => {
 				tooltip._update();