TSK-1430: fix svelte-check & rebase

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
hcengineering · May 19, 2023 · daaff79 · daaff79
1 parent ab6c496
commit daaff79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/ui/src/popups.ts b/packages/ui/src/popups.ts
@@ -36,7 +36,7 @@ export function updatePopup (id: string, props: Partial<CompAndProps>): void {
   popupstore.update((popups) => {
     const popupIndex = popups.findIndex((p) => p.id === id)
     if (popupIndex !== -1) {
-      popups[popupIndex] = { ...popups[popupIndex], props }
+      popups[popupIndex] = { ...popups[popupIndex], ...props }
     }
     return popups
   })

diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
@@ -56,7 +56,7 @@
     const sel = listProvider.docs()[selected] as Attachment
     if (sel !== undefined && attachmentPopupId !== '') {
       listProvider.updateFocus(sel)
-      updatePopup(attachmentPopupId, { file: sel.file, name: sel.name, contentType: sel.type })
+      updatePopup(attachmentPopupId, { props: { file: sel.file, name: sel.name, contentType: sel.type } })
     }
   })
   $: listProvider.update(Array.from(attachments.values()).filter((attachment) => attachment.type.startsWith('image/')))
@@ -365,11 +365,7 @@
       {#each Array.from(attachments.values()) as attachment, index}
         <div class="item flex-center flex-no-shrink clear-mins">
           {#if useAttachmentPreview}
-            <AttachmentPreview
-              value={attachment}
-              {listProvider}
-              on:open={(res) => (attachmentPopupId = res.detail)}
-            />
+            <AttachmentPreview value={attachment} {listProvider} on:open={(res) => (attachmentPopupId = res.detail)} />
           {:else}
             <AttachmentPresenter
               value={attachment}