From 598c31f4850dbe7247c2d2e6cfd1e1125bb0a1f8 Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Fri, 21 Apr 2023 10:56:26 -0700
Subject: [PATCH 1/3] fix: Combobox adds aria-invalid when in an error state

---
 packages/react/src/components/ComboBox/ComboBox.test.tsx | 9 +++++++++
 packages/react/src/components/ComboBox/ComboBox.tsx      | 1 +
 2 files changed, 10 insertions(+)

diff --git a/packages/react/src/components/ComboBox/ComboBox.test.tsx b/packages/react/src/components/ComboBox/ComboBox.test.tsx
index cd1c4eb315c519..d87548b5081ab9 100644
--- a/packages/react/src/components/ComboBox/ComboBox.test.tsx
+++ b/packages/react/src/components/ComboBox/ComboBox.test.tsx
@@ -122,6 +122,15 @@ describe('ComboBox', () => {
     expect(combobox.getAttribute('aria-disabled')).toEqual('true');
   });
 
+  it('Sets aria-invalid when an error message is passed in.', () => {
+    const { getByRole, rerender } = render(<ComboBox errorMessage="error" options={DEFAULT_OPTIONS} />);
+    const combobox = getByRole('combobox');
+    expect(combobox.getAttribute('aria-invalid')).toEqual('true');
+
+    rerender(<ComboBox errorMessage={undefined} options={DEFAULT_OPTIONS} />);
+    expect(combobox.getAttribute('aria-invalid')).toBeNull();
+  });
+
   it('Renders no selected item in default case', () => {
     const { getByRole } = render(<ComboBox options={DEFAULT_OPTIONS} />);
     expect(getByRole('combobox').getAttribute('value')).toEqual('');
diff --git a/packages/react/src/components/ComboBox/ComboBox.tsx b/packages/react/src/components/ComboBox/ComboBox.tsx
index 8c4f9ce65d5146..f2b6da0d0d6811 100644
--- a/packages/react/src/components/ComboBox/ComboBox.tsx
+++ b/packages/react/src/components/ComboBox/ComboBox.tsx
@@ -659,6 +659,7 @@ class ComboBoxInternal extends React.Component<IComboBoxInternalProps, IComboBox
           aria-describedby={
             errorMessage !== undefined ? mergeAriaAttributeValues(ariaDescribedBy, errorMessageId) : ariaDescribedBy
           }
+          aria-invalid={errorMessage !== undefined ? 'true' : undefined}
           aria-activedescendant={ariaActiveDescendantValue}
           aria-required={required}
           aria-disabled={disabled}

From 38065968240c109b158c75817f1fcd02877ebb59 Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Fri, 21 Apr 2023 10:57:37 -0700
Subject: [PATCH 2/3] Change file

---
 ...luentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json

diff --git a/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json b/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json
new file mode 100644
index 00000000000000..9f36d0d2d46bbd
--- /dev/null
+++ b/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: Combobox adds aria-invalid when in an error state\"",
+  "packageName": "@fluentui/react",
+  "email": "sarah.higley@microsoft.com",
+  "dependentChangeType": "patch"
+}

From 294cb9620b1af331433393b16c51d09b492f9793 Mon Sep 17 00:00:00 2001
From: Sarah Higley <smhigley@users.noreply.github.com>
Date: Fri, 23 Jun 2023 13:39:34 -0700
Subject: [PATCH 3/3] Change file typo fix

Co-authored-by: Esteban Munoz Facusse <esteban.230@hotmail.com>
---
 .../@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json b/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json
index 9f36d0d2d46bbd..28495c85b8016c 100644
--- a/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json
+++ b/change/@fluentui-react-dd546ed0-e453-4f25-8149-7f3f79e30e17.json
@@ -1,6 +1,6 @@
 {
   "type": "patch",
-  "comment": "fix: Combobox adds aria-invalid when in an error state\"",
+  "comment": "fix: Combobox adds aria-invalid when in an error state",
   "packageName": "@fluentui/react",
   "email": "sarah.higley@microsoft.com",
   "dependentChangeType": "patch"