diff --git a/src/virtual-repeat.js b/src/virtual-repeat.js index 7f41512..f55e7b1 100644 --- a/src/virtual-repeat.js +++ b/src/virtual-repeat.js @@ -278,7 +278,7 @@ export class VirtualRepeat extends AbstractRepeater { if (!this._calledGetMore) { let executeGetMore = () => { this._calledGetMore = true; - let func = (this.view(0) && this.view(0).firstChild.au) ? this.view(0).firstChild.au['infinite-scroll-next'].instruction.attributes['infinite-scroll-next'] : undefined; + let func = (this.view(0) && this.view(0).firstChild && this.view(0).firstChild.au && this.view(0).firstChild.au['infinite-scroll-next']) ? this.view(0).firstChild.au['infinite-scroll-next'].instruction.attributes['infinite-scroll-next'] : undefined; let topIndex = this._first; let isAtBottom = this._bottomBufferHeight === 0; let isAtTop = this._isAtTop; diff --git a/test/virtual-repeat-integration.spec.js b/test/virtual-repeat-integration.spec.js index d2909ed..02cc259 100644 --- a/test/virtual-repeat-integration.spec.js +++ b/test/virtual-repeat-integration.spec.js @@ -188,6 +188,11 @@ describe('VirtualRepeat Integration', () => { let hiddenVirtualRepeat; let hiddenViewModel; + let containerComponent; + let containerCreate; + let containerVirtualRepeat; + let containerViewModel; + beforeEach(() => { items = []; for(let i = 0; i < 1000; ++i) { @@ -214,11 +219,25 @@ describe('VirtualRepeat Integration', () => { hiddenVirtualRepeat = hiddenComponent.sut; hiddenViewModel = hiddenComponent.viewModel; }); + + containerComponent = StageComponent + .withResources('src/virtual-repeat') + .inView(`