From a7f0fadeaef3bc24ad9ede430e1542d12e6b268c Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Thu, 15 Aug 2024 09:09:18 -0700
Subject: [PATCH] Fix sidebar scroll into view

---
 src-web/components/Sidebar.tsx     | 3 ++-
 src-web/hooks/useScrollIntoView.ts | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index 346b701e..c22a3d8c 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -610,7 +610,6 @@ function SidebarItem({
   children,
 }: SidebarItemProps) {
   const ref = useRef<HTMLLIElement>(null);
-  useScrollIntoView(ref.current, selected);
 
   const [, connectDrop] = useDrop<DragItem, void>(
     {
@@ -670,6 +669,8 @@ function SidebarItem({
   const isActive = activeRequest?.id === itemId;
   const createDropdownItems = useCreateDropdownItems({ folderId: itemId });
 
+  useScrollIntoView(ref.current, isActive);
+
   const handleSubmitNameEdit = useCallback(
     (el: HTMLInputElement) => {
       if (itemModel === 'http_request') {
diff --git a/src-web/hooks/useScrollIntoView.ts b/src-web/hooks/useScrollIntoView.ts
index 204bb410..0881c660 100644
--- a/src-web/hooks/useScrollIntoView.ts
+++ b/src-web/hooks/useScrollIntoView.ts
@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 
-export function useScrollIntoView<T extends HTMLElement>(node: T | null, active: boolean) {
+export function useScrollIntoView<T extends HTMLElement>(node: T | null, enabled: boolean) {
   useEffect(() => {
-    if (active) {
-      node?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    if (enabled) {
+      node?.scrollIntoView({ block: 'nearest' });
     }
-  }, [active, node]);
+  }, [enabled, node]);
 }