Merge branch 'main' into feature/sidebar-ide-style

Author: MohamedAli1937

imagelab-frontend/src/components/Sidebar/CategorySection.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useMemo } from "react";
 import * as Blockly from "blockly";
 import {
   ChevronRight,
@@ -35,6 +35,7 @@ interface CategorySectionProps {
   previews: Map<string, BlockPreview>;
   disabledTypes: Set<string>;
   defaultOpen?: boolean;
+  searchQuery?: string;
 }
 
 export default function CategorySection({
@@ -43,28 +44,49 @@ export default function CategorySection({
   previews,
   disabledTypes,
   defaultOpen,
+  searchQuery = "",
 }: CategorySectionProps) {
   const [isOpen, setIsOpen] = useState(defaultOpen ?? false);
   const Icon = iconMap[category.icon];
 
+  const isSearching = searchQuery.trim().length > 0;
+
+  const filteredBlocks = useMemo(() => {
+    if (!isSearching) return category.blocks;
+    const lowerQuery = searchQuery.toLowerCase();
+    return category.blocks.filter((b) => b.label.toLowerCase().includes(lowerQuery));
+  }, [isSearching, searchQuery, category.blocks]);
+
+  const effectiveOpen = isSearching ? filteredBlocks.length > 0 : isOpen;
+
+  if (isSearching && filteredBlocks.length === 0) return null;
+
   return (
     <div className="border-b border-gray-200">
       <button
-        onClick={() => setIsOpen(!isOpen)}
-        className="w-full flex items-center gap-2 px-3 py-2 hover:bg-gray-50 transition-colors"
+        type="button"
+        onClick={() => {
+          if (!isSearching) setIsOpen((prev) => !prev);
+        }}
+        aria-expanded={effectiveOpen}
+        className={`w-full flex items-center gap-2 px-3 py-2 hover:bg-gray-50 transition-colors ${isSearching ? "cursor-default" : ""}`}
       >
-        {isOpen ? (
-          <ChevronDown size={14} className="text-gray-400" />
+        {effectiveOpen ? (
+          <ChevronDown size={14} className={isSearching ? "text-gray-200" : "text-gray-400"} />
         ) : (
-          <ChevronRight size={14} className="text-gray-400" />
+          <ChevronRight size={14} className={isSearching ? "text-gray-200" : "text-gray-400"} />
         )}
         {Icon && <Icon size={16} color={category.colour} />}
         <span className="text-sm font-medium text-gray-700">{category.name}</span>
-        <span className="ml-auto text-xs text-gray-400 font-normal">{category.blocks.length}</span>
+        <span className="ml-auto text-xs text-gray-400 font-normal">
+          {isSearching
+            ? `${filteredBlocks.length}/${category.blocks.length}`
+            : category.blocks.length}
+        </span>
       </button>
-      {isOpen && (
+      {effectiveOpen && (
         <div className="pb-1 pl-2">
-          {category.blocks.map((block) => (
+          {filteredBlocks.map((block) => (
             <BlockItem
               key={block.type}
               type={block.type}

imagelab-frontend/src/components/Sidebar/Sidebar.tsx

@@ -4,6 +4,7 @@ import { categories } from "../../blocks/categories";
 import { useBlockPreviews } from "../../hooks/useBlockPreviews";
 import { SINGLETON_BLOCK_TYPES } from "../../utils/blockLimits";
 import CategorySection from "./CategorySection";
+import { Search, X } from "lucide-react";
 
 interface SidebarProps {
   workspace: Blockly.WorkspaceSvg | null;
@@ -20,6 +21,7 @@ export default function Sidebar({
 }: SidebarProps) {
   const previews = useBlockPreviews();
   const [tick, setTick] = useState(0);
+  const [query, setQuery] = useState("");
 
   useEffect(() => {
     if (!workspace) return;
@@ -56,6 +58,44 @@ export default function Sidebar({
     >
       <div className="px-3 py-2 border-b border-gray-200 min-w-[200px]">
         <h2 className="text-xs font-semibold text-gray-500 uppercase tracking-wider">Blocks</h2>
+        <div className="relative">
+          <Search
+            size={12}
+            className="absolute left-2.5 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none"
+          />
+          <input
+            type="text"
+            aria-label="Search blocks"
+            value={query}
+            onChange={(e) => setQuery(e.target.value)}
+            placeholder="Search blocks..."
+            className="w-full pl-7 pr-7 py-1.5 text-xs border border-gray-200 rounded-md bg-gray-50 focus:outline-none focus:ring-1 focus:ring-indigo-400 focus:border-indigo-400 placeholder-gray-400"
+          />
+          {query && (
+            <button
+              type="button"
+              title="Clear search"
+              aria-label="Clear search"
+              onClick={() => setQuery("")}
+              className="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600"
+            >
+              <X size={12} aria-hidden="true" />
+            </button>
+          )}
+        </div>
+      </div>
+      <div className="overflow-y-auto flex-1">
+        {categories.map((category) => (
+          <CategorySection
+            key={category.name}
+            category={category}
+            workspace={workspace}
+            previews={previews}
+            disabledTypes={presentSingletons}
+            defaultOpen={category.name === "Basic"}
+            searchQuery={query}
+          />
+        ))}
       </div>
       <div className="flex-1 overflow-y-auto min-w-[200px]">
         {categories.map((category) => (