Skip to content

Commit 68e3319

Browse files
committed
(fix) add files and videos progress bar
1 parent 269e43c commit 68e3319

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

src/lib/Message/MessageFiles/MessageFile/MessageFile.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
>
1111
<progress-bar
1212
v-if="file.progress >= 0"
13-
:style="{ top: `${imageResponsive.loaderTop}px` }"
1413
:progress="file.progress"
14+
:style="{ top: `${imageResponsive.loaderTop}px` }"
1515
/>
1616
<loader
1717
v-else
18-
:style="{ top: `${imageResponsive.loaderTop}px` }"
1918
:show="isImageLoading"
19+
:style="{ top: `${imageResponsive.loaderTop}px` }"
2020
>
2121
<template v-for="(idx, name) in $scopedSlots" #[name]="data">
2222
<slot :name="name" v-bind="data" />
@@ -63,6 +63,7 @@
6363
class="vac-video-container"
6464
@click.stop.prevent="openFile('preview')"
6565
>
66+
<progress-bar v-if="file.progress >= 0" :progress="file.progress" />
6667
<video width="100%" height="100%" controls>
6768
<source :src="file.url" />
6869
</video>
@@ -72,7 +73,7 @@
7273

7374
<script>
7475
import Loader from '../../../../components/Loader/Loader'
75-
import ProgressBar from '../../../../components/ProgressBar/ProgressBar.vue'
76+
import ProgressBar from '../../../../components/ProgressBar/ProgressBar'
7677
import SvgIcon from '../../../../components/SvgIcon/SvgIcon'
7778
7879
const { isImageFile, isVideoFile } = require('../../../../utils/media-file')

src/lib/Message/MessageFiles/MessageFiles.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@
1414
height: 30px;
1515
width: 30px;
1616
}
17+
18+
&.vac-file-container-progress {
19+
background-color: rgba(0, 0, 0, 0.3);
20+
}
1721
}
1822
}

src/lib/Message/MessageFiles/MessageFiles.vue

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
</div>
1616

1717
<div v-for="(file, idx) in otherFiles" :key="idx + 'a'">
18-
<div class="vac-file-container" @click.stop="openFile(file, 'download')">
18+
<progress-bar
19+
v-if="file.progress >= 0"
20+
:progress="file.progress"
21+
:style="{ top: '54px' }"
22+
/>
23+
<div
24+
class="vac-file-container"
25+
:class="{ 'vac-file-container-progress': file.progress >= 0 }"
26+
@click.stop="openFile(file, 'download')"
27+
>
1928
<div class="vac-svg-button">
2029
<slot name="document-icon">
2130
<svg-icon name="document" />
@@ -47,14 +56,15 @@
4756
<script>
4857
import SvgIcon from '../../../components/SvgIcon/SvgIcon'
4958
import FormatMessage from '../../../components/FormatMessage/FormatMessage'
59+
import ProgressBar from '../../../components/ProgressBar/ProgressBar'
5060
5161
import MessageFile from './MessageFile/MessageFile'
5262
5363
const { isImageVideoFile } = require('../../../utils/media-file')
5464
5565
export default {
5666
name: 'MessageFiles',
57-
components: { SvgIcon, FormatMessage, MessageFile },
67+
components: { SvgIcon, FormatMessage, ProgressBar, MessageFile },
5868
5969
props: {
6070
currentUserId: { type: [String, Number], required: true },

0 commit comments

Comments
 (0)