From 76ec792fe575ac1b8caca8222610cbf6bda75fd9 Mon Sep 17 00:00:00 2001
From: Red Adaya <red.adaya@gmail.com>
Date: Mon, 9 Dec 2024 14:36:48 +0800
Subject: [PATCH] refactor showing/hiding of separator for hover and active
 states

---
 frontend/app/tab/tab.scss   | 10 ----------
 frontend/app/tab/tab.tsx    | 30 +++++++++++++++++++++++++-----
 frontend/app/tab/tabbar.tsx |  1 +
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/frontend/app/tab/tab.scss b/frontend/app/tab/tab.scss
index d3270b44c..20a38033c 100644
--- a/frontend/app/tab/tab.scss
+++ b/frontend/app/tab/tab.scss
@@ -49,11 +49,6 @@
         .name {
             color: var(--main-text-color);
         }
-
-		& + .tab .separator,
-		.separator {
-			opacity: 0;
-		}
     }
 
     .name {
@@ -102,11 +97,6 @@
 
 // Only apply hover effects when not in nohover mode. This prevents the previously-hovered tab from remaining hovered while a tab view is not mounted.
 body:not(.nohover) .tab:hover {
-    & + .tab::after,
-    &::after {
-        content: none;
-    }
-
     .tab-inner {
         border-color: transparent;
         background: rgb(from var(--main-text-color) r g b / 0.07);
diff --git a/frontend/app/tab/tab.tsx b/frontend/app/tab/tab.tsx
index 1dd2698ed..ff35a4d30 100644
--- a/frontend/app/tab/tab.tsx
+++ b/frontend/app/tab/tab.tsx
@@ -24,6 +24,7 @@ interface TabProps {
     isNew: boolean;
     isPinned: boolean;
     tabIds: string[];
+    tabRefs: React.MutableRefObject<React.RefObject<HTMLDivElement>[]>;
     onClick: () => void;
     onClose: (event: React.MouseEvent<HTMLButtonElement, MouseEvent> | null) => void;
     onMouseDown: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
@@ -46,6 +47,7 @@ const Tab = memo(
                 tabWidth,
                 isNew,
                 tabIds,
+                tabRefs,
                 onLoaded,
                 onClick,
                 onClose,
@@ -202,15 +204,33 @@ const Tab = memo(
 
             const showSeparator = useCallback(
                 (id) => {
-                    // if (isFirst) return false;
-
                     const idx = tabIds.indexOf(id);
-                    const found = tabIndicesMoved.find((i, ii) => ii !== 0 && i === idx) === undefined;
-                    return found;
+                    const found = tabIndicesMoved.find((i, ii) => ii !== 0 && i === idx);
+                    console.log("id**********", id);
+                    if (found) {
+                        console.log("found=====", tabIds[found]);
+                        console.log("tabIndicesMoved", tabIndicesMoved);
+                        return false;
+                    }
+                    return true;
                 },
                 [isFirst, tabIndicesMoved]
             );
 
+            useEffect(() => {
+                if (!isActive) return;
+
+                const idx = tabIds.indexOf(id);
+                const targetIds = [tabIds[idx], tabIds[idx + 1]];
+
+                tabRefs.current.forEach((ref) => {
+                    const separator = ref.current.querySelector(".separator") as HTMLElement;
+                    if (!separator) return;
+
+                    separator.style.opacity = targetIds.includes(ref.current.dataset.tabId) ? "0" : "1";
+                });
+            }, [id, isActive, tabIds, tabIndicesMoved]);
+
             return (
                 <div
                     ref={tabRef}
@@ -239,7 +259,7 @@ const Tab = memo(
                             suppressContentEditableWarning={true}
                         >
                             {tabData?.name}
-                            {/* {id.substring(id.length - 3)} */}
+                            {id.substring(id.length - 3)}
                         </div>
                         {isPinned ? (
                             <Button
diff --git a/frontend/app/tab/tabbar.tsx b/frontend/app/tab/tabbar.tsx
index 6bbdfccf4..8620af90b 100644
--- a/frontend/app/tab/tabbar.tsx
+++ b/frontend/app/tab/tabbar.tsx
@@ -668,6 +668,7 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
                                 tabIds={tabIds}
                                 onMouseEnter={() => handleMouseEnterTab(index)}
                                 onMouseLeave={() => handleMouseLeaveTab(index)}
+                                tabRefs={tabRefs}
                             />
                         );
                     })}