Skip to content

[stable30] fix: invalid keys #2710

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
skjnldsv merged 3 commits into from
Jan 28, 2025
Merged

[stable30] fix: invalid keys #2710

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
babb844
fix: invalid keys
skjnldsv Jan 28, 2025
5ee1c7a
fix: stylelint
skjnldsv Jan 28, 2025
9086823
chore: Delete node-when-unrelated workflow
skjnldsv Jan 28, 2025
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
Next Next commit
fix: invalid keys 
Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Jan 28, 2025
commit babb844b0d095cbbbbf1e685acfdd59395809242
36 changes: 21 additions & 15 deletions src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
:data-handler="handlerId">
<component :is="currentFile.modal"
v-if="!currentFile.failed"
:key="currentFile | uniqueKey"
:key="uniqueKey(currentFile)"
ref="content"
:active="true"
:can-swipe="false"
Expand Down Expand Up @@ -117,7 +117,7 @@
<!-- COMPARE FILE -->
<div v-if="comparisonFile && !comparisonFile.failed && showComparison" class="viewer__file-wrapper">
<component :is="comparisonFile.modal"
:key="comparisonFile | uniqueKey"
:key="uniqueKey(comparisonFile)"
ref="comparison-content"
v-bind="comparisonFile"
:active="true"
Expand All @@ -132,8 +132,8 @@
</div>

<!-- PREVIOUS -->
<div v-if="previousFile"
:key="previousFile | uniqueKey"
<div v-if="hasPreviousFile"
:key="uniqueKey(previousFile)"
class="viewer__file-wrapper viewer__file-wrapper--hidden"
aria-hidden="true"
inert>
Expand All @@ -149,7 +149,7 @@
</div>

<!-- CURRENT -->
<div :key="currentFile | uniqueKey" class="viewer__file-wrapper">
<div :key="uniqueKey(currentFile)" class="viewer__file-wrapper">
<component :is="currentFile.modal"
v-if="!currentFile.failed"
ref="content"
Expand All @@ -169,8 +169,8 @@
</div>

<!-- NEXT -->
<div v-if="nextFile"
:key="nextFile | uniqueKey"
<div v-if="hasNextFile"
:key="uniqueKey(nextFile)"
class="viewer__file-wrapper viewer__file-wrapper--hidden"
aria-hidden="true"
inert>
Expand Down Expand Up @@ -242,12 +242,6 @@ export default defineComponent({
Pencil,
},

filters: {
uniqueKey(file) {
return '' + file.fileid + file.source
},
},

mixins: [isFullscreen, isMobile],

data() {
Expand Down Expand Up @@ -341,6 +335,15 @@ export default defineComponent({
return this.currentIndex === this.fileList.length - 1
},

hasPreviousFile() {
// Check if empty object
return Object.keys(this.previousFile).length > 0
},
hasNextFile() {
// Check if empty object
return Object.keys(this.nextFile).length > 0
},

isImage() {
return ['image/jpeg', 'image/png', 'image/webp'].includes(this.currentFile?.mime)
},
Expand Down Expand Up @@ -580,6 +583,9 @@ export default defineComponent({
},

methods: {
uniqueKey(file) {
return '' + file.fileid + file.source
},
async beforeOpen() {
// initial loading start
this.initiated = true
Expand Down Expand Up @@ -780,7 +786,7 @@ export default defineComponent({
}
} else {
// RESET
this.previousFile = null
this.previousFile = {}
}

if (next) {
Expand All @@ -790,7 +796,7 @@ export default defineComponent({
}
} else {
// RESET
this.nextFile = null
this.nextFile = {}
}

},
Expand Down
Loading