From f9248e8faa8b44d804a82d30e779b0c58e665aaa Mon Sep 17 00:00:00 2001
From: Brendan Allan <git@brendonovich.dev>
Date: Thu, 14 May 2026 20:34:29 +0800
Subject: [PATCH] cleanup(app): wrap entire MessageTimeline in ScrollView

---
 .../src/pages/session/message-timeline.tsx    | 81 +++++++++----------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/packages/app/src/pages/session/message-timeline.tsx b/packages/app/src/pages/session/message-timeline.tsx
index e28b9ddcd1..0f0da0a818 100644
--- a/packages/app/src/pages/session/message-timeline.tsx
+++ b/packages/app/src/pages/session/message-timeline.tsx
@@ -1163,8 +1163,17 @@ export function MessageTimeline(props: {
           </div>
         </button>
       </div>
-      <div
-        class="relative min-w-0 w-full h-full flex flex-col"
+      <ScrollView
+        viewportRef={bindListRoot}
+        onWheel={handleListWheel}
+        onTouchStart={handleListTouchStart}
+        onTouchMove={handleListTouchMove}
+        onTouchEnd={handleListTouchEnd}
+        onTouchCancel={handleListTouchEnd}
+        onPointerDown={handleListPointerDown}
+        onScroll={handleListScroll}
+        onClick={props.onAutoScrollInteraction}
+        class="relative min-w-0 w-full h-full"
         style={{
           "--session-title-height": showHeader() ? "40px" : "0px",
           "--sticky-accordion-top": showHeader() ? "48px" : "0px",
@@ -1179,7 +1188,6 @@ export function MessageTimeline(props: {
             data-session-title
             classList={{
               "sticky top-0 z-30 bg-[linear-gradient(to_bottom,var(--background-stronger)_48px,transparent)]": true,
-              relative: true,
               "w-full": true,
               "pb-4": true,
               "pl-2 pr-3 md:pl-4 md:pr-3": true,
@@ -1460,46 +1468,33 @@ export function MessageTimeline(props: {
             </div>
           </div>
         </Show>
-        <ScrollView
-          viewportRef={bindListRoot}
-          onWheel={handleListWheel}
-          onTouchStart={handleListTouchStart}
-          onTouchMove={handleListTouchMove}
-          onTouchEnd={handleListTouchEnd}
-          onTouchCancel={handleListTouchEnd}
-          onPointerDown={handleListPointerDown}
-          onScroll={handleListScroll}
-          onClick={props.onAutoScrollInteraction}
-          class="relative min-w-0 w-full h-full"
-        >
-          <Show when={scrollRoot()}>
-            {(root) => (
-              <Virtualizer
-                data={timelineRowKeys()}
-                cache={virtualCache()}
-                itemSize={virtualCache() ? undefined : timelineFallbackItemSize}
-                scrollRef={root()}
-                shift={props.historyShift}
-                keepMounted={keepMounted()}
-                ref={(handle) => {
-                  if (!handle) {
-                    writeTimelineCache(virtualizerSessionKey, virtualizerRowKeys, virtualizer)
-                    virtualizer = undefined
-                    return
-                  }
-                  virtualizer = handle
-                  virtualizerSessionKey = cacheSessionKey
-                  virtualizerRowKeys = cacheRowKeys
-                  maybeAnchorBottom()
-                  scheduleContentRoot(root())
-                }}
-              >
-                {(key) => <TimelineRowView rowKey={key} />}
-              </Virtualizer>
-            )}
-          </Show>
-        </ScrollView>
-      </div>
+        <Show when={scrollRoot()}>
+          {(root) => (
+            <Virtualizer
+              data={timelineRowKeys()}
+              cache={virtualCache()}
+              itemSize={virtualCache() ? undefined : timelineFallbackItemSize}
+              scrollRef={root()}
+              shift={props.historyShift}
+              keepMounted={keepMounted()}
+              ref={(handle) => {
+                if (!handle) {
+                  writeTimelineCache(virtualizerSessionKey, virtualizerRowKeys, virtualizer)
+                  virtualizer = undefined
+                  return
+                }
+                virtualizer = handle
+                virtualizerSessionKey = cacheSessionKey
+                virtualizerRowKeys = cacheRowKeys
+                maybeAnchorBottom()
+                scheduleContentRoot(root())
+              }}
+            >
+              {(key) => <TimelineRowView rowKey={key} />}
+            </Virtualizer>
+          )}
+        </Show>
+      </ScrollView>
     </div>
   )
 }