fix(ivy): consistenly return -1 from ViewContainerRef.indexOf for non…

…-inserted view (#34156) PR Close #34156
angular · Dec 4, 2019 · 0044c66 · 0044c66
1 parent 91f4b81
commit 0044c66
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/packages/core/src/render3/view_engine_compatibility.ts b/packages/core/src/render3/view_engine_compatibility.ts
@@ -281,9 +281,8 @@ export function createContainerRef(
       }
 
       indexOf(viewRef: viewEngine_ViewRef): number {
-        return this._lContainer[VIEW_REFS] !== null ?
-            this._lContainer[VIEW_REFS] !.indexOf(viewRef) :
-            0;
+        const viewRefsArr = this._lContainer[VIEW_REFS];
+        return viewRefsArr !== null ? viewRefsArr.indexOf(viewRef) : -1;
       }
 
       remove(index?: number): void {

diff --git a/packages/core/test/acceptance/view_container_ref_spec.ts b/packages/core/test/acceptance/view_container_ref_spec.ts
@@ -478,6 +478,24 @@ describe('ViewContainerRef', () => {
       vcRefDir.vcref.remove(0);
       expect(vcRefDir.vcref.indexOf(viewRef !)).toEqual(-1);
     });
+
+    it('should return -1 as indexOf when no views were inserted', () => {
+      const fixture = TestBed.createComponent(ViewContainerRefComp);
+      fixture.detectChanges();
+
+      const cmpt = fixture.componentInstance;
+      const viewRef = cmpt.templates.first.createEmbeddedView({});
+
+      // ViewContainerRef is empty and we've got a reference to a view that was not attached
+      // anywhere
+      expect(cmpt.vcr.indexOf(viewRef)).toBe(-1);
+
+      cmpt.vcr.insert(viewRef);
+      expect(cmpt.vcr.indexOf(viewRef)).toBe(0);
+
+      cmpt.vcr.remove(0);
+      expect(cmpt.vcr.indexOf(viewRef)).toBe(-1);
+    });
   });
 
   describe('move', () => {