From 235034af68c007eac9e60904f32908aeb46fc172 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 a9879fc72..60ddffa82 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -118,6 +118,7 @@
 						:placeholder="t('deck', 'Card name')"
 						required
 						pattern=".*\S+.*"
+						@focus="onCreateCardFocus"
 						@keydown.esc="stopCardCreation">
 					<input v-show="!stateCardCreating"
 						class="icon-confirm"
@@ -229,6 +230,13 @@ export default {
 			},
 		},
 	},
+	watch: {
+		showAddCard(newValue) {
+			if (!newValue) {
+				this.$store.dispatch('toggleShortcutLock', false)
+			}
+		},
+	},
 
 	methods: {
 		stopCardCreation(e) {
@@ -318,6 +326,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 da3708f5c..11b5754da 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -130,6 +130,7 @@ export default {
 			showArchived: state => state.showArchived,
 			currentBoard: state => state.currentBoard,
 			showCardCover: state => state.showCardCover,
+			shortcutLock: state => state.shortcutLock,
 		}),
 		...mapGetters([
 			'isArchived',
@@ -205,6 +206,9 @@ export default {
 	},
 	methods: {
 		focus(card) {
+			if (this.shortcutLock) {
+				return
+			}
 			card = this.$refs[`card${card}`]
 			card.focus()
 		},

From 32db88c8822fd8f9fb5ada37710e4c4d3e3ed3b2 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 07348c5c9..695a2d5db 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -17,7 +17,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: