Skip to content

Commit 11aea80

Browse files
authored
Merge branch 'master' into menu-portal-class-name
2 parents 5de4087 + 7c44a99 commit 11aea80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3381
-3002
lines changed

.TODO.md

Lines changed: 0 additions & 98 deletions
This file was deleted.

.changeset/eighty-lemons-happen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-select": patch
3+
---
4+
5+
Fix finding focusable options for groups

.changeset/lovely-dingos-own.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"react-select": patch
3+
"@react-select/docs": patch
4+
---
5+
6+
Bump dependency on @babel/runtime in order to fix compatibility issues with Webpack 5

.changeset/pretty-carpets-mix.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-select": patch
3+
---
4+
5+
Remove unnecessary dependency on @emotion/css

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
extends: ['plugin:react-hooks/recommended'],
23
parser: 'babel-eslint',
34
env: {
45
browser: true,

.sweet-changelogs.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2020 Jed Watson
3+
Copyright (c) 2021 Jed Watson
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ Check the docs for more information on:
152152

153153
Thank you to everyone who has contributed to this project. It's been a wild ride.
154154

155-
If you like React Select, you should [follow me on twitter](https://twitter.com/jedwatson)
155+
If you like React Select, you should [follow me on twitter](https://twitter.com/jedwatson)!
156156

157-
Shout out to [Joss Mackison](https://github.com/jossmac), [Charles Lee](https://github.com/gwyneplaine), [Ben Conolly](https://github.com/Noviny), [Dave Brotherstone](https://github.com/bruderstein), [Brian Vaughn](https://github.com/bvaughn), and the Atlassian Design System team ❤️
157+
Shout out to [Joss Mackison](https://github.com/jossmac), [Charles Lee](https://github.com/gwyneplaine), [Ben Conolly](https://github.com/Noviny), [Tom Walker](https://github.com/bladey), [Nathan Bierema](https://github.com/Methuselah96), [Eric Bonow](https://github.com/ebonow), [Mitchell Hamilton](https://github.com/mitchellhamilton), [Dave Brotherstone](https://github.com/bruderstein), [Brian Vaughn](https://github.com/bvaughn), and the [Atlassian Design System](https://atlassian.design) team who along with many other contributors have made this possible ❤️
158158

159159
## License
160160

161-
MIT Licensed. Copyright (c) Jed Watson 2020.
161+
MIT Licensed. Copyright (c) Jed Watson 2021.

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
plugins: [
3-
'emotion',
3+
'@emotion/babel-plugin',
44
['@babel/plugin-proposal-class-properties', { loose: true }],
55
'@babel/plugin-transform-runtime',
66
],

cypress/fixtures/selectors.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
"multiSelectDefaultValues": "#multi-select .react-select__multi-value",
2323
"multiSelectInput": "#react-select-multi-select-input",
2424
"placeHolderMulti": "#multi-select .react-select__placeholder",
25-
"toggleMenuMulti": "#multi-select .react-select__dropdown-indicator"
26-
}
25+
"toggleMenuMulti": "#multi-select .react-select__dropdown-indicator",
26+
"focusedOption": ".react-select__option--is-focused"
27+
}

0 commit comments

Comments
 (0)