Merge branch 'main' into jg/test-types-app

Author: danielroe

app/components/AppHeader.vue

@@ -19,7 +19,7 @@ const showMobileMenu = shallowRef(false)
 const route = useRoute()
 const isMobile = useIsMobile()
 const isSearchExpandedManually = shallowRef(false)
-const searchBoxRef = shallowRef<{ focus: () => void } | null>(null)
+const searchBoxRef = useTemplateRef('searchBoxRef')
 
 // On search page, always show search expanded on mobile
 const isOnHomePage = computed(() => route.name === 'index')

app/components/CallToAction.vue

@@ -12,12 +12,12 @@ const socialLinks = {
       {{ $t('about.get_involved.title') }}
     </h2>
 
-    <div class="grid gap-4 sm:grid-cols-3">
+    <div class="grid gap-4 sm:grid-cols-3 sm:items-stretch sm:grid-rows-[auto,1fr,auto]">
       <a
         :href="socialLinks.github"
         target="_blank"
         rel="noopener noreferrer"
-        class="group flex flex-col gap-3 p-4 rounded-lg bg-bg-subtle hover:bg-bg-elevated border border-border hover:border-border-hover transition-all duration-200"
+        class="group grid gap-3 p-4 rounded-lg bg-bg-subtle hover:bg-bg-elevated border border-border hover:border-border-hover transition-all duration-200 sm:grid-rows-subgrid sm:row-span-3"
       >
         <div class="flex gap-2">
           <span class="i-carbon:logo-github shrink-0 mt-1 w-5 h-5 text-fg" aria-hidden="true" />
@@ -40,7 +40,7 @@ const socialLinks = {
         :href="socialLinks.discord"
         target="_blank"
         rel="noopener noreferrer"
-        class="group flex flex-col gap-3 p-4 rounded-lg bg-bg-subtle hover:bg-bg-elevated border border-border hover:border-border-hover transition-all duration-200"
+        class="group grid gap-3 p-4 rounded-lg bg-bg-subtle hover:bg-bg-elevated border border-border hover:border-border-hover transition-all duration-200 sm:grid-rows-subgrid sm:row-span-3"
       >
         <div class="flex gap-2">
           <span class="i-carbon:chat shrink-0 mt-1 w-5 h-5 text-fg" aria-hidden="true" />
@@ -63,7 +63,7 @@ const socialLinks = {
         :href="socialLinks.bluesky"
         target="_blank"
         rel="noopener noreferrer"
-        class="group flex flex-col gap-3 p-4 rounded-lg bg-bg-subtle hover:bg-bg-elevated border border-border hover:border-border-hover transition-all duration-200"
+        class="group grid gap-3 p-4 rounded-lg bg-bg-subtle hover:bg-bg-elevated border border-border hover:border-border-hover transition-all duration-200 sm:grid-rows-subgrid sm:row-span-3"
       >
         <div class="flex gap-2">
           <span class="i-simple-icons:bluesky shrink-0 mt-1 w-5 h-5 text-fg" aria-hidden="true" />

app/components/Filter/Panel.vue

@@ -8,8 +8,8 @@ import type {
 } from '#shared/types/preferences'
 import {
   DOWNLOAD_RANGES,
-  SEARCH_SCOPE_OPTIONS,
-  SECURITY_FILTER_OPTIONS,
+  SEARCH_SCOPE_VALUES,
+  SECURITY_FILTER_VALUES,
   UPDATED_WITHIN_OPTIONS,
 } from '#shared/types/preferences'
 
@@ -205,20 +205,20 @@ const hasActiveFilters = computed(() => !!filterSummary.value)
               :aria-label="$t('filters.search_scope')"
             >
               <button
-                v-for="option in SEARCH_SCOPE_OPTIONS"
-                :key="option.value"
+                v-for="scope in SEARCH_SCOPE_VALUES"
+                :key="scope"
                 type="button"
                 class="px-2 py-0.5 text-xs font-mono rounded-sm transition-colors duration-200 focus-visible:ring-2 focus-visible:ring-fg focus-visible:ring-offset-1"
                 :class="
-                  filters.searchScope === option.value
+                  filters.searchScope === scope
                     ? 'bg-bg-muted text-fg'
                     : 'text-fg-muted hover:text-fg'
                 "
-                :aria-pressed="filters.searchScope === option.value"
-                :title="$t(getScopeDescriptionKey(option.value))"
-                @click="emit('update:searchScope', option.value)"
+                :aria-pressed="filters.searchScope === scope"
+                :title="$t(getScopeDescriptionKey(scope))"
+                @click="emit('update:searchScope', scope)"
               >
-                {{ $t(getScopeLabelKey(option.value)) }}
+                {{ $t(getScopeLabelKey(scope)) }}
               </button>
             </div>
           </div>
@@ -301,18 +301,18 @@ const hasActiveFilters = computed(() => !!filterSummary.value)
           </legend>
           <div class="flex flex-wrap gap-2" role="radiogroup" :aria-label="$t('filters.security')">
             <button
-              v-for="option in SECURITY_FILTER_OPTIONS"
-              :key="option.value"
+              v-for="security in SECURITY_FILTER_VALUES"
+              :key="security"
               type="button"
               role="radio"
               disabled
-              :aria-checked="filters.security === option.value"
+              :aria-checked="filters.security === security"
               class="tag transition-colors duration-200 opacity-50 cursor-not-allowed focus-visible:ring-2 focus-visible:ring-fg focus-visible:ring-offset-1"
               :class="
-                filters.security === option.value ? 'bg-fg text-bg border-fg hover:text-bg/70' : ''
+                filters.security === security ? 'bg-fg text-bg border-fg hover:text-bg/70' : ''
               "
             >
-              {{ $t(getSecurityLabelKey(option.value)) }}
+              {{ $t(getSecurityLabelKey(security)) }}
             </button>
           </div>
         </fieldset>

app/components/Header/SearchBox.vue

@@ -80,7 +80,7 @@ function handleSearchFocus() {
 }
 
 // Expose focus method for parent components
-const inputRef = shallowRef<HTMLInputElement | null>(null)
+const inputRef = useTemplateRef('inputRef')
 function focus() {
   inputRef.value?.focus()
 }

app/components/Modal.client.vue

@@ -3,7 +3,7 @@ const props = defineProps<{
   modalTitle: string
 }>()
 
-const dialogRef = ref<HTMLDialogElement>()
+const dialogRef = useTemplateRef('dialogRef')
 
 const modalTitleId = computed(() => {
   const id = getCurrentInstance()?.attrs.id

app/components/Package/ClaimPackageModal.vue

@@ -96,7 +96,7 @@ async function handleClaim() {
   }
 }
 
-const dialogRef = ref<HTMLDialogElement>()
+const dialogRef = useTemplateRef('dialogRef')
 
 function open() {
   // Reset state and check availability each time modal is opened

app/components/compare/FacetSelector.vue

@@ -1,46 +1,36 @@
 <script setup lang="ts">
-import type { ComparisonFacet } from '#shared/types'
-import { FACET_INFO, FACETS_BY_CATEGORY, CATEGORY_ORDER } from '#shared/types/comparison'
-
-const { isFacetSelected, toggleFacet, selectCategory, deselectCategory } = useFacetSelection()
-
-// Enrich facets with their info for rendering
-const facetsByCategory = computed(() => {
-  const result: Record<
-    string,
-    { facet: ComparisonFacet; info: (typeof FACET_INFO)[ComparisonFacet] }[]
-  > = {}
-  for (const category of CATEGORY_ORDER) {
-    result[category] = FACETS_BY_CATEGORY[category].map(facet => ({
-      facet,
-      info: FACET_INFO[facet],
-    }))
-  }
-  return result
-})
+const {
+  isFacetSelected,
+  toggleFacet,
+  selectCategory,
+  deselectCategory,
+  facetsByCategory,
+  categoryOrder,
+  getCategoryLabel,
+} = useFacetSelection()
 
 // Check if all non-comingSoon facets in a category are selected
 function isCategoryAllSelected(category: string): boolean {
   const facets = facetsByCategory.value[category] ?? []
-  const selectableFacets = facets.filter(f => !f.info.comingSoon)
-  return selectableFacets.length > 0 && selectableFacets.every(f => isFacetSelected(f.facet))
+  const selectableFacets = facets.filter(f => !f.comingSoon)
+  return selectableFacets.length > 0 && selectableFacets.every(f => isFacetSelected(f.id))
 }
 
 // Check if no facets in a category are selected
 function isCategoryNoneSelected(category: string): boolean {
   const facets = facetsByCategory.value[category] ?? []
-  const selectableFacets = facets.filter(f => !f.info.comingSoon)
-  return selectableFacets.length > 0 && selectableFacets.every(f => !isFacetSelected(f.facet))
+  const selectableFacets = facets.filter(f => !f.comingSoon)
+  return selectableFacets.length > 0 && selectableFacets.every(f => !isFacetSelected(f.id))
 }
 </script>
 
 <template>
   <div class="space-y-3" role="group" :aria-label="$t('compare.facets.group_label')">
-    <div v-for="category in CATEGORY_ORDER" :key="category">
+    <div v-for="category in categoryOrder" :key="category">
       <!-- Category header with all/none buttons -->
       <div class="flex items-center gap-2 mb-2">
         <span class="text-[10px] text-fg-subtle uppercase tracking-wider">
-          {{ $t(`compare.facets.categories.${category}`) }}
+          {{ getCategoryLabel(category) }}
         </span>
         <button
           type="button"
@@ -51,9 +41,7 @@ function isCategoryNoneSelected(category: string): boolean {
               : 'text-fg-muted/60 hover:text-fg-muted'
           "
           :aria-label="
-            $t('compare.facets.select_category', {
-              category: $t(`compare.facets.categories.${category}`),
-            })
+            $t('compare.facets.select_category', { category: getCategoryLabel(category) })
           "
           :disabled="isCategoryAllSelected(category)"
           @click="selectCategory(category)"
@@ -70,9 +58,7 @@ function isCategoryNoneSelected(category: string): boolean {
               : 'text-fg-muted/60 hover:text-fg-muted'
           "
           :aria-label="
-            $t('compare.facets.deselect_category', {
-              category: $t(`compare.facets.categories.${category}`),
-            })
+            $t('compare.facets.deselect_category', { category: getCategoryLabel(category) })
           "
           :disabled="isCategoryNoneSelected(category)"
           @click="deselectCategory(category)"
@@ -84,31 +70,31 @@ function isCategoryNoneSelected(category: string): boolean {
       <!-- Facet buttons -->
       <div class="flex items-center gap-1.5 flex-wrap" role="group">
         <button
-          v-for="{ facet, info } in facetsByCategory[category]"
-          :key="facet"
+          v-for="facet in facetsByCategory[category]"
+          :key="facet.id"
           type="button"
-          :title="info.comingSoon ? $t('compare.facets.coming_soon') : info.description"
-          :disabled="info.comingSoon"
-          :aria-pressed="isFacetSelected(facet)"
-          :aria-label="info.label"
+          :title="facet.comingSoon ? $t('compare.facets.coming_soon') : facet.description"
+          :disabled="facet.comingSoon"
+          :aria-pressed="isFacetSelected(facet.id)"
+          :aria-label="facet.label"
           class="inline-flex items-center gap-1 px-1.5 py-0.5 font-mono text-xs rounded border transition-colors duration-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-fg/50"
           :class="
-            info.comingSoon
+            facet.comingSoon
               ? 'text-fg-subtle/50 bg-bg-subtle border-border-subtle cursor-not-allowed'
-              : isFacetSelected(facet)
+              : isFacetSelected(facet.id)
                 ? 'text-fg-muted bg-bg-muted border-border'
                 : 'text-fg-subtle bg-bg-subtle border-border-subtle hover:text-fg-muted hover:border-border'
           "
-          @click="!info.comingSoon && toggleFacet(facet)"
+          @click="!facet.comingSoon && toggleFacet(facet.id)"
         >
           <span
-            v-if="!info.comingSoon"
+            v-if="!facet.comingSoon"
             class="w-3 h-3"
-            :class="isFacetSelected(facet) ? 'i-carbon:checkmark' : 'i-carbon:add'"
+            :class="isFacetSelected(facet.id) ? 'i-carbon:checkmark' : 'i-carbon:add'"
             aria-hidden="true"
           />
-          {{ info.label }}
-          <span v-if="info.comingSoon" class="text-[9px]"
+          {{ facet.label }}
+          <span v-if="facet.comingSoon" class="text-[9px]"
             >({{ $t('compare.facets.coming_soon') }})</span
           >
         </button>