From 21880aec14270c54b26e930c016b7dd991679d90 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Fri, 16 May 2025 19:54:37 +0200
Subject: [PATCH] fix: z-index issues on search page (#18336)

---
 .../[[assetId=id]]/+page.svelte               | 102 +++++++++---------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
index d35e2697c1..5f995b9a7a 100644
--- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -249,57 +249,6 @@
 
 <svelte:window use:shortcut={{ shortcut: { key: 'Escape' }, onShortcut: onEscape }} bind:scrollY />
 
-<section>
-  {#if assetInteraction.selectionActive}
-    <div class="fixed top-0 start-0 w-full">
-      <AssetSelectControlBar
-        assets={assetInteraction.selectedAssets}
-        clearSelect={() => cancelMultiselect(assetInteraction)}
-      >
-        <CreateSharedLink />
-        <CircleIconButton title={$t('select_all')} icon={mdiSelectAll} onclick={handleSelectAll} />
-        <ButtonContextMenu icon={mdiPlus} title={$t('add_to')}>
-          <AddToAlbum {onAddToAlbum} />
-          <AddToAlbum shared {onAddToAlbum} />
-        </ButtonContextMenu>
-        <FavoriteAction
-          removeFavorite={assetInteraction.isAllFavorite}
-          onFavorite={(ids, isFavorite) => {
-            for (const id of ids) {
-              const asset = searchResultAssets.find((asset) => asset.id === id);
-              if (asset) {
-                asset.isFavorite = isFavorite;
-              }
-            }
-          }}
-        />
-
-        <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
-          <DownloadAction menuItem />
-          <ChangeDate menuItem />
-          <ChangeLocation menuItem />
-          <ArchiveAction menuItem unarchive={assetInteraction.isAllArchived} />
-          {#if $preferences.tags.enabled && assetInteraction.isAllUserOwned}
-            <TagAction menuItem />
-          {/if}
-          <DeleteAssets menuItem {onAssetDelete} />
-          <hr />
-          <AssetJobActions />
-        </ButtonContextMenu>
-      </AssetSelectControlBar>
-    </div>
-  {:else}
-    <div class="fixed top-0 start-0 w-full">
-      <ControlAppBar onClose={() => goto(previousRoute)} backIcon={mdiArrowLeft}>
-        <div class="absolute bg-light"></div>
-        <div class="w-full flex-1 ps-4">
-          <SearchBar grayTheme={false} value={terms?.query ?? ''} searchQuery={terms} />
-        </div>
-      </ControlAppBar>
-    </div>
-  {/if}
-</section>
-
 {#if terms}
   <section
     id="search-chips"
@@ -380,4 +329,55 @@
       </div>
     {/if}
   </section>
+
+  <section>
+    {#if assetInteraction.selectionActive}
+      <div class="fixed top-0 start-0 w-full">
+        <AssetSelectControlBar
+          assets={assetInteraction.selectedAssets}
+          clearSelect={() => cancelMultiselect(assetInteraction)}
+        >
+          <CreateSharedLink />
+          <CircleIconButton title={$t('select_all')} icon={mdiSelectAll} onclick={handleSelectAll} />
+          <ButtonContextMenu icon={mdiPlus} title={$t('add_to')}>
+            <AddToAlbum {onAddToAlbum} />
+            <AddToAlbum shared {onAddToAlbum} />
+          </ButtonContextMenu>
+          <FavoriteAction
+            removeFavorite={assetInteraction.isAllFavorite}
+            onFavorite={(ids, isFavorite) => {
+              for (const id of ids) {
+                const asset = searchResultAssets.find((asset) => asset.id === id);
+                if (asset) {
+                  asset.isFavorite = isFavorite;
+                }
+              }
+            }}
+          />
+
+          <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
+            <DownloadAction menuItem />
+            <ChangeDate menuItem />
+            <ChangeLocation menuItem />
+            <ArchiveAction menuItem unarchive={assetInteraction.isAllArchived} />
+            {#if $preferences.tags.enabled && assetInteraction.isAllUserOwned}
+              <TagAction menuItem />
+            {/if}
+            <DeleteAssets menuItem {onAssetDelete} />
+            <hr />
+            <AssetJobActions />
+          </ButtonContextMenu>
+        </AssetSelectControlBar>
+      </div>
+    {:else}
+      <div class="fixed top-0 start-0 w-full">
+        <ControlAppBar onClose={() => goto(previousRoute)} backIcon={mdiArrowLeft}>
+          <div class="absolute bg-light"></div>
+          <div class="w-full flex-1 ps-4">
+            <SearchBar grayTheme={false} value={terms?.query ?? ''} searchQuery={terms} />
+          </div>
+        </ControlAppBar>
+      </div>
+    {/if}
+  </section>
 </section>