From c845107a613ebf39bf4c89a221e0e718adf8bbb7 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 15 Apr 2018 14:13:45 -0700
Subject: [PATCH] make PseudoVirtualList sync rather than async

Attempt to address #92
---
 routes/_components/timeline/Timeline.html | 35 +++++++++--------------
 routes/_utils/asyncModules.js             |  4 ---
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/routes/_components/timeline/Timeline.html b/routes/_components/timeline/Timeline.html
index d05fb832..f16ddc9f 100644
--- a/routes/_components/timeline/Timeline.html
+++ b/routes/_components/timeline/Timeline.html
@@ -22,22 +22,17 @@
                  on:noNeedToScroll="onNoNeedToScroll()"
     />
   {{else}}
-    {{#await importPseudoVirtualList}}
-    {{then PseudoVirtualList}}
-      <!-- if this is a status thread, it's easier to just render the
-           whole thing rather than use a virtual list -->
-      <:Component {PseudoVirtualList}
-                 component="{{VirtualListComponent}}"
-                 realm="{{$currentInstance + '/' + timeline}}"
-                 containerQuery=".container"
-                 :makeProps
-                 items="{{$timelineItemIds}}"
-                 scrollToItem="{{scrollToItem}}"
-                 on:initialized="initialize()"
-      />
-    {{catch error}}
-      <div>Component failed to load. Try refreshing! {{error}}</div>
-    {{/await}}
+    <!-- if this is a status thread, it's easier to just render the
+         whole thing rather than use a virtual list -->
+    <PseudoVirtualList
+               component="{{VirtualListComponent}}"
+               realm="{{$currentInstance + '/' + timeline}}"
+               containerQuery=".container"
+               :makeProps
+               items="{{$timelineItemIds}}"
+               scrollToItem="{{scrollToItem}}"
+               on:initialized="initialize()"
+    />
   {{/if}}
 </div>
 <script>
@@ -48,6 +43,7 @@
   import LoadingFooter from './LoadingFooter.html'
   import MoreHeaderVirtualWrapper from './MoreHeaderVirtualWrapper.html'
   import VirtualList from '../virtualList/VirtualList.html'
+  import PseudoVirtualList from '../pseudoVirtualList/PseudoVirtualList.html'
   import { timelines } from '../../_static/timelines'
   import { database } from '../../_database/database'
   import {
@@ -60,7 +56,6 @@
   import { focusWithCapture, blurWithCapture } from '../../_utils/events'
   import { scheduleIdleTask } from '../../_utils/scheduleIdleTask'
   import { mark, stop } from '../../_utils/marks'
-  import { importPseudoVirtualList } from '../../_utils/asyncModules'
   import isEqual from 'lodash-es/isEqual'
   import { doubleRAF } from '../../_utils/doubleRAF'
 
@@ -83,9 +78,6 @@
       scrollTop: 0
     }),
     computed: {
-      importPseudoVirtualList: (virtual) => {
-        return !virtual && importPseudoVirtualList()
-      },
       VirtualListComponent: (timelineType) => {
         return timelineType === 'notifications' ? NotificationVirtualListItem : StatusVirtualListItem
       },
@@ -146,7 +138,8 @@
     },
     store: () => store,
     components: {
-      VirtualList
+      VirtualList,
+      PseudoVirtualList
     },
     events: {
       focusWithCapture,
diff --git a/routes/_utils/asyncModules.js b/routes/_utils/asyncModules.js
index 4127f097..aab1a538 100644
--- a/routes/_utils/asyncModules.js
+++ b/routes/_utils/asyncModules.js
@@ -22,10 +22,6 @@ export const importWebSocketClient = () => import(
   /* webpackChunkName: '@gamestdio/websocket' */ '@gamestdio/websocket'
   ).then(mod => mod.default)
 
-export const importPseudoVirtualList = () => import(
-  /* webpackChunkName: 'PseudoVirtualList' */ '../_components/pseudoVirtualList/PseudoVirtualList.html'
-  ).then(mod => mod.default)
-
 export const importDialogs = () => import(
   /* webpackChunkName: 'dialogs' */ '../_components/dialog/dialogs.js'
   )
\ No newline at end of file