iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! test(ivy): rebase, format and lint (#30449) 

PR Close #30449
This commit is contained in:
Pawel Kozlowski 2019-05-14 09:39:11 +02:00 committed by Jason Aden
parent b1ba2d6f4e
commit 8c1a041411
9 changed files with 78 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/benchmarks/src/expanding_rows/benchmark_module.ts
View File

@ -6,8 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {ErrorHandler} from '@angular/core';
import {Component, Injectable, NgModule} from '@angular/core';
import {Component, ErrorHandler, Injectable, NgModule} from '@angular/core';
@Component({
selector: 'benchmark-area',
@ -27,9 +26,7 @@ import {Component, Injectable, NgModule} from '@angular/core';
export class BenchmarkArea {
}
declare interface ExtendedWindow extends Window {
benchmarkErrors?: string[];
}
declare interface ExtendedWindow extends Window { benchmarkErrors?: string[]; }
const extendedWindow = window as ExtendedWindow;
@Injectable({providedIn: 'root'})

3
modules/benchmarks/src/expanding_rows/benchmarkable_expanding_row_module.ts
View File

@ -8,9 +8,9 @@
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {ExpandingRowModule} from './expanding_row_module';
import {BenchmarkableExpandingRow} from './benchmarkable_expanding_row';
import {ExpandingRowModule} from './expanding_row_module';
@NgModule({
declarations: [BenchmarkableExpandingRow],
@ -22,4 +22,3 @@ import {BenchmarkableExpandingRow} from './benchmarkable_expanding_row';
})
export class BenchmarkableExpandingRowModule {
}

42
modules/benchmarks/src/expanding_rows/expanding_row.ts
View File

@ -8,9 +8,10 @@
import {AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Inject, InjectionToken, Input, Output, QueryList, ViewChild} from '@angular/core';
import {expanding_row_css} from './expanding_row_css';
import {ExpandingRowSummary} from './expanding_row_summary';
import {ExpandingRowToggleEvent} from './expanding_row_toggle_event';
import { expanding_row_css } from './expanding_row_css';
/**
* Injection token to break cylic dependency between ExpandingRow and
@ -144,9 +145,7 @@ export class ExpandingRow {
}
/** TS getter for isExpanded property. */
get isExpanded(): boolean {
return this.isExpandedInternal;
}
get isExpanded(): boolean { return this.isExpandedInternal; }
/** Triggered when isExpanded property changes. */
isExpandedChange = new EventEmitter<void>();
@ -165,9 +164,7 @@ export class ExpandingRow {
}
/** TS getter for isFocused property. */
get isFocused(): boolean {
return this.isFocusedInternal;
}
get isFocused(): boolean { return this.isFocusedInternal; }
/** The index of the row in the context of the entire collection. */
set index(value: number) {
@ -181,9 +178,7 @@ export class ExpandingRow {
}
/** TS getter for index property. */
get index(): number {
return this.indexInternal;
}
get index(): number { return this.indexInternal; }
/**
* We should probably rename this to summaryContentChild. Because technically
@ -219,8 +214,7 @@ export class ExpandingRow {
*/
constructor(
public elementRef: ElementRef,
@Inject(EXPANDING_ROW_HOST_INJECTION_TOKEN) public expandingRowHost:
ExpandingRowHostBase,
@Inject(EXPANDING_ROW_HOST_INJECTION_TOKEN) public expandingRowHost: ExpandingRowHostBase,
private readonly changeDetectorRef: ChangeDetectorRef) {}
/**
@ -229,9 +223,8 @@ export class ExpandingRow {
* is handled in [cfcExpandingRowHost] directive.
*/
handleSummaryClick(): void {
this.collapsedHeight = this.elementRef.nativeElement
.querySelector('.cfc-expanding-row-summary')
.offsetHeight;
this.collapsedHeight =
this.elementRef.nativeElement.querySelector('.cfc-expanding-row-summary').offsetHeight;
this.expandingRowHost.handleRowSummaryClick(this);
this.expand();
}
@ -240,9 +233,7 @@ export class ExpandingRow {
* When user tabs into child cfc-expanding-row-summary component. This method
* will make sure we focuse on this row, and blur on previously focused row.
*/
handleSummaryFocus(): void {
this.focus();
}
handleSummaryFocus(): void { this.focus(); }
/**
* cfc-expanding-row-details-caption component will call this function to
@ -253,8 +244,7 @@ export class ExpandingRow {
* not trigger the row collapse.
*/
handleCaptionClick(event: MouseEvent): void {
if (this.expandingRowHost.isBlacklisted(
event.target as {} as HTMLElement)) {
if (this.expandingRowHost.isBlacklisted(event.target as {} as HTMLElement)) {
return;
}
this.expandingRowHost.handleRowCaptionClick(this);
@ -266,9 +256,7 @@ export class ExpandingRow {
* Gets the height of this component. This height is used in parent
* [cfcExpandingRowHost] directive to compute scroll adjustment.
*/
getHeight(): number {
return this.expandingRowMainElement.nativeElement.offsetHeight;
}
getHeight(): number { return this.expandingRowMainElement.nativeElement.offsetHeight; }
/**
* Expands this row. This will notify the host so that it can collapse
@ -280,9 +268,7 @@ export class ExpandingRow {
this.expandingRowHost.handleRowExpand(this);
// setTimeout here makes sure we scroll this row into view after animation.
setTimeout(() => {
this.expandingRowMainElement.nativeElement.focus();
});
setTimeout(() => { this.expandingRowMainElement.nativeElement.focus(); });
this.onToggle.emit({rowId: this.rowId, isExpand: true});
}
@ -319,9 +305,7 @@ export class ExpandingRow {
// Summary child is not present currently. We need to NG2 to update the
// template.
setTimeout(() => {
this.summaryViewChild.focus();
});
setTimeout(() => { this.summaryViewChild.focus(); });
}
/**

3
modules/benchmarks/src/expanding_rows/expanding_row_blacklist.ts
View File

@ -16,4 +16,5 @@ import {Directive} from '@angular/core';
@Directive({
selector: '[cfcExpandingRowBlacklist]',
})
export class ExpandingRowBlacklist {}
export class ExpandingRowBlacklist {
}

11
modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
View File

@ -42,17 +42,12 @@ export class ExpandingRowDetailsCaption implements OnDestroy {
* this component when the row is collapsed. We also need to relay clicks
* to the parent component.
*/
constructor(
@Host() public expandingRow: ExpandingRow,
changeDetectorRef: ChangeDetectorRef) {
this.expandingRow.isExpandedChange.pipe(takeUntil(this.onDestroy))
.subscribe(() => {
constructor(@Host() public expandingRow: ExpandingRow, changeDetectorRef: ChangeDetectorRef) {
this.expandingRow.isExpandedChange.pipe(takeUntil(this.onDestroy)).subscribe(() => {
changeDetectorRef.markForCheck();
});
}
/** When component is destroyed, unlisten to isExpanded. */
ngOnDestroy(): void {
this.onDestroy.next();
}
ngOnDestroy(): void { this.onDestroy.next(); }
}

12
modules/benchmarks/src/expanding_rows/expanding_row_details_content.ts
View File

@ -34,17 +34,11 @@ export class ExpandingRowDetailsContent implements OnDestroy {
* We need a reference to parent cfc-expanding-row component to make sure we
* hide this component if the row is collapsed.
*/
constructor(
@Host() public expandingRow: ExpandingRow,
changeDetectorRef: ChangeDetectorRef) {
constructor(@Host() public expandingRow: ExpandingRow, changeDetectorRef: ChangeDetectorRef) {
this.isExpandedChangeSubscription =
this.expandingRow.isExpandedChange.subscribe(() => {
changeDetectorRef.markForCheck();
});
this.expandingRow.isExpandedChange.subscribe(() => { changeDetectorRef.markForCheck(); });
}
/** Unsubscribe from changes in parent isExpanded property. */
ngOnDestroy(): void {
this.isExpandedChangeSubscription.unsubscribe();
}
ngOnDestroy(): void { this.isExpandedChangeSubscription.unsubscribe(); }
}

68
modules/benchmarks/src/expanding_rows/expanding_row_host.ts
View File

@ -6,11 +6,12 @@
* found in the LICENSE file at https://angular.io/license
*/
import {AfterContentInit, AfterViewInit, ChangeDetectionStrategy, Component, ContentChildren, ElementRef, EventEmitter, forwardRef, HostListener, Input, OnDestroy, Output, QueryList, ViewChild} from '@angular/core';
import {AfterContentInit, AfterViewInit, ChangeDetectionStrategy, Component, ContentChildren, ElementRef, EventEmitter, HostListener, Input, OnDestroy, Output, QueryList, ViewChild, forwardRef} from '@angular/core';
import {Subscription} from 'rxjs';
import {EXPANDING_ROW_HOST_INJECTION_TOKEN, ExpandingRow, ExpandingRowHostBase} from './expanding_row';
/**
* We use this class in <cfc-expanding-row/> template to identify the row.
* The [cfcExpandingRowHost] directive also uses this class to check if a given
@ -45,12 +46,10 @@ type UpOrDown = 'up'|'down';
tabindex="0">
</div>`,
changeDetection: ChangeDetectionStrategy.OnPush,
providers: [
{provide: EXPANDING_ROW_HOST_INJECTION_TOKEN, useExisting: ExpandingRowHost}
],
providers: [{provide: EXPANDING_ROW_HOST_INJECTION_TOKEN, useExisting: ExpandingRowHost}],
})
export class ExpandingRowHost implements AfterViewInit, OnDestroy,
ExpandingRowHostBase {
export class ExpandingRowHost implements AfterViewInit,
OnDestroy, ExpandingRowHostBase {
/**
* An HTML selector (e.g. "body") for the scroll element. We need this to
* make some scroll adjustments.
@ -113,8 +112,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
* function around. This enables us to detach the click listener when
* component is destroyed.
*/
private handleRootMouseUpBound: EventListenerObject =
this.handleRootMouseUp.bind(this);
private handleRootMouseUpBound: EventListenerObject = this.handleRootMouseUp.bind(this);
/**
* 16px is the margin animation we have on cfc-expanding-row component.
@ -140,9 +138,8 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
clickRootElement.addEventListener('mouseup', this.handleRootMouseUpBound);
this.rowChangeSubscription = this.contentRows.changes.subscribe(() => {
this.recalcRowIndexes();
});
this.rowChangeSubscription =
this.contentRows.changes.subscribe(() => { this.recalcRowIndexes(); });
this.recalcRowIndexes();
}
@ -157,8 +154,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
return;
}
clickRootElement.removeEventListener(
'mouseup', this.handleRootMouseUpBound);
clickRootElement.removeEventListener('mouseup', this.handleRootMouseUpBound);
if (this.rowChangeSubscription) {
this.rowChangeSubscription.unsubscribe();
@ -191,11 +187,9 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
*/
handleRowSummaryClick(row: ExpandingRow): void {
const hadPreviousSelection: boolean = !!this.expandedRow;
const previousSelectedRowIndex: number =
this.getRowIndex(this.expandedRow as ExpandingRow);
const previousSelectedRowIndex: number = this.getRowIndex(this.expandedRow as ExpandingRow);
const newSelectedRowIndex: number = this.getRowIndex(row);
const previousCollapsedHeight: number =
this.getSelectedRowCollapsedHeight();
const previousCollapsedHeight: number = this.getSelectedRowCollapsedHeight();
const previousExpansionHeight = this.getSelectedRowExpandedHeight();
if (this.expandedRow) {
@ -212,11 +206,9 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
scrollAdjustment = previousExpansionHeight - previousCollapsedHeight;
}
const newSelectionIsInfrontOfPrevious: boolean =
newSelectedRowIndex > previousSelectedRowIndex;
const newSelectionIsInfrontOfPrevious: boolean = newSelectedRowIndex > previousSelectedRowIndex;
const multiplier = newSelectionIsInfrontOfPrevious ? -1 : 0;
scrollAdjustment =
scrollAdjustment * multiplier + ExpandingRowHost.rowMargin;
scrollAdjustment = scrollAdjustment * multiplier + ExpandingRowHost.rowMargin;
scrollElement.scrollTop += scrollAdjustment;
}
@ -264,17 +256,13 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
* Function that is called by expanding row summary to focus on the last
* focusable element before the list of expanding rows.
*/
focusOnPreviousFocusableElement(): void {
this.lastFocusedRow = this.focusedRow;
}
focusOnPreviousFocusableElement(): void { this.lastFocusedRow = this.focusedRow; }
/**
* Function that is called by expanding row summary to focus on the next
* focusable element after the list of expanding rows.
*/
focusOnNextFocusableElement(): void {
this.lastFocusedRow = this.focusedRow;
}
focusOnNextFocusableElement(): void { this.lastFocusedRow = this.focusedRow; }
/**
* Handles keydown event on the host. We are just concerned with up,
@ -287,8 +275,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
* - Enter: Expands the focused row.
*/
@HostListener('keydown', ['$event'])
handleKeyDown(event: KeyboardEvent) {
}
handleKeyDown(event: KeyboardEvent) {}
/**
* Recursively returns true if target HTMLElement is within a
@ -431,8 +418,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
/** Returns the HTMLElement that is the currently focused row summary. */
private focusedRowSummary(): HTMLElement|undefined {
return this.focusedRow ?
this.focusedRow.summaryViewChild.mainElementRef.nativeElement :
return this.focusedRow ? this.focusedRow.summaryViewChild.mainElementRef.nativeElement :
undefined;
}
@ -451,30 +437,26 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
* the computed (the one above or below) row. If host has an expanded row,
* this function will expand the computed row.
*/
private handleUpOrDownPressOnce(upOrDown: UpOrDown, event: KeyboardEvent):
void {
private handleUpOrDownPressOnce(upOrDown: UpOrDown, event: KeyboardEvent): void {
event.preventDefault();
// If row is expanded but focus is inside the expanded element, arrow
// key presses should not do anything.
if (this.expandedRow &&
document.activeElement !==
this.expandedRow.expandingRowMainElement.nativeElement) {
document.activeElement !== this.expandedRow.expandingRowMainElement.nativeElement) {
return;
}
// If focus is inside a collapsed row header, arrow key presses should not
// do anything.
if (this.focusedRow &&
document.activeElement !== this.focusedRowSummary()) {
if (this.focusedRow && document.activeElement !== this.focusedRowSummary()) {
return;
}
// We only want screen reader to read the message the first time we enter
// the list of expanding rows, so we must reset the variable here
this.lastFocusedRow = undefined;
const rowToLookFor: ExpandingRow|undefined =
this.expandedRow || this.focusedRow;
const rowToLookFor: ExpandingRow|undefined = this.expandedRow || this.focusedRow;
if (!rowToLookFor) {
return;
}
@ -509,11 +491,7 @@ export class ExpandingRowHost implements AfterViewInit, OnDestroy,
// Updates all of the rows with their new index.
private recalcRowIndexes() {
let index = 0;
setTimeout(() => {
this.contentRows.forEach((row: ExpandingRow) => {
row.index = index++;
});
});
setTimeout(
() => { this.contentRows.forEach((row: ExpandingRow) => { row.index = index++; }); });
}
}

36
modules/benchmarks/src/expanding_rows/expanding_row_summary.ts
View File

@ -63,18 +63,13 @@ export class ExpandingRowSummary implements OnDestroy {
* will act as a header for expanded rows. We also need to relay tab-in and
* click events to the parent.
*/
constructor(
@Host() public expandingRow: ExpandingRow,
changeDetectorRef: ChangeDetectorRef) {
constructor(@Host() public expandingRow: ExpandingRow, changeDetectorRef: ChangeDetectorRef) {
this.expandingRow.summaryViewChild = this;
this.isExpandedSubscription =
this.expandingRow.isExpandedChange.subscribe(() => {
changeDetectorRef.markForCheck();
});
this.expandingRow.isExpandedChange.subscribe(() => { changeDetectorRef.markForCheck(); });
this.indexSubscription = this.expandingRow.indexChange.subscribe(() => {
changeDetectorRef.markForCheck();
});
this.indexSubscription =
this.expandingRow.indexChange.subscribe(() => { changeDetectorRef.markForCheck(); });
}
@ -99,8 +94,8 @@ export class ExpandingRowSummary implements OnDestroy {
//
// TODO(b/62385992) Use the KeyboardFocusService to detect focus cause
// instead of creating multiple monitors on a page.
if (this.expandingRow.expandingRowMainElement.nativeElement.classList
.contains('cdk-mouse-focused')) {
if (this.expandingRow.expandingRowMainElement.nativeElement.classList.contains(
'cdk-mouse-focused')) {
return;
}
@ -144,13 +139,11 @@ export class ExpandingRowSummary implements OnDestroy {
// before expanding row list. Otherwise, if shift+tab is pressed on first
// focusable child inside expanding row summary, it should focus on main
// expanding row summary element.
if (event.shiftKey &&
document.activeElement === this.mainElementRef.nativeElement) {
if (event.shiftKey && document.activeElement === this.mainElementRef.nativeElement) {
event.preventDefault();
this.expandingRow.expandingRowHost.focusOnPreviousFocusableElement();
return;
} else if (
event.shiftKey && document.activeElement === focusableChildren[0]) {
} else if (event.shiftKey && document.activeElement === focusableChildren[0]) {
event.preventDefault();
this.expandingRow.focus();
}
@ -159,8 +152,7 @@ export class ExpandingRowSummary implements OnDestroy {
// summary, focus should be set to the next focusable element after the list
// of expanding rows.
if (!event.shiftKey &&
document.activeElement ===
focusableChildren[focusableChildren.length - 1]) {
document.activeElement === focusableChildren[focusableChildren.length - 1]) {
event.preventDefault();
this.expandingRow.expandingRowHost.focusOnNextFocusableElement();
}
@ -188,8 +180,7 @@ export class ExpandingRowSummary implements OnDestroy {
// If the current expanding row summary was the last focused one before
// focus exited the list, then return true to trigger the screen reader
if (this.mainElementRef.nativeElement ===
expandingRowHost.lastFocusedRow.summaryViewChild.mainElementRef
.nativeElement) {
expandingRowHost.lastFocusedRow.summaryViewChild.mainElementRef.nativeElement) {
return true;
}
return false;
@ -197,8 +188,7 @@ export class ExpandingRowSummary implements OnDestroy {
/** Puts the DOM focus on the main element. */
focus(): void {
if (this.mainElementRef &&
document.activeElement !== this.mainElementRef.nativeElement) {
if (this.mainElementRef && document.activeElement !== this.mainElementRef.nativeElement) {
this.mainElementRef.nativeElement.focus();
}
}
@ -213,7 +203,5 @@ export class ExpandingRowSummary implements OnDestroy {
}
/** Returns array of focusable elements within this component. */
private getFocusableChildren(): HTMLElement[] {
return [];
}
private getFocusableChildren(): HTMLElement[] { return []; }
}