Merge pull request #53872 from nextcloud/fix/headers-lifecycle

This commit is contained in:
John Molakvoæ 2025-07-09 15:31:09 +02:00 committed by GitHub
commit c7b83ef2e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 46 additions and 10 deletions

View file

@ -12,6 +12,8 @@
import type { Folder, Header, View } from '@nextcloud/files'
import type { PropType } from 'vue'
import PQueue from 'p-queue'
import logger from '../logger.ts'
/**
@ -36,6 +38,14 @@ export default {
required: true,
},
},
setup() {
// Create a queue to ensure that the header is only rendered once at a time
const queue = new PQueue({ concurrency: 1 })
return {
queue,
}
},
computed: {
enabled() {
return this.header.enabled?.(this.currentFolder, this.currentView) ?? true
@ -46,19 +56,45 @@ export default {
if (!enabled) {
return
}
this.header.updated(this.currentFolder, this.currentView)
// If the header is enabled, we need to render it
logger.debug(`Enabled ${this.header.id} FilesListHeader`, { header: this.header })
this.queueUpdate(this.currentFolder, this.currentView)
},
currentFolder() {
this.header.updated(this.currentFolder, this.currentView)
currentFolder(folder: Folder) {
// This method can be used to queue an update of the header
// It will ensure that the header is only updated once at a time
this.queueUpdate(folder, this.currentView)
},
currentView(view: View) {
this.queueUpdate(this.currentFolder, view)
},
},
mounted() {
logger.debug(`Mounted ${this.header.id} FilesListHeader`, { header: this.header })
this.header.render(this.$refs.mount as HTMLElement, this.currentFolder, this.currentView)
},
mounted() {
logger.debug(`Mounted ${this.header.id} FilesListHeader`, { header: this.header })
const initialRender = () => this.header.render(this.$refs.mount as HTMLElement, this.currentFolder, this.currentView)
this.queue.add(initialRender).then(() => {
logger.debug(`Rendered ${this.header.id} FilesListHeader`, { header: this.header })
}).catch((error) => {
logger.error(`Error rendering ${this.header.id} FilesListHeader`, { header: this.header, error })
})
},
destroyed() {
logger.debug(`Destroyed ${this.header.id} FilesListHeader`, { header: this.header })
},
methods: {
queueUpdate(currentFolder: Folder, currentView: View) {
// This method can be used to queue an update of the header
// It will ensure that the header is only updated once at a time
this.queue.add(() => this.header.updated(currentFolder, currentView))
.then(() => {
logger.debug(`Updated ${this.header.id} FilesListHeader`, { header: this.header })
})
.catch((error) => {
logger.error(`Error updating ${this.header.id} FilesListHeader`, { header: this.header, error })
})
},
},
}
</script>

4
dist/files-main.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long