From 0c28e89b414fa30ac556e70499136435a4ff7e26 Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Fri, 19 Dec 2025 00:42:47 +0530
Subject: [PATCH] fix: missing required question warning (#6998)

---
 .../src/components/elements/consent.tsx       |  2 +-
 .../src/components/elements/date.tsx          | 28 +++++++++++--------
 .../src/components/elements/file-upload.tsx   |  5 ++--
 .../src/components/elements/matrix.tsx        |  2 ++
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/survey-ui/src/components/elements/consent.tsx b/packages/survey-ui/src/components/elements/consent.tsx
index 7cf7bab4f8..e507d1164e 100644
--- a/packages/survey-ui/src/components/elements/consent.tsx
+++ b/packages/survey-ui/src/components/elements/consent.tsx
@@ -74,7 +74,7 @@ function Consent({
             onCheckedChange={handleCheckboxChange}
             disabled={disabled}
             aria-invalid={Boolean(errorMessage)}
-            aria-required={required}
+            required={required}
           />
           {/* need to use style here because tailwind is not able to use css variables for font size and weight */}
           <span
diff --git a/packages/survey-ui/src/components/elements/date.tsx b/packages/survey-ui/src/components/elements/date.tsx
index d00c2e6e90..f8a703802d 100644
--- a/packages/survey-ui/src/components/elements/date.tsx
+++ b/packages/survey-ui/src/components/elements/date.tsx
@@ -1,5 +1,6 @@
 import * as React from "react";
 import { Calendar } from "@/components/general/calendar";
+import { ElementError } from "@/components/general/element-error";
 import { ElementHeader } from "@/components/general/element-header";
 import { getDateFnsLocale } from "@/lib/locale";
 
@@ -45,6 +46,7 @@ function DateElement({
   dir = "auto",
   disabled = false,
   locale = "en-US",
+  errorMessage,
 }: Readonly<DateElementProps>): React.JSX.Element {
   // Initialize date from value string, parsing as local time to avoid timezone issues
   const [date, setDate] = React.useState<Date | undefined>(() => {
@@ -128,17 +130,21 @@ function DateElement({
       {/* Headline */}
       <ElementHeader headline={headline} description={description} required={required} htmlFor={inputId} />
 
-      {/* Calendar - Always visible */}
-      <div className="w-full">
-        <Calendar
-          mode="single"
-          selected={date}
-          captionLayout="dropdown"
-          disabled={isDateDisabled}
-          onSelect={handleDateSelect}
-          locale={dateLocale}
-          className="rounded-input border-input-border bg-input-bg text-input-text shadow-input mx-auto w-full max-w-[25rem] border"
-        />
+      <div className="relative">
+        <ElementError errorMessage={errorMessage} dir={dir} />
+        {/* Calendar - Always visible */}
+        <div className="w-full">
+          <Calendar
+            mode="single"
+            selected={date}
+            captionLayout="dropdown"
+            disabled={isDateDisabled}
+            onSelect={handleDateSelect}
+            locale={dateLocale}
+            required={required}
+            className="rounded-input border-input-border bg-input-bg text-input-text shadow-input mx-auto w-full max-w-[25rem] border"
+          />
+        </div>
       </div>
     </div>
   );
diff --git a/packages/survey-ui/src/components/elements/file-upload.tsx b/packages/survey-ui/src/components/elements/file-upload.tsx
index 2674b7c382..77520c888d 100644
--- a/packages/survey-ui/src/components/elements/file-upload.tsx
+++ b/packages/survey-ui/src/components/elements/file-upload.tsx
@@ -2,7 +2,6 @@ import { Upload, UploadIcon, X } from "lucide-react";
 import * as React from "react";
 import { ElementError } from "@/components/general/element-error";
 import { ElementHeader } from "@/components/general/element-header";
-import { Input } from "@/components/general/input";
 import { cn } from "@/lib/utils";
 
 /**
@@ -193,11 +192,11 @@ function UploadArea({
           id={`${inputId}-label`}>
           {placeholderText}
         </span>
-        <Input
+        <input
           ref={fileInputRef}
           type="file"
           id={inputId}
-          className="hidden"
+          className="sr-only"
           multiple={allowMultiple}
           accept={acceptAttribute}
           onChange={onFileChange}
diff --git a/packages/survey-ui/src/components/elements/matrix.tsx b/packages/survey-ui/src/components/elements/matrix.tsx
index 2eb050045d..1d5df1e719 100644
--- a/packages/survey-ui/src/components/elements/matrix.tsx
+++ b/packages/survey-ui/src/components/elements/matrix.tsx
@@ -114,6 +114,7 @@ function Matrix({
                     onValueChange={(newColumnId) => {
                       handleRowChange(row.id, newColumnId);
                     }}
+                    name={rowGroupId}
                     disabled={disabled}
                     required={required}
                     aria-invalid={Boolean(errorMessage)}>
@@ -142,6 +143,7 @@ function Matrix({
                             <Label htmlFor={cellId} className="flex cursor-pointer justify-center">
                               <RadioGroupItem
                                 value={column.id}
+                                required={required}
                                 id={cellId}
                                 disabled={disabled}
                                 aria-label={`${row.label}-${column.label}`}