Skip to content

Commit

Permalink
Merge branch 'master' into retry
Browse files Browse the repository at this point in the history
  • Loading branch information
hpeebles authored Dec 20, 2023
2 parents 6755b2f + ffac8f0 commit c4e9c13
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions frontend/app/src/components/home/MessageActions.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
$: showActions = !useDrawer || drawOpen;
$: iconColour = editing ? "var(--button-txt)" : useDrawer ? "var(--txt)" : "var(--icon-txt)";
$: supportedActions = buildListOfActions(permittedMessages, messageAction, narrow);
$: showClose = drawOpen || attachment !== undefined || messageAction === "emoji";
export function close() {
drawOpen = false;
Expand Down Expand Up @@ -59,7 +60,7 @@
}
function toggleDraw() {
if (drawOpen || attachment !== undefined) {
if (showClose) {
close();
} else {
drawOpen = true;
Expand Down Expand Up @@ -157,7 +158,7 @@

{#if useDrawer}
<div class="open-draw" on:click|stopPropagation={toggleDraw}>
{#if drawOpen || attachment !== undefined}
{#if showClose}
<HoverIcon>
<TrayRemove size={$iconSize} color={"var(--icon-txt)"} />
</HoverIcon>
Expand Down

0 comments on commit c4e9c13

Please sign in to comment.