From ee74727e362c5037c7e0752f667b73fcf7154822 Mon Sep 17 00:00:00 2001
From: tdgao <mr.trumgao@gmail.com>
Date: Fri, 14 Aug 2026 12:47:37 -0600
Subject: [PATCH] fix: clear button, page scroll, and metadata loading state

---
 packages/ui/src/components/base/Combobox.vue  |  8 +++++-
 .../ui/src/components/base/StyledInput.vue    |  2 +-
 .../search/SearchDependsOnFilter.vue          | 27 ++++++++++++-------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/packages/ui/src/components/base/Combobox.vue b/packages/ui/src/components/base/Combobox.vue
index 5ce9588624..bf1e2c246a 100644
--- a/packages/ui/src/components/base/Combobox.vue
+++ b/packages/ui/src/components/base/Combobox.vue
@@ -39,7 +39,7 @@
 				@focusin="handleSearchFocus"
 				@focusout="handleSearchFocusout"
 				@click="handleSearchClick"
-				@clear="handleSearchInput"
+				@clear="handleSearchClear"
 			>
 				<template v-if="showChevron" #right>
 					<ChevronLeftIcon
@@ -842,6 +842,12 @@ function handleSearchInput() {
 	}
 }
 
+function handleSearchClear() {
+	userHasTyped.value = true
+	emit('searchInput', searchQuery.value)
+	closeDropdown()
+}
+
 function handleSearchFocus(event: FocusEvent) {
 	const target = event.target
 	if (props.selectSearchTextOnFocus && target instanceof HTMLInputElement) {
diff --git a/packages/ui/src/components/base/StyledInput.vue b/packages/ui/src/components/base/StyledInput.vue
index 31a9ca57d5..949c4a7e57 100644
--- a/packages/ui/src/components/base/StyledInput.vue
+++ b/packages/ui/src/components/base/StyledInput.vue
@@ -91,7 +91,7 @@
 			type="button"
 			class="absolute right-0.5 z-[1] p-2 touch-manipulation bg-transparent border-none text-secondary hover:text-contrast transition-colors cursor-pointer select-none"
 			aria-label="Clear input"
-			@click="clear"
+			@click.stop="clear"
 		>
 			<XIcon class="h-5 w-5" />
 		</button>
diff --git a/packages/ui/src/components/search/SearchDependsOnFilter.vue b/packages/ui/src/components/search/SearchDependsOnFilter.vue
index 749958de39..20e75ea2b6 100644
--- a/packages/ui/src/components/search/SearchDependsOnFilter.vue
+++ b/packages/ui/src/components/search/SearchDependsOnFilter.vue
@@ -10,21 +10,21 @@
 			show-search-icon
 			@update:model-value="addIncludedProject"
 		/>
-		<div v-if="dependencyProjectIds.length > 0" class="flex flex-col gap-1">
+		<div v-if="loadedDependentProjects.length > 0" class="flex flex-col gap-1">
 			<div
-				v-for="projectId in dependencyProjectIds"
+				v-for="{ projectId, project } in loadedDependentProjects"
 				:key="projectId"
 				class="group flex min-w-0 items-center gap-2 rounded-xl px-1.5 py-1 text-primary"
 			>
 				<img
-					v-if="dependentProjectMap.get(projectId)?.icon_url"
-					:src="dependentProjectMap.get(projectId)?.icon_url ?? undefined"
-					:alt="dependentProjectMap.get(projectId)?.title ?? projectId"
+					v-if="project.icon_url"
+					:src="project.icon_url"
+					:alt="project.title"
 					class="size-6 shrink-0 rounded-md object-cover"
 				/>
 				<PackageIcon v-else class="size-8 shrink-0 text-secondary" />
 				<span class="min-w-0 flex-1 truncate font-medium text-contrast">
-					{{ dependentProjectMap.get(projectId)?.title ?? projectId }}
+					{{ project.title }}
 				</span>
 				<div class="flex items-center gap-1">
 					<button
@@ -33,7 +33,7 @@
 						class="flex shrink-0 cursor-pointer items-center justify-center rounded-xl border-0 bg-transparent px-2 py-1 text-secondary transition-all [@media(hover:hover)]:opacity-0 group-hover:opacity-100 hover:bg-button-bg hover:text-contrast active:scale-[0.96]"
 						:aria-label="
 							formatMessage(messages.removeIncludedProject, {
-								project: dependentProjectMap.get(projectId)?.title ?? projectId,
+								project: project.title,
 							})
 						"
 						@click="removeIncludedProject(projectId)"
@@ -68,7 +68,7 @@
 	</div>
 	<div v-else :class="innerPanelClass" class="flex flex-col gap-3">
 		<ProjectCombobox
-			v-show="!selectedProjectId"
+			v-show="!showSelectedProject"
 			ref="projectCombobox"
 			:model-value="selectedProjectId"
 			:project-types="selectableProjectTypes"
@@ -78,7 +78,7 @@
 			show-search-icon
 			@update:model-value="setSelectedProjectId"
 		/>
-		<template v-if="selectedProjectId && selectedProject">
+		<template v-if="showSelectedProject">
 			<div class="flex items-center justify-between gap-3 px-2 text-secondary">
 				<span>
 					{{
@@ -203,13 +203,19 @@ const { data: dependentProjects } = useQuery({
 	]),
 	queryFn: () => labrinth.projects_v2.getMultiple(dependencyProjectIds.value),
 	enabled: computed(() => isModpack.value && dependencyProjectIds.value.length > 0),
-	placeholderData: [],
+	placeholderData: (previousData) => previousData,
 	refetchOnWindowFocus: false,
 })
 
 const dependentProjectMap = computed(
 	() => new Map(dependentProjects.value?.map((project) => [project.id, project]) ?? []),
 )
+const loadedDependentProjects = computed(() =>
+	dependencyProjectIds.value.flatMap((projectId) => {
+		const project = dependentProjectMap.value.get(projectId)
+		return project ? [{ projectId, project }] : []
+	}),
+)
 const projectCombobox = ref<{ selectedProject: SearchHit | null } | null>(null)
 const selectedProject = computed(() => projectCombobox.value?.selectedProject ?? null)
 const selectedDependencyFilter = computed(() =>
@@ -220,6 +226,7 @@ const selectedProjectId = computed(() =>
 		? parseDependencyProjectFilterOption(selectedDependencyFilter.value.option).projectId
 		: undefined,
 )
+const showSelectedProject = computed(() => Boolean(selectedProjectId.value && selectedProject.value))
 
 const dependencyTypes = computed<DependencyType[]>(() =>
 	selectedDependencyFilter.value