diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 988351476b..741961b52f 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -513,11 +513,11 @@ function getRenderParent(tNode: TNode, currentView: LView): RElement|null {
// We've got a parent which is an element in the current view. We just need to verify if the
// parent element is not a component. Component's content nodes are not inserted immediately
// because they will be projected, and so doing insert at this point would be wasteful.
- // Since the projection would than move it to its final destination.
- if (!(parent.flags & TNodeFlags.isComponent)) {
- return getNativeByTNode(parent, currentView) as RElement;
- } else {
+ // Since the projection would then move it to its final destination.
+ if (parent.flags & TNodeFlags.isComponent) {
return null;
+ } else {
+ return getNativeByTNode(parent, currentView) as RElement;
}
}
}
diff --git a/packages/upgrade/test/dynamic/upgrade_spec.ts b/packages/upgrade/test/dynamic/upgrade_spec.ts
index 29a1ec079d..58de0e9494 100644
--- a/packages/upgrade/test/dynamic/upgrade_spec.ts
+++ b/packages/upgrade/test/dynamic/upgrade_spec.ts
@@ -2576,68 +2576,65 @@ withEachNg1Version(() => {
});
describe('transclusion', () => {
- fixmeIvy('FW-714: ng1 projected content is not being rendered')
- .it('should support single-slot transclusion', async(() => {
- const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
- let ng2ComponentAInstance: Ng2ComponentA;
- let ng2ComponentBInstance: Ng2ComponentB;
+ it('should support single-slot transclusion', async(() => {
+ const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
+ 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 `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', adapter.downgradeNg2Component(Ng2ComponentA));
+ // Define `ng1Module`
+ const ng1Module = angular.module('ng1Module', [])
+ .component('ng1', ng1Component)
+ .directive('ng2A', adapter.downgradeNg2Component(Ng2ComponentA));
- // Define `Ng2Module`
- @NgModule({
- imports: [BrowserModule],
- declarations:
- [adapter.upgradeNg1Component('ng1'), Ng2ComponentA, Ng2ComponentB]
- })
- class Ng2Module {
- }
+ // Define `Ng2Module`
+ @NgModule({
+ imports: [BrowserModule],
+ declarations: [adapter.upgradeNg1Component('ng1'), Ng2ComponentA, Ng2ComponentB]
+ })
+ class Ng2Module {
+ }
- // Bootstrap
- const element = html(``);
+ // Bootstrap
+ const element = html(``);
- adapter.bootstrap(element, ['ng1Module']).ready((ref) => {
- expect(multiTrim(element.textContent)).toBe('ng2A(ng1(foo | ))');
+ adapter.bootstrap(element, ['ng1Module']).ready((ref) => {
+ expect(multiTrim(element.textContent)).toBe('ng2A(ng1(foo | ))');
- ng2ComponentAInstance.value = 'baz';
- ng2ComponentAInstance.showB = true;
- $digest(ref);
+ ng2ComponentAInstance.value = 'baz';
+ ng2ComponentAInstance.showB = true;
+ $digest(ref);
- expect(multiTrim(element.textContent)).toBe('ng2A(ng1(baz | ng2B(bar)))');
+ expect(multiTrim(element.textContent)).toBe('ng2A(ng1(baz | ng2B(bar)))');
- ng2ComponentBInstance.value = 'qux';
- $digest(ref);
+ ng2ComponentBInstance.value = 'qux';
+ $digest(ref);
- 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(() => {
const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
@@ -2943,22 +2940,21 @@ withEachNg1Version(() => {
});
}));
- fixmeIvy('FW-714: ng1 projected content is not being rendered')
- .it('should support structural directives in transcluded content', async(() => {
- const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
- let ng2ComponentInstance: Ng2Component;
+ it('should support structural directives in transcluded content', async(() => {
+ const adapter: UpgradeAdapter = new UpgradeAdapter(forwardRef(() => Ng2Module));
+ 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 `Ng2Component`
- @Component({
- selector: 'ng2',
- template: `
+ // Define `Ng2Component`
+ @Component({
+ selector: 'ng2',
+ template: `
ng2(
{{ x }}1
@@ -2967,51 +2963,47 @@ 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', adapter.downgradeNg2Component(Ng2Component));
+ // Define `ng1Module`
+ const ng1Module = angular.module('ng1Module', [])
+ .component('ng1', ng1Component)
+ .directive('ng2', adapter.downgradeNg2Component(Ng2Component));
- // Define `Ng2Module`
- @NgModule({
- imports: [BrowserModule],
- declarations: [adapter.upgradeNg1Component('ng1'), Ng2Component],
- schemas: [NO_ERRORS_SCHEMA]
- })
- class Ng2Module {
- }
+ // Define `Ng2Module`
+ @NgModule({
+ imports: [BrowserModule],
+ declarations: [adapter.upgradeNg1Component('ng1'), Ng2Component],
+ schemas: [NO_ERRORS_SCHEMA]
+ })
+ class Ng2Module {
+ }
- // Bootstrap
- const element = html(``);
+ // Bootstrap
+ const element = html(``);
- adapter.bootstrap(element, ['ng1Module']).ready(ref => {
- expect(multiTrim(element.textContent, true))
- .toBe('ng2(ng1(x(foo1)|default(bar2)))');
+ adapter.bootstrap(element, ['ng1Module']).ready(ref => {
+ expect(multiTrim(element.textContent, true)).toBe('ng2(ng1(x(foo1)|default(bar2)))');
- ng2ComponentInstance.x = 'baz';
- ng2ComponentInstance.y = 'qux';
- ng2ComponentInstance.show = false;
- $digest(ref);
+ ng2ComponentInstance.x = 'baz';
+ ng2ComponentInstance.y = 'qux';
+ ng2ComponentInstance.show = false;
+ $digest(ref);
- 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(ref);
+ ng2ComponentInstance.show = true;
+ $digest(ref);
- expect(multiTrim(element.textContent, true))
- .toBe('ng2(ng1(x(baz1)|default(qux2)))');
- });
- }));
+ expect(multiTrim(element.textContent, true)).toBe('ng2(ng1(x(baz1)|default(qux2)))');
+ });
+ }));
});
it('should bind input properties (<) of components', async(() => {