Merge 811ee15 into 049f821

nextcloud · Nov 7, 2022 · efcf480 · efcf480
2 parents 049f821 + 811ee15
commit efcf480
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 16 deletions.
diff --git a/cypress/e2e/workspace.spec.js b/cypress/e2e/workspace.spec.js
@@ -43,6 +43,31 @@ describe('Workspace', function() {
 		})
 	})
 
+	it('Hides the workspace when switching to another folder', function() {
+		cy.uploadFile('test.md', 'text/markdown', `${currentFolder}/README.md`)
+		cy.createFolder(`${currentFolder}/subdirectory`)
+		cy.reload()
+		cy.get('.files-fileList').should('contain', 'README.md')
+		cy.get('#rich-workspace .ProseMirror')
+			.should('contain', 'Hello world')
+		cy.openFolder('subdirectory')
+		cy.get('#rich-workspace')
+			.get('.ProseMirror')
+			.should('not.exist')
+	})
+
+	it('Hides the workspace when switching to another view', function() {
+		cy.uploadFile('test.md', 'text/markdown', `${currentFolder}/README.md`)
+		cy.reload()
+		cy.get('.files-fileList').should('contain', 'README.md')
+		cy.get('#rich-workspace .ProseMirror')
+			.should('contain', 'Hello world')
+		cy.get('.nav-recent')
+			.click()
+		cy.get('#rich-workspace .ProseMirror')
+			.should('not.exist')
+	})
+
 	it('adds a Readme.md', function() {
 		cy.get('.files-fileList').should('not.contain', 'Readme.md')
 		cy.openWorkspace()

diff --git a/js/editor-rich.js b/js/editor-rich.js
diff --git a/js/editor-rich.js.map b/js/editor-rich.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/helpers/files.js b/src/helpers/files.js
@@ -21,6 +21,7 @@
  */
 
 import { loadState } from '@nextcloud/initial-state'
+import { subscribe } from '@nextcloud/event-bus'
 import { openMimetypes } from './mime.js'
 import { getSharingToken } from './token.js'
 import RichWorkspace from '../views/RichWorkspace.vue'
@@ -170,6 +171,12 @@ const FilesWorkspacePlugin = {
 				store,
 			}).$mount(this.el)
 
+			subscribe('files:navigation:changed', () => {
+				// Expose if the default file list is active to the component
+				// to only render the workspace if the file list is actually visible
+				vm.active = OCA.Files.App.getCurrentFileList() === fileList
+			})
+
 			fileList.$el.on('urlChanged', data => {
 				vm.path = data.dir.toString()
 			})

diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<div v-if="enabled" id="rich-workspace" :class="{'icon-loading': !loaded || !ready, 'focus': focus, 'dark': darkTheme, 'creatable': canCreate, 'empty': showEmptyWorkspace}">
+	<div v-if="enabled && active" id="rich-workspace" :class="{'icon-loading': !loaded || !ready, 'focus': focus, 'dark': darkTheme, 'creatable': canCreate, 'empty': showEmptyWorkspace}">
 		<a v-if="showEmptyWorkspace"
 			tabindex="0"
 			class="empty-workspace"
@@ -71,6 +71,10 @@ export default {
 			type: String,
 			required: true,
 		},
+		active: {
+			type: Boolean,
+			default: true,
+		},
 	},
 	data() {
 		return {