Merge branch 'master' into animated-fetchDOMNode

Author: JedWatson

.changeset/selfish-dots-look.md

@@ -0,0 +1,12 @@
+---
+'react-select': patch
+---
+
+The following improvements have been made for screen reader users:
+
+- NVDA now announces the context text when initially focused
+- Selected option/s (single and multi) are now announced when initially focused
+- VoiceOver now announces the context text when re-focusing
+- The clear action is now announced
+- Placeholder text is now announced
+- Mobile VoiceOver is now able to remove selected multi options

.changeset/tame-suits-lick.md

@@ -0,0 +1,6 @@
+---
+'react-select': patch
+'@react-select/docs': patch
+---
+
+The Option generic is no longer required to extend the OptionBase type

docs/PropTypes/Select.ts

@@ -1,10 +1,10 @@
 import { Component } from 'react';
 
 import { Props, defaultProps } from 'react-select/src/Select';
-import { GroupBase, OptionBase } from 'react-select';
+import { GroupBase } from 'react-select';
 
 export default class Select extends Component<
-  Props<OptionBase, boolean, GroupBase<OptionBase>>
+  Props<unknown, boolean, GroupBase<unknown>>
 > {
   defaultProps = defaultProps;
 }

docs/PropTypes/components/ClearIndicator.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { GroupBase, ClearIndicatorProps, OptionBase } from 'react-select';
+import { GroupBase, ClearIndicatorProps } from 'react-select';
 
 export default class ClearIndicator<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<ClearIndicatorProps<Option, IsMulti, Group>> {}

docs/PropTypes/components/Control.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { ControlProps, GroupBase, OptionBase } from 'react-select';
+import { ControlProps, GroupBase } from 'react-select';
 
 export default class Control<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<ControlProps<Option, IsMulti, Group>> {}

docs/PropTypes/components/DropdownIndicator.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { GroupBase, DropdownIndicatorProps, OptionBase } from 'react-select';
+import { GroupBase, DropdownIndicatorProps } from 'react-select';
 
 export default class DropdownIndicator<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<DropdownIndicatorProps<Option, IsMulti, Group>> {}

docs/PropTypes/components/Group.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { GroupBase, GroupProps, OptionBase } from 'react-select';
+import { GroupBase, GroupProps } from 'react-select';
 
 export default class Group<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<GroupProps<Option, IsMulti, Group>> {}

docs/PropTypes/components/IndicatorsContainer.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { GroupBase, IndicatorsContainerProps, OptionBase } from 'react-select';
+import { GroupBase, IndicatorsContainerProps } from 'react-select';
 
 export default class IndicatorsContainer<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<IndicatorsContainerProps<Option, IsMulti, Group>> {}

docs/PropTypes/components/IndicatorsSeparator.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { DropdownIndicatorProps, GroupBase, OptionBase } from 'react-select';
+import { DropdownIndicatorProps, GroupBase } from 'react-select';
 
 export default class DropdownIndicator<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<DropdownIndicatorProps<Option, IsMulti, Group>> {}

docs/PropTypes/components/Input.ts

@@ -1,8 +1,8 @@
 import { Component } from 'react';
-import { GroupBase, InputProps, OptionBase } from 'react-select';
+import { GroupBase, InputProps } from 'react-select';
 
 export default class Input<
-  Option extends OptionBase,
+  Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
 > extends Component<InputProps<Option, IsMulti, Group>> {}