From b15ad4b2f7dc2657414fa8355006bf7be55ee30f Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Tue, 23 Jan 2018 18:19:03 -0800
Subject: [PATCH] simplify virtual list even more

---
 routes/_components/Timeline.html    | 7 +------
 routes/_components/VirtualList.html | 8 ++++----
 routes/_utils/virtualListStore.js   | 4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/routes/_components/Timeline.html b/routes/_components/Timeline.html
index bf59344a..9e104668 100644
--- a/routes/_components/Timeline.html
+++ b/routes/_components/Timeline.html
@@ -2,7 +2,7 @@
 <div class="timeline" role="feed" aria-label="{{label}}" on:initialized>
   <VirtualList component="{{StatusListItem}}"
                :makeProps
-               :items
+               items="{{statusIds}}"
                on:scrollToBottom="onScrollToBottom()"
                shown="{{initialized}}"
                footerComponent="{{LoadingFooter}}"
@@ -49,11 +49,6 @@
     }),
     computed: {
       makeProps: ($currentInstance) => (statusId) => database.getStatus($currentInstance, statusId),
-      items: (statusIds) => {
-        return statusIds.map(statusId => ({
-          key: statusId
-        }))
-      },
       lastStatusId: (statusIds) => statusIds.length && statusIds[statusIds.length - 1],
       label: (timeline, $currentInstance) => {
         if (timelines[timeline]) {
diff --git a/routes/_components/VirtualList.html b/routes/_components/VirtualList.html
index fcc694a6..025fe33e 100644
--- a/routes/_components/VirtualList.html
+++ b/routes/_components/VirtualList.html
@@ -1,11 +1,11 @@
 <!-- TODO: setting height is hacky, just make this element the scroller -->
 <div class="virtual-list {{shown ? '' : 'hidden'}}" style="height: {{$height}}px;">
-  {{#each $visibleItems as item @key}}
+  {{#each $visibleItems as visibleItem @key}}
     <VirtualListLazyItem :component
-                         offset="{{item.offset}}"
+                         offset="{{visibleItem.offset}}"
                          makeProps="{{makeProps}}"
-                         key="{{item.key}}"
-                         index="{{item.index}}"
+                         key="{{visibleItem.key}}"
+                         index="{{visibleItem.index}}"
     />
   {{/each}}
   {{#if $showFooter}}
diff --git a/routes/_utils/virtualListStore.js b/routes/_utils/virtualListStore.js
index 8d02c358..ef45cb3b 100644
--- a/routes/_utils/virtualListStore.js
+++ b/routes/_utils/virtualListStore.js
@@ -56,7 +56,7 @@ virtualListStore.compute('visibleItems',
   let len = items.length
   let i = -1
   while (++i < len) {
-    let { key } = items[i]
+    let key = items[i]
     let height = itemHeights[key] || 0
     let currentOffset = totalOffset
     totalOffset += height
@@ -87,7 +87,7 @@ virtualListStore.compute('heightWithoutFooter',
   let i = -1
   let len = items.length
   while (++i < len) {
-    sum += itemHeights[items[i].key] || 0
+    sum += itemHeights[items[i]] || 0
   }
   return sum
 })