From efcb98730416c7efc8c339304580a864f92a29b6 Mon Sep 17 00:00:00 2001
From: Christian Hartmann <chris-hartmann@gmx.de>
Date: Fri, 12 Jun 2026 11:34:36 +0200
Subject: [PATCH] fix: validation error shown in NcNoteCard for QuestionShort

also add missing aria error handling

Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>
---
 playwright/support/sections/SubmitSection.ts  |  2 +
 src/components/Questions/QuestionColor.vue    |  2 +
 src/components/Questions/QuestionDate.vue     |  2 +
 src/components/Questions/QuestionDropdown.vue |  2 +
 src/components/Questions/QuestionFile.vue     |  4 +-
 .../Questions/QuestionLinearScale.vue         |  2 +
 src/components/Questions/QuestionLong.vue     |  2 +
 src/components/Questions/QuestionRanking.vue  |  4 +-
 src/components/Questions/QuestionShort.vue    | 56 ++++++++++---------
 9 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/playwright/support/sections/SubmitSection.ts b/playwright/support/sections/SubmitSection.ts
index a23e0e097..4f6f5edcd 100644
--- a/playwright/support/sections/SubmitSection.ts
+++ b/playwright/support/sections/SubmitSection.ts
@@ -46,6 +46,8 @@ export class SubmitSection {
 	): Promise<void> {
 		const question = this.getQuestion(questionName)
 		await question.getByRole('textbox').fill(value)
+		// Wait for the debounced input handler to fire (INPUT_DEBOUNCE_MS = 400ms)
+		await this.page.waitForTimeout(500)
 	}
 
 	/**
diff --git a/src/components/Questions/QuestionColor.vue b/src/components/Questions/QuestionColor.vue
index 2655cb1b9..89f45b7bc 100644
--- a/src/components/Questions/QuestionColor.vue
+++ b/src/components/Questions/QuestionColor.vue
@@ -19,6 +19,8 @@
 				:modelValue="pickedColor"
 				advancedFields
 				:aria-required="isRequired"
+				:aria-errormessage="hasError ? errorId : undefined"
+				:aria-invalid="hasError ? 'true' : undefined"
 				@update:modelValue="onUpdatePickedColor">
 				<NcButton :disabled="!readOnly">
 					{{ colorPickerPlaceholder }}
diff --git a/src/components/Questions/QuestionDate.vue b/src/components/Questions/QuestionDate.vue
index e4e5aa1f3..087cf0b02 100644
--- a/src/components/Questions/QuestionDate.vue
+++ b/src/components/Questions/QuestionDate.vue
@@ -97,6 +97,8 @@
 				:disabledDate="disabledDates"
 				:disabledTime="disabledTimes"
 				:aria-required="isRequired"
+				:aria-errormessage="hasError ? errorId : undefined"
+				:aria-invalid="hasError ? 'true' : undefined"
 				clearable
 				@update:modelValue="onValueChange" />
 		</div>
diff --git a/src/components/Questions/QuestionDropdown.vue b/src/components/Questions/QuestionDropdown.vue
index e937a79a3..4e3ea9a4e 100644
--- a/src/components/Questions/QuestionDropdown.vue
+++ b/src/components/Questions/QuestionDropdown.vue
@@ -41,6 +41,8 @@
 				:searchable="false"
 				label="text"
 				:aria-label-combobox="selectOptionPlaceholder"
+				:aria-errormessage="hasError ? errorId : undefined"
+				:aria-invalid="hasError ? 'true' : undefined"
 				@invalid.prevent="validate"
 				@update:modelValue="onInput" />
 		</div>
diff --git a/src/components/Questions/QuestionFile.vue b/src/components/Questions/QuestionFile.vue
index bfca0c56b..e6dda6b06 100644
--- a/src/components/Questions/QuestionFile.vue
+++ b/src/components/Questions/QuestionFile.vue
@@ -111,7 +111,9 @@
 						class="question__input-wrapper"
 						role="group"
 						:aria-labelledby="titleId"
-						:aria-describedby="description ? descriptionId : undefined">
+						:aria-describedby="description ? descriptionId : undefined"
+						:aria-errormessage="hasError ? errorId : undefined"
+						:aria-invalid="hasError ? 'true' : undefined">
 						<label>
 							{{ t('forms', 'Add new file as answer') }}
 							<input
diff --git a/src/components/Questions/QuestionLinearScale.vue b/src/components/Questions/QuestionLinearScale.vue
index 4a8888fde..ac7195ff6 100644
--- a/src/components/Questions/QuestionLinearScale.vue
+++ b/src/components/Questions/QuestionLinearScale.vue
@@ -81,6 +81,8 @@
 					<NcCheckboxRadioSwitch
 						:id="`linear-scale-${id}-${option}`"
 						:aria-describedby="index === 0 ? labelId : undefined"
+						:aria-errormessage="hasError ? errorId : undefined"
+						:aria-invalid="hasError ? 'true' : undefined"
 						:disabled="!readOnly"
 						:modelValue="questionValues"
 						:value="option.toString()"
diff --git a/src/components/Questions/QuestionLong.vue b/src/components/Questions/QuestionLong.vue
index ffabdb983..110c40861 100644
--- a/src/components/Questions/QuestionLong.vue
+++ b/src/components/Questions/QuestionLong.vue
@@ -15,6 +15,8 @@
 				ref="textarea"
 				:aria-labelledby="titleId"
 				:aria-describedby="description ? descriptionId : undefined"
+				:aria-errormessage="hasError ? errorId : undefined"
+				:aria-invalid="hasError ? 'true' : undefined"
 				:placeholder="submissionInputPlaceholder"
 				:disabled="!readOnly"
 				:required="isRequired"
diff --git a/src/components/Questions/QuestionRanking.vue b/src/components/Questions/QuestionRanking.vue
index d5687f145..0287b96b3 100644
--- a/src/components/Questions/QuestionRanking.vue
+++ b/src/components/Questions/QuestionRanking.vue
@@ -32,7 +32,9 @@
 			class="question__content"
 			role="list"
 			:aria-labelledby="titleId"
-			:aria-describedby="description ? descriptionId : undefined">
+			:aria-describedby="description ? descriptionId : undefined"
+			:aria-errormessage="hasError ? errorId : undefined"
+			:aria-invalid="hasError ? 'true' : undefined">
 			<!-- Unranked pool -->
 			<div class="ranking-unranked">
 				<Draggable
diff --git a/src/components/Questions/QuestionShort.vue b/src/components/Questions/QuestionShort.vue
index 56ba76bb3..1718dffb1 100644
--- a/src/components/Questions/QuestionShort.vue
+++ b/src/components/Questions/QuestionShort.vue
@@ -15,6 +15,8 @@
 				ref="input"
 				:aria-labelledby="titleId"
 				:aria-describedby="description ? descriptionId : undefined"
+				:aria-errormessage="hasError ? errorId : undefined"
+				:aria-invalid="hasError ? 'true' : undefined"
 				:placeholder="submissionInputPlaceholder"
 				:disabled="!readOnly"
 				:name="name || undefined"
@@ -78,12 +80,14 @@
 
 <script>
 import IconRegex from '@material-symbols/svg-400/outlined/regular_expression.svg?raw'
+import debounce from 'debounce'
 import NcActionInput from '@nextcloud/vue/components/NcActionInput'
 import NcActionRadio from '@nextcloud/vue/components/NcActionRadio'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import Question from './Question.vue'
 import QuestionMixin from '../../mixins/QuestionMixin.js'
+import { INPUT_DEBOUNCE_MS } from '../../models/Constants.ts'
 import validationTypes from '../../models/ValidationTypes.js'
 import { splitRegex, validateExpression } from '../../utils/RegularExpression.js'
 
@@ -159,44 +163,42 @@ export default {
 
 	methods: {
 		async validate() {
-			if (
-				this.isRequired
-				&& (this.values.length === 0 || this.values[0] === '')
-			) {
+			/** @type {HTMLInputElement} */
+			const input = this.$refs.input
+			const value = input.value
+
+			// Clear the previous custom error before checking native validity.
+			input.setCustomValidity('')
+
+			if (this.isRequired && input.validity.valueMissing) {
 				this.errorMessage = t('forms', 'You must answer this question')
 				return false
 			}
 
