diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 0478ae789f..83ff24a416 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -43,6 +43,7 @@ import GalleryViewer from '../shared-components/gallery-viewer/gallery-viewer.svelte'; import ImmichLogo from '../shared-components/immich-logo.svelte'; import Button from '../elements/buttons/button.svelte'; + import { clickOutside } from '$lib/utils/click-outside'; export let album: AlbumResponseDto; export let sharedLink: SharedLinkResponseDto | undefined = undefined; @@ -457,11 +458,26 @@ {/if} {#if !isPublicShared} - +
(isShowAlbumOptions = false)}> + {#if isShowAlbumOptions} + + {#if isOwned} + { + isShowThumbnailSelection = true; + isShowAlbumOptions = false; + }} + text="Set album cover" + /> + {/if} + + {/if} + +
{/if} {#if isPublicShared} @@ -590,20 +606,6 @@ /> {/if} -{#if isShowAlbumOptions} - (isShowAlbumOptions = false)}> - {#if isOwned} - { - isShowThumbnailSelection = true; - isShowAlbumOptions = false; - }} - text="Set album cover" - /> - {/if} - -{/if} - {#if isShowThumbnailSelection} import { createEventDispatcher, onMount } from 'svelte'; import { AlbumResponseDto, api, UserResponseDto } from '@api'; + import { clickOutside } from '$lib/utils/click-outside'; import BaseModal from '../shared-components/base-modal.svelte'; import CircleAvatar from '../shared-components/circle-avatar.svelte'; import DotsVertical from 'svelte-material-icons/DotsVertical.svelte'; @@ -84,13 +85,21 @@
{#if isOwned} - showContextMenu(user.id)} - logo={DotsVertical} - backgroundColor={'transparent'} - hoverColor={'#e2e7e9'} - size={'20'} - /> +
(isShowMenu = false)}> + showContextMenu(user.id)} + logo={DotsVertical} + backgroundColor={'transparent'} + hoverColor={'#e2e7e9'} + size={'20'} + > + {#if isShowMenu} + + removeUser(targetUserId)} text="Remove" /> + + {/if} + +
{:else if user.id == currentUser?.id}
{/each} - - {#if isShowMenu} - (isShowMenu = false)}> - removeUser(targetUserId)} text="Remove" /> - - {/if} diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte index 6f8c8a8956..484670ac3b 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte @@ -1,6 +1,7 @@
dispatch('goBack')} />
-
+
{#if isOwner} dispatch('delete')} title="Delete" /> - +
(isShowAssetOptions = false)}> + + {#if isShowAssetOptions} + +
+ onMenuClick('addToAlbum')} text="Add to Album" /> + onMenuClick('addToSharedAlbum')} + text="Add to Shared Album" + /> +
+
+ {/if} +
+
{/if}
- -{#if isShowAssetOptions} - (isShowAssetOptions = false)}> -
- onMenuClick('addToAlbum')} text="Add to Album" /> - onMenuClick('addToSharedAlbum')} text="Add to Shared Album" /> -
-
-{/if} diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte index e5ed0a3fcd..ecf6cc59bc 100644 --- a/web/src/lib/components/asset-viewer/asset-viewer.svelte +++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte @@ -391,7 +391,7 @@
+