From 5369e96ab70b88abf1492c50f191dcf9e3bb7108 Mon Sep 17 00:00:00 2001 From: adamelmore <2363879+adamdottv@users.noreply.github.com> Date: Sun, 25 Jan 2026 19:07:19 -0600 Subject: fix(app): line selection colors --- packages/ui/src/components/code.tsx | 27 +++++++++++++++++++++++++++ packages/ui/src/components/diff-ssr.tsx | 20 ++++++++++++++++++++ packages/ui/src/components/diff.tsx | 27 +++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) (limited to 'packages/ui/src/components') diff --git a/packages/ui/src/components/code.tsx b/packages/ui/src/components/code.tsx index eb0ba7826..a7687444f 100644 --- a/packages/ui/src/components/code.tsx +++ b/packages/ui/src/components/code.tsx @@ -91,6 +91,19 @@ export function Code(props: CodeProps) { return root } + const applyScheme = () => { + const host = container.querySelector("diffs-container") + if (!(host instanceof HTMLElement)) return + + const scheme = document.documentElement.dataset.colorScheme + if (scheme === "dark" || scheme === "light") { + host.dataset.colorScheme = scheme + return + } + + host.removeAttribute("data-color-scheme") + } + const applyCommentedLines = (ranges: SelectedLineRange[]) => { const root = getRoot() if (!root) return @@ -369,10 +382,24 @@ export function Code(props: CodeProps) { containerWrapper: container, }) + applyScheme() + setRendered((value) => value + 1) notifyRendered() }) + createEffect(() => { + if (typeof document === "undefined") return + if (typeof MutationObserver === "undefined") return + + const root = document.documentElement + const monitor = new MutationObserver(() => applyScheme()) + monitor.observe(root, { attributes: true, attributeFilter: ["data-color-scheme"] }) + applyScheme() + + onCleanup(() => monitor.disconnect()) + }) + createEffect(() => { rendered() const ranges = local.commentedLines ?? [] diff --git a/packages/ui/src/components/diff-ssr.tsx b/packages/ui/src/components/diff-ssr.tsx index 9456e4a3c..4ab632008 100644 --- a/packages/ui/src/components/diff-ssr.tsx +++ b/packages/ui/src/components/diff-ssr.tsx @@ -28,6 +28,16 @@ export function Diff(props: SSRDiffProps) { const getRoot = () => fileDiffRef?.shadowRoot ?? undefined + const applyScheme = () => { + const scheme = document.documentElement.dataset.colorScheme + if (scheme === "dark" || scheme === "light") { + fileDiffRef.dataset.colorScheme = scheme + return + } + + fileDiffRef.removeAttribute("data-color-scheme") + } + const findSide = (element: HTMLElement): "additions" | "deletions" => { const line = element.closest("[data-line], [data-alt-line]") if (line instanceof HTMLElement) { @@ -121,6 +131,16 @@ export function Diff(props: SSRDiffProps) { onMount(() => { if (isServer || !props.preloadedDiff) return + + applyScheme() + + if (typeof MutationObserver !== "undefined") { + const root = document.documentElement + const monitor = new MutationObserver(() => applyScheme()) + monitor.observe(root, { attributes: true, attributeFilter: ["data-color-scheme"] }) + onCleanup(() => monitor.disconnect()) + } + fileDiffInstance = new FileDiff( { ...createDefaultOptions(props.diffStyle), diff --git a/packages/ui/src/components/diff.tsx b/packages/ui/src/components/diff.tsx index 2fb2ea3bc..c97744a9f 100644 --- a/packages/ui/src/components/diff.tsx +++ b/packages/ui/src/components/diff.tsx @@ -102,6 +102,19 @@ export function Diff(props: DiffProps) { return root } + const applyScheme = () => { + const host = container.querySelector("diffs-container") + if (!(host instanceof HTMLElement)) return + + const scheme = document.documentElement.dataset.colorScheme + if (scheme === "dark" || scheme === "light") { + host.dataset.colorScheme = scheme + return + } + + host.removeAttribute("data-color-scheme") + } + const notifyRendered = () => { if (!local.onRendered) return @@ -488,10 +501,24 @@ export function Diff(props: DiffProps) { containerWrapper: container, }) + applyScheme() + setRendered((value) => value + 1) notifyRendered() }) + createEffect(() => { + if (typeof document === "undefined") return + if (typeof MutationObserver === "undefined") return + + const root = document.documentElement + const monitor = new MutationObserver(() => applyScheme()) + monitor.observe(root, { attributes: true, attributeFilter: ["data-color-scheme"] }) + applyScheme() + + onCleanup(() => monitor.disconnect()) + }) + createEffect(() => { rendered() const ranges = local.commentedLines ?? [] -- cgit v1.2.3