From e882cf507e59c0bcffabf91773da945b7c9a4850 Mon Sep 17 00:00:00 2001 From: cvs Date: Mon, 16 Oct 2017 15:43:12 +0200 Subject: [PATCH] Correct crash with specific navigation case --- src/common.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common.ts b/src/common.ts index 2dc4e7a..4bc24f6 100644 --- a/src/common.ts +++ b/src/common.ts @@ -248,12 +248,18 @@ export function getLastScrollTopIndex( const scrollTop = getScrollUpIndex(filteredData, hoveringValue); if (scrollTop - lastScrollTopIndex > 5) { lastScrollTopIndex += scrollTop - lastScrollTopIndex - 5; - results.scrollTop = results.querySelectorAll("li").item(scrollTop).offsetTop - results.offsetHeight; + const item = results.querySelectorAll("li").item(scrollTop); + if (item) { + results.scrollTop = item.offsetTop - results.offsetHeight; + } return lastScrollTopIndex; } if (lastScrollTopIndex - scrollTop > 0) { lastScrollTopIndex -= lastScrollTopIndex - scrollTop; - results.scrollTop = results.querySelectorAll("li").item(lastScrollTopIndex - 1).offsetTop; + const item = results.querySelectorAll("li").item(lastScrollTopIndex - 1); + if (item) { + results.scrollTop = item.offsetTop; + } return lastScrollTopIndex; } return null;