Skip to content

[stable30] fix(FilePreview): set fixed size to image container #13114

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

Merged
Antreesy merged 3 commits into from
Aug 26, 2024
Merged

[stable30] fix(FilePreview): set fixed size to image container #13114

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
ac65175
fix(FilePreview): set fixed size to image container
Antreesy Aug 22, 2024
e817764
fix(FilePreview): use NcLoadingIcon
Antreesy Aug 22, 2024
993ada1
fix(FilePreview): don't make a background load, add a smooth transition
Antreesy Aug 22, 2024
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
49 changes: 19 additions & 30 deletions src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ describe('FilePreview.vue', () => {
let localVue
let testStoreConfig
let propsData
let imageMock
let getUserIdMock
let oldPixelRatio

Expand All @@ -39,16 +38,6 @@ describe('FilePreview.vue', () => {
testStoreConfig.modules.actorStore.getters.getUserId = () => getUserIdMock
store = new Vuex.Store(testStoreConfig)

imageMock = {
onload: jest.fn(),
onerror: jest.fn(),
src: null,
}
jest.spyOn(global, 'Image')
.mockImplementation(() => {
return imageMock
})

propsData = {
token: 'TOKEN',
file: {
Expand Down Expand Up @@ -84,7 +73,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src'))
Expand All @@ -107,7 +96,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src'))
Expand All @@ -129,7 +118,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src'))
Expand All @@ -145,7 +134,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src'))
Expand Down Expand Up @@ -185,7 +174,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('DIV')
expect(wrapper.find('img').attributes('src')).toBe('blob:XYZ')
Expand All @@ -206,8 +195,8 @@ describe('FilePreview.vue', () => {
})

expect(wrapper.element.tagName).toBe('A')
expect(wrapper.find('img').exists()).toBe(false)
expect(wrapper.find('.loading').exists()).toBe(true)
const spinner = wrapper.findComponent({ name: 'NcLoadingIcon' })
expect(spinner.exists()).toBe(true)
})

test('renders default mime icon on load error', async () => {
Expand All @@ -218,7 +207,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onerror()
await wrapper.find('img').trigger('error')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = wrapper.find('img').attributes('src')
Expand All @@ -235,7 +224,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = wrapper.find('img').attributes('src')
Expand All @@ -259,7 +248,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
expect(wrapper.find('img').attributes('src'))
Expand All @@ -276,7 +265,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
expect(wrapper.find('img').attributes('src'))
Expand All @@ -294,7 +283,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
expect(wrapper.find('img').attributes('src'))
Expand All @@ -311,7 +300,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('A')
const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src'))
Expand Down Expand Up @@ -370,7 +359,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

await wrapper.find('a').trigger('click')

Expand Down Expand Up @@ -404,7 +393,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

await wrapper.find('a').trigger('click')

Expand All @@ -419,7 +408,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

// no error
await wrapper.find('a').trigger('click')
Expand Down Expand Up @@ -450,7 +439,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

const buttonEl = wrapper.findComponent(PlayCircleOutline)
expect(buttonEl.exists()).toBe(visible)
Expand Down Expand Up @@ -491,7 +480,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onerror()
await wrapper.find('img').trigger('error')

const buttonEl = wrapper.findComponent(PlayCircleOutline)
expect(buttonEl.exists()).toBe(false)
Expand Down Expand Up @@ -524,7 +513,7 @@ describe('FilePreview.vue', () => {
propsData,
})

await imageMock.onload()
await wrapper.find('img').trigger('load')

expect(wrapper.element.tagName).toBe('DIV')
await wrapper.findComponent(NcButton).trigger('click')
Expand Down
108 changes: 56 additions & 52 deletions src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,36 @@
v-bind="filePreviewBinding"
@click.exact="handleClick"
@keydown.enter="handleClick">
<span v-if="!isLoading || fallbackLocalUrl"
<span v-tooltip="previewTooltip"
class="image-container"
:class="{'playable': isPlayable}">
<span v-if="isPlayable && !smallPreview" class="play-video-button">
<PlayCircleOutline :size="48"
fill-color="#ffffff" />
</span>
<img v-if="!failed"
v-tooltip="previewTooltip"
:class="{'playable': isPlayable}"
:style="imageContainerStyle">
<img class="file-preview__image"
:class="previewImageClass"
class="file-preview__image"
alt=""
:src="previewUrl">
<img v-else
:class="previewImageClass"
alt=""
:src="defaultIconUrl">
<NcProgressBar v-if="showUploadProgress"
class="file-preview__progress"
type="circular"
:value="uploadProgress" />
:alt="file.name"
:src="failed ? defaultIconUrl : previewUrl"
@load="onLoad"
@error="onError">
<template v-if="!isLoading || fallbackLocalUrl">
<span v-if="isPlayable && !smallPreview" class="play-video-button">
<PlayCircleOutline :size="48"
fill-color="#ffffff" />
</span>
<NcProgressBar v-if="showUploadProgress"
class="file-preview__progress"
type="circular"
:value="uploadProgress" />
</template>
<TransitionWrapper v-else-if="isLoading" name="fade">
<canvas v-if="file.blurhash"
ref="blurCanvas"
width="32"
height="32"
class="preview preview-loading" />
<NcLoadingIcon v-else class="preview preview-loading" />
</TransitionWrapper>
</span>
<template v-else-if="isLoading">
<canvas v-if="file.blurhash"
ref="blurCanvas"
width="32"
height="32"
class="preview"
:style="imageContainerStyle" />
<span v-else
v-tooltip="previewTooltip"
class="preview loading"
:style="imageContainerStyle" />
</template>

<NcButton v-if="isUploadEditor"
class="remove-file"
tabindex="1"
Expand Down Expand Up @@ -77,10 +73,12 @@ import { generateUrl, imagePath, generateRemoteUrl } from '@nextcloud/router'
import { getUploader } from '@nextcloud/upload'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
import NcProgressBar from '@nextcloud/vue/dist/Components/NcProgressBar.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import AudioPlayer from './AudioPlayer.vue'
import TransitionWrapper from '../../../../UIShared/TransitionWrapper.vue'

import { useViewer } from '../../../../../composables/useViewer.js'
import { SHARED_ITEM } from '../../../../../constants.js'
Expand All @@ -98,10 +96,13 @@ export default {
name: 'FilePreview',

components: {
NcButton,
NcLoadingIcon,
NcProgressBar,
TransitionWrapper,
// Icons
Close,
PlayCircleOutline,
NcButton,
},

directives: {
Expand Down Expand Up @@ -183,6 +184,7 @@ export default {
uploadManager: null,
}
},

computed: {
shouldShowFileDetail() {
if (this.isSharedItems && !this.rowLayout) {
Expand Down Expand Up @@ -477,16 +479,6 @@ export default {
imageData.data.set(decode(this.file.blurhash, 32, 32))
ctx.putImageData(imageData, 0, 0)
}

const img = new Image()
img.onerror = () => {
this.isLoading = false
this.failed = true
}
img.onload = () => {
this.isLoading = false
}
img.src = this.previewUrl
},

beforeDestroy() {
Expand All @@ -495,6 +487,16 @@ export default {

methods: {
t,

onLoad() {
this.isLoading = false
},

onError() {
this.isLoading = false
this.failed = true
},

handleClick(event) {
if (this.isUploadEditor) {
this.$emit('remove-file', this.file.id)
Expand Down Expand Up @@ -574,12 +576,6 @@ export default {
transform: translate(100%, -50%);
}

.loading {
display: inline-block;
min-width: 32px;
background-color: var(--color-background-dark);
}

.mimeicon {
min-height: 128px;
}
Expand All @@ -590,31 +586,39 @@ export default {
}

.preview {
display: inline-block;
border-radius: var(--border-radius);
max-width: 100%;
max-height: 384px;
}

.preview-medium {
display: inline-block;
border-radius: var(--border-radius);
max-width: 100%;
max-height: 192px;
}

.preview-small {
display: inline-block;
border-radius: var(--border-radius);
max-width: 100%;
max-height: 32px;
}

.preview-loading {
position: absolute;
border-radius: var(--border-radius);
width: 100%;
height: 100%;
background-color: var(--color-background-dark);
}

.image-container {
position: relative;
display: inline-block;
display: inline-flex;
width: 100%;
height: 100%;
max-width: 100%;
max-height: 100%;
border-radius: var(--border-radius);

&.playable {
.preview {
Expand Down