From b09e8c85ab29cd42728cccd8b120ea1e3c97d2a4 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 15 Jan 2018 17:25:32 -0800
Subject: [PATCH] kinda really sorta working

---
 routes/_components/Status.html          |  9 ++---
 routes/_components/VirtualList.html     | 25 +++++++------
 routes/_components/VirtualListItem.html |  2 -
 routes/_utils/virtualListStore.js       | 49 ++++++++++++++-----------
 4 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/routes/_components/Status.html b/routes/_components/Status.html
index 18b1ad8..be135fd 100644
--- a/routes/_components/Status.html
+++ b/routes/_components/Status.html
@@ -190,13 +190,10 @@
     components: {
       Avatar
     },
-    data: () => ({
-      status: null,
-    }),
     computed: {
-      relativeDate: (status) => {
-        let date = new Date(status.created_at)
-        return relativeFormat.format(date)
+      createdAtDate: (status) => status.created_at,
+      relativeDate: (createdAtDate) => {
+        return relativeFormat.format(new Date(createdAtDate))
       },
       original: (status) => status.reblog ? status.reblog.account : status.account
     },
diff --git a/routes/_components/VirtualList.html b/routes/_components/VirtualList.html
index 2aebc88..6111631 100644
--- a/routes/_components/VirtualList.html
+++ b/routes/_components/VirtualList.html
@@ -1,13 +1,12 @@
-<:Window bind:scrollY='scrollY' bind:innerHeight='innerHeight' />
+<:Window bind:scrollY='scrollY' bind:innerHeight='innerHeight'/>
 <div class="virtual-list" ref:node style="height: {{$height}}px;">
   <!-- <div class="virtual-list-viewport" ref:viewport></div> -->
-  {{#each $visibleItems as item, index @key}}
-    <VirtualListItem :component
-                     offset="{{item.offset}}"
-                     props="{{item.props}}"
-                     key="{{item.key}}"
-                     index="{{item.index}}"
-    />
+  {{#each $visibleItems as item @key}}
+  <VirtualListItem :component
+                   offset="{{item.offset}}"
+                   props="{{item.props}}"
+                   key="{{item.key}}"
+  />
   {{/each}}
 </div>
 <style>
@@ -20,14 +19,16 @@
   import { virtualListStore } from '../_utils/virtualListStore'
   import debounce from 'lodash/debounce'
 
+  const DEBOUNCE_TIME = 200
+
   export default {
-    oncreate() {
-      this.observe('innerHeight', innerHeight => {
+    oncreate () {
+      this.observe('innerHeight', debounce(innerHeight => {
         console.log('setting innerHeight', innerHeight)
         this.store.set({
           innerHeight: innerHeight
         })
-      })
+      }, DEBOUNCE_TIME))
       this.observe('items', (items) => {
         console.log('setting items')
         this.store.set({
@@ -39,7 +40,7 @@
         this.store.set({
           scrollTop: scrollY
         })
-      }, 2000))
+      }, DEBOUNCE_TIME))
     },
     data: () => ({
       component: null
diff --git a/routes/_components/VirtualListItem.html b/routes/_components/VirtualListItem.html
index 786db5d..6aff4d6 100644
--- a/routes/_components/VirtualListItem.html
+++ b/routes/_components/VirtualListItem.html
@@ -1,8 +1,6 @@
 <div class="virtual-list-item"
      ref:node
      style="transform: translate3d(0, {{offset}}px, 0);"
-     data-virtual-key="{{key}}"
-     data-virtual-index="{{index}}"
 >
   <:Component {component} virtualProps="{{props}}" />
 </div>
diff --git a/routes/_utils/virtualListStore.js b/routes/_utils/virtualListStore.js
index d86951e..cd26ae4 100644
--- a/routes/_utils/virtualListStore.js
+++ b/routes/_utils/virtualListStore.js
@@ -15,35 +15,42 @@ virtualListStore.compute('visibleItems',
     ['items', 'scrollTop', 'height', 'itemHeights', 'innerHeight'],
     (items, scrollTop, height, itemHeights, innerHeight) => {
   let visibleItems = []
-  let currentOffset = 0
-  items.forEach((item, index) => {
-    let { props, key } = item
+  let totalOffset = 0
+  let len = items.length
+  let i = -1
+  while (++i < len) {
+    let { props, key } = items[i]
     let height = itemHeights[key] || 0
-    console.log(key, 'scrollTop', scrollTop, 'currentOffset', currentOffset, 'innerHeight', innerHeight)
-    if (
-      ((currentOffset < scrollTop)  && (scrollTop - RENDER_BUFFER < currentOffset)) ||
-      ((currentOffset >= scrollTop) && (currentOffset < (scrollTop + innerHeight + RENDER_BUFFER)))
-    ) {
-      console.log('    rendering', key)
-      visibleItems.push({
-        offset: currentOffset,
-        props: props,
-        key: key,
-        index: index
-      })
+    let currentOffset = totalOffset
+    totalOffset += height
+    //console.log(key, 'scrollTop', scrollTop, 'currentOffset', currentOffset, 'innerHeight', innerHeight)
+    let isBelowViewport = (currentOffset < scrollTop)
+    if (isBelowViewport) {
+      if (scrollTop - RENDER_BUFFER > currentOffset) {
+        continue // below the area we want to render
+      }
     } else {
-      console.log('not rendering', key)
+      if (currentOffset > (scrollTop + innerHeight + RENDER_BUFFER)) {
+        break // above the area we want to render
+      }
     }
-    currentOffset += height
-  })
+    visibleItems.push({
+      offset: currentOffset,
+      props: props,
+      key: key,
+      index: i
+    })
+  }
   return visibleItems
 })
 
 virtualListStore.compute('height', ['items', 'itemHeights'], (items, itemHeights) => {
   let sum = 0
-  items.forEach(item => {
-    sum += itemHeights[item.key] || 0
-  })
+  let i = -1
+  let len = items.length
+  while (++i < len) {
+    sum += itemHeights[items[i].key] || 0
+  }
   return sum
 })