From edbfc5f86bde3cff981944220099a0c55b2f5b5c Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sun, 6 Jul 2025 00:12:07 +0200
Subject: [PATCH] Fix: disable crash in settings by improving typing

---
 src/UI/Base/SvelteUIElement.ts                         | 10 +++++++++-
 src/UI/Base/ToSvelte.svelte                            |  2 +-
 src/UI/SpecialVisualisations/SettingsVisualisations.ts |  5 +++--
 src/Utils.ts                                           |  7 ++++++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/UI/Base/SvelteUIElement.ts b/src/UI/Base/SvelteUIElement.ts
index 79bec4fba..4f93c93bb 100644
--- a/src/UI/Base/SvelteUIElement.ts
+++ b/src/UI/Base/SvelteUIElement.ts
@@ -25,12 +25,20 @@ export default class SvelteUIElement<
     private tag: "div" | "span" = "div"
     public readonly isSvelte = true
 
-    constructor(svelteElement, props?: Props, events?: Events, slots?: Slots) {
+    constructor(svelteElement : {
+        new (args: {
+            target: HTMLElement
+            props: Props
+            events?: Events
+            slots?: Slots
+        }): SvelteComponentTyped<Props, Events, Slots>
+    }, props?: Props, events?: Events, slots?: Slots) {
         super()
         this._svelteComponent = <any>svelteElement
         this._props = props ?? <Props>{}
         this._events = events
         this._slots = slots
+        console.trace("Constructing a special stack element")
     }
 
     public setSpan() {
diff --git a/src/UI/Base/ToSvelte.svelte b/src/UI/Base/ToSvelte.svelte
index c6c742071..cb7dca98b 100644
--- a/src/UI/Base/ToSvelte.svelte
+++ b/src/UI/Base/ToSvelte.svelte
@@ -31,7 +31,7 @@
   })
 </script>
 
-{#if isSvelte}
+{#if svelteElem?._svelteComponent}
   {#if svelteElem.getClass() || svelteElem.getStyle()}
     <svelte:component
       this={svelteElem?._svelteComponent}
diff --git a/src/UI/SpecialVisualisations/SettingsVisualisations.ts b/src/UI/SpecialVisualisations/SettingsVisualisations.ts
index a6f2c7af0..243e7ba92 100644
--- a/src/UI/SpecialVisualisations/SettingsVisualisations.ts
+++ b/src/UI/SpecialVisualisations/SettingsVisualisations.ts
@@ -17,6 +17,7 @@ import { Feature } from "geojson"
 import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
 import QrCode from "../Popup/QrCode.svelte"
 import ClearGPSHistory from "../BigComponents/ClearGPSHistory.svelte"
+import DisabledQuestions from "../Popup/DisabledQuestions.svelte"
 
 class LanguagePickerVis extends SpecialVisualizationSvelte {
     funcName = "language_picker"
@@ -40,7 +41,7 @@ class LanguagePickerVis extends SpecialVisualizationSvelte {
     }
 }
 
-class DisabledQuestions extends SpecialVisualizationSvelte {
+class DisabledQuestionsVis extends SpecialVisualizationSvelte {
     funcName = "disabled_questions"
     group = "settings"
     docs = "Shows which questions are disabled for every layer. Used in 'settings'"
@@ -234,7 +235,7 @@ export class SettingsVisualisations {
         return [
             new LanguagePickerVis(),
 
-            new DisabledQuestions(),
+            new DisabledQuestionsVis(),
             new GyroscopeAllTags(),
             new GpsAllTags(),
             new StorageAlLTags(),
diff --git a/src/Utils.ts b/src/Utils.ts
index 5775883d4..a861007ba 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -1630,7 +1630,12 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
             ;[_, functionName, path, line, column] = matchWithFuncName
         } else {
             const regexNoFuncName: RegExp = new RegExp("at ([a-zA-Z0-9-/.]+):([0-9]+):([0-9]+)")
-            ;[_, path, line, column] = stackItem.match(regexNoFuncName)
+            try {
+                [_, path, line, column] = stackItem.match(regexNoFuncName)
+            } catch (e) {
+                console.error("Could not match a stack item:", stackItem)
+                return undefined
+            }
         }
 
         const markdownLocation = path.substring(path.indexOf("MapComplete/src") + 11) + "#L" + line