diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json index fd32d34715..3a2aac7f16 100644 --- a/integration/_payload-limits.json +++ b/integration/_payload-limits.json @@ -12,7 +12,7 @@ "master": { "uncompressed": { "runtime": 1440, - "main": 14021, + "main": 13517, "polyfills": 43567 } } @@ -34,4 +34,4 @@ } } } -} +} \ No newline at end of file diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts index a6561712bc..27245b4bad 100644 --- a/packages/core/src/render3/instructions/shared.ts +++ b/packages/core/src/render3/instructions/shared.ts @@ -387,7 +387,8 @@ export function createEmbeddedViewAndNode( } /** - * Used for rendering embedded views (e.g. dynamically created views) + * Used for rendering views in a LContainer (embedded views or root component views for dynamically + * created components). * * Dynamically created views must store/retrieve their TViews differently from component views * because their template functions are nested in the template functions of their hosts, creating @@ -401,22 +402,20 @@ export function renderEmbeddedTemplate(viewToRender: LView, tView: TView, con const _isParent = getIsParent(); const _previousOrParentTNode = getPreviousOrParentTNode(); let oldView: LView; - if (viewToRender[FLAGS] & LViewFlags.IsRoot) { - // This is a root view inside the view tree - tickRootContext(getRootContext(viewToRender)); - } else { - // Will become true if the `try` block executes with no errors. - let safeToRunHooks = false; - try { - oldView = enterView(viewToRender, viewToRender[T_HOST]); - resetPreOrderHookFlags(viewToRender); - executeTemplate(viewToRender, tView.template !, getRenderFlags(viewToRender), context); - refreshDescendantViews(viewToRender); - safeToRunHooks = true; - } finally { - leaveView(oldView !, safeToRunHooks); - setPreviousOrParentTNode(_previousOrParentTNode, _isParent); + // Will become true if the `try` block executes with no errors. + let safeToRunHooks = false; + try { + oldView = enterView(viewToRender, viewToRender[T_HOST]); + resetPreOrderHookFlags(viewToRender); + const templateFn = tView.template; + if (templateFn !== null) { + executeTemplate(viewToRender, templateFn, getRenderFlags(viewToRender), context); } + refreshDescendantViews(viewToRender); + safeToRunHooks = true; + } finally { + leaveView(oldView !, safeToRunHooks); + setPreviousOrParentTNode(_previousOrParentTNode, _isParent); } } diff --git a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json index e8b3085865..b9cf299485 100644 --- a/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json +++ b/packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json @@ -404,12 +404,6 @@ { "name": "getRenderParent" }, - { - "name": "getRootContext" - }, - { - "name": "getRootView" - }, { "name": "getSelectedIndex" }, @@ -548,12 +542,6 @@ { "name": "postProcessDirective" }, - { - "name": "readPatchedData" - }, - { - "name": "readPatchedLView" - }, { "name": "refreshChildComponents" }, @@ -578,9 +566,6 @@ { "name": "renderComponent" }, - { - "name": "renderComponentOrTemplate" - }, { "name": "renderEmbeddedTemplate" }, @@ -686,9 +671,6 @@ { "name": "throwMultipleComponentError" }, - { - "name": "tickRootContext" - }, { "name": "unwrapRNode" }, diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json index d304ab9a1a..fb93df66e9 100644 --- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json +++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json @@ -326,12 +326,6 @@ { "name": "getRenderParent" }, - { - "name": "getRootContext" - }, - { - "name": "getRootView" - }, { "name": "getSelectedIndex" }, @@ -413,12 +407,6 @@ { "name": "postProcessBaseDirective" }, - { - "name": "readPatchedData" - }, - { - "name": "readPatchedLView" - }, { "name": "refreshChildComponents" }, @@ -434,9 +422,6 @@ { "name": "renderComponent" }, - { - "name": "renderComponentOrTemplate" - }, { "name": "renderEmbeddedTemplate" }, @@ -500,9 +485,6 @@ { "name": "syncViewWithBlueprint" }, - { - "name": "tickRootContext" - }, { "name": "unwrapRNode" }, diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json index 8323bf925f..5407073b7e 100644 --- a/packages/core/test/bundling/todo/bundle.golden_symbols.json +++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json @@ -899,12 +899,6 @@ { "name": "getRenderer" }, - { - "name": "getRootContext" - }, - { - "name": "getRootView" - }, { "name": "getSelectedIndex" },