From a364ca8733c5b8b4989c0a8ef5bc836e32b5d4e8 Mon Sep 17 00:00:00 2001
From: Luka Trovic <luka@nextcloud.com>
Date: Fri, 26 Jul 2024 13:57:57 +0200
Subject: [PATCH 1/2] fix: losing focus while editing title field

Signed-off-by: Luka Trovic <luka@nextcloud.com>
---
 src/components/board/Stack.vue    | 11 +++++++++++
 src/components/cards/CardItem.vue |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index f3a51c39f..37ead724a 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -100,6 +100,7 @@
 						:placeholder="t('deck', 'Card name')"
 						required
 						pattern=".*\S+.*"
+						@focus="onCreateCardFocus"
 						@keydown.esc="stopCardCreation">
 					<input v-show="!stateCardCreating"
 						class="icon-confirm"
@@ -211,6 +212,13 @@ export default {
 			},
 		},
 	},
+	watch: {
+		showAddCard(newValue) {
+			if (!newValue) {
+				this.$store.dispatch('toggleShortcutLock', false)
+			}
+		},
+	},
 
 	methods: {
 		stopCardCreation(e) {
@@ -300,6 +308,9 @@ export default {
 				this.stateCardCreating = false
 			}
 		},
+		onCreateCardFocus() {
+			this.$store.dispatch('toggleShortcutLock', true)
+		},
 	},
 }
 </script>
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index f1de67971..f0be5a275 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -109,6 +109,7 @@ export default {
 			showArchived: state => state.showArchived,
 			currentBoard: state => state.currentBoard,
 			showCardCover: state => state.showCardCover,
+			shortcutLock: state => state.shortcutLock,
 		}),
 		...mapGetters([
 			'isArchived',
@@ -184,6 +185,9 @@ export default {
 	},
 	methods: {
 		focus(card) {
+			if (this.shortcutLock) {
+				return
+			}
 			card = this.$refs[`card${card}`]
 			card.focus()
 		},

From 2e552f474a3ecd4cf2af62f9615513b3df577297 Mon Sep 17 00:00:00 2001
From: Luka Trovic <luka@nextcloud.com>
Date: Thu, 1 Aug 2024 14:37:17 +0200
Subject: [PATCH 2/2] fix: cypress ci issue

Signed-off-by: Luka Trovic <luka@nextcloud.com>
---
 cypress/support/e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 8e213da64..f76ab5383 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -21,7 +21,7 @@
 import './commands.js'
 
 Cypress.on('uncaught:exception', (err) => {
-	return !err.message.includes('ResizeObserver loop limit exceeded')
+	return !err.message.includes('ResizeObserver loop limit exceeded') && !err.message.includes('ResizeObserver loop completed with undelivered notifications')
 })
 
 // Alternatively you can use CommonJS syntax: