diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index dab5c4f372..8c36b0d41d 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -52,9 +52,9 @@ export function getLContainer(tNode: TViewNode, embeddedView: LView): LContainer
* Retrieves render parent for a given view.
* Might be null if a view is not yet attached to any container.
*/
-export function getContainerRenderParent(tViewNode: TViewNode, view: LView): RElement|null {
+function getContainerRenderParent(tViewNode: TViewNode, view: LView): RElement|null {
const container = getLContainer(tViewNode, view);
- return container ? container[RENDER_PARENT] : null;
+ return container ? nativeParentNode(view[RENDERER], container[NATIVE]) : null;
}
const enum WalkTNodeTreeAction {
diff --git a/packages/upgrade/test/static/integration/upgrade_component_spec.ts b/packages/upgrade/test/static/integration/upgrade_component_spec.ts
index 0f69b35ce8..bac8ae52c4 100644
--- a/packages/upgrade/test/static/integration/upgrade_component_spec.ts
+++ b/packages/upgrade/test/static/integration/upgrade_component_spec.ts
@@ -2134,76 +2134,72 @@ withEachNg1Version(() => {
});
describe('transclusion', () => {
- fixmeIvy(`FW-863: Error: Failed to execute 'insertBefore' on 'Node'`)
- .it('should support single-slot transclusion', async(() => {
- let ng2ComponentAInstance: Ng2ComponentA;
- let ng2ComponentBInstance: Ng2ComponentB;
+ it('should support single-slot transclusion', async(() => {
+ let ng2ComponentAInstance: Ng2ComponentA;
+ let ng2ComponentBInstance: Ng2ComponentB;
- // Define `ng1Component`
- const ng1Component: angular.IComponent = {
- template: 'ng1(
)',
- transclude: true
- };
+ // Define `ng1Component`
+ const ng1Component:
+ angular.IComponent = {template: 'ng1()', transclude: true};
- // Define `Ng1ComponentFacade`
- @Directive({selector: 'ng1'})
- class Ng1ComponentFacade extends UpgradeComponent {
- constructor(elementRef: ElementRef, injector: Injector) {
- super('ng1', elementRef, injector);
- }
- }
+ // Define `Ng1ComponentFacade`
+ @Directive({selector: 'ng1'})
+ class Ng1ComponentFacade extends UpgradeComponent {
+ constructor(elementRef: ElementRef, injector: Injector) {
+ super('ng1', elementRef, injector);
+ }
+ }
- // Define `Ng2Component`
- @Component({
- selector: 'ng2A',
- template: 'ng2A({{ value }} | )'
- })
- class Ng2ComponentA {
- value = 'foo';
- showB = false;
- constructor() { ng2ComponentAInstance = this; }
- }
+ // Define `Ng2Component`
+ @Component({
+ selector: 'ng2A',
+ template: 'ng2A({{ value }} | )'
+ })
+ class Ng2ComponentA {
+ value = 'foo';
+ showB = false;
+ constructor() { ng2ComponentAInstance = this; }
+ }
- @Component({selector: 'ng2B', template: 'ng2B({{ value }})'})
- class Ng2ComponentB {
- value = 'bar';
- constructor() { ng2ComponentBInstance = this; }
- }
+ @Component({selector: 'ng2B', template: 'ng2B({{ value }})'})
+ class Ng2ComponentB {
+ value = 'bar';
+ constructor() { ng2ComponentBInstance = this; }
+ }
- // Define `ng1Module`
- const ng1Module =
- angular.module('ng1Module', [])
- .component('ng1', ng1Component)
- .directive('ng2A', downgradeComponent({component: Ng2ComponentA}));
+ // Define `ng1Module`
+ const ng1Module = angular.module('ng1Module', [])
+ .component('ng1', ng1Component)
+ .directive('ng2A', downgradeComponent({component: Ng2ComponentA}));
- // Define `Ng2Module`
- @NgModule({
- imports: [BrowserModule, UpgradeModule],
- declarations: [Ng1ComponentFacade, Ng2ComponentA, Ng2ComponentB],
- entryComponents: [Ng2ComponentA]
- })
- class Ng2Module {
- ngDoBootstrap() {}
- }
+ // Define `Ng2Module`
+ @NgModule({
+ imports: [BrowserModule, UpgradeModule],
+ declarations: [Ng1ComponentFacade, Ng2ComponentA, Ng2ComponentB],
+ entryComponents: [Ng2ComponentA]
+ })
+ class Ng2Module {
+ ngDoBootstrap() {}
+ }
- // Bootstrap
- const element = html(``);
+ // Bootstrap
+ const element = html(``);
- bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then(adapter => {
- expect(multiTrim(element.textContent)).toBe('ng2A(ng1(foo | ))');
+ bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then(adapter => {
+ expect(multiTrim(element.textContent)).toBe('ng2A(ng1(foo | ))');
- ng2ComponentAInstance.value = 'baz';
- ng2ComponentAInstance.showB = true;
- $digest(adapter);
+ ng2ComponentAInstance.value = 'baz';
+ ng2ComponentAInstance.showB = true;
+ $digest(adapter);
- expect(multiTrim(element.textContent)).toBe('ng2A(ng1(baz | ng2B(bar)))');
+ expect(multiTrim(element.textContent)).toBe('ng2A(ng1(baz | ng2B(bar)))');
- ng2ComponentBInstance.value = 'qux';
- $digest(adapter);
+ ng2ComponentBInstance.value = 'qux';
+ $digest(adapter);
- expect(multiTrim(element.textContent)).toBe('ng2A(ng1(baz | ng2B(qux)))');
- });
- }));
+ expect(multiTrim(element.textContent)).toBe('ng2A(ng1(baz | ng2B(qux)))');
+ });
+ }));
it('should support single-slot transclusion with fallback content', async(() => {
let ng1ControllerInstances: any[] = [];
@@ -2530,29 +2526,28 @@ withEachNg1Version(() => {
});
}));
- fixmeIvy(`FW-863: Error: Failed to execute 'insertBefore' on 'Node'`)
- .it('should support structural directives in transcluded content', async(() => {
- let ng2ComponentInstance: Ng2Component;
+ it('should support structural directives in transcluded content', async(() => {
+ let ng2ComponentInstance: Ng2Component;
- // Define `ng1Component`
- const ng1Component: angular.IComponent = {
- template:
- 'ng1(x() | default())',
- transclude: {slotX: 'contentX'}
- };
+ // Define `ng1Component`
+ const ng1Component: angular.IComponent = {
+ template:
+ 'ng1(x() | default())',
+ transclude: {slotX: 'contentX'}
+ };
- // Define `Ng1ComponentFacade`
- @Directive({selector: 'ng1'})
- class Ng1ComponentFacade extends UpgradeComponent {
- constructor(elementRef: ElementRef, injector: Injector) {
- super('ng1', elementRef, injector);
- }
- }
+ // Define `Ng1ComponentFacade`
+ @Directive({selector: 'ng1'})
+ class Ng1ComponentFacade extends UpgradeComponent {
+ constructor(elementRef: ElementRef, injector: Injector) {
+ super('ng1', elementRef, injector);
+ }
+ }
- // Define `Ng2Component`
- @Component({
- selector: 'ng2',
- template: `
+ // Define `Ng2Component`
+ @Component({
+ selector: 'ng2',
+ template: `
ng2(
{{ x }}1
@@ -2561,53 +2556,49 @@ withEachNg1Version(() => {
{{ y }}2
)`
- })
- class Ng2Component {
- x = 'foo';
- y = 'bar';
- show = true;
- constructor() { ng2ComponentInstance = this; }
- }
+ })
+ class Ng2Component {
+ x = 'foo';
+ y = 'bar';
+ show = true;
+ constructor() { ng2ComponentInstance = this; }
+ }
- // Define `ng1Module`
- const ng1Module =
- angular.module('ng1Module', [])
- .component('ng1', ng1Component)
- .directive('ng2', downgradeComponent({component: Ng2Component}));
+ // Define `ng1Module`
+ const ng1Module = angular.module('ng1Module', [])
+ .component('ng1', ng1Component)
+ .directive('ng2', downgradeComponent({component: Ng2Component}));
- // Define `Ng2Module`
- @NgModule({
- imports: [BrowserModule, UpgradeModule],
- declarations: [Ng1ComponentFacade, Ng2Component],
- entryComponents: [Ng2Component],
- schemas: [NO_ERRORS_SCHEMA]
- })
- class Ng2Module {
- ngDoBootstrap() {}
- }
+ // Define `Ng2Module`
+ @NgModule({
+ imports: [BrowserModule, UpgradeModule],
+ declarations: [Ng1ComponentFacade, Ng2Component],
+ entryComponents: [Ng2Component],
+ schemas: [NO_ERRORS_SCHEMA]
+ })
+ class Ng2Module {
+ ngDoBootstrap() {}
+ }
- // Bootstrap
- const element = html(``);
+ // Bootstrap
+ const element = html(``);
- bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then(adapter => {
- expect(multiTrim(element.textContent, true))
- .toBe('ng2(ng1(x(foo1)|default(bar2)))');
+ bootstrap(platformBrowserDynamic(), Ng2Module, element, ng1Module).then(adapter => {
+ expect(multiTrim(element.textContent, true)).toBe('ng2(ng1(x(foo1)|default(bar2)))');
- ng2ComponentInstance.x = 'baz';
- ng2ComponentInstance.y = 'qux';
- ng2ComponentInstance.show = false;
- $digest(adapter);
+ ng2ComponentInstance.x = 'baz';
+ ng2ComponentInstance.y = 'qux';
+ ng2ComponentInstance.show = false;
+ $digest(adapter);
- expect(multiTrim(element.textContent, true))
- .toBe('ng2(ng1(x(baz2)|default(qux1)))');
+ expect(multiTrim(element.textContent, true)).toBe('ng2(ng1(x(baz2)|default(qux1)))');
- ng2ComponentInstance.show = true;
- $digest(adapter);
+ ng2ComponentInstance.show = true;
+ $digest(adapter);
- expect(multiTrim(element.textContent, true))
- .toBe('ng2(ng1(x(baz1)|default(qux2)))');
- });
- }));
+ expect(multiTrim(element.textContent, true)).toBe('ng2(ng1(x(baz1)|default(qux2)))');
+ });
+ }));
});
describe('lifecycle hooks', () => {