From a42fe4d3502e0b15df44422f31e5355802f8b139 Mon Sep 17 00:00:00 2001
From: Ben Senescu <44480372+bensenescu@users.noreply.github.com>
Date: Mon, 4 May 2026 14:04:44 -0400
Subject: [PATCH] keywords: consolidate export buttons into dropdown (#147)

---
 .../page/KeywordResearchDesktopResults.tsx    | 64 +++++++++++++------
 .../page/KeywordResearchMobileResults.tsx     | 63 +++++++++++++-----
 2 files changed, 92 insertions(+), 35 deletions(-)

diff --git a/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx b/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx
index d72bace..42d24ab 100644
--- a/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx
+++ b/src/client/features/keywords/page/KeywordResearchDesktopResults.tsx
@@ -1,12 +1,15 @@
 import {
+  ChevronDown,
+  Download,
   FileDown,
   Globe,
   RotateCcw,
   Save,
+  Sheet,
   SlidersHorizontal,
 } from "lucide-react";
-import { ExportToSheetsButton } from "@/client/components/table/ExportToSheetsButton";
 import { KEYWORD_RESEARCH_HEADERS } from "@/client/features/keywords/state/keywordControllerActions";
+import { exportTableToSheets } from "@/client/lib/exportToSheets";
 import {
   AreaTrendChart,
   KeywordRow,
@@ -121,6 +124,15 @@ function DesktopTableCard({ controller }: Props) {
         ? `Showing ${filteredRows.length} of ${rows.length} keywords`
         : `Showing ${filteredRows.length} keywords`;
 
+  const canExport = filteredRows.length > 0;
+  const handleExportToSheets = () => {
+    void exportTableToSheets({
+      headers: KEYWORD_RESEARCH_HEADERS,
+      rows: sheetsExportRows,
+      feature: "keyword_research",
+    });
+  };
+
   return (
     <div className="flex-1 flex flex-col min-w-0 border border-base-300 rounded-xl bg-base-100 overflow-hidden">
       <div className="shrink-0 flex items-center gap-2 px-4 py-2 border-b border-base-300">
@@ -149,20 +161,34 @@ function DesktopTableCard({ controller }: Props) {
           <Save className="size-3.5" />
           <span className="hidden lg:inline">Save Keywords</span>
         </button>
-        <ExportToSheetsButton
-          headers={KEYWORD_RESEARCH_HEADERS}
-          rows={sheetsExportRows}
-          feature="keyword_research"
-          className="btn-sm"
-        />
-        <button
-          className="btn btn-ghost btn-sm gap-1"
-          onClick={controller.exportCsv}
-          disabled={filteredRows.length === 0}
-        >
-          <FileDown className="size-3.5" />
-          <span className="hidden lg:inline">Export CSV</span>
-        </button>
+        <div className="dropdown dropdown-end">
+          <div
+            tabIndex={0}
+            role="button"
+            className={`btn btn-ghost btn-sm gap-1 ${!canExport ? "btn-disabled" : ""}`}
+          >
+            <Download className="size-3.5" />
+            <span className="hidden lg:inline">Export</span>
+            <ChevronDown className="size-3 opacity-60" />
+          </div>
+          <ul
+            tabIndex={0}
+            className="dropdown-content z-10 menu p-2 shadow-lg bg-base-100 border border-base-300 rounded-box w-56"
+          >
+            <li>
+              <button onClick={handleExportToSheets} disabled={!canExport}>
+                <Sheet className="size-4" />
+                Export to Google Sheets
+              </button>
+            </li>
+            <li>
+              <button onClick={controller.exportCsv} disabled={!canExport}>
+                <FileDown className="size-4" />
+                Export CSV
+              </button>
+            </li>
+          </ul>
+        </div>
       </div>
 
       {showFilters ? <DesktopFilters controller={controller} /> : null}
@@ -330,9 +356,9 @@ function DesktopSerpPanel({ controller }: Props) {
     : "Last 12 available months";
 
   return (
-    <div className="order-1 xl:order-2 flex flex-col min-w-0 gap-2 xl:flex-1">
+    <div className="order-1 xl:order-2 flex flex-col min-w-0 gap-2 xl:flex-1 xl:overflow-y-auto">
       {overviewKeyword && overviewKeyword.trend.length > 0 ? (
-        <div className="shrink-0 border border-base-300 rounded-xl bg-base-100 px-4 py-3">
+        <div className="shrink-0 overflow-hidden border border-base-300 rounded-xl bg-base-100 px-4 py-3">
           <h4 className="text-sm font-semibold mb-1">
             Search Trends{" "}
             <span className="font-normal text-base-content/50">
@@ -343,7 +369,7 @@ function DesktopSerpPanel({ controller }: Props) {
         </div>
       ) : null}
 
-      <div className="flex-1 flex flex-col overflow-hidden border border-base-300 rounded-xl bg-base-100">
+      <div className="flex flex-col overflow-hidden border border-base-300 rounded-xl bg-base-100">
         <div className="shrink-0 px-4 py-3 border-b border-base-300">
           <h3 className="text-sm font-semibold flex items-center gap-1.5">
             <Globe className="size-3.5" />
@@ -355,7 +381,7 @@ function DesktopSerpPanel({ controller }: Props) {
             ) : null}
           </h3>
         </div>
-        <div className="flex-1 overflow-y-auto p-4">
+        <div className="p-4">
           <SerpAnalysisCard
             items={controller.serpResults}
             keyword={controller.activeSerpKeyword}
diff --git a/src/client/features/keywords/page/KeywordResearchMobileResults.tsx b/src/client/features/keywords/page/KeywordResearchMobileResults.tsx
index 4d656e7..3c6b198 100644
--- a/src/client/features/keywords/page/KeywordResearchMobileResults.tsx
+++ b/src/client/features/keywords/page/KeywordResearchMobileResults.tsx
@@ -1,6 +1,14 @@
-import { FileDown, RotateCcw, Save, SlidersHorizontal } from "lucide-react";
-import { ExportToSheetsButton } from "@/client/components/table/ExportToSheetsButton";
+import {
+  ChevronDown,
+  Download,
+  FileDown,
+  RotateCcw,
+  Save,
+  Sheet,
+  SlidersHorizontal,
+} from "lucide-react";
 import { KEYWORD_RESEARCH_HEADERS } from "@/client/features/keywords/state/keywordControllerActions";
+import { exportTableToSheets } from "@/client/lib/exportToSheets";
 import {
   KeywordCard,
   SerpAnalysisCard,
@@ -76,6 +84,15 @@ function MobileKeywordCards({ controller }: Props) {
         ? `Showing ${filteredRows.length} of ${rows.length}`
         : `Showing ${filteredRows.length} keywords`;
 
+  const canExport = filteredRows.length > 0;
+  const handleExportToSheets = () => {
+    void exportTableToSheets({
+      headers: KEYWORD_RESEARCH_HEADERS,
+      rows: sheetsExportRows,
+      feature: "keyword_research",
+    });
+  };
+
   return (
     <div className="flex-1 flex flex-col overflow-hidden">
       {controller.showApproximateMatchNotice ? (
@@ -113,20 +130,34 @@ function MobileKeywordCards({ controller }: Props) {
         >
           <Save className="size-3.5" />
         </button>
-        <ExportToSheetsButton
-          headers={KEYWORD_RESEARCH_HEADERS}
-          rows={sheetsExportRows}
-          feature="keyword_research"
-          iconOnly
-        />
-        <button
-          className="btn btn-ghost btn-xs"
-          onClick={controller.exportCsv}
-          disabled={filteredRows.length === 0}
-          title="Download CSV"
-        >
-          <FileDown className="size-3.5" />
-        </button>
+        <div className="dropdown dropdown-end">
+          <div
+            tabIndex={0}
+            role="button"
+            className={`btn btn-ghost btn-xs gap-1 ${!canExport ? "btn-disabled" : ""}`}
+            aria-label="Export"
+          >
+            <Download className="size-3.5" />
+            <ChevronDown className="size-3 opacity-60" />
+          </div>
+          <ul
+            tabIndex={0}
+            className="dropdown-content z-10 menu p-2 shadow-lg bg-base-100 border border-base-300 rounded-box w-56"
+          >
+            <li>
+              <button onClick={handleExportToSheets} disabled={!canExport}>
+                <Sheet className="size-4" />
+                Export to Google Sheets
+              </button>
+            </li>
+            <li>
+              <button onClick={controller.exportCsv} disabled={!canExport}>
+                <FileDown className="size-4" />
+                Export CSV
+              </button>
+            </li>
+          </ul>
+        </div>
       </div>
 
       {showFilters ? <MobileFilters controller={controller} /> : null}