Merge branch 'main' into dish_intern

warm-coolguy · web-flow · commit 68aff2a17509 · 2025-01-20T07:06:56.000+01:00
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## unpublished
 
-- Fix: Add `crossOrigin` differently to layer sources that are an instance of `ImageWMS` as they require it being set as `crossOrigin_` to be recognized.
 - Feature: Additionally export `MapInstance` type.
+- Fix: Add `crossOrigin` differently to layer sources that are an instance of `ImageWMS` as they require it being set as `crossOrigin_` to be recognized.
+- Fix: Add missing `font-family` css so that tooltips are always `Arial, sans-serif`.
 
 ## 2.0.0
 
diff --git a/packages/core/src/utils/createMap/pullVuetifyStyleToShadow.ts b/packages/core/src/utils/createMap/pullVuetifyStyleToShadow.ts
@@ -11,4 +11,11 @@ export const pullVuetifyStyleToShadow = (shadowRoot: ShadowRoot) => {
     return
   }
   shadowRoot.appendChild(vuetifyStyle)
+
+  // tooltips are technically a neighbour of the app; add missing font style
+  const tooltipStyle = document.createElement('style')
+  tooltipStyle.innerHTML = `.v-tooltip__content {
+  font-family: sans-serif;
+}`
+  shadowRoot.appendChild(tooltipStyle)
 }

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,11 @@ export const pullVuetifyStyleToShadow = (shadowRoot: ShadowRoot) => {`
`11`	`11`	`return`
`12`	`12`	`}`
`13`	`13`	`shadowRoot.appendChild(vuetifyStyle)`
	`14`	`+`
	`15`	`+ // tooltips are technically a neighbour of the app; add missing font style`
	`16`	`+ const tooltipStyle = document.createElement('style')`
	`17`	+ tooltipStyle.innerHTML = `.v-tooltip__content {
	`18`	`+ font-family: sans-serif;`
	`19`	+}`
	`20`	`+ shadowRoot.appendChild(tooltipStyle)`
`14`	`21`	`}`