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

fix(core): require 'static' flag on queries in typings (#30639) 

This commit makes the static flag on @ViewChild and @ContentChild required.

BREAKING CHANGE:

In Angular version 8, it's required that all @ViewChild and @ContentChild
queries have a 'static' flag specifying whether the query is 'static' or
'dynamic'. The compiler previously sorted queries automatically, but in
8.0 developers are required to explicitly specify which behavior is wanted.
This is a temporary requirement as part of a migration; see
https://angular.io/guide/static-query-migration for more details.

@ViewChildren and @ContentChildren queries are always dynamic, and so are
unaffected.

PR Close #30639
This commit is contained in:
Alex Rickabaugh 2019-05-23 11:31:10 -07:00 committed by Matias Niemelä
parent dc6406e5e8
commit 84dd2679a9
21 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aio/content/examples/component-interaction/src/app/countdown-parent.component.ts
View File

@ -39,7 +39,7 @@ export class CountdownLocalVarParentComponent { }
})
export class CountdownViewChildParentComponent implements AfterViewInit {
@ViewChild(CountdownTimerComponent)
@ViewChild(CountdownTimerComponent, {static: false})
private timerComponent: CountdownTimerComponent;
seconds() { return 0; }

2
aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
View File

@ -20,7 +20,7 @@ import { AdComponent } from './ad.component';
export class AdBannerComponent implements OnInit, OnDestroy {
@Input() ads: AdItem[];
currentAdIndex = -1;
@ViewChild(AdDirective) adHost: AdDirective;
@ViewChild(AdDirective, {static: true}) adHost: AdDirective;
interval: any;
constructor(private componentFactoryResolver: ComponentFactoryResolver) { }

2
aio/content/examples/lifecycle-hooks/src/app/after-content.component.ts
View File

@ -34,7 +34,7 @@ export class AfterContentComponent implements AfterContentChecked, AfterContentI
comment = '';
// Query for a CONTENT child of type `ChildComponent`
@ContentChild(ChildComponent) contentChild: ChildComponent;
@ContentChild(ChildComponent, {static: false}) contentChild: ChildComponent;
// #enddocregion hooks
constructor(private logger: LoggerService) {

2
aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts
View File

@ -35,7 +35,7 @@ export class AfterViewComponent implements AfterViewChecked, AfterViewInit {
private prevHero = '';
// Query for a VIEW child of type `ChildViewComponent`
@ViewChild(ChildViewComponent) viewChild: ChildViewComponent;
@ViewChild(ChildViewComponent, {static: false}) viewChild: ChildViewComponent;
// #enddocregion hooks
constructor(private logger: LoggerService) {

2
aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
View File

@ -81,7 +81,7 @@ export class DoCheckParentComponent {
hero: Hero;
power: string;
title = 'DoCheck';
@ViewChild(DoCheckComponent) childView: DoCheckComponent;
@ViewChild(DoCheckComponent, {static: false}) childView: DoCheckComponent;
constructor() { this.reset(); }

2
aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
View File

@ -55,7 +55,7 @@ export class OnChangesParentComponent {
hero: Hero;
power: string;
title = 'OnChanges';
@ViewChild(OnChangesComponent) childView: OnChangesComponent;
@ViewChild(OnChangesComponent, {static: false}) childView: OnChangesComponent;
constructor() {
this.reset();

2
aio/content/examples/template-syntax/src/app/hero-form.component.ts
View File

@ -13,7 +13,7 @@ import { Hero } from './hero';
})
export class HeroFormComponent {
@Input() hero: Hero;
@ViewChild('heroForm') form: NgForm;
@ViewChild('heroForm', {static: false}) form: NgForm;
private _submitMessage = '';

2
aio/content/examples/testing/src/app/shared/canvas.component.ts
View File

@ -6,7 +6,7 @@ import { Component, AfterViewInit, ViewChild } from '@angular/core';
})
export class CanvasComponent implements AfterViewInit {
blobSize: number;
@ViewChild('sampleCanvas') sampleCanvas;
@ViewChild('sampleCanvas', {static: false}) sampleCanvas;
constructor() { }

2
aio/src/app/custom-elements/code/code-example.component.spec.ts
View File

@ -96,5 +96,5 @@ class HostComponent {
path = 'code-path';
hidecopy: boolean | string = false;
@ViewChild(CodeExampleComponent) codeExampleComponent: CodeExampleComponent;
@ViewChild(CodeExampleComponent, {static: true}) codeExampleComponent: CodeExampleComponent;
}

2
aio/src/app/custom-elements/code/code-tabs.component.spec.ts
View File

@ -92,5 +92,5 @@ describe('CodeTabsComponent', () => {
`
})
class HostComponent {
@ViewChild(CodeTabsComponent) codeTabsComponent: CodeTabsComponent;
@ViewChild(CodeTabsComponent, {static: true}) codeTabsComponent: CodeTabsComponent;
}

2
aio/src/app/custom-elements/code/code.component.spec.ts
View File

@ -284,7 +284,7 @@ class HostComponent implements AfterViewInit {
region: string;
header: string;
@ViewChild(CodeComponent) codeComponent: CodeComponent;
@ViewChild(CodeComponent, {static: false}) codeComponent: CodeComponent;
ngAfterViewInit() {
this.setCode(oneLineCode);

2
aio/src/testing/doc-viewer-utils.ts
View File

@ -37,7 +37,7 @@ export class TestDocViewerComponent extends DocViewerComponent {
})
export class TestParentComponent {
currentDoc?: DocumentContents|null;
@ViewChild(DocViewerComponent) docViewer: DocViewerComponent;
@ViewChild(DocViewerComponent, {static: true}) docViewer: DocViewerComponent;
}
// Mock services.

14
integration/dynamic-compiler/src/app.component.ts
View File

@ -10,18 +10,16 @@ declare var System: any;
`,
})
export class AppComponent implements AfterViewInit {
@ViewChild('vc', {read: ViewContainerRef}) container: ViewContainerRef;
@ViewChild('vc', {read: ViewContainerRef, static: false}) container: ViewContainerRef;
constructor(private compiler: Compiler) {
}
constructor(private compiler: Compiler) {}
ngAfterViewInit() {
System.import('./dist/lazy.bundle.js').then((module: any) => {
this.compiler.compileModuleAndAllComponentsAsync(module.LazyModule)
.then((compiled) => {
const factory = compiled.componentFactories[0];
this.container.createComponent(factory);
});
this.compiler.compileModuleAndAllComponentsAsync(module.LazyModule).then((compiled) => {
const factory = compiled.componentFactories[0];
this.container.createComponent(factory);
});
});
}
}

2
packages/compiler-cli/integrationtest/src/queries.ts
View File

@ -15,7 +15,7 @@ export class CompForChildQuery {
@Component(
{selector: 'comp-with-child-query', template: '<comp-for-child-query></comp-for-child-query>'})
export class CompWithChildQuery {
@ViewChild(CompForChildQuery) child: CompForChildQuery;
@ViewChild(CompForChildQuery, {static: true}) child: CompForChildQuery;
@ViewChildren(CompForChildQuery) children: QueryList<CompForChildQuery>;
}

2
packages/compiler/src/core.ts
View File

@ -29,7 +29,7 @@ export interface Query {
read: any;
isViewQuery: boolean;
selector: any;
static?: boolean;
static: boolean;
}
export const createContentChildren = makeMetadataFactory<Query>(

10
packages/core/src/metadata/di.ts
View File

@ -102,7 +102,7 @@ export interface Query {
read: any;
isViewQuery: boolean;
selector: any;
static?: boolean;
static: boolean;
}
/**
@ -218,8 +218,8 @@ export interface ContentChildDecorator {
*
* @Annotation
*/
(selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): any;
new (selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): ContentChild;
(selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): any;
new (selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): ContentChild;
}
/**
@ -350,8 +350,8 @@ export interface ViewChildDecorator {
*
* @Annotation
*/
(selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): any;
new (selector: Type<any>|Function|string, opts?: {read?: any, static?: boolean}): ViewChild;
(selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): any;
new (selector: Type<any>|Function|string, opts: {read?: any, static: boolean}): ViewChild;
}
/**

6
packages/core/test/render3/jit/directive_spec.ts
View File

@ -52,7 +52,8 @@ describe('jit directive helper functions', () => {
descendants: false,
first: false,
isViewQuery: false,
read: undefined
read: undefined,
static: false,
})).toEqual({
propertyName: 'propName',
predicate: ['localRef'],
@ -69,7 +70,8 @@ describe('jit directive helper functions', () => {
descendants: true,
first: true,
isViewQuery: true,
read: undefined
read: undefined,
static: false,
})).toEqual({
propertyName: 'propName',
predicate: ['foo', 'bar', 'baz'],

8
packages/platform-browser/animations/test/animation_renderer_spec.ts
View File

@ -168,7 +168,7 @@ import {el} from '../../testing/src/browser_util';
})
class Cmp {
exp: any;
@ViewChild('elm') public element: any;
@ViewChild('elm', {static: false}) public element: any;
}
TestBed.configureTestingModule({
@ -213,11 +213,11 @@ import {el} from '../../testing/src/browser_util';
exp2: any = true;
exp3: any = true;
@ViewChild('elm1') public elm1: any;
@ViewChild('elm1', {static: false}) public elm1: any;
@ViewChild('elm2') public elm2: any;
@ViewChild('elm2', {static: false}) public elm2: any;
@ViewChild('elm3') public elm3: any;
@ViewChild('elm3', {static: false}) public elm3: any;
}
TestBed.configureTestingModule({

2
packages/platform-browser/animations/test/browser_animation_builder_spec.ts
View File

@ -51,7 +51,7 @@ import {el} from '../../testing/src/browser_util';
template: '...',
})
class Cmp {
@ViewChild('target') public target: any;
@ViewChild('target', {static: false}) public target: any;
constructor(public builder: AnimationBuilder) {}

5
packages/router/test/regression_integration.spec.ts
View File

@ -73,9 +73,10 @@ describe('Integration', () => {
})
class ComponentWithRouterLink {
// TODO(issue/24571): remove '!'.
@ViewChild(TemplateRef) templateRef !: TemplateRef<any>;
@ViewChild(TemplateRef, {static: true}) templateRef !: TemplateRef<any>;
// TODO(issue/24571): remove '!'.
@ViewChild('container', {read: ViewContainerRef}) container !: ViewContainerRef;
@ViewChild('container', {read: ViewContainerRef, static: true})
container !: ViewContainerRef;
addLink() {
this.container.createEmbeddedView(this.templateRef, {$implicit: '/simple'});

18
tools/public_api_guard/core/core.d.ts vendored
View File

@ -168,13 +168,13 @@ export interface ConstructorSansProvider {
export declare type ContentChild = Query;
export interface ContentChildDecorator {
(selector: Type<any> | Function | string, opts?: {
(selector: Type<any> | Function | string, opts: {
read?: any;
static?: boolean;
static: boolean;
}): any;
new (selector: Type<any> | Function | string, opts?: {
new (selector: Type<any> | Function | string, opts: {
read?: any;
static?: boolean;
static: boolean;
}): ContentChild;
}
@ -1104,7 +1104,7 @@ export interface Query {
isViewQuery: boolean;
read: any;
selector: any;
static?: boolean;
static: boolean;
}
export declare abstract class Query {
@ -1382,13 +1382,13 @@ export declare const VERSION: Version;
export declare type ViewChild = Query;
export interface ViewChildDecorator {
(selector: Type<any> | Function | string, opts?: {
(selector: Type<any> | Function | string, opts: {
read?: any;
static?: boolean;
static: boolean;
}): any;
new (selector: Type<any> | Function | string, opts?: {
new (selector: Type<any> | Function | string, opts: {
read?: any;
static?: boolean;
static: boolean;
}): ViewChild;
}