From d06aec6417092e061ddacb31a37434cd05d8f014 Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Mon, 14 Aug 2023 06:48:04 -0600 Subject: [PATCH] fix(multiple): update API to match previous accesible members --- src/material/checkbox/testing/checkbox-harness.ts | 2 +- src/material/dialog/testing/dialog-opener.ts | 2 +- src/material/paginator/testing/paginator-harness.ts | 4 ++-- src/material/select/select.ts | 2 +- src/material/slide-toggle/slide-toggle.ts | 8 ++++---- src/material/slide-toggle/testing/slide-toggle-harness.ts | 2 +- src/material/table/testing/table-harness.ts | 4 ++-- tools/public_api_guard/material/checkbox-testing.md | 4 ++++ tools/public_api_guard/material/dialog-testing.md | 2 +- tools/public_api_guard/material/paginator-testing.md | 7 +++++++ tools/public_api_guard/material/select.md | 1 + tools/public_api_guard/material/slide-toggle-testing.md | 4 ++++ tools/public_api_guard/material/slide-toggle.md | 4 +++- tools/public_api_guard/material/table-testing.md | 4 ++++ 14 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/material/checkbox/testing/checkbox-harness.ts b/src/material/checkbox/testing/checkbox-harness.ts index 3f7a1b5826c3..f81e1c1c1f9e 100644 --- a/src/material/checkbox/testing/checkbox-harness.ts +++ b/src/material/checkbox/testing/checkbox-harness.ts @@ -18,7 +18,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion'; export class MatCheckboxHarness extends ComponentHarness { static hostSelector = '.mat-mdc-checkbox'; - private _input = this.locatorFor('input'); + _input = this.locatorFor('input'); private _label = this.locatorFor('label'); private _inputContainer = this.locatorFor('.mdc-checkbox'); diff --git a/src/material/dialog/testing/dialog-opener.ts b/src/material/dialog/testing/dialog-opener.ts index 7cca26b1306f..24a26d68e9d0 100644 --- a/src/material/dialog/testing/dialog-opener.ts +++ b/src/material/dialog/testing/dialog-opener.ts @@ -25,7 +25,7 @@ import {Subscription} from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, }) -export class MatTestDialogOpener implements OnDestroy { +export class MatTestDialogOpener implements OnDestroy { /** Component that should be opened with the MatDialog `open` method. */ protected static component: ComponentType | undefined; diff --git a/src/material/paginator/testing/paginator-harness.ts b/src/material/paginator/testing/paginator-harness.ts index 295de61553fa..a3b83707038b 100644 --- a/src/material/paginator/testing/paginator-harness.ts +++ b/src/material/paginator/testing/paginator-harness.ts @@ -23,13 +23,13 @@ export class MatPaginatorHarness extends ComponentHarness { private _previousButton = this.locatorFor('.mat-mdc-paginator-navigation-previous'); private _firstPageButton = this.locatorForOptional('.mat-mdc-paginator-navigation-first'); private _lastPageButton = this.locatorForOptional('.mat-mdc-paginator-navigation-last'); - private _select = this.locatorForOptional( + _select = this.locatorForOptional( MatSelectHarness.with({ ancestor: '.mat-mdc-paginator-page-size', }), ); private _pageSizeFallback = this.locatorFor('.mat-mdc-paginator-page-size-value'); - private _rangeLabel = this.locatorFor('.mat-mdc-paginator-range-label'); + _rangeLabel = this.locatorFor('.mat-mdc-paginator-range-label'); /** * Gets a `HarnessPredicate` that can be used to search for a paginator with specific attributes. diff --git a/src/material/select/select.ts b/src/material/select/select.ts index 371567746128..0f58027cceb2 100644 --- a/src/material/select/select.ts +++ b/src/material/select/select.ts @@ -303,7 +303,7 @@ export class MatSelect ]; /** Scrolls a particular option into the view. */ - private _scrollOptionIntoView(index: number): void { + _scrollOptionIntoView(index: number): void { const option = this.options.toArray()[index]; if (option) { diff --git a/src/material/slide-toggle/slide-toggle.ts b/src/material/slide-toggle/slide-toggle.ts index 41b25999bb63..2d118799488a 100644 --- a/src/material/slide-toggle/slide-toggle.ts +++ b/src/material/slide-toggle/slide-toggle.ts @@ -210,15 +210,15 @@ export class MatSlideToggle protected _focusMonitor: FocusMonitor, protected _changeDetectorRef: ChangeDetectorRef, @Attribute('tabindex') tabIndex: string, - @Inject(MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS) private _defaults: MatSlideToggleDefaultOptions, + @Inject(MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS) public defaults: MatSlideToggleDefaultOptions, @Optional() @Inject(ANIMATION_MODULE_TYPE) animationMode?: string, ) { super(elementRef); this.tabIndex = parseInt(tabIndex) || 0; - this.color = this.defaultColor = _defaults.color || 'accent'; + this.color = this.defaultColor = defaults.color || 'accent'; this._noopAnimations = animationMode === 'NoopAnimations'; this.id = this._uniqueId = `mat-mdc-slide-toggle-${++nextUniqueId}`; - this._hideIcon = _defaults.hideIcon ?? false; + this._hideIcon = defaults.hideIcon ?? false; this._labelId = this._uniqueId + '-label'; } @@ -285,7 +285,7 @@ export class MatSlideToggle _handleClick() { this.toggleChange.emit(); - if (!this._defaults.disableToggleValue) { + if (!this.defaults.disableToggleValue) { this.checked = !this.checked; this._onChange(this.checked); this.change.emit(new MatSlideToggleChange(this, this.checked)); diff --git a/src/material/slide-toggle/testing/slide-toggle-harness.ts b/src/material/slide-toggle/testing/slide-toggle-harness.ts index f7e5b502ed2e..ad44bfa92a52 100644 --- a/src/material/slide-toggle/testing/slide-toggle-harness.ts +++ b/src/material/slide-toggle/testing/slide-toggle-harness.ts @@ -17,7 +17,7 @@ import {SlideToggleHarnessFilters} from './slide-toggle-harness-filters'; /** Harness for interacting with a mat-slide-toggle in tests. */ export class MatSlideToggleHarness extends ComponentHarness { private _label = this.locatorFor('label'); - private _nativeElement = this.locatorFor('button'); + _nativeElement = this.locatorFor('button'); static hostSelector = '.mat-mdc-slide-toggle'; /** diff --git a/src/material/table/testing/table-harness.ts b/src/material/table/testing/table-harness.ts index 4c6ec7a52725..1293f9c1bbc5 100644 --- a/src/material/table/testing/table-harness.ts +++ b/src/material/table/testing/table-harness.ts @@ -33,8 +33,8 @@ export interface MatTableHarnessColumnsText { export class MatTableHarness extends ContentContainerComponentHarness { /** The selector for the host element of a `MatTableHarness` instance. */ static hostSelector = '.mat-mdc-table'; - private _headerRowHarness = MatHeaderRowHarness; - private _rowHarness = MatRowHarness; + _headerRowHarness = MatHeaderRowHarness; + _rowHarness = MatRowHarness; private _footerRowHarness = MatFooterRowHarness; /** diff --git a/tools/public_api_guard/material/checkbox-testing.md b/tools/public_api_guard/material/checkbox-testing.md index 2a2424dfbbbf..ade46e278ba0 100644 --- a/tools/public_api_guard/material/checkbox-testing.md +++ b/tools/public_api_guard/material/checkbox-testing.md @@ -4,10 +4,12 @@ ```ts +import { AsyncFactoryFn } from '@angular/cdk/testing'; import { BaseHarnessFilters } from '@angular/cdk/testing'; import { ComponentHarness } from '@angular/cdk/testing'; import { ComponentHarnessConstructor } from '@angular/cdk/testing'; import { HarnessPredicate } from '@angular/cdk/testing'; +import { TestElement } from '@angular/cdk/testing'; // @public export interface CheckboxHarnessFilters extends BaseHarnessFilters { @@ -29,6 +31,8 @@ export class MatCheckboxHarness extends ComponentHarness { getValue(): Promise; // (undocumented) static hostSelector: string; + // (undocumented) + _input: AsyncFactoryFn; isChecked(): Promise; isDisabled(): Promise; isFocused(): Promise; diff --git a/tools/public_api_guard/material/dialog-testing.md b/tools/public_api_guard/material/dialog-testing.md index b9487e71534b..00c2404ebaaf 100644 --- a/tools/public_api_guard/material/dialog-testing.md +++ b/tools/public_api_guard/material/dialog-testing.md @@ -54,7 +54,7 @@ export const enum MatDialogSection { } // @public -export class MatTestDialogOpener implements OnDestroy { +export class MatTestDialogOpener implements OnDestroy { constructor(dialog: MatDialog); closedResult: R | undefined; protected static component: ComponentType | undefined; diff --git a/tools/public_api_guard/material/paginator-testing.md b/tools/public_api_guard/material/paginator-testing.md index 928f6e3fea75..cbdbdb8254e4 100644 --- a/tools/public_api_guard/material/paginator-testing.md +++ b/tools/public_api_guard/material/paginator-testing.md @@ -4,10 +4,13 @@ ```ts +import { AsyncFactoryFn } from '@angular/cdk/testing'; import { BaseHarnessFilters } from '@angular/cdk/testing'; import { ComponentHarness } from '@angular/cdk/testing'; import { ComponentHarnessConstructor } from '@angular/cdk/testing'; import { HarnessPredicate } from '@angular/cdk/testing'; +import { MatSelectHarness } from '@angular/material/select/testing'; +import { TestElement } from '@angular/cdk/testing'; // @public export class MatPaginatorHarness extends ComponentHarness { @@ -21,6 +24,10 @@ export class MatPaginatorHarness extends ComponentHarness { isNextPageDisabled(): Promise; // (undocumented) isPreviousPageDisabled(): Promise; + // (undocumented) + _rangeLabel: AsyncFactoryFn; + // (undocumented) + _select: AsyncFactoryFn; setPageSize(size: number): Promise; static with(this: ComponentHarnessConstructor, options?: PaginatorHarnessFilters): HarnessPredicate; } diff --git a/tools/public_api_guard/material/select.md b/tools/public_api_guard/material/select.md index 9d9c403299d4..7e34dce94f09 100644 --- a/tools/public_api_guard/material/select.md +++ b/tools/public_api_guard/material/select.md @@ -155,6 +155,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, registerOnTouched(fn: () => {}): void; get required(): boolean; set required(value: BooleanInput); + _scrollOptionIntoView(index: number): void; _scrollStrategy: ScrollStrategy; get selected(): MatOption | MatOption[]; readonly selectionChange: EventEmitter; diff --git a/tools/public_api_guard/material/slide-toggle-testing.md b/tools/public_api_guard/material/slide-toggle-testing.md index 8d39ba884e57..219340c37bb2 100644 --- a/tools/public_api_guard/material/slide-toggle-testing.md +++ b/tools/public_api_guard/material/slide-toggle-testing.md @@ -4,10 +4,12 @@ ```ts +import { AsyncFactoryFn } from '@angular/cdk/testing'; import { BaseHarnessFilters } from '@angular/cdk/testing'; import { ComponentHarness } from '@angular/cdk/testing'; import { ComponentHarnessConstructor } from '@angular/cdk/testing'; import { HarnessPredicate } from '@angular/cdk/testing'; +import { TestElement } from '@angular/cdk/testing'; // @public export class MatSlideToggleHarness extends ComponentHarness { @@ -25,6 +27,8 @@ export class MatSlideToggleHarness extends ComponentHarness { isFocused(): Promise; isRequired(): Promise; isValid(): Promise; + // (undocumented) + _nativeElement: AsyncFactoryFn; toggle(): Promise; uncheck(): Promise; static with(this: ComponentHarnessConstructor, options?: SlideToggleHarnessFilters): HarnessPredicate; diff --git a/tools/public_api_guard/material/slide-toggle.md b/tools/public_api_guard/material/slide-toggle.md index ff52962f1752..d76f9b06d299 100644 --- a/tools/public_api_guard/material/slide-toggle.md +++ b/tools/public_api_guard/material/slide-toggle.md @@ -42,7 +42,7 @@ export const MAT_SLIDE_TOGGLE_VALUE_ACCESSOR: { // @public (undocumented) export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestroy, AfterContentInit, ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple { - constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, _defaults: MatSlideToggleDefaultOptions, animationMode?: string); + constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, defaults: MatSlideToggleDefaultOptions, animationMode?: string); ariaDescribedby: string; ariaLabel: string | null; ariaLabelledby: string | null; @@ -52,6 +52,8 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro protected _changeDetectorRef: ChangeDetectorRef; get checked(): boolean; set checked(value: BooleanInput); + // (undocumented) + defaults: MatSlideToggleDefaultOptions; protected _emitChangeEvent(): void; focus(): void; _focused: boolean; diff --git a/tools/public_api_guard/material/table-testing.md b/tools/public_api_guard/material/table-testing.md index 5440f5510dd0..db1b9c61affa 100644 --- a/tools/public_api_guard/material/table-testing.md +++ b/tools/public_api_guard/material/table-testing.md @@ -90,7 +90,11 @@ export class MatTableHarness extends ContentContainerComponentHarness { getFooterRows(filter?: RowHarnessFilters): Promise; getHeaderRows(filter?: RowHarnessFilters): Promise; getRows(filter?: RowHarnessFilters): Promise; + // (undocumented) + _headerRowHarness: typeof MatHeaderRowHarness; static hostSelector: string; + // (undocumented) + _rowHarness: typeof MatRowHarness; static with(this: ComponentHarnessConstructor, options?: TableHarnessFilters): HarnessPredicate; }