Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix(files): focus sidebar tab on tab or file change
Signed-off-by: Grigorii K. Shartsev <[email protected]>
  • Loading branch information
ShGKme authored and backportbot[bot] committed Feb 8, 2024
commit b3958652dfab2882354224a49722aba2447d213e
25 changes: 16 additions & 9 deletions apps/files/src/views/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
ref="sidebar"
v-bind="appSidebar"
:force-menu="true"
tabindex="0"
@close="close"
@update:active="setActiveTab"
@[defaultActionListener].stop.prevent="onDefaultAction"
Expand Down Expand Up @@ -470,6 +469,10 @@ export default {
throw new Error(`Invalid path '${path}'`)
}

// Only focus the tab when the selected file/tab is changed in already opened sidebar
// Focusing the sidebar on first file open is handled by NcAppSidebar
const focusTabAfterLoad = !!this.Sidebar.file

// update current opened file
this.Sidebar.file = path

Expand All @@ -488,19 +491,23 @@ export default {
view.setFileInfo(this.fileInfo)
})

this.$nextTick(() => {
if (this.$refs.tabs) {
this.$refs.tabs.updateTabs()
}
this.setActiveTab(this.Sidebar.activeTab || this.tabs[0].id)
})
await this.$nextTick()

this.setActiveTab(this.Sidebar.activeTab || this.tabs[0].id)

this.loading = false

await this.$nextTick()

if (focusTabAfterLoad) {
this.$refs.sidebar.focusActiveTabContent()
}
} catch (error) {
this.loading = false
this.error = t('files', 'Error while loading the file data')
console.error('Error while loading the file data', error)

throw new Error(error)
} finally {
this.loading = false
}
},

Expand Down