From e065ba749f63fb203eee5bb68612e7e0e12de5ff Mon Sep 17 00:00:00 2001
From: BiggerRain <15911122312@163.COM>
Date: Mon, 26 May 2025 15:44:05 +0800
Subject: [PATCH] chore: assistant keyboard events and mouse events (#559)

* chore: assistant keyboard events and mouse events

* docs: update notes
---
 docs/content.en/docs/release-notes/_index.md |   1 +
 src/components/Assistant/AssistantItem.tsx   |  70 +++++++++++
 src/components/Assistant/AssistantList.tsx   | 122 +++++++------------
 src/components/Common/Pagination.tsx         |  39 ++++++
 src/components/Search/MCPPopover.tsx         |  38 +++---
 src/components/Search/SearchPopover.tsx      |  38 +++---
 6 files changed, 182 insertions(+), 126 deletions(-)
 create mode 100644 src/components/Assistant/AssistantItem.tsx
 create mode 100644 src/components/Common/Pagination.tsx

diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
index 94791fad..d2a885e1 100644
--- a/docs/content.en/docs/release-notes/_index.md
+++ b/docs/content.en/docs/release-notes/_index.md
@@ -74,6 +74,7 @@ Information about release notes of Coco Server is provided here.
 - chore: add global login judgment #544
 - chore: mark server offline on user logout #546
 - chore: logout update server profile #549
+- chore: assistant keyboard events and mouse events #559
 
 ## 0.4.0 (2025-04-27)
 
diff --git a/src/components/Assistant/AssistantItem.tsx b/src/components/Assistant/AssistantItem.tsx
new file mode 100644
index 00000000..ac8ba377
--- /dev/null
+++ b/src/components/Assistant/AssistantItem.tsx
@@ -0,0 +1,70 @@
+import { memo } from "react";
+import clsx from "clsx";
+import { Check } from "lucide-react";
+
+import VisibleKey from "@/components/Common/VisibleKey";
+import FontIcon from "@/components/Common/Icons/FontIcon";
+import logoImg from "@/assets/icon.svg";
+
+interface AssistantItemProps {
+  _id: string;
+  _source?: {
+    icon?: string;
+    name?: string;
+    description?: string;
+  };
+  name?: string;
+  isActive: boolean;
+  isHighlight: boolean;
+  isKeyboardActive: boolean;
+  onClick: () => void;
+}
+
+const AssistantItem = memo(
+  ({
+    _id,
+    _source,
+    name,
+    isActive,
+    isHighlight,
+    isKeyboardActive = false,
+    onClick,
+  }: AssistantItemProps) => (
+    <button
+      key={_id}
+      className={clsx(
+        "w-full flex items-center h-[50px] gap-2 rounded-lg p-2 mb-1 transition",
+        {
+          "hover:bg-[#E6E6E6] dark:hover:bg-[#1F2937]": !isKeyboardActive,
+          "bg-[#E6E6E6] dark:bg-[#1F2937]": isHighlight || isActive,
+        }
+      )}
+      onClick={onClick}
+    >
+      <div className="flex items-center justify-center size-6 bg-white border border-[#E6E6E6] rounded-full overflow-hidden">
+        {_source?.icon?.startsWith("font_") ? (
+          <FontIcon name={_source?.icon} className="size-4" />
+        ) : (
+          <img src={logoImg} className="size-4" alt={name} />
+        )}
+      </div>
+      <div className="text-left flex-1 min-w-0">
+        <div className="font-medium text-gray-900 dark:text-white truncate">
+          {_source?.name || "-"}
+        </div>
+        <div className="text-xs text-gray-500 dark:text-gray-400 truncate">
+          {_source?.description || ""}
+        </div>
+      </div>
+      {isActive && (
+        <div className="flex items-center">
+          <VisibleKey shortcut="↓↑" shortcutClassName="w-6 -translate-x-4">
+            <Check className="w-4 h-4 text-gray-500 dark:text-gray-400" />
+          </VisibleKey>
+        </div>
+      )}
+    </button>
+  )
+);
+
+export default AssistantItem;
\ No newline at end of file
diff --git a/src/components/Assistant/AssistantList.tsx b/src/components/Assistant/AssistantList.tsx
index 5cf1f40d..5da62886 100644
--- a/src/components/Assistant/AssistantList.tsx
+++ b/src/components/Assistant/AssistantList.tsx
@@ -1,19 +1,9 @@
 import { useState, useRef, useCallback } from "react";
-import {
-  ChevronDownIcon,
-  RefreshCw,
-  Check,
-  ChevronLeft,
-  ChevronRight,
-} from "lucide-react";
+import { ChevronDownIcon, RefreshCw } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { isNil } from "lodash-es";
 import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
-import {
-  useDebounce,
-  useKeyPress,
-  usePagination,
-} from "ahooks";
+import { useDebounce, useKeyPress, usePagination } from "ahooks";
 import clsx from "clsx";
 
 import logoImg from "@/assets/icon.svg";
@@ -24,6 +14,8 @@ import { useShortcutsStore } from "@/stores/shortcutsStore";
 import NoDataImage from "@/components/Common/NoDataImage";
 import PopoverInput from "@/components/Common/PopoverInput";
 import { AssistantFetcher } from "./AssistantFetcher";
+import AssistantItem from "./AssistantItem";
+import Pagination from "@/components/Common/Pagination";
 
 interface AssistantListProps {
   assistantIDs?: string[];
@@ -67,6 +59,9 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
     setTimeout(() => setIsRefreshing(false), 1000);
   };
 
+  const [highlightIndex, setHighlightIndex] = useState<number>(-1);
+  const [isKeyboardActive, setIsKeyboardActive] = useState(false);
+
   useKeyPress(
     ["uparrow", "downarrow", "enter"],
     (event, key) => {
@@ -77,9 +72,7 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
       event.stopPropagation();
       event.preventDefault();
 
-      if (key === "enter") {
-        return popoverButtonRef.current?.click();
-      }
+      setIsKeyboardActive(true);
 
       const index = assistants.findIndex(
         (item) => item._id === currentAssistant?._id
@@ -88,15 +81,20 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
 
       if (length <= 1) return;
 
-      let nextIndex = index;
+      let nextIndex = highlightIndex === -1 ? index : highlightIndex;
 
       if (key === "uparrow") {
-        nextIndex = index > 0 ? index - 1 : length - 1;
-      } else {
-        nextIndex = index < length - 1 ? index + 1 : 0;
+        nextIndex = nextIndex > 0 ? nextIndex - 1 : length - 1;
+      } else if (key === "downarrow") {
+        nextIndex = nextIndex < length - 1 ? nextIndex + 1 : 0;
       }
 
-      setCurrentAssistant(assistants[nextIndex]);
+      if (key === "enter") {
+        setCurrentAssistant(assistants[nextIndex]);
+        return popoverButtonRef.current?.click();
+      }
+
+      setHighlightIndex(nextIndex);
     },
     {
       target: popoverRef,
@@ -117,6 +115,11 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
     pagination.changeCurrent(pagination.current + 1);
   }, [pagination]);
 
+  const handleMouseMove = useCallback(() => {
+    setHighlightIndex(-1);
+    setIsKeyboardActive(false);
+  }, []);
+
   return (
     <div className="relative">
       <Popover ref={popoverRef}>
@@ -151,7 +154,10 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
           </VisibleKey>
         </PopoverButton>
 
-        <PopoverPanel className="absolute z-50 top-full mt-1 left-0 w-60 rounded-xl bg-white dark:bg-[#202126] p-3 text-sm/6 text-[#333] dark:text-[#D8D8D8] shadow-lg border dark:border-white/10 focus:outline-none max-h-[calc(100vh-80px)] overflow-y-auto">
+        <PopoverPanel
+          className="absolute z-50 top-full mt-1 left-0 w-60 rounded-xl bg-white dark:bg-[#202126] p-3 text-sm/6 text-[#333] dark:text-[#D8D8D8] shadow-lg border dark:border-white/10 focus:outline-none max-h-[calc(100vh-80px)] overflow-y-auto"
+          onMouseMove={handleMouseMove}
+        >
           <div className="flex items-center justify-between text-sm font-bold">
             <div>
               {t("assistant.popover.title")}（{pagination.total}）
@@ -197,73 +203,29 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
 
           {assistants.length > 0 ? (
             <>
-              {assistants.map((assistant) => {
-                const { _id, _source, name } = assistant;
-
-                const isActive = currentAssistant?._id === _id;
-
+              {assistants.map((assistant, index) => {
                 return (
-                  <button
-                    key={_id}
-                    className={clsx(
-                      "w-full flex items-center h-[50px] gap-2 rounded-lg p-2 mb-1 hover:bg-[#E6E6E6] dark:hover:bg-[#1F2937] transition",
-                      {
-                        "bg-[#E6E6E6] dark:bg-[#1F2937]": isActive,
-                      }
-                    )}
+                  <AssistantItem
+                    key={assistant._id}
+                    {...assistant}
+                    isActive={currentAssistant?._id === assistant._id}
+                    isHighlight={highlightIndex === index}
+                    isKeyboardActive={isKeyboardActive}
                     onClick={() => {
                       setCurrentAssistant(assistant);
                       popoverButtonRef.current?.click();
                     }}
-                  >
-                    <div className="flex items-center justify-center size-6 bg-white border border-[#E6E6E6] rounded-full overflow-hidden">
-                      {_source?.icon?.startsWith("font_") ? (
-                        <FontIcon name={_source?.icon} className="size-4" />
-                      ) : (
-                        <img src={logoImg} className="size-4" alt={name} />
-                      )}
-                    </div>
-                    <div className="text-left flex-1 min-w-0">
-                      <div className="font-medium text-gray-900 dark:text-white truncate">
-                        {_source?.name || "-"}
-                      </div>
-                      <div className="text-xs text-gray-500 dark:text-gray-400 truncate">
-                        {_source?.description || ""}
-                      </div>
-                    </div>
-                    {isActive && (
-                      <div className="flex items-center">
-                        <VisibleKey
-                          shortcut="↓↑"
-                          shortcutClassName="w-6 -translate-x-4"
-                        >
-                          <Check className="w-4 h-4 text-gray-500 dark:text-gray-400" />
-                        </VisibleKey>
-                      </div>
-                    )}
-                  </button>
+                  />
                 );
               })}
 
-              <div className="flex items-center justify-between h-8 -mx-3 -mb-3 px-3 text-[#999] border-t dark:border-t-white/10">
-                <VisibleKey shortcut="leftarrow" onKeyPress={handlePrev}>
-                  <ChevronLeft
-                    className="size-4 cursor-pointer"
-                    onClick={handlePrev}
-                  />
-                </VisibleKey>
-
-                <div className="text-xs">
-                  {pagination.current}/{pagination.totalPage}
-                </div>
-
-                <VisibleKey shortcut="rightarrow" onKeyPress={handleNext}>
-                  <ChevronRight
-                    className="size-4 cursor-pointer"
-                    onClick={handleNext}
-                  />
-                </VisibleKey>
-              </div>
+              <Pagination
+                current={pagination.current}
+                totalPage={pagination.totalPage}
+                onPrev={handlePrev}
+                onNext={handleNext}
+                className="-mx-3 -mb-3"
+              />
             </>
           ) : (
             <div className="flex justify-center items-center py-2">
diff --git a/src/components/Common/Pagination.tsx b/src/components/Common/Pagination.tsx
new file mode 100644
index 00000000..67657b8d
--- /dev/null
+++ b/src/components/Common/Pagination.tsx
@@ -0,0 +1,39 @@
+import { ChevronLeft, ChevronRight } from "lucide-react";
+
+import VisibleKey from "./VisibleKey";
+
+interface PaginationProps {
+  current: number;
+  totalPage: number;
+  onPrev: () => void;
+  onNext: () => void;
+  className?: string;
+}
+
+function Pagination({
+  current,
+  totalPage,
+  onPrev,
+  onNext,
+  className = "",
+}: PaginationProps) {
+  return (
+    <div
+      className={`flex items-center justify-between h-8 px-3 text-[#999] border-t dark:border-t-white/10 ${className}`}
+    >
+      <VisibleKey shortcut="leftarrow" onKeyPress={onPrev}>
+        <ChevronLeft className="size-4 cursor-pointer" onClick={onPrev} />
+      </VisibleKey>
+
+      <div className="text-xs">
+        {current}/{totalPage}
+      </div>
+
+      <VisibleKey shortcut="rightarrow" onKeyPress={onNext}>
+        <ChevronRight className="size-4 cursor-pointer" onClick={onNext} />
+      </VisibleKey>
+    </div>
+  );
+}
+
+export default Pagination;
diff --git a/src/components/Search/MCPPopover.tsx b/src/components/Search/MCPPopover.tsx
index 6ec46161..0fae34f5 100644
--- a/src/components/Search/MCPPopover.tsx
+++ b/src/components/Search/MCPPopover.tsx
@@ -1,13 +1,6 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
-import {
-  ChevronDownIcon,
-  RefreshCw,
-  Layers,
-  Hammer,
-  ChevronRight,
-  ChevronLeft,
-} from "lucide-react";
+import { ChevronDownIcon, RefreshCw, Layers, Hammer } from "lucide-react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { useDebounce } from "ahooks";
@@ -21,7 +14,8 @@ import { useShortcutsStore } from "@/stores/shortcutsStore";
 import VisibleKey from "@/components/Common/VisibleKey";
 import { useChatStore } from "@/stores/chatStore";
 import NoDataImage from "@/components/Common/NoDataImage";
-import PopoverInput from "../Common/PopoverInput";
+import PopoverInput from "@/components/Common/PopoverInput";
+import Pagination from "@/components/Common/Pagination";
 
 interface MCPPopoverProps {
   isMCPActive: boolean;
@@ -287,7 +281,11 @@ export default function MCPPopover({
                               ) : (
                                 <CommonIcon
                                   item={item}
-                                  renderOrder={["item_icon", "connector_icon", "default_icon"]}
+                                  renderOrder={[
+                                    "item_icon",
+                                    "connector_icon",
+                                    "default_icon",
+                                  ]}
                                   itemIcon={item.icon}
                                   className="size-4"
                                 />
@@ -329,19 +327,13 @@ export default function MCPPopover({
                 </div>
 
                 {visibleList.length > 0 && (
-                  <div className="flex items-center justify-between h-8 px-3 border-t dark:border-t-[#202126]">
-                    <VisibleKey shortcut="leftarrow" onKeyPress={handlePrev}>
-                      <ChevronLeft className="size-4" onClick={handlePrev} />
-                    </VisibleKey>
-
-                    <div className="text-xs">
-                      {page}/{totalPage}
-                    </div>
-
-                    <VisibleKey shortcut="rightarrow" onKeyPress={handleNext}>
-                      <ChevronRight className="size-4" onClick={handleNext} />
-                    </VisibleKey>
-                  </div>
+                  <Pagination
+                    current={page}
+                    totalPage={totalPage}
+                    onPrev={handlePrev}
+                    onNext={handleNext}
+                    className="dark:border-t-[#202126]"
+                  />
                 )}
               </div>
             </PopoverPanel>
diff --git a/src/components/Search/SearchPopover.tsx b/src/components/Search/SearchPopover.tsx
index 62e19a5e..e5902558 100644
--- a/src/components/Search/SearchPopover.tsx
+++ b/src/components/Search/SearchPopover.tsx
@@ -1,13 +1,6 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
-import {
-  ChevronDownIcon,
-  RefreshCw,
-  Layers,
-  Globe,
-  ChevronRight,
-  ChevronLeft,
-} from "lucide-react";
+import { ChevronDownIcon, RefreshCw, Layers, Globe } from "lucide-react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { useDebounce } from "ahooks";
@@ -21,7 +14,8 @@ import { useShortcutsStore } from "@/stores/shortcutsStore";
 import VisibleKey from "@/components/Common/VisibleKey";
 import { useChatStore } from "@/stores/chatStore";
 import NoDataImage from "@/components/Common/NoDataImage";
-import PopoverInput from "../Common/PopoverInput";
+import PopoverInput from "@/components/Common/PopoverInput";
+import Pagination from "@/components/Common/Pagination";
 
 interface SearchPopoverProps {
   isSearchActive: boolean;
@@ -292,7 +286,11 @@ export default function SearchPopover({
                               ) : (
                                 <CommonIcon
                                   item={item}
-                                  renderOrder={["item_icon", "connector_icon", "default_icon"]}
+                                  renderOrder={[
+                                    "item_icon",
+                                    "connector_icon",
+                                    "default_icon",
+                                  ]}
                                   itemIcon={item.icon}
                                   className="size-4"
                                 />
@@ -334,19 +332,13 @@ export default function SearchPopover({
                 </div>
 
                 {visibleList.length > 0 && (
-                  <div className="flex items-center justify-between h-8 px-3 border-t dark:border-t-[#202126]">
-                    <VisibleKey shortcut="leftarrow" onKeyPress={handlePrev}>
-                      <ChevronLeft className="size-4" onClick={handlePrev} />
-                    </VisibleKey>
-
-                    <div className="text-xs">
-                      {page}/{totalPage}
-                    </div>
-
-                    <VisibleKey shortcut="rightarrow" onKeyPress={handleNext}>
-                      <ChevronRight className="size-4" onClick={handleNext} />
-                    </VisibleKey>
-                  </div>
+                  <Pagination
+                    current={page}
+                    totalPage={totalPage}
+                    onPrev={handlePrev}
+                    onNext={handleNext}
+                    className="dark:border-t-[#202126]"
+                  />
                 )}
               </div>
             </PopoverPanel>