3 files changed, 76 insertions, 69 deletions
diff --git a/apps/files/src/mixins/actionsMixin.ts b/apps/files/src/mixins/actionsMixin.ts
new file mode 100644
index 00000000000..f81b0754431
--- /dev/null
+++ b/apps/files/src/mixins/actionsMixin.ts
@@ -0,0 +1,65 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { FileAction } from '@nextcloud/files'
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+
+	data() {
+		return {
+			openedSubmenu: null as FileAction|null,
+		}
+	},
+
+	computed: {
+		enabledSubmenuActions(): Record<string, FileAction[]> {
+			return (this.enabledFileActions as FileAction[])
+				.reduce((record, action) => {
+					if (action.parent !== undefined) {
+						if (!record[action.parent]) {
+							record[action.parent] = []
+						}
+
+						record[action.parent].push(action)
+					}
+					return record
+				}, {} as Record<string, FileAction[]>)
+		},
+	},
+
+	methods: {
+		/**
+		 * Check if a menu is valid, meaning it is
+		 * defined and has at least one action
+		 *
+		 * @param action The action to check
+		 */
+		isValidMenu(action: FileAction): boolean {
+			return this.enabledSubmenuActions[action.id]?.length > 0
+		},
+
+		async onBackToMenuClick(action: FileAction|null) {
+			if (!action) {
+				return
+			}
+
+			this.openedSubmenu = null
+			// Wait for first render
+			await this.$nextTick()
+
+			// Focus the previous menu action button
+			this.$nextTick(() => {
+				// Focus the action button, test both batch and single action references
+				// as this mixin is used in both single and batch actions.
+				const menuAction = this.$refs[`action-batch-${action.id}`]?.[0]
+					|| this.$refs[`action-${action.id}`]?.[0]
+				if (menuAction) {
+					menuAction.$el.querySelector('button')?.focus()
+				}
+			})
+		},
+	},
+})
diff --git a/apps/files/src/mixins/filesListWidth.ts b/apps/files/src/mixins/filesListWidth.ts
deleted file mode 100644
index 31f942e2d7b..00000000000
--- a/apps/files/src/mixins/filesListWidth.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import Vue from 'vue'
-
-export default Vue.extend({
-	data() {
-		return {
-			filesListWidth: null as number | null,
-		}
-	},
-	mounted() {
-		const fileListEl = document.querySelector('#app-content-vue')
-		this.filesListWidth = fileListEl?.clientWidth ?? null
-
-		this.$resizeObserver = new ResizeObserver((entries) => {
-			if (entries.length > 0 && entries[0].target === fileListEl) {
-				this.filesListWidth = entries[0].contentRect.width
-			}
-		})
-		this.$resizeObserver.observe(fileListEl as Element)
-	},
-	beforeDestroy() {
-		this.$resizeObserver.disconnect()
-	},
-})
diff --git a/apps/files/src/mixins/filesSorting.ts b/apps/files/src/mixins/filesSorting.ts
index 0457969c01b..12515db103f 100644
--- a/apps/files/src/mixins/filesSorting.ts
+++ b/apps/files/src/mixins/filesSorting.ts
@@ -1,38 +1,25 @@
 /**
- * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import Vue from 'vue'
 
 import { mapState } from 'pinia'
 import { useViewConfigStore } from '../store/viewConfig'
-import { Navigation, View } from '@nextcloud/files'
+import { useNavigation } from '../composables/useNavigation'
 
 export default Vue.extend({
+	setup() {
+		const { currentView } = useNavigation()
+
+		return {
+			currentView,
+		}
+	},
+
 	computed: {
 		...mapState(useViewConfigStore, ['getConfig', 'setSortingBy', 'toggleSortingDirection']),
 
-		currentView(): View {
-			return (this.$navigation as Navigation).active as View
-		},
-
 		/**
 		 * Get the sorting mode for the current view
 		 */