Merge remote-tracking branch 'origin/main' into search-modal-qol

Author: SeanCassiere

app/components/SearchModal.tsx

@@ -150,7 +150,7 @@ const Hit = ({ hit, isFocused }: { hit: any; isFocused?: boolean }) => {
                   alt={framework.label}
                   className="w-4"
                 />
-                {framework.label}
+                {capitalize(framework.label)}
               </div>
             </div>
           )
@@ -160,13 +160,13 @@ const Hit = ({ hit, isFocused }: { hit: any; isFocused?: boolean }) => {
   )
 }
 
-function CustomRefinementList() {
+function LibraryRefinement() {
   const subpathname = useRouterState({
     select: (state) => state.location.pathname.split('/')[1],
   })
 
   const { items, refine } = useRefinementList({
-    attribute: '_tags',
+    attribute: 'library',
     limit: 50,
     sortBy: ['isRefined:desc', 'count:desc', 'name:asc'],
   })
@@ -185,27 +185,99 @@ function CustomRefinementList() {
 
   return (
     <div className="overflow-x-auto scrollbar-hide">
-      <div className="flex gap-2 p-4 min-w-max">
-        {items.map((item) => {
-          const library = libraries.find((l) => l.id === item.value)
+      <div className="flex items-center gap-2 p-2 min-w-max">
+        <span className="text-xs font-medium text-gray-500 dark:text-gray-400 whitespace-nowrap">
+          Libraries:
+        </span>
+        <div className="flex gap-1.5">
+          {items.map((item) => {
+            const library = libraries.find((l) => l.id === item.value)
+
+            return (
+              <button
+                key={item.value}
+                onClick={() => refine(item.value)}
+                className={twMerge(
+                  'px-2 py-0.5 text-xs rounded-full transition-colors font-bold text-white',
+                  item.isRefined
+                    ? library
+                      ? library.bgStyle
+                      : 'bg-black dark:bg-white'
+                    : 'bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-700'
+                )}
+              >
+                {item.label} ({item.count.toLocaleString()})
+              </button>
+            )
+          })}
+        </div>
+      </div>
+    </div>
+  )
+}
 
-          return (
-            <button
-              key={item.value}
-              onClick={() => refine(item.value)}
-              className={twMerge(
-                'px-3 py-1 text-sm rounded-full transition-colors font-bold text-white',
-                item.isRefined
-                  ? library
-                    ? library.bgStyle
-                    : 'bg-black dark:bg-white'
-                  : 'bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-700'
-              )}
-            >
-              {capitalize(item.label)} ({item.count.toLocaleString()})
-            </button>
-          )
-        })}
+function FrameworkRefinement() {
+  const subpathname = useRouterState({
+    select: (state) => {
+      const path = state.location.pathname
+      const frameworkIndex = path.indexOf('/framework/')
+      if (frameworkIndex !== -1) {
+        return path.split('/')[
+          path.split('/').indexOf('framework') + 1
+        ] as string
+      }
+      return null
+    },
+  })
+
+  const { items, refine } = useRefinementList({
+    attribute: 'framework',
+    limit: 50,
+    sortBy: ['isRefined:desc', 'count:desc', 'name:asc'],
+  })
+
+  React.useEffect(() => {
+    if (!subpathname) return
+
+    const isAlreadyRefined = items.some(
+      (item) => item.value === subpathname && item.isRefined
+    )
+
+    const framework = frameworkOptions.find((f) => f.value === subpathname)
+
+    if (!isAlreadyRefined && framework) {
+      refine(subpathname)
+    }
+  }, [items, refine, subpathname])
+
+  return (
+    <div className="overflow-x-auto scrollbar-hide">
+      <div className="flex items-center gap-2 p-2 min-w-max">
+        <span className="text-xs font-medium text-gray-500 dark:text-gray-400 whitespace-nowrap">
+          Frameworks:
+        </span>
+        <div className="flex gap-1.5">
+          {items.map((item) => {
+            const framework = frameworkOptions.find(
+              (f) => f.value === item.value
+            )
+
+            return (
+              <button
+                key={item.value}
+                onClick={() => refine(item.value)}
+                className={twMerge(
+                  'px-2 py-0.5 text-xs rounded-full transition-colors font-bold text-white',
+                  item.isRefined
+                    ? framework?.color || 'bg-black dark:bg-white'
+                    : 'bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-400 hover:bg-gray-200 dark:hover:bg-gray-700'
+                )}
+              >
+                {capitalize(item.label)} ({item.count.toLocaleString()})
+              </button>
+            )
+          })}
+        </div>
       </div>
     </div>
   )
@@ -384,7 +456,8 @@ function SearchResults({ focusedIndex }: { focusedIndex: number }) {
 
   return (
     <>
-      <CustomRefinementList />
+      <LibraryRefinement />
+      <FrameworkRefinement />
       <div
         className="max-h-[80vh] lg:max-h-[60vh] overflow-y-auto"
         role="listbox"

app/libraries/index.tsx

@@ -20,15 +20,25 @@ import { pacerProject } from './pacer'
 // import { optimisticProject } from './optimistic'
 
 export const frameworkOptions = [
-  { label: 'React', value: 'react', logo: reactLogo },
-  { label: 'Preact', value: 'preact', logo: preactLogo },
-  { label: 'Vue', value: 'vue', logo: vueLogo },
-  { label: 'Angular', value: 'angular', logo: angularLogo },
-  { label: 'Solid', value: 'solid', logo: solidLogo },
-  { label: 'Lit', value: 'lit', logo: litLogo },
-  { label: 'Svelte', value: 'svelte', logo: svelteLogo },
-  { label: 'Qwik', value: 'qwik', logo: qwikLogo },
-  { label: 'Vanilla', value: 'vanilla', logo: jsLogo },
+  { label: 'React', value: 'react', logo: reactLogo, color: 'bg-blue-500' },
+  { label: 'Preact', value: 'preact', logo: preactLogo, color: 'bg-blue-400' },
+  { label: 'Vue', value: 'vue', logo: vueLogo, color: 'bg-green-500' },
+  {
+    label: 'Angular',
+    value: 'angular',
+    logo: angularLogo,
+    color: 'bg-red-500',
+  },
+  { label: 'Solid', value: 'solid', logo: solidLogo, color: 'bg-blue-600' },
+  { label: 'Lit', value: 'lit', logo: litLogo, color: 'bg-orange-500' },
+  {
+    label: 'Svelte',
+    value: 'svelte',
+    logo: svelteLogo,
+    color: 'bg-orange-600',
+  },
+  { label: 'Qwik', value: 'qwik', logo: qwikLogo, color: 'bg-purple-500' },
+  { label: 'Vanilla', value: 'vanilla', logo: jsLogo, color: 'bg-yellow-500' },
 ] as const
 
 export type Framework = (typeof frameworkOptions)[number]['value']