Skip to content

Commit 6be496d

Browse files
committed
fix: more z-index issue
1 parent 1f84cbe commit 6be496d

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

web/src/lib/components/asset-viewer/detail-panel.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@
495495
zoom={12.5}
496496
simplified
497497
useLocationPin
498+
showSimpleControls={!showEditFaces}
498499
onOpenInMapView={() => goto(`${AppRoute.MAP}#12.5/${latlng.lat}/${latlng.lng}`)}
499500
>
500501
{#snippet popup({ marker })}

web/src/lib/components/photos-page/memory-lane.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
onscroll={onScroll}
4646
>
4747
{#if canScrollLeft || canScrollRight}
48-
<div class="sticky start-0">
48+
<div class="sticky start-0 z-1">
4949
{#if canScrollLeft}
5050
<div class="absolute start-4 top-24" transition:fade={{ duration: 200 }}>
5151
<button
@@ -60,7 +60,7 @@
6060
</div>
6161
{/if}
6262
{#if canScrollRight}
63-
<div class="absolute end-4 top-24" transition:fade={{ duration: 200 }}>
63+
<div class="absolute end-4 top-24 z-1" transition:fade={{ duration: 200 }}>
6464
<button
6565
type="button"
6666
class="rounded-full border border-gray-500 bg-gray-100 p-2 text-gray-500 opacity-50 hover:opacity-100"

web/src/lib/components/shared-components/map/map.svelte

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
onClickPoint?: ({ lat, lng }: { lat: number; lng: number }) => void;
5555
popup?: import('svelte').Snippet<[{ marker: MapMarkerResponseDto }]>;
5656
rounded?: boolean;
57+
showSimpleControls?: boolean;
5758
}
5859
5960
let {
@@ -70,6 +71,7 @@
7071
onClickPoint = () => {},
7172
popup,
7273
rounded = false,
74+
showSimpleControls = true,
7375
}: Props = $props();
7476
7577
let map: maplibregl.Map | undefined = $state();
@@ -266,13 +268,15 @@
266268
bind:map
267269
>
268270
{#snippet children({ map }: { map: maplibregl.Map })}
269-
<NavigationControl position="top-left" showCompass={!simplified} />
270-
271-
{#if !simplified}
272-
<GeolocateControl position="top-left" />
273-
<FullscreenControl position="top-left" />
274-
<ScaleControl />
275-
<AttributionControl compact={false} />
271+
{#if showSimpleControls}
272+
<NavigationControl position="top-left" showCompass={!simplified} />
273+
274+
{#if !simplified}
275+
<GeolocateControl position="top-left" />
276+
<FullscreenControl position="top-left" />
277+
<ScaleControl />
278+
<AttributionControl compact={false} />
279+
{/if}
276280
{/if}
277281

278282
{#if showSettings}
@@ -285,7 +289,7 @@
285289
</Control>
286290
{/if}
287291

288-
{#if onOpenInMapView}
292+
{#if onOpenInMapView && showSimpleControls}
289293
<Control position="top-right">
290294
<ControlGroup>
291295
<ControlButton onclick={() => onOpenInMapView()}>

web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
{/if}
453453
</section>
454454
{#if isEditingName}
455-
<div class="absolute w-64 sm:w-96">
455+
<div class="absolute w-64 sm:w-96 z-1">
456456
{#if isSearchingPeople}
457457
<div
458458
class="flex border h-14 rounded-b-lg border-gray-400 dark:border-immich-dark-gray place-items-center bg-gray-200 p-2 dark:bg-gray-700"

0 commit comments

Comments
 (0)