From 947f0f8a157d0c9ce38d9b0ed925a8ea110da06a Mon Sep 17 00:00:00 2001
From: speshkar-c <speshkar-c@eightfold.ai>
Date: Mon, 23 Jun 2025 16:16:49 +0530
Subject: [PATCH 1/3] fix: removed ariaDescribedby on conditionally joined
 ariadescribedBy

---
 src/components/Inputs/TextInput/TextInput.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/Inputs/TextInput/TextInput.tsx b/src/components/Inputs/TextInput/TextInput.tsx
index 7933b689e..40ef43ce6 100644
--- a/src/components/Inputs/TextInput/TextInput.tsx
+++ b/src/components/Inputs/TextInput/TextInput.tsx
@@ -131,10 +131,9 @@ export const TextInput: FC<TextInputProps> = React.forwardRef(
     } = useContext(FormItemInputContext);
     const mergedStatus = getMergedStatus(contextStatus, status);
     const ariaInvalid = ariaInvalidProp || mergedStatus === 'error';
-    const ariaDescribedBy =
-      mergedStatus === 'error'
-        ? ariaDescribedByProp || errorMessageId
-        : undefined;
+    const ariaDescribedBy = [ariaDescribedByProp, errorMessageId]
+      .filter(Boolean)
+      .join(' ');
 
     // Needed for form error scroll-into-view by id
     const mergedFormItemInput: boolean = isFormItemInput || formItemInput;

From ecc32d4d710cef05c4478bc9a1a4e6fa641bfba4 Mon Sep 17 00:00:00 2001
From: speshkar-c <speshkar-c@eightfold.ai>
Date: Thu, 3 Jul 2025 15:36:58 +0530
Subject: [PATCH 2/3] fix: added props for aria-describedby and aria-labelledby

---
 src/components/Inputs/TextInput/TextInput.tsx |  7 ++++---
 src/components/Upload/Upload.tsx              | 13 ++++++++++++-
 src/components/Upload/Upload.types.tsx        |  4 ++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/Inputs/TextInput/TextInput.tsx b/src/components/Inputs/TextInput/TextInput.tsx
index 200c3f23a..43725d965 100644
--- a/src/components/Inputs/TextInput/TextInput.tsx
+++ b/src/components/Inputs/TextInput/TextInput.tsx
@@ -132,9 +132,10 @@ export const TextInput: FC<TextInputProps> = React.forwardRef(
     } = useContext(FormItemInputContext);
     const mergedStatus = getMergedStatus(contextStatus, status);
     const ariaInvalid = ariaInvalidProp || mergedStatus === 'error';
-    const ariaDescribedBy = [ariaDescribedByProp, errorMessageId]
-      .filter(Boolean)
-      .join(' ');
+    const ariaDescribedBy =
+      mergedStatus === 'error'
+        ? [ariaDescribedByProp, errorMessageId].filter(Boolean).join(' ')
+        : ariaDescribedByProp;
 
     // Needed for form error scroll-into-view by id
     const mergedFormItemInput: boolean = isFormItemInput || formItemInput;
diff --git a/src/components/Upload/Upload.tsx b/src/components/Upload/Upload.tsx
index 6884d53c3..cc3bb7e5d 100644
--- a/src/components/Upload/Upload.tsx
+++ b/src/components/Upload/Upload.tsx
@@ -47,6 +47,8 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     accept = '',
     acceptedFileTypesText: defaultAcceptedFileTypesText,
     action = '',
+    'aria-describedby': ariaDescribedBy,
+    'aria-labelledby': ariaLabelledBy,
     children,
     classNames,
     configContextProps = {
@@ -92,6 +94,7 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     type = 'select',
     uploadErrorText: defaultUploadErrorText,
     uploadingText: defaultUploadingText,
+    ...rest
   } = props;
 
   const contextuallyDisabled: Disabled = useContext(DisabledContext);
@@ -475,6 +478,7 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     onProgress,
     onSuccess,
     ...props,
+    ...rest,
     accept,
     action,
     beforeUpload: mergedBeforeUpload,
@@ -577,6 +581,8 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     );
     const renderButton = (): JSX.Element => (
       <Button
+        aria-describedby={ariaDescribedBy}
+        aria-labelledby={ariaLabelledBy}
         classNames={styles.uploadDropButton}
         configContextProps={configContextProps}
         disabled={mergedDisabled}
@@ -699,7 +705,12 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
   const renderUploadButton = (
     uploadButtonStyle?: React.CSSProperties
   ): JSX.Element => (
-    <div className={uploadButtonClassNames} style={uploadButtonStyle}>
+    <div
+      aria-describedby={ariaDescribedBy}
+      aria-labelledby={ariaLabelledBy}
+      className={uploadButtonClassNames}
+      style={uploadButtonStyle}
+    >
       <OcUpload {...ocUploadProps} ref={upload} />
     </div>
   );
diff --git a/src/components/Upload/Upload.types.tsx b/src/components/Upload/Upload.types.tsx
index 932a3b64d..c164c31c5 100755
--- a/src/components/Upload/Upload.types.tsx
+++ b/src/components/Upload/Upload.types.tsx
@@ -314,6 +314,10 @@ export interface UploadProps<T = any> extends Pick<OcUploadProps, 'capture'> {
    * Upload URL
    */
   action?: Action;
+
+  'aria-describedby'?: string;
+
+  'aria-labelledby'?: string;
   /**
    * Hook executed before uploading.
    * Uploading will be stopped with false or a rejected Promise returned.

From ad13afff2094d97cb883127f3268ca4701809e07 Mon Sep 17 00:00:00 2001
From: speshkar-c <speshkar-c@eightfold.ai>
Date: Wed, 13 Aug 2025 11:31:40 +0530
Subject: [PATCH 3/3] fix: remove unnecessary rest spread operator from Upload
 component

---
 src/components/Upload/Upload.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/Upload/Upload.tsx b/src/components/Upload/Upload.tsx
index cc3bb7e5d..9b54e8a92 100644
--- a/src/components/Upload/Upload.tsx
+++ b/src/components/Upload/Upload.tsx
@@ -94,7 +94,6 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     type = 'select',
     uploadErrorText: defaultUploadErrorText,
     uploadingText: defaultUploadingText,
-    ...rest
   } = props;
 
   const contextuallyDisabled: Disabled = useContext(DisabledContext);
@@ -478,7 +477,6 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     onProgress,
     onSuccess,
     ...props,
-    ...rest,
     accept,
     action,
     beforeUpload: mergedBeforeUpload,