+			const isCustomValid =
+				!value
+				|| this.validationObject.validate(
+					value,
+					splitRegex(this.validationRegex),
+				)
+
+			if (!input.validity.valid || !isCustomValid) {
+				input.setCustomValidity(this.validationObject.errorMessage)
+				this.errorMessage = this.validationObject.errorMessage
+				return false
+			}
+
 			this.errorMessage = null
 			return true
 		},
 
-		onInput() {
-			/** @type {HTMLObjectElement} */
+		onInput: debounce(async function () {
+			/** @type {HTMLInputElement} */
 			const input = this.$refs.input
-			/** @type {string} */
 			const value = input.value
-
-			input.setCustomValidity('')
-
-			// Only check non empty values, this question might not be required, if not already invalid
-			if (value) {
-				// Then check native browser validation (might be better then our)
-				// If the browsers validation succeeds either the browser does not implement a validation
-				// or it is valid, so we double check by running our custom validation.
-				if (
-					!input.checkValidity()
-					|| !this.validationObject.validate(
-						value,
-						splitRegex(this.validationRegex),
-					)
-				) {
-					input.setCustomValidity(this.validationObject.errorMessage)
-				}
-			}
-
 			this.$emit('update:values', [value])
-		},
+			this.validate()
+		}, INPUT_DEBOUNCE_MS),
 
 		/**
 		 * Change input type