fix: Revert existing rich workspace styling and make cypress tests mo…

…re stable Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Feb 1, 2023 · 0f94194 · 0f94194
1 parent 91d7794
commit 0f94194
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/cypress/e2e/workspace.spec.js b/cypress/e2e/workspace.spec.js
@@ -73,7 +73,7 @@ describe('Workspace', function() {
 		cy.visit(`apps/files?dir=/${encodeURIComponent(currentFolder)}`)
 		cy.get('.files-fileList').should('not.contain', 'Readme.md')
 
-		cy.get('.files-controls').within(() => {
+		cy.get('.files-controls').first().within(() => {
 			cy.get('.button.new').click()
 			cy.get('.newFileMenu a.menuitem[data-action="rich-workspace-init"]').click()
 			cy.wait('@addDescription')
@@ -87,8 +87,8 @@ describe('Workspace', function() {
 	it('formats text', function() {
 		cy.visit(`apps/files?dir=/${encodeURIComponent(currentFolder)}`)
 		cy.openWorkspace()
-			.type('Format me', { force: true })
-			.type('{selectall}', { force: true })
+			.type('Format me')
+			.type('{selectall}')
 		;[
 			['bold', 'strong'],
 			['italic', 'em'],

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -332,7 +332,7 @@ Cypress.Commands.add('getMenuEntry', (name) => {
 Cypress.Commands.add('getSubmenuEntry', { prevSubject: 'optional' }, (subject, parent, name) => {
 	return (subject ? cy.wrap(subject) : cy.getMenu())
 		.getActionEntry(parent)
-		.click({force: true})
+		.click()
 		.then(() => cy.getActionSubEntry(name))
 })
 
@@ -401,7 +401,7 @@ Cypress.Commands.add('createDescription', () => {
 		.as('addDescription')
 
 	cy.get('.files-fileList').should('not.contain', 'Readme.md')
-	cy.get('.files-controls').within(() => {
+	cy.get('.files-controls').first().within(() => {
 		cy.get('.button.new').click()
 		cy.get('.newFileMenu a.menuitem[data-action="rich-workspace-init"]').click()
 	})

diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
@@ -219,42 +219,42 @@ export default {
 		color: var(--color-text-maxcontrast);
 	}
 
-	#rich-workspace div[contenteditable=false] {
+	#rich-workspace:deep(div[contenteditable=false]) {
 		width: 100%;
 		padding: 0px;
 		background-color: var(--color-main-background);
 		opacity: 1;
 		border: none;
 	}
 
-	#rich-workspace .text-editor {
+	#rich-workspace:deep(.text-editor) {
 		height: 100%;
 		position: unset !important;
 		top: auto !important;
 	}
 
-	#rich-workspace .text-editor__wrapper {
+	#rich-workspace:deep(.text-editor__wrapper) {
 		position: unset !important;
 		overflow: visible;
 	}
 
-	#rich-workspace .text-editor__main {
+	#rich-workspace:deep(.text-editor__main) {
 		overflow: visible !important;
 	}
 
-	#rich-workspace .content-wrapper {
+	#rich-workspace:deep(.content-wrapper) {
 		overflow: scroll !important;
 		max-height: calc(40vh - 50px);
 		padding-left: 10px;
 		padding-bottom: 10px;
 	}
 
-	#rich-workspace .text-editor__wrapper .ProseMirror {
+	#rich-workspace:deep(.text-editor__wrapper .ProseMirror) {
 		padding: 0px;
 		margin: 0;
 	}
 
-	#rich-workspace .editor__content {
+	#rich-workspace:deep(.editor__content) {
 		margin: 0;
 	}