#36 close popup via x or click outside

modules/gui/src/components/SearchPopupResults/SearchPopupResults.svelte

@@ -9,16 +9,16 @@
 	import { installPackage } from '@api';
 	import type { AirtablePost } from '@tea/ui/types';
 	let term: string;
-	let packagesFound: GUIPackage[] = [];
+	let packages: GUIPackage[] = [];
-
 	let articles: AirtablePost[] = []; // news, blogs, etc
 	let workshops: AirtablePost[] = []; // workshops, course
+	let loading = true;
 
 	searchStore.subscribe((v) => {
 		term = v;
 	});
 	searchStore.packagesSearch.subscribe((pkgs) => {
-		packagesFound = pkgs;
+		packages = pkgs;
 	});
 	searchStore.postsSearch.subscribe((posts) => {
 		let partialArticles: AirtablePost[] = [];
@@ -36,6 +36,8 @@
 		workshops = partialWorkshops;
 	});
 
+	searchStore.searching.subscribe((v) => (loading = v));
+
 	const getCTALabel = (state: PackageStates): string => {
 		return {
 			[PackageStates.AVAILABLE]: 'INSTALL',
@@ -44,24 +46,32 @@
 			[PackageStates.UNINSTALLED]: 'RE-INSTALL'
 		}[state];
 	};
+
+	const onClose = () => {
+		term = '';
+	};
 </script>
 
 <section class={term ? 'show' : ''}>
-	<div class="border border-gray bg-black">
+	<!-- svelte-ignore a11y-click-events-have-key-events -->
-		<header class="p-4 text-2xl text-primary">
+	<figure on:click={onClose} />
-			Showing search results for `{term}`
+	<div class="z-20 border border-gray bg-black">
+		<header class="flex justify-between p-4">
+			<div class="text-2xl text-primary">Showing search results for `{term}`</div>
+
+			<button on:click={onClose}>&#x2715</button>
 		</header>
 		<menu class="flex h-8 w-full gap-4 bg-accent px-4 text-xs">
-			<button>packages ({packagesFound.length})</button>
+			<button>packages ({packages.length})</button>
 			<button>articles ({articles.length})</button>
 			<button>workshops ({workshops.length})</button>
 		</menu>
 		<header class="p-4 text-lg text-primary">
-			Top Package Results ({packagesFound.length})
+			Top Package Results ({packages.length})
 		</header>
 		<ul class="grid grid-cols-3">
-			{#if packagesFound.length > 0}
+			{#if packages.length > 0}
-				{#each packagesFound as pkg}
+				{#each packages as pkg}
 					<div class={pkg.state === PackageStates.INSTALLING ? 'animate-pulse' : ''}>
 						<PackageCard
 							{pkg}
@@ -79,7 +89,7 @@
 						/>
 					</div>
 				{/each}
-			{:else}
+			{:else if loading}
 				{#each Array(12) as _}
 					<section class="h-50 border border-gray p-4">
 						<Preloader />
@@ -92,7 +102,7 @@
 		</header>
 		{#if articles.length}
 			<Posts posts={articles} linkTarget="_blank" />
-		{:else}
+		{:else if loading}
 			<section class="h-64 border border-gray bg-black p-4">
 				<Preloader />
 			</section>
@@ -102,7 +112,7 @@
 		</header>
 		{#if workshops.length}
 			<Posts posts={workshops} linkTarget="_blank" />
-		{:else}
+		{:else if loading}
 			<section class="h-64 border border-gray bg-black p-4">
 				<Preloader />
 			</section>
@@ -122,14 +132,23 @@
 		opacity: 0%;
 		overflow: hidden;
 		height: 0px;
+		z-index: 10;
 	}
 
+	section > figure {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
 	section.show {
 		opacity: 100%;
 		height: 100%;
 	}
 
 	section > div {
+		position: relative;
 		height: 0%;
 		transition: height 0.6s ease-in-out;
 		overflow-y: scroll;

modules/gui/src/libs/stores.ts

@@ -119,6 +119,7 @@ function initPosts() {
 export const postsStore = initPosts();
 
 function initSearchStore() {
+	const searching = writable<boolean>(false);
 	const { subscribe, set } = writable<string>('');
 	const packagesSearch = writable<GUIPackage[]>([]);
 	const postsSearch = writable<AirtablePost[]>([]);
@@ -137,18 +138,29 @@ function initSearchStore() {
 
 	return {
 		term,
+		searching,
 		packagesSearch,
 		postsSearch,
 		packagesFound,
 		subscribe,
 		search: async (term: string) => {
+			searching.set(true);
+			try {
+				if (term) {
 					const [resultPkgs, resultPosts] = await Promise.all([
 						packagesStore.search(term, 5),
 						postsStore.search(term, 10)
 					]);
 					packagesSearch.set(resultPkgs);
 					postsSearch.set(resultPosts);
+				} else {
+					packagesSearch.set([]);
+					postsSearch.set([]);
+				}
 				set(term);
+			} finally {
+				searching.set(false);
+			}
 		}
 	};
 }

modules/gui/src/routes/+layout.svelte

@@ -6,7 +6,7 @@
 	import FooterLinks from '$components/FooterLinks/FooterLinks.svelte';
 
 	import { backLink as backLinkStore } from '$libs/stores';
-	import SearchResults from '$components/SearchResults/SearchResults.svelte';
+	import SearchPopupResults from '$components/SearchPopupResults/SearchPopupResults.svelte';
 
 	let view: HTMLElement;
 
@@ -37,7 +37,7 @@
 		<footer class="mt-8 w-full border border-r-0 border-gray bg-black">
 			<FooterLinks />
 		</footer>
-		<SearchResults />
+		<SearchPopupResults />
 	</section>
 </div>
 
@@ -58,15 +58,17 @@
 		overflow-y: scroll;
 	}
 
-	@media screen and (min-width: 1440px) {
 	figure {
-			position: fixed;
 		z-index: 0;
+		position: fixed;
 		top: 220px;
 		left: 240px;
 		right: 0px;
 		bottom: 0px;
 		background-image: url('/images/gui-background-grid.svg');
+	}
+	@media screen and (min-width: 1440px) {
+		figure {
 			background-size: cover;
 			background-repeat: repeat-y;
 		}
@@ -76,13 +78,6 @@
 	}
 	@media screen and (max-width: 1440px) {
 		figure {
-			position: fixed;
-			z-index: 0;
-			top: 220px;
-			left: 240px;
-			right: 0px;
-			bottom: 0px;
-			background-image: url('/images/gui-background-grid.svg');
 			background-size: contain;
 			background-repeat: repeat;
 		}