Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ describe('MdSelect', () => {
ThrowsErrorOnInit,
BasicSelectOnPush,
BasicSelectOnPushPreselected,
SelectWithPlainTabindex
SelectWithPlainTabindex,
SelectEarlyAccessSibling
],
providers: [
{provide: OverlayContainer, useFactory: () => {
Expand Down Expand 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 Down Expand 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
Original file line number Diff line number Diff 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 Down Expand 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 Down Expand 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