fix(files): simplify active store handling

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

apps/files/src/components/FileEntry/FileEntryActions.vue

@@ -162,7 +162,7 @@ export default defineComponent({
 
 	computed: {
 		isActive() {
-			return this.activeStore.active?.source === this.source.source
+			return this.activeStore.activeNode?.source === this.source.source
 		},
 
 		isLoading() {

apps/files/src/components/FileEntry/FileEntryCheckbox.vue

@@ -74,7 +74,7 @@ export default defineComponent({
 
 	computed: {
 		isActive() {
-			return this.activeStore.active?.source === this.source.source
+			return this.activeStore.activeNode?.source === this.source.source
 		},
 
 		selectedFiles() {

apps/files/src/store/active.ts

@@ -4,16 +4,20 @@
  */
 
 import type { ActiveStore } from '../types.ts'
-import type { Node } from '@nextcloud/files'
+import type { Node, View } from '@nextcloud/files'
 
 import { defineStore } from 'pinia'
+import { getNavigation } from '@nextcloud/files'
 import { subscribe } from '@nextcloud/event-bus'
+
 import logger from '../logger.ts'
 
 export const useActiveStore = function(...args) {
 	const store = defineStore('active', {
 		state: () => ({
-			active: null,
+			_initialized: false,
+			activeNode: null,
+			activeView: null,
 		} as ActiveStore),
 
 		actions: {
@@ -22,32 +26,43 @@ export const useActiveStore = function(...args) {
 					throw new Error('Use clearActiveNode to clear the active node')
 				}
 				logger.debug('Setting active node', { node })
-				this.active = node
+				this.activeNode = node
 			},
 
 			/**
 			 * Clear the active node
 			 */
 			clearActiveNode() {
-				this.active = null
+				this.activeNode = null
 			},
 
 			onDeletedNode(node: Node) {
-				if (this.active && this.active.source === node.source) {
+				if (this.activeNode && this.activeNode.source === node.source) {
 					this.clearActiveNode()
 				}
 			},
+
+			onChangedView(view: View|null = null) {
+				logger.debug('Setting active view', { view })
+				this.activeView = view
+				this.clearActiveNode()
+			},
 		},
 	})
 
 	const activeStore = store(...args)
+	const navigation = getNavigation()
 
 	// Make sure we only register the listeners once
 	if (!activeStore._initialized) {
 		subscribe('files:node:deleted', activeStore.onDeletedNode)
-		subscribe('files:navigation:changed', activeStore.clearActiveNode)
 
 		activeStore._initialized = true
+
+		// Or you can react to changes of the current active view
+		navigation.addEventListener('updateActive', (event) => {
+			activeStore.onChangedView(event.detail)
+		})
 	}
 
 	return activeStore

apps/files/src/types.ts

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { Folder, Node } from '@nextcloud/files'
+import type { Folder, Node, View } from '@nextcloud/files'
 import type { Upload } from '@nextcloud/upload'
 
 // Global definitions
@@ -97,7 +97,9 @@ export interface DragAndDropStore {
 
 // Active node store
 export interface ActiveStore {
-	active: Node|null
+	_initialized: boolean
+	activeNode: Node|null
+	activeView: View|null
 }
 
 export interface TemplateFile {