From 6b1d56d3feffa256acee9ef14913e2acefd2e62c Mon Sep 17 00:00:00 2001
From: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Date: Mon, 8 Jun 2026 14:30:50 +0200
Subject: [PATCH 1/3] fix: save question reorder on drop instead of during drag

Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
---
 src/views/Create.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Create.vue b/src/views/Create.vue
index 05736f05a..9c7e98b3c 100644
--- a/src/views/Create.vue
+++ b/src/views/Create.vue
@@ -121,7 +121,7 @@
 					direction="vertical"
 					invertSwap
 					handle=".question__drag-handle"
-					@change="onQuestionOrderChange"
+					@update="onQuestionOrderChange"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<TransitionGroup

From f67613cd02976c852bbcc684261c3833d5b77e31 Mon Sep 17 00:00:00 2001
From: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Date: Mon, 8 Jun 2026 15:00:47 +0200
Subject: [PATCH 2/3] fix: save option reorder on drop instead of during drag

Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
---
 src/components/Questions/QuestionDropdown.vue | 2 +-
 src/components/Questions/QuestionGrid.vue     | 4 ++--
 src/components/Questions/QuestionMultiple.vue | 2 +-
 src/components/Questions/QuestionRanking.vue  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Questions/QuestionDropdown.vue b/src/components/Questions/QuestionDropdown.vue
index e128031fe..ee0ea90b7 100644
--- a/src/components/Questions/QuestionDropdown.vue
+++ b/src/components/Questions/QuestionDropdown.vue
@@ -55,7 +55,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@change="saveOptionsOrder('choice')"
+				@update="saveOptionsOrder('choice')"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/components/Questions/QuestionGrid.vue b/src/components/Questions/QuestionGrid.vue
index 97d017acd..44127c4e5 100644
--- a/src/components/Questions/QuestionGrid.vue
+++ b/src/components/Questions/QuestionGrid.vue
@@ -101,7 +101,7 @@
 					handle=".option__drag-handle"
 					invertSwap
 					target=".sort-target"
-					@change="saveOptionsOrder('column')"
+					@update="saveOptionsOrder('column')"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<!-- Column input edit -->
@@ -139,7 +139,7 @@
 					handle=".option__drag-handle"
 					invertSwap
 					target=".sort-target"
-					@change="saveOptionsOrder('row')"
+					@update="saveOptionsOrder('row')"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<TransitionGroup
diff --git a/src/components/Questions/QuestionMultiple.vue b/src/components/Questions/QuestionMultiple.vue
index 67d30ee44..d6ca2211a 100644
--- a/src/components/Questions/QuestionMultiple.vue
+++ b/src/components/Questions/QuestionMultiple.vue
@@ -126,7 +126,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@change="saveOptionsOrder('choice')"
+				@update="saveOptionsOrder('choice')"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/components/Questions/QuestionRanking.vue b/src/components/Questions/QuestionRanking.vue
index 181369af3..8a84b9d7b 100644
--- a/src/components/Questions/QuestionRanking.vue
+++ b/src/components/Questions/QuestionRanking.vue
@@ -141,7 +141,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@change="saveOptionsOrder('choice')"
+				@update="saveOptionsOrder('choice')"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup

From 6ea6cba2e1b0ac66423e9b6d05d61ed144e0eaeb Mon Sep 17 00:00:00 2001
From: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Date: Mon, 8 Jun 2026 15:36:59 +0200
Subject: [PATCH 3/3] fix: save option reorder on drop via debounced watcher

Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
---
 src/components/Questions/QuestionDropdown.vue | 2 +-
 src/components/Questions/QuestionGrid.vue     | 4 ++--
 src/components/Questions/QuestionMultiple.vue | 2 +-
 src/components/Questions/QuestionRanking.vue  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Questions/QuestionDropdown.vue b/src/components/Questions/QuestionDropdown.vue
index ee0ea90b7..b0f3bf091 100644
--- a/src/components/Questions/QuestionDropdown.vue
+++ b/src/components/Questions/QuestionDropdown.vue
@@ -55,7 +55,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@update="saveOptionsOrder('choice')"
+				@update="dirtyOptionsType = 'choice'"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/components/Questions/QuestionGrid.vue b/src/components/Questions/QuestionGrid.vue
index 44127c4e5..642d3680b 100644
--- a/src/components/Questions/QuestionGrid.vue
+++ b/src/components/Questions/QuestionGrid.vue
@@ -101,7 +101,7 @@
 					handle=".option__drag-handle"
 					invertSwap
 					target=".sort-target"
-					@update="saveOptionsOrder('column')"
+					@update="dirtyOptionsType = 'column'"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<!-- Column input edit -->
@@ -139,7 +139,7 @@
 					handle=".option__drag-handle"
 					invertSwap
 					target=".sort-target"
-					@update="saveOptionsOrder('row')"
+					@update="dirtyOptionsType = 'row'"
 					@start="onDragStart"
 					@end="onDragEnd">
 					<TransitionGroup
diff --git a/src/components/Questions/QuestionMultiple.vue b/src/components/Questions/QuestionMultiple.vue
index d6ca2211a..a6d4ae723 100644
--- a/src/components/Questions/QuestionMultiple.vue
+++ b/src/components/Questions/QuestionMultiple.vue
@@ -126,7 +126,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@update="saveOptionsOrder('choice')"
+				@update="dirtyOptionsType = 'choice'"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup
diff --git a/src/components/Questions/QuestionRanking.vue b/src/components/Questions/QuestionRanking.vue
index 8a84b9d7b..beb7473af 100644
--- a/src/components/Questions/QuestionRanking.vue
+++ b/src/components/Questions/QuestionRanking.vue
@@ -141,7 +141,7 @@
 				handle=".option__drag-handle"
 				invertSwap
 				target=".sort-target"
-				@update="saveOptionsOrder('choice')"
+				@update="dirtyOptionsType = 'choice'"
 				@start="onDragStart"
 				@end="onDragEnd">
 				<TransitionGroup