From 05dd7210d9a970c3a9bc8a827208fae07c69a78f Mon Sep 17 00:00:00 2001
From: Mike Bender <mikebender@deephaven.io>
Date: Tue, 31 Dec 2024 10:55:26 -0500
Subject: [PATCH] Add an instant flag to the scroll, wait for attach instead of
 timeout

- Instead of using a timeout, just wait for the element to be attached. Should be more reliable
---
 packages/console/src/Console.tsx |  2 +-
 tests/console.spec.ts            | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/console/src/Console.tsx b/packages/console/src/Console.tsx
index b94bc78ff..8ddbc534d 100644
--- a/packages/console/src/Console.tsx
+++ b/packages/console/src/Console.tsx
@@ -678,7 +678,7 @@ export class Console extends PureComponent<ConsoleProps, ConsoleState> {
     }
 
     window.requestAnimationFrame(() => {
-      pane.scrollTo({ top: pane.scrollHeight });
+      pane.scrollTo({ top: pane.scrollHeight, behavior: 'instant' });
     });
   }
 
diff --git a/tests/console.spec.ts b/tests/console.spec.ts
index 7c1911934..0b75534c4 100644
--- a/tests/console.spec.ts
+++ b/tests/console.spec.ts
@@ -12,6 +12,12 @@ function logMessageLocator(page: Page, text?: string): Locator {
     .filter({ hasText: text });
 }
 
+function historyContentLocator(page: Page, text?: string): Locator {
+  return page
+    .locator('.console-history .console-history-content')
+    .filter({ hasText: text });
+}
+
 function panelTabLocator(page: Page, text: string): Locator {
   return page.locator('.lm_tab .lm_title').filter({ hasText: text });
 }
@@ -90,8 +96,9 @@ test.describe('console scroll tests', () => {
     await pasteInMonaco(consoleInput, command);
     await page.keyboard.press('Enter');
 
-    // Allow time for the text to colorize/render
-    await page.waitForTimeout(100);
+    await historyContentLocator(page, ids[ids.length - 1]).waitFor({
+      state: 'attached',
+    });
 
     // Expect the console to be scrolled to the bottom
     const scrollPane = await scrollPanelLocator(page);
@@ -116,8 +123,9 @@ test.describe('console scroll tests', () => {
     await panelTabLocator(page, 'Log').click();
 
     // wait for a bit for the code block to render
-    // Since it's in the background, we can't use the waitForSelector method. It should render in less than 1s.
-    await page.waitForTimeout(1000);
+    await historyContentLocator(page, ids[ids.length - 1]).waitFor({
+      state: 'attached',
+    });
 
     // Switch back to the console, and expect it to be scrolled to the bottom
     await panelTabLocator(page, 'Console').click();