Skip to content

fix(select): exception if selected value is accessed on init#3785

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
tinayuangao merged 1 commit into from
Mar 29, 2017
Merged

fix(select): exception if selected value is accessed on init #3785

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
18 changes: 17 additions & 1 deletion src/lib/select/select.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,8 @@ describe('MdSelect', () => {
ThrowsErrorOnInit,
BasicSelectOnPush,
BasicSelectOnPushPreselected,
SelectWithPlainTabindex
SelectWithPlainTabindex,
SelectEarlyAccessSibling
],
providers: [
{provide: OverlayContainer, useFactory: () => {
Expand DownExpand Up@@ -1322,6 +1323,12 @@ describe('MdSelect', () => {
}).toThrowError(new RegExp('Oh no!', 'g'));
}));

it('should not throw when trying to access the selected value on init', async(() => {
expect(() => {
TestBed.createComponent(SelectEarlyAccessSibling).detectChanges();
}).not.toThrow();
}));

});

describe('change event', () => {
Expand DownExpand Up@@ -1896,6 +1903,15 @@ class MultiSelect {
})
class SelectWithPlainTabindex { }

@Component({
selector: 'select-early-sibling-access',
template: `
<md-select #select="mdSelect"></md-select>
<div *ngIf="select.selected"></div>
`
})
class SelectEarlyAccessSibling { }


class FakeViewportRuler {
getViewportRect() {
Expand Down
8 changes: 6 additions & 2 deletions src/lib/select/select.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
ViewChild,
ChangeDetectorRef,
Attribute,
OnInit,
} from '@angular/core';
import {MdOption, MdOptionSelectionChange} from '../core/option/option';
import {ENTER, SPACE} from '../core/keyboard/keycodes';
Expand DownExpand Up@@ -118,7 +119,7 @@ export type MdSelectFloatPlaceholderType = 'always' | 'never' | 'auto';
],
exportAs: 'mdSelect',
})
export class MdSelect implements AfterContentInit, ControlValueAccessor, OnDestroy {
export class MdSelect implements AfterContentInit, OnDestroy, OnInit, ControlValueAccessor {
/** Whether or not the overlay panel is open. */
private _panelOpen = false;

Expand DownExpand Up@@ -304,8 +305,11 @@ export class MdSelect implements AfterContentInit, ControlValueAccessor, OnDestr
this._tabIndex = parseInt(tabIndex) || 0;
}

ngAfterContentInit() {
ngOnInit() {
this._selectionModel = new SelectionModel<MdOption>(this.multiple, null, false);
}

ngAfterContentInit() {
this._initKeyManager();

this._changeSubscription = this.options.changes.startWith(null).subscribe(() => {
Expand Down