Skip to content

Revert "fix(a11y): activeItem out of date if active index is removed from ListKeyManager" #14467

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

Merged
merged 7 commits into from
Dec 11, 2018
Merged

Revert "fix(a11y): activeItem out of date if active index is removed from ListKeyManager" #14467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
667cfcd
Revert "build: update sauce connect (#14422)"
mmalerba Dec 11, 2018
7a4268a
Revert "build: changelog script not filtering duplicate entries (#144…
mmalerba Dec 11, 2018
876901d
Revert "build: update to angular 7.1.2 (#14418)"
mmalerba Dec 11, 2018
56ee441
Revert "refactor(drag-drop): move logic out of directives (#14350)"
mmalerba Dec 11, 2018
dd1b0d4
Revert "fix(checkbox): redirect focus to underlying input element (#1…
mmalerba Dec 11, 2018
339bd5a
Revert "fix(radio): host element unable to receive focus events (#139…
mmalerba Dec 11, 2018
1666a26
Revert "fix(a11y): activeItem out of date if active index is removed …
mmalerba Dec 11, 2018
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
11 changes: 0 additions & 11 deletions src/cdk/a11y/key-manager/list-key-manager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,6 @@ describe('Key managers', () => {
expect(keyManager.activeItem!.getLabel()).toBe('one');
});

it('should keep the active item in sync if the active item is removed', () => {
expect(keyManager.activeItemIndex).toBe(0);
expect(keyManager.activeItem!.getLabel()).toBe('one');

itemList.items.shift();
itemList.notifyOnChanges();

expect(keyManager.activeItemIndex).toBe(0);
expect(keyManager.activeItem!.getLabel()).toBe('two');
});

it('should start off the activeItem as null', () => {
expect(new ListKeyManager([]).activeItem).toBeNull();
});
Expand Down
4 changes: 2 additions & 2 deletions src/cdk/a11y/key-manager/list-key-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
const itemArray = newItems.toArray();
const newIndex = itemArray.indexOf(this._activeItem);

if (newIndex !== this._activeItemIndex) {
this.updateActiveItem(newIndex > -1 ? newIndex : this._activeItemIndex);
if (newIndex > -1 && newIndex !== this._activeItemIndex) {
this._activeItemIndex = newIndex;
}
}
});
Expand Down