more stable

mongodb-js · Dec 12, 2024 · add38a0 · add38a0
1 parent 9b15c06
commit add38a0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/packages/browser-repl/src/components/shell.spec.tsx b/packages/browser-repl/src/components/shell.spec.tsx
@@ -120,8 +120,8 @@ describe('shell', function () {
 
     expect(filterEvaluateCalls(fakeRuntime.evaluate.args)).to.have.length(1);
 
-    // scrolls to the bottom initially
-    expect(Element.prototype.scrollIntoView).to.have.been.calledOnce;
+    // scrolls to the bottom initially and every time it outputs
+    expect(Element.prototype.scrollIntoView).to.have.been.calledTwice;
 
     // make sure we scroll to the bottom every time output changes
     rerender(
@@ -133,7 +133,7 @@ describe('shell', function () {
       />
     );
     await waitFor(() => {
-      expect(Element.prototype.scrollIntoView).to.have.been.calledTwice;
+      expect(Element.prototype.scrollIntoView).to.have.been.calledThrice;
     });
   });
 
@@ -478,7 +478,7 @@ describe('shell', function () {
       render(<ShellWrapper runtime={fakeRuntime} />);
 
       await waitFor(() => {
-        expect(Element.prototype.scrollIntoView).to.have.been.calledOnce;
+        expect(Element.prototype.scrollIntoView).to.have.been.calledTwice;
       });
 
       expect(screen.getByLabelText('Chevron Right Icon')).to.exist;
@@ -492,7 +492,7 @@ describe('shell', function () {
       render(<ShellWrapper runtime={fakeRuntime} />);
 
       await waitFor(() => {
-        expect(Element.prototype.scrollIntoView).to.have.been.calledOnce;
+        expect(Element.prototype.scrollIntoView).to.have.been.calledTwice;
       });
 
       expect(screen.getByText('$custom$')).to.exist;
@@ -509,7 +509,7 @@ describe('shell', function () {
       render(<ShellWrapper runtime={fakeRuntime} />);
 
       await waitFor(() => {
-        expect(Element.prototype.scrollIntoView).to.have.been.calledOnce;
+        expect(Element.prototype.scrollIntoView).to.have.been.calledTwice;
       });
 
       expect(screen.getByText('abc')).to.exist;

diff --git a/packages/browser-repl/src/components/shell.tsx b/packages/browser-repl/src/components/shell.tsx
@@ -202,6 +202,10 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
   const darkMode = useDarkMode();
 
   const editorRef = useRef<EditorRef | null>(null);
+  const outputRef = useRef(output);
+  const historyRef = useRef(history);
+  const shellInputContainerRef = useRef<HTMLDivElement>(null);
+  const initialEvaluateRef = useRef(initialEvaluate);
 
   useImperativeHandle(
     ref,
@@ -233,8 +237,6 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
     []
   );
 
-  const shellInputContainerRef = useRef<HTMLDivElement>(null);
-
   const [passwordPrompt, setPasswordPrompt] = useState('');
   const [shellPrompt, setShellPrompt] = useState('>');
   const [onFinishPasswordPrompt, setOnFinishPasswordPrompt] = useState<
@@ -252,7 +254,7 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
     return {
       onPrint: (result: RuntimeEvaluationResult[]): void => {
         const newOutput = [
-          ...(output ?? []),
+          ...(outputRef.current ?? []),
           ...result.map(
             (entry): ShellOutputEntry => ({
               format: 'output',
@@ -299,7 +301,7 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
         onOutputChanged?.([]);
       },
     };
-  }, [focusEditor, maxOutputLength, onOutputChanged, output]);
+  }, [focusEditor, maxOutputLength, onOutputChanged]);
 
   const updateShellPrompt = useCallback(async (): Promise<void> => {
     let newShellPrompt = '>';
@@ -366,8 +368,8 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
 
   const onInput = useCallback(
     async (code: string) => {
-      const newOutput = [...(output ?? [])];
-      const newHistory = [...(history ?? [])];
+      const newOutput = [...(outputRef.current ?? [])];
+      const newHistory = [...(historyRef.current ?? [])];
 
       // don't evaluate empty input, but do add it to the output
       if (!code || code.trim() === '') {
@@ -405,8 +407,6 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
       onHistoryChanged?.(newHistory);
     },
     [
-      output,
-      history,
       onOutputChanged,
       evaluate,
       redactInfo,
@@ -446,11 +446,7 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
     return Promise.resolve(false);
   }, [isOperationInProgress, runtime]);
 
-  const initialEvaluateRef = useRef(initialEvaluate);
-
   useEffect(() => {
-    scrollToBottom();
-
     void updateShellPrompt().then(async () => {
       if (initialEvaluateRef.current) {
         const evalLines = normalizeInitialEvaluate(initialEvaluateRef.current);
@@ -459,7 +455,11 @@ const _Shell: ForwardRefRenderFunction<EditorRef | null, ShellProps> = (
         }
       }
     });
-  }, [onInput, scrollToBottom, updateShellPrompt]);
+  }, [onInput, updateShellPrompt]);
+
+  useEffect(() => {
+    scrollToBottom();
+  });
 
   /* eslint-disable jsx-a11y/no-static-element-interactions */
   /* eslint-disable jsx-a11y/click-events-have-key-events */