From 7af44151946a3cf101ef6fa31594a68e4723c3a2 Mon Sep 17 00:00:00 2001
From: Preston Richey <prestonleerichey@gmail.com>
Date: Mon, 6 Dec 2021 13:35:39 -0500
Subject: [PATCH 1/5] Update types for aria-invalid

---
 packages/react-select/src/Select.tsx             | 3 ++-
 packages/react-select/src/accessibility/index.ts | 2 ++
 packages/react-select/src/index.ts               | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/react-select/src/Select.tsx b/packages/react-select/src/Select.tsx
index 758eb44511..0ee417bf99 100644
--- a/packages/react-select/src/Select.tsx
+++ b/packages/react-select/src/Select.tsx
@@ -14,6 +14,7 @@ import LiveRegion from './components/LiveRegion';
 import { createFilter, FilterOptionOption } from './filters';
 import { DummyInput, ScrollManager } from './internal/index';
 import {
+  AriaInvalid,
   AriaLive,
   AriaLiveMessages,
   AriaSelection,
@@ -76,7 +77,7 @@ export interface Props<
   /** HTML ID of an element containing an error message related to the input**/
   'aria-errormessage'?: string;
   /** Indicate if the value entered in the field is invalid **/
-  'aria-invalid'?: boolean;
+  'aria-invalid'?: AriaInvalid;
   /** Aria label (for assistive tech) */
   'aria-label'?: string;
   /** HTML ID of an element that should be used as the label (for assistive tech) */
diff --git a/packages/react-select/src/accessibility/index.ts b/packages/react-select/src/accessibility/index.ts
index cc8eb64ad5..2f308e4994 100644
--- a/packages/react-select/src/accessibility/index.ts
+++ b/packages/react-select/src/accessibility/index.ts
@@ -11,6 +11,8 @@ export type OptionContext = 'menu' | 'value';
 
 export type GuidanceContext = 'menu' | 'input' | 'value';
 
+export type AriaInvalid = boolean | 'false' | 'true' | 'grammar' | 'spelling';
+
 export type AriaLive = 'polite' | 'off' | 'assertive';
 
 export type AriaSelection<Option, IsMulti extends boolean> =
diff --git a/packages/react-select/src/index.ts b/packages/react-select/src/index.ts
index c94bbbe63a..5e0c176062 100644
--- a/packages/react-select/src/index.ts
+++ b/packages/react-select/src/index.ts
@@ -46,6 +46,7 @@ export * from './types';
 export type {
   OptionContext,
   GuidanceContext,
+  AriaInvalid,
   AriaLive,
   AriaGuidanceProps,
   AriaOnChangeProps,

From a6c99bdbf5fd1f75dc48012a7c656d4de260fbe1 Mon Sep 17 00:00:00 2001
From: Preston Richey <prestonleerichey@gmail.com>
Date: Wed, 8 Dec 2021 11:31:10 -0500
Subject: [PATCH 2/5] Reference React's AriaAttributes type rather than
 redefining

---
 packages/react-select/src/Select.tsx           | 18 +++++++-----------
 .../react-select/src/accessibility/index.ts    |  4 ----
 packages/react-select/src/index.ts             |  2 --
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/react-select/src/Select.tsx b/packages/react-select/src/Select.tsx
index 0ee417bf99..efe1089ab4 100644
--- a/packages/react-select/src/Select.tsx
+++ b/packages/react-select/src/Select.tsx
@@ -1,4 +1,5 @@
 import React, {
+  AriaAttributes,
   Component,
   FocusEventHandler,
   FormEventHandler,
@@ -13,12 +14,7 @@ import LiveRegion from './components/LiveRegion';
 
 import { createFilter, FilterOptionOption } from './filters';
 import { DummyInput, ScrollManager } from './internal/index';
-import {
-  AriaInvalid,
-  AriaLive,
-  AriaLiveMessages,
-  AriaSelection,
-} from './accessibility/index';
+import { AriaLiveMessages, AriaSelection } from './accessibility/index';
 
 import {
   classNames,
@@ -75,15 +71,15 @@ export interface Props<
   Group extends GroupBase<Option>
 > {
   /** HTML ID of an element containing an error message related to the input**/
-  'aria-errormessage'?: string;
+  'aria-errormessage'?: AriaAttributes['aria-errormessage'];
   /** Indicate if the value entered in the field is invalid **/
-  'aria-invalid'?: AriaInvalid;
+  'aria-invalid'?: AriaAttributes['aria-invalid'];
   /** Aria label (for assistive tech) */
-  'aria-label'?: string;
+  'aria-label'?: AriaAttributes['aria-label'];
   /** HTML ID of an element that should be used as the label (for assistive tech) */
-  'aria-labelledby'?: string;
+  'aria-labelledby'?: AriaAttributes['aria-labelledby'];
   /** Used to set the priority with which screen reader should treat updates to live regions. The possible settings are: off, polite (default) or assertive */
-  'aria-live'?: AriaLive;
+  'aria-live'?: AriaAttributes['aria-live'];
   /** Customize the messages used by the aria-live component */
   ariaLiveMessages?: AriaLiveMessages<Option, IsMulti, Group>;
   /** Focus the control when it is mounted */
diff --git a/packages/react-select/src/accessibility/index.ts b/packages/react-select/src/accessibility/index.ts
index 2f308e4994..b4ee5694b7 100644
--- a/packages/react-select/src/accessibility/index.ts
+++ b/packages/react-select/src/accessibility/index.ts
@@ -11,10 +11,6 @@ export type OptionContext = 'menu' | 'value';
 
 export type GuidanceContext = 'menu' | 'input' | 'value';
 
-export type AriaInvalid = boolean | 'false' | 'true' | 'grammar' | 'spelling';
-
-export type AriaLive = 'polite' | 'off' | 'assertive';
-
 export type AriaSelection<Option, IsMulti extends boolean> =
   | InitialInputFocusedActionMeta<Option, IsMulti>
   | (ActionMeta<Option> & {
diff --git a/packages/react-select/src/index.ts b/packages/react-select/src/index.ts
index 5e0c176062..95c2656d8d 100644
--- a/packages/react-select/src/index.ts
+++ b/packages/react-select/src/index.ts
@@ -46,8 +46,6 @@ export * from './types';
 export type {
   OptionContext,
   GuidanceContext,
-  AriaInvalid,
-  AriaLive,
   AriaGuidanceProps,
   AriaOnChangeProps,
   AriaOnFilterProps,

From 9ace36c0b5a83625e589357beec70c71ebdac99f Mon Sep 17 00:00:00 2001
From: Preston Richey <prestonleerichey@gmail.com>
Date: Wed, 8 Dec 2021 13:02:04 -0500
Subject: [PATCH 3/5] Use AriaAttributes reference in AriaGuidanceProps

---
 packages/react-select/src/accessibility/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-select/src/accessibility/index.ts b/packages/react-select/src/accessibility/index.ts
index b4ee5694b7..637783ed48 100644
--- a/packages/react-select/src/accessibility/index.ts
+++ b/packages/react-select/src/accessibility/index.ts
@@ -1,3 +1,4 @@
+import type { AriaAttributes } from 'react';
 import {
   ActionMeta,
   GroupBase,
@@ -21,7 +22,7 @@ export type AriaSelection<Option, IsMulti extends boolean> =
 
 export interface AriaGuidanceProps {
   /** String value of selectProp aria-label */
-  'aria-label': string | undefined;
+  'aria-label': AriaAttributes['aria-label'];
   /** String indicating user's current context and available keyboard interactivity */
   context: GuidanceContext;
   /** Boolean value of selectProp isSearchable */

From 677f4543064d4ea2ae2ffd3ee57e708ce8248562 Mon Sep 17 00:00:00 2001
From: Preston Richey <prestonleerichey@gmail.com>
Date: Wed, 8 Dec 2021 13:37:10 -0500
Subject: [PATCH 4/5] Add changeset

---
 .changeset/sour-socks-boil.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/sour-socks-boil.md

diff --git a/.changeset/sour-socks-boil.md b/.changeset/sour-socks-boil.md
new file mode 100644
index 0000000000..5476eb0645
--- /dev/null
+++ b/.changeset/sour-socks-boil.md
@@ -0,0 +1,5 @@
+---
+'react-select': minor
+---
+
+Use React's AriaAttributes type directly rather than recreating

From 6a399f03883a482d6dbc71aed8f9deb6262fbf12 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Thu, 13 Jan 2022 12:16:33 -0500
Subject: [PATCH 5/5] Update sour-socks-boil.md

---
 .changeset/sour-socks-boil.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/sour-socks-boil.md b/.changeset/sour-socks-boil.md
index 5476eb0645..32f5b5a107 100644
--- a/.changeset/sour-socks-boil.md
+++ b/.changeset/sour-socks-boil.md
@@ -1,5 +1,5 @@
 ---
-'react-select': minor
+'react-select': patch
 ---
 
 Use React's AriaAttributes type directly rather than recreating