Skip to content

fix: avoid breaking card details modal when viewing attachment #7978

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

Open
luka-nextcloud wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

fix: avoid breaking card details modal when viewing attachment #7978

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion src/components/card/AttachmentList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ export default {
return (attachment) => attachment?.extendedData?.info?.extension
?? (attachment?.name ?? attachment.data).split('.').pop()
},
cardDetailsInModal() {
return this.$store.getters.config('cardDetailsInModal')
},
},
watch: {
cardId: {
Expand Down Expand Up @@ -245,7 +248,17 @@ export default {
},
showViewer(attachment) {
if (attachment.extendedData.fileid && window.OCA.Viewer.availableHandlers.map(handler => handler.mimes).flat().includes(attachment.extendedData.mimetype)) {
window.OCA.Viewer.open({ path: attachment.extendedData.path })
// Hide the sidebar if opening card in modal to avoid wrong sidebar position calculating in Viewer app
const sidebar = document.querySelector('aside.app-sidebar')
if (sidebar && this.cardDetailsInModal) {
sidebar.style.display = 'none'
}
const onClose = () => {
if (sidebar && sidebar.style.display === 'none') {
sidebar.style.display = ''
}
}
window.OCA.Viewer.open({ path: attachment.extendedData.path, onClose })
return
}

Expand Down
Loading