From 9a0ef78b62cb971cf0ce093cc146b3d20c02859a Mon Sep 17 00:00:00 2001
From: dev <info@activething.com>
Date: Fri, 15 May 2026 18:42:32 +0200
Subject: [PATCH] Route Soma timers and document lookup through ActiveDom

---
 src/uix/soma/components/announce/global.svelte.ts        | 9 +++++++--
 .../components/date-field/date-field-provider.svelte.ts  | 4 ++--
 .../components/time-field/time-field-provider.svelte.ts  | 4 ++--
 src/uix/soma/datetime/announcer.ts                       | 2 +-
 src/uix/soma/layers/dismissal.svelte.ts                  | 5 +++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/uix/soma/components/announce/global.svelte.ts b/src/uix/soma/components/announce/global.svelte.ts
index 4086053d8..d151f90a8 100644
--- a/src/uix/soma/components/announce/global.svelte.ts
+++ b/src/uix/soma/components/announce/global.svelte.ts
@@ -94,6 +94,8 @@ function ensurePair(
 }
 
 function scheduleClear(
+	dom: ActiveDom,
+	target: HTMLElement,
 	key: string,
 	timeout: number,
 	task: () => void,
@@ -106,10 +108,11 @@ function scheduleClear(
 		});
 	}
 
-	const native = setTimeout(task, timeout);
+	const win = dom.getWindow(target);
+	const native = win.setTimeout(task, timeout);
 	return {
 		cancel() {
-			clearTimeout(native);
+			win.clearTimeout(native);
 			return true;
 		}
 	};
@@ -132,6 +135,8 @@ function write(
 	}
 	if (pair.timer) pair.timer.cancel();
 	pair.timer = scheduleClear(
+		dom,
+		pair.a,
 		`soma:announce:global:${pair.a.id}`,
 		timeout,
 		() => {
diff --git a/src/uix/soma/components/date-field/date-field-provider.svelte.ts b/src/uix/soma/components/date-field/date-field-provider.svelte.ts
index f0164622e..7491a7774 100644
--- a/src/uix/soma/components/date-field/date-field-provider.svelte.ts
+++ b/src/uix/soma/components/date-field/date-field-provider.svelte.ts
@@ -14,7 +14,7 @@ import {
 } from '$libs/reactive';
 import type { SomaFocusEvent, SomaKeyboardEvent, SomaMouseEvent, OnChangeFn } from '../../types';
 import { KEYS, getDirectionalKeys } from '../../keyboard';
-import { getDocument, isBrowser } from '$adom';
+import { isBrowser } from '$adom';
 import { isNumberString } from '../../types/guards';
 import { useId } from '../../id';
 import { Soma } from '../../core/soma.svelte';
@@ -759,7 +759,7 @@ export class DateFieldInputProvider {
 
 	readonly ariaDescribedBy = $derived.by(() => {
 		if (!isBrowser) return undefined;
-		const doc = getDocument(this.opts.ref.current);
+		const doc = this.provider.soma.dom.getDocument(this.opts.ref.current);
 		const exists = doc?.getElementById(this.provider.descriptionId);
 		return exists ? this.provider.descriptionId : undefined;
 	});
diff --git a/src/uix/soma/components/time-field/time-field-provider.svelte.ts b/src/uix/soma/components/time-field/time-field-provider.svelte.ts
index 9ade4dd63..b874884af 100644
--- a/src/uix/soma/components/time-field/time-field-provider.svelte.ts
+++ b/src/uix/soma/components/time-field/time-field-provider.svelte.ts
@@ -11,7 +11,7 @@ import {
 } from '$libs/reactive';
 import type { SomaFocusEvent, SomaKeyboardEvent, OnChangeFn } from '../../types';
 import { KEYS, getDirectionalKeys } from '../../keyboard';
-import { getDocument, isBrowser } from '$adom';
+import { isBrowser } from '$adom';
 import { isNumberString } from '../../types/guards';
 import { useId } from '../../id';
 import { Soma } from '../../core/soma.svelte';
@@ -517,7 +517,7 @@ export class TimeFieldInputProvider {
 
 	readonly ariaDescribedBy = $derived.by(() => {
 		if (!isBrowser) return undefined;
-		const doc = getDocument(this.opts.ref.current);
+		const doc = this.provider.soma.dom.getDocument(this.opts.ref.current);
 		const exists = doc?.getElementById(this.provider.descriptionId);
 		return exists ? this.provider.descriptionId : undefined;
 	});
diff --git a/src/uix/soma/datetime/announcer.ts b/src/uix/soma/datetime/announcer.ts
index 7bc88a8e9..ae9f9093c 100644
--- a/src/uix/soma/datetime/announcer.ts
+++ b/src/uix/soma/datetime/announcer.ts
@@ -72,7 +72,7 @@ export function getAnnouncer(dom: ActiveDom | null, target?: Node | null) {
 		}
 		if (!log) return;
 		dom.writeText(log, value);
-		return setTimeout(() => {
+		return dom.getWindow(log).setTimeout(() => {
 			dom.writeText(log, '');
 		}, timeout);
 	}
diff --git a/src/uix/soma/layers/dismissal.svelte.ts b/src/uix/soma/layers/dismissal.svelte.ts
index 29ed42067..d3e64c17f 100644
--- a/src/uix/soma/layers/dismissal.svelte.ts
+++ b/src/uix/soma/layers/dismissal.svelte.ts
@@ -85,7 +85,8 @@ export class Dismissal {
 			if (!enabled || !ref) return;
 
 			// Small delay to avoid catching the same event that opened the layer
-			const timer = setTimeout(() => {
+			const win = opts.dom.getWindow(ref);
+			const timer = win.setTimeout(() => {
 				if (!opts.ref.current) return;
 				registry.set(this, {
 					escapeBehavior: opts.escapeKeydownBehavior,
@@ -96,7 +97,7 @@ export class Dismissal {
 			}, 1);
 
 			return () => {
-				clearTimeout(timer);
+				win.clearTimeout(timer);
 				unsubEvents();
 				this.resetState();
 				registry.delete(this);