Skip to content

Commit 9e10e16

Browse files
committed
fix(bidi): make dir and changes readonly
1 parent 077ebf6 commit 9e10e16

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

src/cdk/bidi/dir.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import {
1010
Directive,
11-
HostBinding,
1211
Output,
1312
Input,
1413
EventEmitter
@@ -23,11 +22,9 @@ import {Direction, Directionality} from './directionality';
2322
*/
2423
@Directive({
2524
selector: '[dir]',
26-
// TODO(hansl): maybe `$implicit` isn't the best option here, but for now that's the best we got.
27-
exportAs: '$implicit',
28-
providers: [
29-
{provide: Directionality, useExisting: Dir}
30-
]
25+
providers: [{provide: Directionality, useExisting: Dir}],
26+
host: {'[dir]': 'dir'},
27+
exportAs: 'dir',
3128
})
3229
export class Dir implements Directionality {
3330
/** Layout direction of the element. */
@@ -40,7 +37,6 @@ export class Dir implements Directionality {
4037
@Output('dirChange') change = new EventEmitter<void>();
4138

4239
/** @docs-private */
43-
@HostBinding('attr.dir')
4440
@Input('dir')
4541
get dir(): Direction {
4642
return this._dir;
@@ -56,7 +52,6 @@ export class Dir implements Directionality {
5652

5753
/** Current layout direction of the element. */
5854
get value(): Direction { return this.dir; }
59-
set value(v: Direction) { this.dir = v; }
6055

6156
/** Initialize once default value has been set. */
6257
ngAfterContentInit() {

src/cdk/bidi/directionality.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export const DIR_DOCUMENT = new InjectionToken<Document>('md-dir-doc');
3737
*/
3838
@Injectable()
3939
export class Directionality {
40-
value: Direction = 'ltr';
41-
change = new EventEmitter<void>();
40+
readonly value: Direction = 'ltr';
41+
readonly change = new EventEmitter<void>();
4242

4343
constructor(@Optional() @Inject(DIR_DOCUMENT) _document?: any) {
4444
if (_document) {

src/demo-app/demo-app/demo-app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>Angular Material Demos</h1>
4040
</div>
4141
</md-toolbar>
4242

43-
<div #root="$implicit" dir="ltr" class="demo-content" [ngSwitch]="changeDetectionStrategy">
43+
<div #root="dir" dir="ltr" class="demo-content" [ngSwitch]="changeDetectionStrategy">
4444
<div *ngSwitchDefault>
4545
<router-outlet></router-outlet>
4646
</div>

src/lib/tabs/tab-header.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ describe('MdTabHeader', () => {
210210
beforeEach(() => {
211211
dir = 'rtl';
212212
fixture = TestBed.createComponent(SimpleTabHeaderApp);
213-
fixture.detectChanges();
214-
215213
appComponent = fixture.componentInstance;
216214
appComponent.dir = 'rtl';
215+
216+
fixture.detectChanges();
217217
});
218218

219219
it('should scroll to show the focused tab label', () => {

0 commit comments

Comments
 (0)