fix: removed ariaDescribedby on conditionally joined ariadescribedBy (#1012)

* fix: removed ariaDescribedby on conditionally joined ariadescribedBy

* fix: added props for aria-describedby and aria-labelledby

* fix: remove unnecessary rest spread operator from Upload component

---------

Co-authored-by: ypatadia-eightfold <ypatadia@eightfold.ai>

Author: speshkar-c-eightfold

src/components/Inputs/TextInput/TextInput.tsx

@@ -134,8 +134,8 @@ export const TextInput: FC<TextInputProps> = React.forwardRef(
     const ariaInvalid = ariaInvalidProp || mergedStatus === 'error';
     const ariaDescribedBy =
       mergedStatus === 'error'
-        ? ariaDescribedByProp || errorMessageId
-        : undefined;
+        ? [ariaDescribedByProp, errorMessageId].filter(Boolean).join(' ')
+        : ariaDescribedByProp;
 
     // Needed for form error scroll-into-view by id
     const mergedFormItemInput: boolean = isFormItemInput || formItemInput;

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 = {
@@ -577,6 +579,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 +703,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>
   );

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.