From 543e7616f8d25ff518c9bae6de8b508529336f06 Mon Sep 17 00:00:00 2001
From: Anna No <anna.no@xored.com>
Date: Wed, 13 Apr 2022 10:44:13 +0700
Subject: [PATCH] Fix AddAttachment control

Signed-off-by: Anna No <anna.no@xored.com>
---
 .../src/components/AddAttachment.svelte       |  4 +-
 .../src/components/KanbanCard.svelte          | 59 +++++++++----------
 .../components/editor/CardAttachments.svelte  |  4 +-
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/plugins/attachment-resources/src/components/AddAttachment.svelte b/plugins/attachment-resources/src/components/AddAttachment.svelte
index 32811da319..979b1e70fa 100644
--- a/plugins/attachment-resources/src/components/AddAttachment.svelte
+++ b/plugins/attachment-resources/src/components/AddAttachment.svelte
@@ -31,9 +31,7 @@
 
 <div>
   {#if $$slots.control}
-    <div on:click={openFile}>
-      <slot name="control"/>
-    </div>
+    <slot name="control" click={openFile}/>
   {:else}
     <CircleButton
       icon={IconAdd}
diff --git a/plugins/board-resources/src/components/KanbanCard.svelte b/plugins/board-resources/src/components/KanbanCard.svelte
index d4de151c00..bb06302732 100644
--- a/plugins/board-resources/src/components/KanbanCard.svelte
+++ b/plugins/board-resources/src/components/KanbanCard.svelte
@@ -46,37 +46,36 @@
   objectId={object._id}
   space={object.space}>
   <div class:opacity-overlay={dragoverAttachment}>
-  <div class="flex-between mb-4">
-    <div class="flex-col">
-      <div class="fs-title cursor-pointer" on:click={showCard}>{object.title}</div>
-    </div>
-    <div class="flex-row-center">
-      <div class="mr-2">
-        <Component is={notification.component.NotificationPresenter} props={{ value: object }} />
+    <div class="flex-between mb-4">
+      <div class="flex-col">
+        <div class="fs-title cursor-pointer" on:click={showCard}>{object.title}</div>
+      </div>
+      <div class="flex-row-center">
+        <div class="mr-2">
+          <Component is={notification.component.NotificationPresenter} props={{ value: object }} />
+        </div>
+        <ActionIcon
+          label={board.string.More}
+          action={(evt) => {
+            showMenu(evt)
+          }}
+          icon={IconMoreH}
+          size="small" />
+      </div>
+    </div>
+    <div class="flex-between">
+      <div class="flex-row-center">
+        {#if (object.attachments ?? 0) > 0}
+          <div class="step-lr75">
+            <AttachmentsPresenter value={object} />
+          </div>
+        {/if}
+        {#if (object.comments ?? 0) > 0}
+          <div class="step-lr75">
+            <CommentsPresenter value={object} />
+          </div>
+        {/if}
       </div>
-      <ActionIcon
-        label={board.string.More}
-        action={(evt) => {
-          showMenu(evt)
-        }}
-        icon={IconMoreH}
-        size="small" />
     </div>
   </div>
-  <div class="flex-between">
-    <div class="flex-row-center">
-      {#if (object.attachments ?? 0) > 0}
-        <div class="step-lr75">
-          <AttachmentsPresenter value={object} />
-        </div>
-      {/if}
-      {#if (object.comments ?? 0) > 0}
-        <div class="step-lr75">
-          <CommentsPresenter value={object} />
-        </div>
-      {/if}
-    </div>
-  </div>
-</div>
 </AttachmentDroppable>
-
diff --git a/plugins/board-resources/src/components/editor/CardAttachments.svelte b/plugins/board-resources/src/components/editor/CardAttachments.svelte
index 47ce37f961..64e1ff2a6d 100644
--- a/plugins/board-resources/src/components/editor/CardAttachments.svelte
+++ b/plugins/board-resources/src/components/editor/CardAttachments.svelte
@@ -54,7 +54,9 @@
         {/each}
         <div class="mt-2">
           <AddAttachment bind:inputFile objectClass={value._class} objectId={value._id} space={value.space}>
-            <Button label={board.string.AddAttachment} kind="no-border" slot="control" />
+            <svelte:fragment slot="control" let:click>
+              <Button label={board.string.AddAttachment} kind="no-border" on:click={click}/>
+            </svelte:fragment>
           </AddAttachment>
         </div>
       </div>