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

refactor(common): add defaults to new generic parameters (#34206) 

This is a follow-up to #33997 where some new generic parameters were added without defaults which is technically a breaking change. These changes add the defaults.

PR Close #34206
This commit is contained in:
Kristiyan Kostadinov 2019-12-03 11:59:46 +01:00 committed by Miško Hevery
parent 9b6a1b85b1
commit cca2616637
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/common/src/directives/ng_for_of.ts
View File

@ -11,7 +11,7 @@ import {Directive, DoCheck, EmbeddedViewRef, Input, IterableChangeRecord, Iterab
/** /**
* @publicApi * @publicApi
*/ */
export class NgForOfContext<T, U extends NgIterable<T>> { export class NgForOfContext<T, U extends NgIterable<T> = NgIterable<T>> {
constructor(public $implicit: T, public ngForOf: U, public index: number, public count: number) {} constructor(public $implicit: T, public ngForOf: U, public index: number, public count: number) {}
get first(): boolean { return this.index === 0; } get first(): boolean { return this.index === 0; }
@ -121,7 +121,7 @@ export class NgForOfContext<T, U extends NgIterable<T>> {
* @publicApi * @publicApi
*/ */
@Directive({selector: '[ngFor][ngForOf]'}) @Directive({selector: '[ngFor][ngForOf]'})
export class NgForOf<T, U extends NgIterable<T>> implements DoCheck { export class NgForOf<T, U extends NgIterable<T> = NgIterable<T>> implements DoCheck {
/** /**
* The value of the iterable expression, which can be used as a * The value of the iterable expression, which can be used as a
* [template input variable](guide/structural-directives#template-input-variable). * [template input variable](guide/structural-directives#template-input-variable).

4
packages/common/src/directives/ng_if.ts
View File

@ -149,7 +149,7 @@ import {Directive, EmbeddedViewRef, Input, TemplateRef, ViewContainerRef, ɵstri
* @publicApi * @publicApi
*/ */
@Directive({selector: '[ngIf]'}) @Directive({selector: '[ngIf]'})
export class NgIf<T> { export class NgIf<T = unknown> {
private _context: NgIfContext<T> = new NgIfContext<T>(); private _context: NgIfContext<T> = new NgIfContext<T>();
private _thenTemplateRef: TemplateRef<NgIfContext<T>>|null = null; private _thenTemplateRef: TemplateRef<NgIfContext<T>>|null = null;
private _elseTemplateRef: TemplateRef<NgIfContext<T>>|null = null; private _elseTemplateRef: TemplateRef<NgIfContext<T>>|null = null;
@ -238,7 +238,7 @@ export class NgIf<T> {
/** /**
* @publicApi * @publicApi
*/ */
export class NgIfContext<T> { export class NgIfContext<T = unknown> {
public $implicit: T = null !; public $implicit: T = null !;
public ngIf: T = null !; public ngIf: T = null !;
} }

8
packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts
View File

@ -26,7 +26,7 @@ runInEachFileSystem(() => {
env.write('node_modules/@angular/common/index.d.ts', ` env.write('node_modules/@angular/common/index.d.ts', `
import * as i0 from '@angular/core'; import * as i0 from '@angular/core';
export declare class NgForOfContext<T, U extends NgIterable<T>> { export declare class NgForOfContext<T, U extends i0.NgIterable<T> = i0.NgIterable<T>> {
$implicit: T; $implicit: T;
count: number; count: number;
readonly even: boolean; readonly even: boolean;
@ -54,7 +54,7 @@ export declare class SlicePipe {
static ɵpipe: i0.ɵPipeDefWithMeta<SlicePipe, 'slice'>; static ɵpipe: i0.ɵPipeDefWithMeta<SlicePipe, 'slice'>;
} }
export declare class NgForOf<T, U extends i0.NgIterable<T>> implements DoCheck { export declare class NgForOf<T, U extends i0.NgIterable<T> = i0.NgIterable<T>> implements DoCheck {
ngForOf: (U & i0.NgIterable<T>) | undefined | null; ngForOf: (U & i0.NgIterable<T>) | undefined | null;
ngForTemplate: TemplateRef<NgForOfContext<T, U>>; ngForTemplate: TemplateRef<NgForOfContext<T, U>>;
ngForTrackBy: TrackByFunction<T>; ngForTrackBy: TrackByFunction<T>;
@ -64,7 +64,7 @@ export declare class NgForOf<T, U extends i0.NgIterable<T>> implements DoCheck {
static ɵdir: i0.ɵɵDirectiveDefWithMeta<NgForOf<any>, '[ngFor][ngForOf]', never, {'ngForOf': 'ngForOf'}, {}, never>; static ɵdir: i0.ɵɵDirectiveDefWithMeta<NgForOf<any>, '[ngFor][ngForOf]', never, {'ngForOf': 'ngForOf'}, {}, never>;
} }
export declare class NgIf<T> { export declare class NgIf<T = unknown> {
ngIf: T; ngIf: T;
ngIfElse: TemplateRef<NgIfContext<T>> | null; ngIfElse: TemplateRef<NgIfContext<T>> | null;
ngIfThen: TemplateRef<NgIfContext<T>> | null; ngIfThen: TemplateRef<NgIfContext<T>> | null;
@ -74,7 +74,7 @@ export declare class NgIf<T> {
static ɵdir: i0.ɵɵDirectiveDefWithMeta<NgIf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>; static ɵdir: i0.ɵɵDirectiveDefWithMeta<NgIf<any>, '[ngIf]', never, {'ngIf': 'ngIf'}, {}, never>;
} }
export declare class NgIfContext<T> { export declare class NgIfContext<T = unknown> {
$implicit: T; $implicit: T;
ngIf: T; ngIf: T;
} }

8
tools/public_api_guard/common/common.d.ts vendored
View File

@ -216,7 +216,7 @@ export declare class NgComponentOutlet implements OnChanges, OnDestroy {
ngOnDestroy(): void; ngOnDestroy(): void;
} }
export declare class NgForOf<T, U extends NgIterable<T>> implements DoCheck { export declare class NgForOf<T, U extends NgIterable<T> = NgIterable<T>> implements DoCheck {
ngForOf: (U & NgIterable<T>) | undefined | null; ngForOf: (U & NgIterable<T>) | undefined | null;
ngForTemplate: TemplateRef<NgForOfContext<T, U>>; ngForTemplate: TemplateRef<NgForOfContext<T, U>>;
ngForTrackBy: TrackByFunction<T>; ngForTrackBy: TrackByFunction<T>;
@ -225,7 +225,7 @@ export declare class NgForOf<T, U extends NgIterable<T>> implements DoCheck {
static ngTemplateContextGuard<T, U extends NgIterable<T>>(dir: NgForOf<T, U>, ctx: any): ctx is NgForOfContext<T, U>; static ngTemplateContextGuard<T, U extends NgIterable<T>>(dir: NgForOf<T, U>, ctx: any): ctx is NgForOfContext<T, U>;
} }
export declare class NgForOfContext<T, U extends NgIterable<T>> { export declare class NgForOfContext<T, U extends NgIterable<T> = NgIterable<T>> {
$implicit: T; $implicit: T;
count: number; count: number;
readonly even: boolean; readonly even: boolean;
@ -237,7 +237,7 @@ export declare class NgForOfContext<T, U extends NgIterable<T>> {
constructor($implicit: T, ngForOf: U, index: number, count: number); constructor($implicit: T, ngForOf: U, index: number, count: number);
} }
export declare class NgIf<T> { export declare class NgIf<T = unknown> {
ngIf: T; ngIf: T;
ngIfElse: TemplateRef<NgIfContext<T>> | null; ngIfElse: TemplateRef<NgIfContext<T>> | null;
ngIfThen: TemplateRef<NgIfContext<T>> | null; ngIfThen: TemplateRef<NgIfContext<T>> | null;
@ -246,7 +246,7 @@ export declare class NgIf<T> {
static ngTemplateContextGuard<T>(dir: NgIf<T>, ctx: any): ctx is NgIfContext<T>; static ngTemplateContextGuard<T>(dir: NgIf<T>, ctx: any): ctx is NgIfContext<T>;
} }
export declare class NgIfContext<T> { export declare class NgIfContext<T = unknown> {
$implicit: T; $implicit: T;
ngIf: T; ngIf: T;
} }