From 1b2c3f5dbf6974d9cda873e29ba78d343934fbd7 Mon Sep 17 00:00:00 2001
From: felistachio <felix.fourcolor@gmail.com>
Date: Sun, 21 Sep 2025 13:19:22 -0700
Subject: [PATCH] Hide also the tab buttons if there are only chapters

and small refactor
---
 src/popup/SegmentListComponent.tsx | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/popup/SegmentListComponent.tsx b/src/popup/SegmentListComponent.tsx
index 35bf9e7e..31c530b5 100644
--- a/src/popup/SegmentListComponent.tsx
+++ b/src/popup/SegmentListComponent.tsx
@@ -32,6 +32,14 @@ interface SegmentWithNesting extends SponsorTime {
     innerChapters?: (SegmentWithNesting|SponsorTime)[];
 }
 
+function isSegment(segment) {
+    return segment.actionType !== ActionType.Chapter;
+}
+
+function isChapter(segment) {
+    return segment.actionType === ActionType.Chapter;
+}
+
 export const SegmentListComponent = (props: SegmentListComponentProps) => {
     const [tab, setTab] = React.useState(SegmentListTab.Segments);
     const [isVip, setIsVip] = React.useState(Config.config?.isVip ?? false);
@@ -46,18 +54,25 @@ export const SegmentListComponent = (props: SegmentListComponentProps) => {
         }
     }, []);
 
+    const [hasSegments, hasChapters] = React.useMemo(() => {
+        const hasSegments = Boolean(props.segments.find(isSegment))
+        const hasChapters = Boolean(props.segments.find(isChapter))
+        return [hasSegments, hasChapters];
+    }, [props.segments]);
+
     React.useEffect(() => {
-        const hasSegments = props.segments.find(seg => seg.actionType !== ActionType.Chapter)
-        if (!hasSegments && props.segments.length > 0) {
+        if (hasSegments){
+            setTab(SegmentListTab.Segments);
+        } else {
             setTab(SegmentListTab.Chapter);
         }
-    }, [props.videoID, props.segments]);
+    }, [props.videoID, hasSegments]);
 
     const tabFilter = (segment: SponsorTime) => {
         if (tab === SegmentListTab.Chapter) {
-            return segment.actionType === ActionType.Chapter;
+            return isChapter(segment);
         } else {
-            return segment.actionType !== ActionType.Chapter;
+            return isSegment(segment);
         }
     };
 
@@ -99,7 +114,7 @@ export const SegmentListComponent = (props: SegmentListComponentProps) => {
 
     return (
         <div id="issueReporterContainer">
-            <div id="issueReporterTabs" className={props.segments && props.segments.find(s => s.actionType === ActionType.Chapter) ? "" : "hidden"}>
+            <div id="issueReporterTabs" className={hasSegments && hasChapters ? "" : "hidden"}>
                 <span id="issueReporterTabSegments" className={tab === SegmentListTab.Segments ? "sbSelected" : ""} onClick={() => {
                     setTab(SegmentListTab.Segments);
                 }}>