fix(files): focus sidebar tab on tab or file change

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>

diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue
index d0c6b90b49d36fad2332e2f2f242749edddd9102..01cea14f8ebfdf529c2598ce3461f317256e31e5 100644 (file)
--- a/apps/files/src/views/Sidebar.vue
+++ b/apps/files/src/views/Sidebar.vue
@@ -25,7 +25,6 @@
                ref="sidebar"
                v-bind="appSidebar"
                :force-menu="true"
-               tabindex="0"
                @close="close"
                @update:active="setActiveTab"
                @[defaultActionListener].stop.prevent="onDefaultAction"
@@ -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
 
@@ -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
                        }
                },