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.

Sign up for GitHub

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

fix(Dropdown): prevent unnecessary duplicate VO readings #7768

Merged
merged 12 commits into from
Mar 22, 2021
Merged

fix(Dropdown): prevent unnecessary duplicate VO readings #7768

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ca3e592
fix(ListBoxMenuItem): add title tooltip only when content overflows
emyarod Feb 9, 2021
8b2171a
docs(ListBoxMenu): update children proptype
emyarod Feb 9, 2021
fe2b32b
docs(Dropdown): reduce item width
emyarod Feb 9, 2021
5af57b2
chore: update snapshots
emyarod Feb 9, 2021
e37609b
fix(ListBoxMenuItem): add title tooltip only when content overflows
emyarod Feb 26, 2021
f69b7f9
refactor(ComboBox): convert to functional component to allow hooks
emyarod Feb 26, 2021
7c7105d
fix(ListBoxMenuItem): forward ref for class based listbox components
emyarod Feb 26, 2021
ead8636
test(ListBox): update assertions for forwarded ref in listbox menu items
emyarod Feb 26, 2021
55750fd
chore: update snapshots
emyarod Feb 26, 2021
3b128a5
Merge remote-tracking branch 'upstream/master' into 7707-dropdown-ite…
emyarod Mar 4, 2021
0b581a8
Merge remote-tracking branch 'upstream/master' into 7707-dropdown-ite…
emyarod Mar 4, 2021
77a9187
Merge branch 'main' into 7707-dropdown-items-vo
kodiakhq[bot] Mar 22, 2021
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
21 changes: 4 additions & 17 deletions packages/react/src/components/ComboBox/ComboBox-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { mount } from 'enzyme';
import {
findListBoxNode,
findMenuNode,
findMenuItemNode,
assertMenuOpen,
assertMenuClosed,
generateItems,
Expand All @@ -20,13 +19,7 @@ import ComboBox from '../ComboBox';
import { settings } from 'carbon-components';

const { prefix } = settings;

const findInputNode = (wrapper) => wrapper.find(`.${prefix}--text-input`);
const downshiftActions = {
setHighlightedIndex: jest.fn(),
};
const clearInput = (wrapper) =>
wrapper.instance().handleOnStateChange({ inputValue: '' }, downshiftActions);
const openMenu = (wrapper) => {
wrapper.find(`[role="combobox"]`).simulate('click');
};
Expand Down Expand Up @@ -64,9 +57,8 @@ describe('ComboBox', () => {
expect(mockProps.onChange).not.toHaveBeenCalled();

for (let i = 0; i < mockProps.items.length; i++) {
clearInput(wrapper);
openMenu(wrapper);
findMenuItemNode(wrapper, i).simulate('click');
wrapper.find('ForwardRef(ListBoxMenuItem)').at(i).simulate('click');
expect(mockProps.onChange).toHaveBeenCalledTimes(i + 1);
expect(mockProps.onChange).toHaveBeenCalledWith({
selectedItem: mockProps.items[i],
Expand Down Expand Up @@ -100,7 +92,7 @@ describe('ComboBox', () => {
it('should let the user select an option by clicking on the option node', () => {
const wrapper = mount(<ComboBox {...mockProps} />);
openMenu(wrapper);
findMenuItemNode(wrapper, 0).simulate('click');
wrapper.find('ForwardRef(ListBoxMenuItem)').at(0).simulate('click');
expect(mockProps.onChange).toHaveBeenCalledTimes(1);
expect(mockProps.onChange).toHaveBeenCalledWith({
selectedItem: mockProps.items[0],
Expand All @@ -110,7 +102,7 @@ describe('ComboBox', () => {
mockProps.onChange.mockClear();

openMenu(wrapper);
findMenuItemNode(wrapper, 1).simulate('click');
wrapper.find('ForwardRef(ListBoxMenuItem)').at(1).simulate('click');
expect(mockProps.onChange).toHaveBeenCalledTimes(1);
expect(mockProps.onChange).toHaveBeenCalledWith({
selectedItem: mockProps.items[1],
Expand Down Expand Up @@ -207,12 +199,7 @@ describe('ComboBox', () => {

it('should set `inputValue` to an empty string if a falsey-y value is given', () => {
const wrapper = mount(<ComboBox {...mockProps} />);

wrapper.instance().handleOnInputValueChange('foo', downshiftActions);
expect(wrapper.state('inputValue')).toBe('foo');

wrapper.instance().handleOnInputValueChange(null, downshiftActions);
expect(wrapper.state('inputValue')).toBe('');
expect(wrapper.find('input').instance().value).toBe('');
});
});
});
Loading