Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(react): upgrade downshift dependency to v5 #5373

Merged
merged 118 commits into from
May 7, 2020
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
ed6085a
fix(Dropdown): rely on list-box height closes #4916
vpicone Dec 18, 2019
7a3b726
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Jan 7, 2020
e8c792d
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Jan 8, 2020
8efb0e8
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Jan 15, 2020
72dd222
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Feb 7, 2020
1d70598
feat(react): update Downshift to v2.2.3
joshblack Feb 13, 2020
1b38bc2
feat(react): update Downshift to v3.4.8
joshblack Feb 13, 2020
a12b04f
feat(react): update Downshift to v4.1.0
joshblack Feb 13, 2020
391e4af
Merge branch 'master' into feat/upgrade-downshift-dependency
joshblack Feb 14, 2020
fec3000
feat(react): upgrade downshift to v5
dakahn Feb 14, 2020
bfe0972
fix(react): add prop adapter for downshift depreacations from v1 to v5
dakahn Feb 17, 2020
df43531
fix(react): add propAdapter for downshift v3 breaking changes
dakahn Feb 17, 2020
2aa4c76
fix(react): add propAdapter for downshift v3 breaking changes
dakahn Feb 17, 2020
1ad3cab
test(react): add propadapter test
dakahn Feb 17, 2020
1d887eb
Merge branch 'master' into upgrade-downshift-dependency
tw15egan Feb 18, 2020
238e5f9
fix(react): update createPropAdapter comment to be better
dakahn Feb 18, 2020
635d530
fix(combobox): add getMenuProps override
dakahn Feb 18, 2020
208c9b7
fix(list-box): change psuedo selector to match Downshift changes
dakahn Feb 18, 2020
3e182ae
Merge branch 'master' of github.com:carbon-design-system/carbon into …
dakahn Feb 20, 2020
e87d073
fix(dropdown): get menu items speaking in NVDA again
dakahn Feb 22, 2020
81c1697
Merge branch 'upgrade-downshift-dependency' of github.com:dakahn/carb…
dakahn Feb 24, 2020
281c012
fix(dropdown): fix dap violations
dakahn Feb 24, 2020
c0775a3
fix(dropdown): remove refkey
dakahn Feb 24, 2020
24286d8
fix(dropdown): remove refkey/unused aria
dakahn Feb 24, 2020
944909e
fix(dropdown): remove refkey for real
dakahn Feb 24, 2020
24416db
fix(dropdown): various changes of varying importance
dakahn Feb 26, 2020
2fc17aa
Merge branch 'master' of github.com:carbon-design-system/carbon into …
joshblack Feb 26, 2020
eda7b55
fix(listbox): update downshift usage for dropdown
joshblack Feb 26, 2020
db4a2f9
fix(react): removed weird dir I accidentally added
dakahn Feb 26, 2020
2f6b6dc
fix(dropdown): add inputprops id
dakahn Feb 27, 2020
0e20dbc
fix(dropdown): add useState implementation
dakahn Feb 28, 2020
c541a9b
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Mar 3, 2020
fd1a557
Merge branch 'master' of github.com:dakahn/carbon into upgrade-downsh…
dakahn Mar 4, 2020
50fedcb
fix(dropdown): convert to useSelect
dakahn Mar 7, 2020
c97ebdb
fix(dropdown): convert to useSelect hook w/ListBox
dakahn Mar 9, 2020
f686f98
fix(dropdown): add button reset
dakahn Mar 10, 2020
4b3311a
fix(dropdown): style dropdown button
dakahn Mar 10, 2020
3a2417e
fix(dropdown): un-nest button selector
dakahn Mar 11, 2020
af10259
fix(combobox/dropdown): nits/style/bug tweaks
dakahn Mar 11, 2020
70536d4
fix(dropdown): add translateWithId and initialSelectedItem props
dakahn Mar 11, 2020
cc9a988
fix(dropdown): add back css reset
dakahn Mar 11, 2020
992bc79
fix(dropdown): update tests
dakahn Mar 12, 2020
8cf6b52
fix(combobox): remove incorrectly set innerref
dakahn Mar 12, 2020
a7a98d1
fix(combobox): remove incorrectly set innerref
dakahn Mar 12, 2020
afeba36
fix(combobox): update tests and remove unneeded aria
dakahn Mar 13, 2020
270341b
fix(combobox): add combobox test helpers and fix broke tests
dakahn Mar 13, 2020
f179810
fix(multiselect): update tests
dakahn Mar 17, 2020
2b53d21
test(listbox): update test helpers and snapshots
joshblack Mar 17, 2020
29788a0
test(listbox): update test helpers and snapshots
joshblack Mar 17, 2020
5e2fcac
fix(tests): update snapshots
dakahn Mar 18, 2020
6508738
fix(test): remove empty createPropAdapter-test file
dakahn Mar 18, 2020
39f7be3
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Mar 23, 2020
617b267
chore(dropdown): sync with master; fix conflicts
dakahn Mar 23, 2020
c3bb05e
test(dropdown): update snapshots
dakahn Mar 23, 2020
38ad34b
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Mar 24, 2020
769b479
fix(combobox): resolve merge conflicts
dakahn Mar 24, 2020
59bc86b
fix(combobox): remove _menu added to referenced id
dakahn Mar 25, 2020
1a88b44
fix(combobox): add back accidentally removed disabled
dakahn Mar 25, 2020
668fcf5
fix(multiselect): refactor for useSelect hook
dakahn Mar 26, 2020
49ec8bb
chore: check-in work
joshblack Mar 26, 2020
6320d7a
fix(multiselect): update state logic for selecting options
joshblack Mar 30, 2020
435859c
fix(tools): add banner to createPropAdapter
dakahn Apr 2, 2020
2c3d4f9
fix(dropdown/listbox): address styling regressions
dakahn Apr 3, 2020
7419caa
fix(dropdown): hide helper text in inline
dakahn Apr 3, 2020
9e2544d
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Apr 3, 2020
201dc69
chore(all): sync with upstream master
dakahn Apr 3, 2020
096d8c0
chore(tests): update snapshots
dakahn Apr 3, 2020
61a8e15
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Apr 3, 2020
3dc5ddd
Merge branch 'master' into upgrade-downshift-dependency
dakahn Apr 3, 2020
9227209
chore(tag): update formatting to fix invalid CSS
joshblack Apr 4, 2020
fb69bd7
fix(multiselect): remove old reference file
dakahn Apr 5, 2020
2022260
Merge branch 'master' into upgrade-downshift-dependency
joshblack Apr 6, 2020
81b78a9
chore(test): update snapshots
joshblack Apr 6, 2020
a0c71b8
chore(colors): add back in scss folder
joshblack Apr 6, 2020
34cac21
Update packages/components/src/components/dropdown/_dropdown.scss
dakahn Apr 7, 2020
beb2a8e
Update packages/components/src/components/dropdown/_dropdown.scss
dakahn Apr 7, 2020
51cc02c
Update packages/react/src/components/Dropdown/Dropdown.js
dakahn Apr 7, 2020
5fb9359
fix(dropdown): fix type
dakahn Apr 8, 2020
6aa21bf
Update packages/components/src/components/list-box/_list-box.scss
dakahn Apr 8, 2020
7ef3d63
fix(combobox): remove ms-clear
dakahn Apr 8, 2020
778778c
fix(multiselect): add null check for selectedItems
dakahn Apr 10, 2020
b46799d
fix(filterable-multiselect): add unique id for checkbox
dakahn Apr 13, 2020
18019af
fix(filterable-multiselect): add role=group to menu
dakahn Apr 13, 2020
e21c664
fix(listbox): add outline border to fix jitter
dakahn Apr 14, 2020
5785f17
fix(dropdown/listbo): remove unused outline and changed border type
dakahn Apr 14, 2020
6b265fc
fix(multiselect): change field type to fix broken labeling
dakahn Apr 15, 2020
6f5822e
Merge branch 'master' of github.com:carbon-design-system/carbon
dakahn Apr 16, 2020
810d85d
chore(react): fix merge conflicts
dakahn Apr 16, 2020
0bbc9e4
chore(tests): update snapshots
dakahn Apr 16, 2020
4a12f43
fix(filterablemultiselect): fix incorrect field name
dakahn Apr 16, 2020
0be7230
fix(dropdown): add inline story variant and removed knob
dakahn Apr 17, 2020
0144569
fix(listbox): remove hover styles for disabled
dakahn Apr 17, 2020
791a1b7
Merge branch 'master' into upgrade-downshift-dependency
dakahn Apr 20, 2020
e28871c
test(react): update snapshots
joshblack Apr 20, 2020
b036ffe
Merge branch 'master' into upgrade-downshift-dependency
tw15egan Apr 21, 2020
ea66eda
fix(tests): update multiselect tests
dakahn Apr 22, 2020
4d178e9
Merge branch 'upgrade-downshift-dependency' of github.com:dakahn/carb…
dakahn Apr 22, 2020
96b16ec
chore(carbon): sync with upstream master
dakahn Apr 29, 2020
93680e1
test(multiselect): fix broken onCheange check
dakahn Apr 29, 2020
733e69f
test(multiselect): build out more tests
dakahn May 1, 2020
b1fa538
test(FilterableMultiSelect): update tests to pass
dakahn May 1, 2020
10ace87
Merge branch 'master' into upgrade-downshift-dependency
dakahn May 2, 2020
00dffbc
test(checkbox): remove irrelevent tests
dakahn May 4, 2020
d870909
Merge branch 'master' into upgrade-downshift-dependency
joshblack May 4, 2020
d4a94d1
Merge branch 'master' into upgrade-downshift-dependency
dakahn May 4, 2020
6801ae4
Merge branch 'master' into upgrade-downshift-dependency
tw15egan May 5, 2020
422df80
Update packages/react/src/components/Dropdown/Dropdown-story.js
dakahn May 5, 2020
ebd956e
fix(checkbox): rollback changes to id prop
dakahn May 5, 2020
fdb86bc
fix(dropdown): add direction prop
dakahn May 5, 2020
4e265d7
fix(multiselect): add back direction prop
dakahn May 5, 2020
fb92023
test(dropdown): update snappies
dakahn May 5, 2020
f30d280
Merge branch 'master' into upgrade-downshift-dependency
tw15egan May 6, 2020
5f72abf
Merge branch 'master' into upgrade-downshift-dependency
tw15egan May 6, 2020
efed00d
Merge branch 'master' into upgrade-downshift-dependency
tw15egan May 6, 2020
2f52582
Merge branch 'master' into upgrade-downshift-dependency
tw15egan May 6, 2020
fa2316d
fix(listbox): add height adjustment to get label lined up
dakahn May 6, 2020
cb73ac7
Merge branch 'upgrade-downshift-dependency' of github.com:dakahn/carb…
dakahn May 6, 2020
2880d29
Merge branch 'master' into upgrade-downshift-dependency
dakahn May 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file added .yarn/offline-mirror/downshift-5.0.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@carbon/icons-react": "^10.8.0",
"classnames": "2.2.6",
"downshift": "^1.31.14",
"downshift": "^5.0.0",
"flatpickr": "4.6.1",
"invariant": "^2.2.3",
"lodash.debounce": "^4.0.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/ComboBox/ComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export default class ComboBox extends React.Component {
defaultSelectedItem={initialSelectedItem}
selectedItem={selectedItem}>
{({
getButtonProps,
getToggleButtonProps,
getInputProps,
getItemProps,
getRootProps,
Expand All @@ -343,7 +343,7 @@ export default class ComboBox extends React.Component {
disabled={disabled}
aria-labelledby={comboBoxLabelId}
aria-describedby={comboBoxHelperId}
{...getButtonProps({
{...getToggleButtonProps({
disabled,
onClick: this.onToggleClick(isOpen),
})}>
Expand Down
9 changes: 5 additions & 4 deletions packages/react/src/components/Dropdown/Dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { settings } from 'carbon-components';
import { Checkmark16, WarningFilled16 } from '@carbon/icons-react';
import ListBox, { PropTypes as ListBoxPropTypes } from '../ListBox';
import { match, keys } from '../../internal/keyboard';
import { mapDownshiftProps } from '../../tools/createPropAdapter';

const { prefix } = settings;

Expand Down Expand Up @@ -225,24 +226,24 @@ export default class Dropdown extends React.Component {
{title}
{!inline && helper}
<Downshift
{...downshiftProps}
{...mapDownshiftProps(downshiftProps)}
onChange={this.handleOnChange}
itemToString={itemToString}
defaultSelectedItem={initialSelectedItem}
initialSelectedItem={initialSelectedItem}
selectedItem={selectedItem}>
{({
isOpen,
itemToString,
selectedItem,
highlightedIndex,
getRootProps,
getButtonProps,
getToggleButtonProps,
getItemProps,
getLabelProps,
toggleMenu,
}) => {
const buttonProps = {
...getButtonProps({
...getToggleButtonProps({
onKeyDown: event => {
if (match(event, keys.Enter)) {
toggleMenu();
Expand Down
Loading