Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ivy): compiler should emit new refresh pattern #21862

Closed
wants to merge 1 commit into from
Closed

fix(ivy): compiler should emit new refresh pattern #21862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/compiler/src/render3/r3_identifiers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export class Identifiers {
/* Methods */
static NEW_METHOD = 'n';
static HOST_BINDING_METHOD = 'h';
static REFRESH_METHOD = 'r';

/* Instructions */
static createElement: o.ExternalReference = {name: 'ɵE', moduleName: CORE};
Expand Down
9 changes: 4 additions & 5 deletions packages/compiler/src/render3/r3_view_compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,10 @@ class TemplateDefinitionBuilder implements TemplateAstVisitor, LocalResolver {
o.importExpr(R3.bind).callFn([convertedBinding.currValExpr]));
}

// e.g. TodoComponentDef.r(0, 0);
this._refreshMode.push(
this.definitionOf(directiveType, kind)
.callMethod(R3.REFRESH_METHOD, [o.literal(directiveIndex), o.literal(nodeIndex)])
.toStmt());
// e.g. r(0, 0);
this.instruction(
this._refreshMode, directive.sourceSpan, R3.refreshComponent, o.literal(directiveIndex),
o.literal(nodeIndex));
}
}

Expand Down
16 changes: 7 additions & 9 deletions packages/compiler/test/render3/r3_view_compiler_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ describe('r3_view_compiler', () => {
IDENT.ɵe();
IDENT.ɵT(3, '!');
}
ChildComponent.ngComponentDef.r(1, 0);
SomeDirective.ngDirectiveDef.r(2, 0);
IDENT.ɵr(1, 0);
IDENT.ɵr(2, 0);
}
});
`;
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('r3_view_compiler', () => {
}
const IDENT = IDENT.ɵm(1);
IDENT.ɵcR(2);
IfDirective.ngDirectiveDef.r(3,2);
IDENT.ɵr(3,2);
IDENT.ɵcr();

function MyComponent_IfDirective_Template_2(ctx0: IDENT, cm: IDENT) {
Expand Down Expand Up @@ -419,13 +419,11 @@ describe('r3_view_compiler', () => {
// TODO(chuckj): Enforce this when the directives are specified
const ForDirectiveDefinition = `
static ngDirectiveDef = IDENT.ɵdefineDirective({
type: ForOfDirective,
factory: function ForOfDirective_Factory() {
return new ForOfDirective(IDENT.ɵinjectViewContainerRef(), IDENT.ɵinjectTemplateRef());
},
features: [IDENT.ɵNgOnChangesFeature(NgForOf)],
refresh: function ForOfDirective_Refresh(directiveIndex: IDENT, elementIndex: IDENT) {
IDENT.ɵm<ForOfDirective>(directiveIndex).ngDoCheck();
},
inputs: {forOf: 'forOf'}
});
`;
Expand All @@ -443,7 +441,7 @@ describe('r3_view_compiler', () => {
}
IDENT.ɵp(1, 'forOf', IDENT.ɵb(ctx.items));
IDENT.ɵcR(1);
ForOfDirective.ngDirectiveDef.r(2, 1);
IDENT.ɵr(2, 1);
IDENT.ɵcr();

function MyComponent_ForOfDirective_Template_1(ctx0: IDENT, cm: IDENT) {
Expand Down Expand Up @@ -517,7 +515,7 @@ describe('r3_view_compiler', () => {
}
IDENT.ɵp(1, 'forOf', IDENT.ɵb(ctx.items));
IDENT.ɵcR(1);
IDENT.r(2, 1);
IDENT.ɵr(2, 1);
IDENT.ɵcr();

function MyComponent_ForOfDirective_Template_1(ctx0: IDENT, cm: IDENT) {
Expand All @@ -535,7 +533,7 @@ describe('r3_view_compiler', () => {
IDENT.ɵp(4, 'forOf', IDENT.ɵb(IDENT.infos));
IDENT.ɵt(2, IDENT.ɵb1('', IDENT.name, ''));
IDENT.ɵcR(4);
IDENT.r(5, 4);
IDENT.ɵr(5, 4);
IDENT.ɵcr();

function MyComponent_ForOfDirective_ForOfDirective_Template_4(
Expand Down