From fc51dcc58796532358a28433575e8bb55aa0381e Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Wed, 23 Oct 2019 12:00:49 -0700 Subject: [PATCH 1/5] feat: expand input types with coercion to work with ngtsc input type checking --- src/a11y-demo/datepicker/datepicker-a11y.ts | 2 +- .../scrolling/auto-size-virtual-scroll.ts | 3 ++ src/cdk/a11y/focus-trap/focus-trap.ts | 3 ++ src/cdk/accordion/accordion-item.ts | 3 ++ src/cdk/accordion/accordion.ts | 2 ++ src/cdk/drag-drop/directives/drag-handle.ts | 2 ++ src/cdk/drag-drop/directives/drag.ts | 2 ++ .../drag-drop/directives/drop-list-group.ts | 2 ++ src/cdk/drag-drop/directives/drop-list.ts | 3 ++ src/cdk/observers/observe-content.ts | 3 ++ src/cdk/overlay/overlay-directives.ts | 6 ++++ src/cdk/portal/portal-directives.ts | 2 ++ .../scrolling/fixed-size-virtual-scroll.ts | 4 +++ src/cdk/stepper/stepper.ts | 12 +++++++ src/cdk/table/cell.ts | 3 ++ src/cdk/table/row.ts | 4 +++ src/cdk/table/table.ts | 2 ++ src/cdk/text-field/autosize.ts | 10 ++++-- src/cdk/tree/padding.ts | 2 ++ src/cdk/tree/toggle.ts | 2 ++ src/dev-app/badge/badge-demo.html | 2 +- src/dev-app/checkbox/checkbox-demo.html | 4 +-- src/dev-app/dialog/dialog-demo.ts | 2 +- src/dev-app/example/example-list.ts | 2 ++ src/dev-app/input/input-demo.html | 2 +- .../mdc-checkbox/mdc-checkbox-demo.html | 4 +-- src/dev-app/toolbar/toolbar-demo.html | 2 +- .../cdk-drag-drop-enter-predicate-example.ts | 2 +- .../datepicker-filter-example.ts | 4 +-- .../form-field-custom-control-example.ts | 3 ++ .../mdc-button/button.ts | 6 ++++ src/material-experimental/mdc-button/fab.ts | 6 ++++ .../mdc-button/icon-button.ts | 6 ++++ .../mdc-checkbox/checkbox.ts | 6 ++++ .../mdc-chips/chip-grid.ts | 3 ++ .../mdc-chips/chip-icons.ts | 2 ++ .../mdc-chips/chip-input.ts | 3 ++ .../mdc-chips/chip-listbox.ts | 5 +++ .../mdc-chips/chip-option.ts | 7 ++++ .../mdc-chips/chip-row.ts | 5 +++ .../mdc-chips/chip-set.ts | 2 ++ src/material-experimental/mdc-chips/chip.ts | 5 +++ .../mdc-menu/menu-item.ts | 5 ++- src/material-experimental/mdc-menu/menu.ts | 3 ++ src/material-experimental/mdc-radio/radio.ts | 2 ++ .../mdc-slide-toggle/slide-toggle.ts | 6 ++++ .../mdc-slider/slider.ts | 8 +++++ .../mdc-tabs/tab-group.ts | 6 ++++ .../mdc-tabs/tab-header.ts | 3 ++ .../mdc-tabs/tab-label-wrapper.ts | 3 ++ .../mdc-tabs/tab-nav-bar/tab-nav-bar.ts | 7 ++++ src/material-experimental/mdc-tabs/tab.ts | 2 ++ .../autocomplete/autocomplete-trigger.ts | 2 ++ src/material/autocomplete/autocomplete.ts | 3 ++ src/material/badge/badge.ts | 11 ++++++- src/material/button-toggle/button-toggle.ts | 10 ++++++ src/material/button/button.ts | 6 ++++ src/material/checkbox/checkbox.ts | 4 +++ src/material/chips/chip-input.ts | 3 ++ src/material/chips/chip-list.ts | 5 +++ src/material/chips/chip.ts | 6 ++++ src/material/core/option/optgroup.ts | 2 ++ src/material/core/option/option.ts | 2 ++ src/material/datepicker/calendar-body.ts | 2 +- src/material/datepicker/calendar.ts | 4 +-- src/material/datepicker/datepicker-input.ts | 6 ++++ src/material/datepicker/datepicker-toggle.ts | 2 ++ src/material/datepicker/datepicker.ts | 3 ++ src/material/divider/divider.ts | 3 ++ src/material/expansion/accordion.ts | 3 ++ src/material/expansion/expansion-panel.ts | 4 +++ src/material/form-field/form-field.ts | 2 ++ src/material/grid-list/grid-list.ts | 2 ++ src/material/grid-list/grid-tile.ts | 3 ++ src/material/icon/icon.ts | 2 ++ src/material/input/autosize.ts | 4 +++ src/material/input/input.ts | 8 +++++ src/material/list/list.ts | 6 ++++ src/material/list/selection-list.ts | 7 ++++ src/material/menu/menu-item.ts | 2 ++ src/material/menu/menu.ts | 3 ++ src/material/paginator/paginator.ts | 8 +++++ src/material/progress-bar/progress-bar.ts | 32 +++++++++++-------- .../progress-spinner/progress-spinner.ts | 8 +++++ src/material/radio/radio.ts | 7 ++++ src/material/select/select.ts | 24 ++++++++++---- src/material/sidenav/drawer.ts | 24 ++++++++------ src/material/sidenav/sidenav.ts | 10 ++++++ src/material/slide-toggle/slide-toggle.ts | 5 +++ src/material/slider/slider.ts | 10 ++++++ src/material/sort/sort-header.ts | 3 ++ src/material/sort/sort.ts | 3 ++ src/material/stepper/stepper.ts | 26 +++++++++++++++ src/material/table/cell.ts | 8 ++--- src/material/table/row.ts | 2 ++ src/material/table/table.ts | 2 ++ src/material/tabs/tab-group.ts | 5 +++ src/material/tabs/tab-header.ts | 3 ++ src/material/tabs/tab-label-wrapper.ts | 2 ++ src/material/tabs/tab-nav-bar/tab-nav-bar.ts | 6 ++++ src/material/tabs/tab.ts | 2 ++ src/material/tooltip/tooltip.ts | 4 +++ src/material/tree/node.ts | 4 +++ src/material/tree/padding.ts | 2 ++ src/material/tree/toggle.ts | 2 ++ tools/defaults.bzl | 2 -- tools/public_api_guard/cdk/a11y.d.ts | 2 ++ tools/public_api_guard/cdk/accordion.d.ts | 3 ++ tools/public_api_guard/cdk/drag-drop.d.ts | 6 ++++ tools/public_api_guard/cdk/observers.d.ts | 2 ++ tools/public_api_guard/cdk/overlay.d.ts | 5 +++ tools/public_api_guard/cdk/portal.d.ts | 1 + tools/public_api_guard/cdk/scrolling.d.ts | 3 ++ tools/public_api_guard/cdk/stepper.d.ts | 10 ++++++ tools/public_api_guard/cdk/table.d.ts | 5 +++ tools/public_api_guard/cdk/text-field.d.ts | 3 ++ tools/public_api_guard/cdk/tree.d.ts | 2 ++ .../material/autocomplete.d.ts | 3 ++ tools/public_api_guard/material/badge.d.ts | 5 ++- .../material/button-toggle.d.ts | 8 +++++ tools/public_api_guard/material/button.d.ts | 4 +++ tools/public_api_guard/material/checkbox.d.ts | 3 ++ tools/public_api_guard/material/chips.d.ts | 11 +++++++ tools/public_api_guard/material/core.d.ts | 2 ++ .../public_api_guard/material/datepicker.d.ts | 15 +++++---- tools/public_api_guard/material/divider.d.ts | 2 ++ .../public_api_guard/material/expansion.d.ts | 5 +++ .../public_api_guard/material/form-field.d.ts | 1 + .../public_api_guard/material/grid-list.d.ts | 3 ++ tools/public_api_guard/material/icon.d.ts | 1 + tools/public_api_guard/material/input.d.ts | 7 ++++ tools/public_api_guard/material/list.d.ts | 8 +++++ tools/public_api_guard/material/menu.d.ts | 4 +++ .../public_api_guard/material/paginator.d.ts | 6 ++++ .../material/progress-bar.d.ts | 1 + .../material/progress-spinner.d.ts | 6 ++++ tools/public_api_guard/material/radio.d.ts | 6 ++++ tools/public_api_guard/material/select.d.ts | 6 ++++ tools/public_api_guard/material/sidenav.d.ts | 13 ++++++++ .../material/slide-toggle.d.ts | 4 +++ tools/public_api_guard/material/slider.d.ts | 9 ++++++ tools/public_api_guard/material/sort.d.ts | 4 +++ tools/public_api_guard/material/stepper.d.ts | 22 +++++++++++++ tools/public_api_guard/material/table.d.ts | 7 ++-- tools/public_api_guard/material/tabs.d.ts | 12 +++++++ tools/public_api_guard/material/tooltip.d.ts | 3 ++ tools/public_api_guard/material/tree.d.ts | 4 +++ tslint.json | 3 +- 148 files changed, 687 insertions(+), 67 deletions(-) diff --git a/src/a11y-demo/datepicker/datepicker-a11y.ts b/src/a11y-demo/datepicker/datepicker-a11y.ts index 2e9e1eb8665f..91ae3fbfb2fe 100644 --- a/src/a11y-demo/datepicker/datepicker-a11y.ts +++ b/src/a11y-demo/datepicker/datepicker-a11y.ts @@ -31,5 +31,5 @@ export class DatepickerAccessibilityDemo { appointmentDate: Date; minAppointmentDate = new Date(); maxAppointmentDate = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000); - weekdaysOnly = (d: Date) => d.getDay() != 0 && d.getDay() != 6; + weekdaysOnly = (d: Date|null) => d !== null && d.getDay() != 0 && d.getDay() != 6; } diff --git a/src/cdk-experimental/scrolling/auto-size-virtual-scroll.ts b/src/cdk-experimental/scrolling/auto-size-virtual-scroll.ts index 84b7a0bca92d..4a80f2e55f03 100644 --- a/src/cdk-experimental/scrolling/auto-size-virtual-scroll.ts +++ b/src/cdk-experimental/scrolling/auto-size-virtual-scroll.ts @@ -463,4 +463,7 @@ export class CdkAutoSizeVirtualScroll implements OnChanges { ngOnChanges() { this._scrollStrategy.updateBufferSize(this.minBufferPx, this.maxBufferPx); } + + static ngAcceptInputType_minBufferPx: number | string; + static ngAcceptInputType_maxBufferPx: number | string; } diff --git a/src/cdk/a11y/focus-trap/focus-trap.ts b/src/cdk/a11y/focus-trap/focus-trap.ts index 0880c0f160f0..ada8f49994e2 100644 --- a/src/cdk/a11y/focus-trap/focus-trap.ts +++ b/src/cdk/a11y/focus-trap/focus-trap.ts @@ -418,4 +418,7 @@ export class CdkTrapFocus implements OnDestroy, AfterContentInit, DoCheck { this.focusTrap.attachAnchors(); } } + + static ngAcceptInputType_enabled: boolean | string; + static ngAcceptInputType_autoCapture: boolean | string; } diff --git a/src/cdk/accordion/accordion-item.ts b/src/cdk/accordion/accordion-item.ts index 2a020c0fc2a4..ca3543dd2cd4 100644 --- a/src/cdk/accordion/accordion-item.ts +++ b/src/cdk/accordion/accordion-item.ts @@ -152,4 +152,7 @@ export class CdkAccordionItem implements OnDestroy { } }); } + + static ngAcceptInputType_expanded: boolean | string; + static ngAcceptInputType_disabled: boolean | string; } diff --git a/src/cdk/accordion/accordion.ts b/src/cdk/accordion/accordion.ts index e3edebbabbda..bacc1c19ac8f 100644 --- a/src/cdk/accordion/accordion.ts +++ b/src/cdk/accordion/accordion.ts @@ -59,4 +59,6 @@ export class CdkAccordion implements OnDestroy, OnChanges { this._openCloseAllActions.next(expanded); } } + + static ngAcceptInputType_multi: boolean | string; } diff --git a/src/cdk/drag-drop/directives/drag-handle.ts b/src/cdk/drag-drop/directives/drag-handle.ts index 31c28c9f7782..880e7949cf0f 100644 --- a/src/cdk/drag-drop/directives/drag-handle.ts +++ b/src/cdk/drag-drop/directives/drag-handle.ts @@ -46,4 +46,6 @@ export class CdkDragHandle implements OnDestroy { ngOnDestroy() { this._stateChanges.complete(); } + + static ngAcceptInputType_disabled: boolean | string; } diff --git a/src/cdk/drag-drop/directives/drag.ts b/src/cdk/drag-drop/directives/drag.ts index 934a89eaa2b7..733f38c3f59b 100644 --- a/src/cdk/drag-drop/directives/drag.ts +++ b/src/cdk/drag-drop/directives/drag.ts @@ -408,6 +408,8 @@ export class CdkDrag implements AfterViewInit, OnChanges, OnDestroy { }); }); } + + static ngAcceptInputType_disabled: boolean | string; } /** Gets the closest ancestor of an element that matches a selector. */ diff --git a/src/cdk/drag-drop/directives/drop-list-group.ts b/src/cdk/drag-drop/directives/drop-list-group.ts index ef57b25e705a..688204c28045 100644 --- a/src/cdk/drag-drop/directives/drop-list-group.ts +++ b/src/cdk/drag-drop/directives/drop-list-group.ts @@ -34,4 +34,6 @@ export class CdkDropListGroup implements OnDestroy { ngOnDestroy() { this._items.clear(); } + + static ngAcceptInputType_disabled: boolean | string; } diff --git a/src/cdk/drag-drop/directives/drop-list.ts b/src/cdk/drag-drop/directives/drop-list.ts index d057471ad57d..e422c4168cf3 100644 --- a/src/cdk/drag-drop/directives/drop-list.ts +++ b/src/cdk/drag-drop/directives/drop-list.ts @@ -328,4 +328,7 @@ export class CdkDropList implements AfterContentInit, OnDestroy { }); } + static ngAcceptInputType_disabled: boolean | string; + static ngAcceptInputType_sortingDisabled: boolean | string; + static ngAcceptInputType_autoScrollDisabled: boolean | string; } diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts index 39fe14a89b81..1a6a18f7926c 100644 --- a/src/cdk/observers/observe-content.ts +++ b/src/cdk/observers/observe-content.ts @@ -193,6 +193,9 @@ export class CdkObserveContent implements AfterContentInit, OnDestroy { this._currentSubscription.unsubscribe(); } } + + static ngAcceptInputType_disabled: boolean | string; + static ngAcceptInputType_debounce: boolean | string; } diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts index 97eb07d5eb21..fc7c5f897044 100644 --- a/src/cdk/overlay/overlay-directives.ts +++ b/src/cdk/overlay/overlay-directives.ts @@ -383,6 +383,12 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges { this._backdropSubscription.unsubscribe(); } + + static ngAcceptInputType_hasBackdrop: boolean | string; + static ngAcceptInputType_lockPosition: boolean | string; + static ngAcceptInputType_flexibleDimensions: boolean | string; + static ngAcceptInputType_growAfterOpen: boolean | string; + static ngAcceptInputType_push: boolean | string; } diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts index 8bb7db845e53..cb1639d58140 100644 --- a/src/cdk/portal/portal-directives.ts +++ b/src/cdk/portal/portal-directives.ts @@ -170,6 +170,8 @@ export class CdkPortalOutlet extends BasePortalOutlet implements OnInit, OnDestr return viewRef; } + + static ngAcceptInputType_portal: Portal | null | undefined | ''; } /** diff --git a/src/cdk/scrolling/fixed-size-virtual-scroll.ts b/src/cdk/scrolling/fixed-size-virtual-scroll.ts index ff06254d1acb..0e7796ba136c 100644 --- a/src/cdk/scrolling/fixed-size-virtual-scroll.ts +++ b/src/cdk/scrolling/fixed-size-virtual-scroll.ts @@ -203,4 +203,8 @@ export class CdkFixedSizeVirtualScroll implements OnChanges { ngOnChanges() { this._scrollStrategy.updateItemAndBufferSize(this.itemSize, this.minBufferPx, this.maxBufferPx); } + + static ngAcceptInputType_itemSize: string | number; + static ngAcceptInputType_minBufferPx: string | number; + static ngAcceptInputType_maxBufferPx: string | number; } diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts index 8fb9d1463001..87542a054575 100644 --- a/src/cdk/stepper/stepper.ts +++ b/src/cdk/stepper/stepper.ts @@ -231,6 +231,11 @@ export class CdkStep implements OnChanges { // underlying MatStepHeader, we have to make sure that change detection runs correctly. this._stepper._stateChanged(); } + + static ngAcceptInputType_editable: boolean | string; + static ngAcceptInputType_hasError: boolean | string; + static ngAcceptInputType_optional: boolean | string; + static ngAcceptInputType_completed: boolean | string; } @Directive({ @@ -519,6 +524,13 @@ export class CdkStepper implements AfterViewInit, OnDestroy { const focusedElement = this._document.activeElement; return stepperElement === focusedElement || stepperElement.contains(focusedElement); } + + static ngAcceptInputType_editable: boolean | string; + static ngAcceptInputType_optional: boolean | string; + static ngAcceptInputType_completed: boolean | string; + static ngAcceptInputType_hasError: boolean | string; + static ngAcceptInputType_linear: boolean | string; + static ngAcceptInputType_selectedIndex: number | string; } diff --git a/src/cdk/table/cell.ts b/src/cdk/table/cell.ts index 73b78f5eb281..765cfd8b84ce 100644 --- a/src/cdk/table/cell.ts +++ b/src/cdk/table/cell.ts @@ -107,6 +107,9 @@ export class CdkColumnDef extends _CdkColumnDefBase implements CanStick { * do not match are replaced by the '-' character. */ cssClassFriendlyName: string; + + static ngAcceptInputType_sticky: boolean | string; + static ngAcceptInputType_stickyEnd: boolean | string; } /** Base class for the cells. Adds a CSS classname that identifies the column it renders in. */ diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts index 0db0d38a0ee5..a7f49be5f943 100644 --- a/src/cdk/table/row.ts +++ b/src/cdk/table/row.ts @@ -99,6 +99,8 @@ export class CdkHeaderRowDef extends _CdkHeaderRowDefBase implements CanStick, O ngOnChanges(changes: SimpleChanges): void { super.ngOnChanges(changes); } + + static ngAcceptInputType_sticky: boolean | string; } // Boilerplate for applying mixins to CdkFooterRowDef. @@ -125,6 +127,8 @@ export class CdkFooterRowDef extends _CdkFooterRowDefBase implements CanStick, O ngOnChanges(changes: SimpleChanges): void { super.ngOnChanges(changes); } + + static ngAcceptInputType_sticky: boolean | string; } /** diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts index 11e01208661a..36b104a921be 100644 --- a/src/cdk/table/table.ts +++ b/src/cdk/table/table.ts @@ -1077,6 +1077,8 @@ export class CdkTable implements AfterContentChecked, CollectionViewer, OnDes this.updateStickyColumnStyles(); }); } + + static ngAcceptInputType_multiTemplateDataRows: boolean | string; } /** Utility function that gets a merged list of the entries in a QueryList and values of a Set. */ diff --git a/src/cdk/text-field/autosize.ts b/src/cdk/text-field/autosize.ts index d1366dc09e12..d15242a6a345 100644 --- a/src/cdk/text-field/autosize.ts +++ b/src/cdk/text-field/autosize.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {coerceBooleanProperty} from '@angular/cdk/coercion'; +import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion'; import { Directive, ElementRef, @@ -56,7 +56,7 @@ export class CdkTextareaAutosize implements AfterViewInit, DoCheck, OnDestroy { @Input('cdkAutosizeMinRows') get minRows(): number { return this._minRows; } set minRows(value: number) { - this._minRows = value; + this._minRows = coerceNumberProperty(value); this._setMinHeight(); } @@ -64,7 +64,7 @@ export class CdkTextareaAutosize implements AfterViewInit, DoCheck, OnDestroy { @Input('cdkAutosizeMaxRows') get maxRows(): number { return this._maxRows; } set maxRows(value: number) { - this._maxRows = value; + this._maxRows = coerceNumberProperty(value); this._setMaxHeight(); } @@ -272,4 +272,8 @@ export class CdkTextareaAutosize implements AfterViewInit, DoCheck, OnDestroy { textarea.setSelectionRange(selectionStart, selectionEnd); } } + + static ngAcceptInputType_minRows: number | string; + static ngAcceptInputType_maxRows: number | string; + static ngAcceptInputType_enabled: boolean | string; } diff --git a/src/cdk/tree/padding.ts b/src/cdk/tree/padding.ts index 30fad4993a27..0d166fff2106 100644 --- a/src/cdk/tree/padding.ts +++ b/src/cdk/tree/padding.ts @@ -109,4 +109,6 @@ export class CdkTreeNodePadding implements OnDestroy { this._currentPadding = padding; } } + + static ngAcceptInputType_level: number | string; } diff --git a/src/cdk/tree/toggle.ts b/src/cdk/tree/toggle.ts index a8bd4fdafaa4..774b8907f9df 100644 --- a/src/cdk/tree/toggle.ts +++ b/src/cdk/tree/toggle.ts @@ -38,4 +38,6 @@ export class CdkTreeNodeToggle { event.stopPropagation(); } + + static ngAcceptInputType_recursive: boolean | string; } diff --git a/src/dev-app/badge/badge-demo.html b/src/dev-app/badge/badge-demo.html index c07828170996..0ed1d00a007f 100644 --- a/src/dev-app/badge/badge-demo.html +++ b/src/dev-app/badge/badge-demo.html @@ -65,7 +65,7 @@

