chore: enhance Autocomplete

web/components/routes/public/Autocomplete.tsx

@@ -1,10 +1,9 @@
-"use client"
+import React, { useState, useRef, useCallback, useMemo, useEffect } from "react"
-
-import React, { useState, useRef, useCallback, useMemo } from "react"
 import { Command, CommandGroup, CommandItem, CommandList } from "@/components/ui/command"
 import { Command as CommandPrimitive } from "cmdk"
 import { motion, AnimatePresence } from "framer-motion"
-import { cn, searchSafeRegExp } from "@/lib/utils"
+import { cn, searchSafeRegExp, shuffleArray } from "@/lib/utils"
+import { useMountedState } from "react-use"
 
 interface GraphNode {
 	name: string
@@ -20,22 +19,30 @@ interface AutocompleteProps {
 
 export function Autocomplete({ topics = [], onSelect, onInputChange }: AutocompleteProps): JSX.Element {
 	const inputRef = useRef<HTMLInputElement>(null)
+	const isMounted = useMountedState()
 	const [open, setOpen] = useState(false)
 	const [inputValue, setInputValue] = useState("")
+	const [isInitialOpen, setIsInitialOpen] = useState(true)
+	const [hasInteracted, setHasInteracted] = useState(false)
+
+	const initialShuffledTopics = useMemo(() => shuffleArray(topics).slice(0, 5), [topics])
 
 	const filteredTopics = useMemo(() => {
 		if (!inputValue) {
-			return topics.slice(0, 5)
+			return initialShuffledTopics
 		}
 
 		const regex = searchSafeRegExp(inputValue)
-		return topics.filter(
+		return topics
+			.filter(
 				topic =>
 					regex.test(topic.name) ||
 					regex.test(topic.prettyName) ||
 					topic.connectedTopics.some(connectedTopic => regex.test(connectedTopic))
 			)
-	}, [inputValue, topics])
+			.sort((a, b) => a.prettyName.localeCompare(b.prettyName))
+			.slice(0, 10)
+	}, [inputValue, topics, initialShuffledTopics])
 
 	const handleSelect = useCallback(
 		(topic: GraphNode) => {
@@ -52,62 +59,96 @@ export function Autocomplete({ topics = [], onSelect, onInputChange }: Autocompl
 				handleSelect(filteredTopics[0])
 			} else if ((e.key === "Backspace" || e.key === "Delete") && inputRef.current?.value === "") {
 				setOpen(true)
+				setIsInitialOpen(true)
+			}
+			if (!hasInteracted) {
+				setHasInteracted(true)
 			}
 		},
-		[filteredTopics, handleSelect]
+		[filteredTopics, handleSelect, hasInteracted]
 	)
 
 	const handleInputChange = useCallback(
 		(value: string) => {
 			setInputValue(value)
 			setOpen(true)
+			setIsInitialOpen(false)
 			onInputChange(value)
+			if (!hasInteracted) {
+				setHasInteracted(true)
+			}
 		},
-		[onInputChange]
+		[onInputChange, hasInteracted]
 	)
 
+	const commandKey = useMemo(() => {
+		return filteredTopics
+			.map(topic => `${topic.name}:${topic.prettyName}:${topic.connectedTopics.join(",")}`)
+			.join("__")
+	}, [filteredTopics])
+
+	useEffect(() => {
+		if (inputRef.current && isMounted() && hasInteracted) {
+			inputRef.current.focus()
+		}
+	}, [commandKey, isMounted, hasInteracted])
+
+	const animationProps = {
+		initial: { opacity: 0, y: -10 },
+		animate: { opacity: 1, y: 0 },
+		exit: { opacity: 0, y: -10 },
+		transition: { duration: 0.1 }
+	}
+
 	return (
 		<Command
-			className={cn("bg-background relative overflow-visible", {
+			key={commandKey}
+			className={cn("relative overflow-visible", {
 				"rounded-lg border": !open,
 				"rounded-none rounded-t-lg border-l border-r border-t": open
 			})}
 			onKeyDown={handleKeyDown}
 		>
-			<div className="flex items-center p-2">
+			<div className={"relative flex items-center px-2 py-3"}>
 				<CommandPrimitive.Input
 					ref={inputRef}
 					value={inputValue}
 					onValueChange={handleInputChange}
-					onBlur={() => setTimeout(() => setOpen(false), 100)}
+					onBlur={() => {
-					onFocus={() => setOpen(true)}
+						setTimeout(() => {
+							setOpen(false)
+							setIsInitialOpen(true)
+						}, 100)
+					}}
+					onFocus={() => {
+						setOpen(true)
+						setIsInitialOpen(true)
+						if (!hasInteracted) {
+							setHasInteracted(true)
+						}
+					}}
 					placeholder="Search for a topic..."
-					className={cn("placeholder:text-muted-foreground flex-1 bg-transparent px-2 py-1 outline-none", {
+					className={cn("placeholder:text-muted-foreground flex-1 bg-transparent px-2 outline-none")}
-						"mb-1 border-b pb-2.5": open
-					})}
 				/>
 			</div>
 			<div className="relative">
 				<AnimatePresence>
 					{open && (
 						<motion.div
-							initial={{ opacity: 0, y: -10 }}
+							{...(isInitialOpen ? animationProps : {})}
-							animate={{ opacity: 1, y: 0 }}
+							className="bg-background absolute left-0 right-0 z-10 -mx-px rounded-b-lg border-b border-l border-r border-t shadow-lg"
-							exit={{ opacity: 0, y: -10 }}
-							transition={{ duration: 0.1 }}
-							className="bg-background absolute left-0 right-0 z-10 -mx-px rounded-b-lg border-b border-l border-r shadow-lg"
 						>
-							<CommandList className="max-h-52">
+							<CommandList className="max-h-56">
-								<CommandGroup className="mb-2">
+								<CommandGroup className="my-2">
-									{filteredTopics.map(topic => (
+									{filteredTopics.map((topic, index) => (
 										<CommandItem
-											key={topic.name}
+											key={index}
 											onSelect={() => handleSelect(topic)}
 											className="min-h-10 rounded-none px-3 py-1.5"
 										>
 											<span>{topic.prettyName}</span>
 											<span className="text-muted-foreground ml-auto text-xs">
-												{topic.connectedTopics.length > 0 ? topic.connectedTopics.join(", ") : "-"}
+												{topic.connectedTopics.length > 0 && topic.connectedTopics.join(", ")}
 											</span>
 										</CommandItem>
 									))}