Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Telegram: latest messages below. Update AttachmentPreview layout. #1768

Merged
merged 3 commits into from
May 18, 2022
Merged

Telegram: latest messages below. Update AttachmentPreview layout. #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c138c42
Telegram: latest messages below. Update AttachmentPreview layout.
SasLord May 16, 2022
2dc6b16
Fix format
SasLord May 16, 2022
5be2fb2
Fix resolve
SasLord May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions plugins/attachment-resources/src/components/AttachmentActions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<script lang="ts">
import type { Attachment } from '@anticrm/attachment'
import { getResource } from '@anticrm/platform'
import { showPopup, ActionIcon, IconMoreH, Menu, Icon } from '@anticrm/ui'
import { showPopup, ActionIcon, IconMoreH, Menu } from '@anticrm/ui'
import { Action } from '@anticrm/view'
import { getFileUrl } from '@anticrm/presentation'

Expand Down Expand Up @@ -55,19 +55,9 @@
}
</script>

<div class="actions">
<a class="downloadButton" href={getFileUrl(attachment.file)} download={attachment.name} on:click|stopPropagation>
<Icon icon={FileDownload} size={'small'} />
<div class="flex">
<a class="mr-1" href={getFileUrl(attachment.file)} download={attachment.name} on:click|stopPropagation>
<ActionIcon icon={FileDownload} size={'small'} action={() => {}} />
</a>
<ActionIcon icon={IconMoreH} size={'small'} action={showMenu} />
</div>

<style lang="scss">
.actions {
display: flex;
}

.downloadButton {
margin-right: 0.2rem;
}
</style>
10 changes: 2 additions & 8 deletions plugins/attachment-resources/src/components/AttachmentList.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,11 @@
</script>

{#if attachments.length}
<div class="container">
<div class="flex-col">
{#each attachments as attachment}
<div class="item">
<div class="step-tb75">
<AttachmentPreview value={attachment} isSaved={savedAttachmentsIds?.includes(attachment._id) ?? false} />
</div>
{/each}
</div>
{/if}

<style lang="scss">
.item {
padding: 0.5rem;
}
</style>
104 changes: 61 additions & 43 deletions plugins/attachment-resources/src/components/AttachmentPreview.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,63 +28,81 @@
$: type = getType(value.type)
</script>

<div class="flex-row-center">
{#if type === 'image'}
<div
class="content flex-center buttonContainer cursor-pointer"
on:click={() => {
closeTooltip()
showPopup(PDFViewer, { file: value.file, name: value.name, contentType: value.type }, 'right')
}}
>
<img src={getFileUrl(value.file)} alt={value.name} />
<div class="actions">
<AttachmentActions attachment={value} {isSaved} />
</div>
{#if type === 'image'}
<div
class="content flex-center buttonContainer cursor-pointer"
on:click={() => {
closeTooltip()
showPopup(PDFViewer, { file: value.file, name: value.name, contentType: value.type }, 'right')
}}
>
<img src={getFileUrl(value.file)} alt={value.name} />
<div class="actions conner">
<AttachmentActions attachment={value} {isSaved} />
</div>
{:else if type === 'audio'}
<div class="buttonContainer">
<AudioPlayer {value} />
<div class="actions">
<AttachmentActions attachment={value} {isSaved} />
</div>
</div>
{:else if type === 'audio'}
<div class="buttonContainer">
<AudioPlayer {value} />
<div class="actions conner" style:padding={'0.125rem 0.25rem'}>
<AttachmentActions attachment={value} {isSaved} />
</div>
{:else if type === 'video'}
<div class="content buttonContainer flex-center">
<video controls>
<source src={getFileUrl(value.file)} type={value.type} />
<track kind="captions" label={value.name} />
<div class="container">
<AttachmentPresenter {value} />
</div>
</video>
<div class="actions">
<AttachmentActions attachment={value} {isSaved} />
</div>
{:else if type === 'video'}
<div class="content buttonContainer flex-center">
<video controls>
<source src={getFileUrl(value.file)} type={value.type} />
<track kind="captions" label={value.name} />
<div class="container">
<AttachmentPresenter {value} />
</div>
</video>
<div class="actions conner">
<AttachmentActions attachment={value} {isSaved} />
</div>
{:else}
<div class="flex container buttonContainer">
<AttachmentPresenter {value} />
<div class="actions">
<AttachmentActions attachment={value} {isSaved} />
</div>
</div>
{:else}
<div class="flex container buttonContainer extraWidth">
<AttachmentPresenter {value} />
<div class="actions conner">
<AttachmentActions attachment={value} {isSaved} />
</div>
{/if}
</div>
</div>
{/if}

<style lang="scss">
.container {
background-color: var(--theme-bg-accent-color);
border: 1px solid var(--theme-bg-accent-color);
border-radius: 0.75rem;
background-color: var(--board-card-bg-color);
border: 1px solid var(--button-border-color);
border-radius: 0.5rem;
padding: 0.5rem;
}

.buttonContainer {
align-items: flex-start;
position: relative;
width: fit-content;
height: fit-content;

&.extraWidth {
padding-right: 2.5rem;
}

.actions {
margin-left: 0.5rem;
visibility: hidden;
position: absolute;
top: 0.25rem;
right: 0.25rem;
padding: 0.25rem;
background-color: var(--button-bg-color);
border-radius: 0.75rem;
box-shadow: var(--board-card-shadow);

&.conner {
top: 0;
right: 0;
padding: 0.25rem;
border-radius: 0 0.4rem 0 0.25rem;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/telegram-resources/src/components/Chat.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
telegram.class.Message,
{ attachedTo: channelId },
(res) => {
messages = res
messages = res.reverse()
if (channel !== undefined) {
notificationClient.updateLastView(channel._id, channel._class, undefined, true)
}
Expand Down