Merge pull request #4735 from nextcloud/bugfix/lists

nextcloud · Sep 5, 2023 · ff8c2d0 · ff8c2d0
2 parents 9fe22e4 + fafb9fc
commit ff8c2d0
Show file tree

Hide file tree

Showing 17 changed files with 57 additions and 25 deletions.
diff --git a/cypress/e2e/viewer.spec.js b/cypress/e2e/viewer.spec.js
@@ -94,4 +94,33 @@ describe('Open test.md in viewer', function() {
  cy.get('#viewer .modal-header button.header-close').click()
  cy.get('#viewer').should('not.exist')
  })
+
+ it('Can use tab keys for list in the viewer', function() {
+ // This used to break with the focus trap that the viewer modal has
+ cy.openFile('empty.md')
+
+ cy.getContent()
+ .type('- test{enter}')
+
+ // Cypress does not have native tab key support, though this seems to work
+ // for triggering the key handler of tiptap
+ // https:/cypress-io/cypress/issues/311
+ cy.getContent()
+ .trigger('keydown', { keyCode: 9 })
+ cy.getContent()
+ .trigger('keyup', { keyCode: 9 })
+ cy.getContent()
+ .type('Nested list')
+
+ cy.getContent().find('ul li').should('contain', 'test')
+ cy.getContent().find('ul li ul li').should('contain', 'Nested list')
+
+ cy.getContent()
+ .trigger('keydown', { keyCode: 9, shiftKey: true })
+ cy.getContent()
+ .trigger('keyup', { keyCode: 9, shiftKey: true })
+
+ cy.getContent().find('ul li').eq(0).should('contain', 'test')
+ cy.getContent().find('ul li').eq(1).should('contain', 'Nested list')
+ })
 })
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.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/components/Editor.vue b/src/components/Editor.vue
@@ -635,9 +635,16 @@ export default {
 
  onFocus() {
  this.emit('focus')
+
+ // Make sure that the focus trap doesn't catch tab keys while being in the contenteditable
+ window._nc_focus_trap?.[0]?.pause()
  },
  onBlur() {
  this.emit('blur')
+
+ // Hand back focus to the previous trap
+ window._nc_focus_trap?.[0]?.unpause()
+ this.$el.focus()
  },
 
  onAddImageNode() {