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

refactor(ivy): remove elementIndex param from all element-level styling instructions (#30313)

Browse Source 
This patch is one commit of many patches that will unify all styling instructions
across both template-level bindings and host-level bindings. This patch in particular
removes the `elementIndex` param because it is already set prior to each styling
instruction via the `select(n)` instruction.

PR Close #30313
This commit is contained in:
Matias Niemelä
2019-05-07 14:02:11 -07:00
committed by Alex Rickabaugh
parent de651122a5
commit 7c8a62d64d
11 changed files with 174 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/compiler/src/render3/view/styling_builder.ts
View File

@ -389,22 +389,13 @@ export class StylingBuilder {
sourceSpan: stylingInput.sourceSpan,
reference,
allocateBindingSlots: totalBindingSlotsRequired,
buildParams: (convertFn: (value: any) => o.Expression) => {
const params: o.Expression[] = [];
if (!isHostBinding) {
params.push(this._elementIndexExpr);
}
params.push(convertFn(mapValue));
return params;
}
buildParams: (convertFn: (value: any) => o.Expression) => { return [convertFn(mapValue)]; }
};
}
private _buildSingleInputs(
reference: o.ExternalReference, isHostBinding: boolean, inputs: BoundStylingEntry[],
mapIndex: Map<string, number>, allowUnits: boolean,
valueConverter: ValueConverter): Instruction[] {
reference: o.ExternalReference, inputs: BoundStylingEntry[], mapIndex: Map<string, number>,
allowUnits: boolean, valueConverter: ValueConverter): Instruction[] {
let totalBindingSlotsRequired = 0;
return inputs.map(input => {
const bindingIndex: number = mapIndex.get(input.name !) !;
@ -421,11 +412,6 @@ export class StylingBuilder {
// min params => elementStylingProp(elmIndex, bindingIndex, value)
// max params => elementStylingProp(elmIndex, bindingIndex, value, overrideFlag)
const params: o.Expression[] = [];
if (!isHostBinding) {
params.push(this._elementIndexExpr);
}
params.push(o.literal(bindingIndex));
params.push(convertFn(value));
@ -452,8 +438,7 @@ export class StylingBuilder {
const isHostBinding = !!this._directiveExpr;
const reference = isHostBinding ? R3.elementHostClassProp : R3.elementClassProp;
return this._buildSingleInputs(
reference, isHostBinding, this._singleClassInputs, this._classesIndex, false,
valueConverter);
reference, this._singleClassInputs, this._classesIndex, false, valueConverter);
}
return [];
}
@ -463,8 +448,7 @@ export class StylingBuilder {
const isHostBinding = !!this._directiveExpr;
const reference = isHostBinding ? R3.elementHostStyleProp : R3.elementStyleProp;
return this._buildSingleInputs(
reference, isHostBinding, this._singleStyleInputs, this._stylesIndex, true,
valueConverter);
reference, this._singleStyleInputs, this._stylesIndex, true, valueConverter);
}
return [];
}
@ -476,13 +460,7 @@ export class StylingBuilder {
sourceSpan: this._lastStylingInput ? this._lastStylingInput.sourceSpan : null,
reference,
allocateBindingSlots: 0,
buildParams: () => {
// HOST:
// params => elementHostStylingApply()
// Template:
// params => elementStylingApply(elmIndex)
return isHostBinding ? [] : [this._elementIndexExpr];
}
buildParams: () => { return []; }
};
}