From af017c09dd63e67487513e53858e758a6b545335 Mon Sep 17 00:00:00 2001
From: ben-basten <45583362+ben-basten@users.noreply.github.com>
Date: Fri, 6 Sep 2024 22:21:14 -0400
Subject: [PATCH 1/3] feat(web): move search options into a modal

---
 .../full-screen-modal.svelte                  |  2 +-
 .../shared-components/modal-header.svelte     |  2 +-
 .../search-bar/search-bar.svelte              |  8 ++--
 ...-box.svelte => search-filter-modal.svelte} | 42 ++++++++-----------
 .../search-bar/search-media-section.svelte    |  2 +-
 web/src/lib/i18n/en.json                      |  1 +
 6 files changed, 25 insertions(+), 32 deletions(-)
 rename web/src/lib/components/shared-components/search-bar/{search-filter-box.svelte => search-filter-modal.svelte} (82%)

diff --git a/web/src/lib/components/shared-components/full-screen-modal.svelte b/web/src/lib/components/shared-components/full-screen-modal.svelte
index be407decded14..8599d546a90f4 100644
--- a/web/src/lib/components/shared-components/full-screen-modal.svelte
+++ b/web/src/lib/components/shared-components/full-screen-modal.svelte
@@ -69,7 +69,7 @@
     </div>
     {#if isStickyBottom}
       <div
-        class="flex flex-col sm:flex-row justify-end w-full gap-2 sm:gap-4 sticky bottom-0 py-4 px-5 bg-immich-bg dark:bg-immich-dark-gray border-t border-gray-200 dark:border-gray-500 shadow"
+        class="flex flex-col sm:flex-row justify-end w-full gap-2 sm:gap-4 sticky bottom-0 py-4 px-5 bg-immich-bg dark:bg-immich-dark-gray border-t border-gray-200 dark:border-gray-500 shadow z-[9999]"
       >
         <slot name="sticky-bottom" />
       </div>
diff --git a/web/src/lib/components/shared-components/modal-header.svelte b/web/src/lib/components/shared-components/modal-header.svelte
index 59c62e0a97638..152ed66b1496a 100644
--- a/web/src/lib/components/shared-components/modal-header.svelte
+++ b/web/src/lib/components/shared-components/modal-header.svelte
@@ -33,5 +33,5 @@
     </h1>
   </div>
 
-  <CircleIconButton on:click={onClose} icon={mdiClose} size={'20'} title={$t('close')} />
+  <CircleIconButton on:click={onClose} icon={mdiClose} size={'20'} title={$t('close')} class="focus:ring-2" />
 </div>
diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
index 07d4df6e66f7e..b0bbdbe71fcb1 100644
--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
@@ -4,7 +4,7 @@
   import { isSearchEnabled, preventRaceConditionSearchBar, savedSearchTerms } from '$lib/stores/search.store';
   import { mdiClose, mdiMagnify, mdiTune } from '@mdi/js';
   import SearchHistoryBox from './search-history-box.svelte';
-  import SearchFilterBox from './search-filter-box.svelte';
+  import SearchFilterModal from './search-filter-modal.svelte';
   import type { MetadataSearchDto, SmartSearchDto } from '@immich/sdk';
   import { getMetadataSearchQuery } from '$lib/utils/metadata-search';
   import { handlePromiseError } from '$lib/utils';
@@ -160,8 +160,8 @@
         id="main-search-bar"
         class="w-full transition-all border-2 px-14 py-4 text-immich-fg/75 dark:text-immich-dark-fg
         {grayTheme ? 'dark:bg-immich-dark-gray' : 'dark:bg-immich-dark-bg'}
-        {(showSuggestions && isSearchSuggestions) || showFilter ? 'rounded-t-3xl' : 'rounded-3xl bg-gray-200'}
-        {$isSearchEnabled ? 'border-gray-200 dark:border-gray-700 bg-white' : 'border-transparent'}"
+        {showSuggestions && isSearchSuggestions ? 'rounded-t-3xl' : 'rounded-3xl bg-gray-200'}
+        {$isSearchEnabled && !showFilter ? 'border-gray-200 dark:border-gray-700 bg-white' : 'border-transparent'}"
         placeholder={$t('search_your_photos')}
         required
         pattern="^(?!m:$).*$"
@@ -215,6 +215,6 @@
   </form>
 
   {#if showFilter}
-    <SearchFilterBox {searchQuery} on:search={({ detail }) => onSearch(detail)} />
+    <SearchFilterModal {searchQuery} onSearch={(payload) => onSearch(payload)} onClose={() => (showFilter = false)} />
   {/if}
 </div>
diff --git a/web/src/lib/components/shared-components/search-bar/search-filter-box.svelte b/web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte
similarity index 82%
rename from web/src/lib/components/shared-components/search-bar/search-filter-box.svelte
rename to web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte
index 4fd85fa9bdf4f..fbc8604b4dc50 100644
--- a/web/src/lib/components/shared-components/search-bar/search-filter-box.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte
@@ -24,8 +24,6 @@
 <script lang="ts">
   import Button from '$lib/components/elements/buttons/button.svelte';
   import { AssetTypeEnum, type SmartSearchDto, type MetadataSearchDto } from '@immich/sdk';
-  import { createEventDispatcher } from 'svelte';
-  import { fly } from 'svelte/transition';
   import SearchPeopleSection from './search-people-section.svelte';
   import SearchLocationSection from './search-location-section.svelte';
   import SearchCameraSection, { type SearchCameraFilter } from './search-camera-section.svelte';
@@ -35,12 +33,17 @@
   import SearchDisplaySection from './search-display-section.svelte';
   import SearchTextSection from './search-text-section.svelte';
   import { t } from 'svelte-i18n';
+  import FullScreenModal from '$lib/components/shared-components/full-screen-modal.svelte';
+  import { mdiTune } from '@mdi/js';
+  import { generateId } from '$lib/utils/generate-id';
 
   export let searchQuery: MetadataSearchDto | SmartSearchDto;
+  export let onClose: () => void;
+  export let onSearch: (search: SmartSearchDto | MetadataSearchDto) => void;
 
   const parseOptionalDate = (dateString?: string) => (dateString ? parseUtcDate(dateString) : undefined);
   const toStartOfDayDate = (dateString: string) => parseUtcDate(dateString)?.startOf('day').toISODate() || undefined;
-  const dispatch = createEventDispatcher<{ search: SmartSearchDto | MetadataSearchDto }>();
+  const formId = generateId();
 
   // combobox and all the search components have terrible support for value | null so we use empty string instead.
   function withNullAsUndefined<T>(value: T | null) {
@@ -113,21 +116,13 @@
       type,
     };
 
-    dispatch('search', payload);
+    onSearch(payload);
   };
 </script>
 
-<div
-  transition:fly={{ y: 25, duration: 250 }}
-  class="absolute w-full rounded-b-3xl border-2 border-t-0 border-gray-200 bg-white shadow-2xl dark:border-gray-700 dark:bg-immich-dark-gray dark:text-gray-300"
->
-  <form
-    id="search-filter-form"
-    autocomplete="off"
-    on:submit|preventDefault={search}
-    on:reset|preventDefault={resetForm}
-  >
-    <div class="px-4 sm:px-6 py-4 space-y-10 max-h-[calc(100dvh-12rem)] overflow-y-auto immich-scrollbar" tabindex="-1">
+<FullScreenModal icon={mdiTune} width="wide" title={$t('search_options')} {onClose}>
+  <form id={formId} autocomplete="off" on:submit|preventDefault={search} on:reset|preventDefault={resetForm}>
+    <div class="space-y-10 pb-10" tabindex="-1">
       <!-- PEOPLE -->
       <SearchPeopleSection bind:selectedPeople={filter.personIds} />
 
@@ -143,7 +138,7 @@
       <!-- DATE RANGE -->
       <SearchDateSection bind:filters={filter.date} />
 
-      <div class="grid md:grid-cols-2 gap-x-5 gap-y-8">
+      <div class="grid md:grid-cols-2 gap-x-5 gap-y-10">
         <!-- MEDIA TYPE -->
         <SearchMediaSection bind:filteredMedia={filter.mediaType} />
 
@@ -151,13 +146,10 @@
         <SearchDisplaySection bind:filters={filter.display} />
       </div>
     </div>
-
-    <div
-      id="button-row"
-      class="flex justify-end gap-4 border-t dark:border-gray-800 dark:bg-immich-dark-gray px-4 sm:py-6 py-4 mt-2 rounded-b-3xl"
-    >
-      <Button type="reset" color="gray">{$t('clear_all')}</Button>
-      <Button type="submit">{$t('search')}</Button>
-    </div>
   </form>
-</div>
+
+  <svelte:fragment slot="sticky-bottom">
+    <Button type="reset" color="gray" fullwidth form={formId}>{$t('clear_all')}</Button>
+    <Button type="submit" fullwidth form={formId}>{$t('search')}</Button>
+  </svelte:fragment>
+</FullScreenModal>
diff --git a/web/src/lib/components/shared-components/search-bar/search-media-section.svelte b/web/src/lib/components/shared-components/search-bar/search-media-section.svelte
index ce43dd0141ef8..b78868d6146c9 100644
--- a/web/src/lib/components/shared-components/search-bar/search-media-section.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-media-section.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import RadioButton from '$lib/components/elements/radio-button.svelte';
-  import { MediaType } from './search-filter-box.svelte';
+  import { MediaType } from './search-filter-modal.svelte';
   import { t } from 'svelte-i18n';
 
   export let filteredMedia: MediaType;
diff --git a/web/src/lib/i18n/en.json b/web/src/lib/i18n/en.json
index b8f0032836665..39f36c14dd803 100644
--- a/web/src/lib/i18n/en.json
+++ b/web/src/lib/i18n/en.json
@@ -1067,6 +1067,7 @@
   "search_for_existing_person": "Search for existing person",
   "search_no_people": "No people",
   "search_no_people_named": "No people named \"{name}\"",
+  "search_options": "Search options",
   "search_people": "Search people",
   "search_places": "Search places",
   "search_state": "Search state...",

From c27aba8022697332b512f45db8424ba9881e61bb Mon Sep 17 00:00:00 2001
From: ben-basten <45583362+ben-basten@users.noreply.github.com>
Date: Mon, 9 Sep 2024 07:09:21 -0400
Subject: [PATCH 2/3] chore: revert adding focus ring

---
 web/src/lib/components/shared-components/modal-header.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/shared-components/modal-header.svelte b/web/src/lib/components/shared-components/modal-header.svelte
index 152ed66b1496a..59c62e0a97638 100644
--- a/web/src/lib/components/shared-components/modal-header.svelte
+++ b/web/src/lib/components/shared-components/modal-header.svelte
@@ -33,5 +33,5 @@
     </h1>
   </div>
 
-  <CircleIconButton on:click={onClose} icon={mdiClose} size={'20'} title={$t('close')} class="focus:ring-2" />
+  <CircleIconButton on:click={onClose} icon={mdiClose} size={'20'} title={$t('close')} />
 </div>

From 007aa4ab29c69367d25798ffba61b1cf97096ada Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.tran1502@gmail.com>
Date: Mon, 9 Sep 2024 22:59:04 -0500
Subject: [PATCH 3/3] minor styling

---
 .../full-screen-modal.svelte                  | 29 ++++++++++++++-----
 .../shared-components/modal-header.svelte     |  2 +-
 .../search-bar/search-filter-modal.svelte     |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/web/src/lib/components/shared-components/full-screen-modal.svelte b/web/src/lib/components/shared-components/full-screen-modal.svelte
index 1ee66c5ed925d..2cecdf74e8424 100644
--- a/web/src/lib/components/shared-components/full-screen-modal.svelte
+++ b/web/src/lib/components/shared-components/full-screen-modal.svelte
@@ -22,7 +22,7 @@
    * - `narrow`: 28rem
    * - `auto`: fits the width of the modal content, up to a maximum of 32rem
    */
-  export let width: 'wide' | 'narrow' | 'auto' = 'narrow';
+  export let width: 'extra-wide' | 'wide' | 'narrow' | 'auto' = 'narrow';
 
   /**
    * Unique identifier for the modal.
@@ -34,12 +34,25 @@
 
   let modalWidth: string;
   $: {
-    if (width === 'wide') {
-      modalWidth = 'w-[48rem]';
-    } else if (width === 'narrow') {
-      modalWidth = 'w-[28rem]';
-    } else {
-      modalWidth = 'sm:max-w-4xl';
+    switch (width) {
+      case 'extra-wide': {
+        modalWidth = 'w-[56rem]';
+        break;
+      }
+
+      case 'wide': {
+        modalWidth = 'w-[48rem]';
+        break;
+      }
+
+      case 'narrow': {
+        modalWidth = 'w-[28rem]';
+        break;
+      }
+
+      default: {
+        modalWidth = 'sm:max-w-4xl';
+      }
     }
   }
 </script>
@@ -62,7 +75,7 @@
     aria-labelledby={titleId}
   >
     <div
-      class="immich-scrollbar overflow-y-auto max-h-[min(92dvh,56rem)]"
+      class="immich-scrollbar overflow-y-auto max-h-[min(92dvh,64rem)]"
       class:scroll-pb-40={isStickyBottom}
       class:sm:scroll-p-24={isStickyBottom}
     >
diff --git a/web/src/lib/components/shared-components/modal-header.svelte b/web/src/lib/components/shared-components/modal-header.svelte
index 8c81cebe1a6ad..efd87b476cb68 100644
--- a/web/src/lib/components/shared-components/modal-header.svelte
+++ b/web/src/lib/components/shared-components/modal-header.svelte
@@ -26,7 +26,7 @@
     {#if showLogo}
       <ImmichLogo noText={true} width={32} />
     {:else if icon}
-      <Icon path={icon} size={32} ariaHidden={true} class="text-immich-primary dark:text-immich-dark-primary" />
+      <Icon path={icon} size={24} ariaHidden={true} class="text-immich-primary dark:text-immich-dark-primary" />
     {/if}
     <h1 {id}>
       {title}
diff --git a/web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte b/web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte
index 9624e379ea2d5..3ec539ad976b4 100644
--- a/web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-filter-modal.svelte
@@ -124,7 +124,7 @@
   };
 </script>
 
-<FullScreenModal icon={mdiTune} width="wide" title={$t('search_options')} {onClose}>
+<FullScreenModal icon={mdiTune} width="extra-wide" title={$t('search_options')} {onClose}>
   <form id={formId} autocomplete="off" on:submit|preventDefault={search} on:reset|preventDefault={resetForm}>
     <div class="space-y-10 pb-10" tabindex="-1">
       <!-- PEOPLE -->