Skip to content

fix(selection-model): inaccurate selected value when accessed in change subscription #8599

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 1 commit into from
Dec 1, 2017
Merged

fix(selection-model): inaccurate selected value when accessed in change subscription #8599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/cdk/collections/selection.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,19 @@ describe('SelectionModel', () => {
expect(event.added).toEqual([2]);
});

it('should have updated the selected value before emitting the change event', () => {
let model = new SelectionModel(true);
let spy = jasmine.createSpy('SelectionModel change event');

// Note: this assertion is only here to run the getter.
expect(model.selected).toEqual([]);

model.onChange!.subscribe(() => spy(model.selected));
model.select(1);

expect(spy).toHaveBeenCalledWith([1]);
});

describe('selection', () => {
let model: SelectionModel<any>;
let spy: jasmine.Spy;
Expand Down
7 changes: 4 additions & 3 deletions src/cdk/collections/selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,11 @@ export class SelectionModel<T> {

/** Emits a change event and clears the records of selected and deselected values. */
private _emitChangeEvent() {
// Clear the selected values so they can be re-cached.
this._selected = null;

if (this._selectedToEmit.length || this._deselectedToEmit.length) {
let eventData = new SelectionChange(this._selectedToEmit, this._deselectedToEmit);
const eventData = new SelectionChange(this._selectedToEmit, this._deselectedToEmit);

if (this.onChange) {
this.onChange.next(eventData);
Expand All @@ -128,8 +131,6 @@ export class SelectionModel<T> {
this._deselectedToEmit = [];
this._selectedToEmit = [];
}

this._selected = null;
}

/** Selects a value. */
Expand Down