cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ivy): patch animations into metadata (#25828)

Browse Source 
PR Close #25828
This commit is contained in:
Matias Niemelä
2018-09-05 15:23:59 -07:00
committed by Igor Minar
parent d6cd041cbd
commit d2dfd48be0
8 changed files with 176 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/compiler/src/compile_metadata.ts
View File

@ -189,6 +189,7 @@ export interface CompileTemplateSummary {
ngContentSelectors: string[];
encapsulation: ViewEncapsulation|null;
styles: string[];
animations: any[]|null;
}
/**
@ -244,7 +245,8 @@ export class CompileTemplateMetadata {
return {
ngContentSelectors: this.ngContentSelectors,
encapsulation: this.encapsulation,
styles: this.styles
styles: this.styles,
animations: this.animations
};
}
}

5
packages/compiler/src/render3/view/api.ts
View File

@ -175,6 +175,11 @@ export interface R3ComponentMetadata extends R3DirectiveMetadata {
* into a shadow root.
*/
encapsulation: ViewEncapsulation;
/**
* A collection of animation triggers that will be used in the component template.
*/
animations: {[key: string]: any}[]|null;
}
/**

12
packages/compiler/src/render3/view/compiler.ts
View File

@ -27,7 +27,7 @@ import {typeWithParameters} from '../util';
import {R3ComponentDef, R3ComponentMetadata, R3DirectiveDef, R3DirectiveMetadata, R3QueryMetadata} from './api';
import {BindingScope, TemplateDefinitionBuilder, ValueConverter, renderFlagCheckIfStmt} from './template';
import {CONTEXT_NAME, DefinitionMap, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, temporaryAllocator} from './util';
import {CONTEXT_NAME, DefinitionMap, RENDER_FLAGS, TEMPORARY_NAME, asLiteral, conditionallyCreateMapObjectLiteral, getQueryPredicate, mapToExpression, temporaryAllocator} from './util';
const EMPTY_ARRAY: any[] = [];
@ -246,6 +246,12 @@ export function compileComponentFromMetadata(
definitionMap.set('styles', o.literalArr(strings));
}
// e.g. `animations: [trigger('123', [])]`
if (meta.animations) {
const animationValues = meta.animations.map(entry => mapToExpression(entry));
definitionMap.set('animations', o.literalArr(animationValues));
}
// On the type side, remove newlines from the selector as it will need to fit into a TypeScript
// string literal, which must be on one line.
const selectorForType = (meta.selector || '').replace(/\n/g, '');
@ -301,6 +307,7 @@ export function compileComponentFromRender2(
const definitionField = outputCtx.constantPool.propertyNameOf(DefinitionKind.Component);
const summary = component.toSummary();
const animations = summary.template && summary.template.animations || null;
// Compute the R3ComponentMetadata from the CompileDirectiveMetadata
const meta: R3ComponentMetadata = {
@ -318,7 +325,8 @@ export function compileComponentFromRender2(
wrapDirectivesInClosure: false,
styles: (summary.template && summary.template.styles) || EMPTY_ARRAY,
encapsulation:
(summary.template && summary.template.encapsulation) || core.ViewEncapsulation.Emulated
(summary.template && summary.template.encapsulation) || core.ViewEncapsulation.Emulated,
animations
};
const res = compileComponentFromMetadata(meta, outputCtx.constantPool, bindingParser);