Buttons

diff --git a/src/dev-app/checkbox/checkbox-demo.html b/src/dev-app/checkbox/checkbox-demo.html index d9bd82bd9eff..0c867edb0597 100644 --- a/src/dev-app/checkbox/checkbox-demo.html +++ b/src/dev-app/checkbox/checkbox-demo.html @@ -30,7 +30,7 @@

mat-checkbox: Basic Example

value="after" id="align-after" name="labelPosition" - (click)="labelPosition = after.value" + (click)="labelPosition = 'after'" checked> @@ -39,7 +39,7 @@

mat-checkbox: Basic Example

value="before" id="align-before" name="labelPosition" - (click)="labelPosition = before.value"> + (click)="labelPosition = 'before'"> diff --git a/src/dev-app/dialog/dialog-demo.ts b/src/dev-app/dialog/dialog-demo.ts index 9016bd6cc911..328d34b20b80 100644 --- a/src/dev-app/dialog/dialog-demo.ts +++ b/src/dev-app/dialog/dialog-demo.ts @@ -175,7 +175,7 @@ export class JazzDialog { diff --git a/src/dev-app/example/example-list.ts b/src/dev-app/example/example-list.ts index 5731764c1880..425e73b98414 100644 --- a/src/dev-app/example/example-list.ts +++ b/src/dev-app/example/example-list.ts @@ -65,4 +65,6 @@ export class ExampleList { _expandAll: boolean; exampleComponents = EXAMPLE_COMPONENTS; + + static ngAcceptInputType_expandAll: boolean | string; } diff --git a/src/dev-app/input/input-demo.html b/src/dev-app/input/input-demo.html index 90cbe268c5d6..10b9e8d69656 100644 --- a/src/dev-app/input/input-demo.html +++ b/src/dev-app/input/input-demo.html @@ -552,7 +552,7 @@

Regular <textarea> with maxRows and minRows

cdkTextareaAutosize [cdkAutosizeMinRows]="parseNumber(minRows.value)" [cdkAutosizeMaxRows]="parseNumber(maxRows.value)"> - +

<textarea> with mat-form-field

diff --git a/src/dev-app/mdc-checkbox/mdc-checkbox-demo.html b/src/dev-app/mdc-checkbox/mdc-checkbox-demo.html index d9bd82bd9eff..0c867edb0597 100644 --- a/src/dev-app/mdc-checkbox/mdc-checkbox-demo.html +++ b/src/dev-app/mdc-checkbox/mdc-checkbox-demo.html @@ -30,7 +30,7 @@

mat-checkbox: Basic Example

value="after" id="align-after" name="labelPosition" - (click)="labelPosition = after.value" + (click)="labelPosition = 'after'" checked>
@@ -39,7 +39,7 @@

mat-checkbox: Basic Example

value="before" id="align-before" name="labelPosition" - (click)="labelPosition = before.value"> + (click)="labelPosition = 'before'"> diff --git a/src/dev-app/toolbar/toolbar-demo.html b/src/dev-app/toolbar/toolbar-demo.html index fb5f6a7517a4..bd84ff2b9895 100644 --- a/src/dev-app/toolbar/toolbar-demo.html +++ b/src/dev-app/toolbar/toolbar-demo.html @@ -46,7 +46,7 @@ -