fix(web): asset viewer navbar overlapping with details tab and context menu not closing on button press (except in album viewer) (#2323)

* fix overlapping of asset-viewer-nav-bar
with details tab

* fix contextmenu not closing on button press

---------

Co-authored-by: faupau03 <paul.paffe@gmx.net>
This commit is contained in:
faupau
2023-04-26 04:30:19 +02:00
committed by GitHub
parent b8313abfa8
commit 6631b286c1
5 changed files with 57 additions and 45 deletions

View File

@@ -1,6 +1,7 @@
<script lang="ts">
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 @@
<div id={`icon-${user.id}`} class="flex place-items-center">
{#if isOwned}
<CircleIconButton
on:click={() => showContextMenu(user.id)}
logo={DotsVertical}
backgroundColor={'transparent'}
hoverColor={'#e2e7e9'}
size={'20'}
/>
<div use:clickOutside on:outclick={() => (isShowMenu = false)}>
<CircleIconButton
on:click={() => showContextMenu(user.id)}
logo={DotsVertical}
backgroundColor={'transparent'}
hoverColor={'#e2e7e9'}
size={'20'}
>
{#if isShowMenu}
<ContextMenu {...position}>
<MenuOption on:click={() => removeUser(targetUserId)} text="Remove" />
</ContextMenu>
{/if}
</CircleIconButton>
</div>
{:else if user.id == currentUser?.id}
<button
on:click={() => removeUser('me')}
@@ -102,10 +111,4 @@
</div>
{/each}
</section>
{#if isShowMenu}
<ContextMenu {...position} on:clickoutside={() => (isShowMenu = false)}>
<MenuOption on:click={() => removeUser(targetUserId)} text="Remove" />
</ContextMenu>
{/if}
</BaseModal>