solid-ui 2.4.27-e1d1a020 → 2.4.27-e6d67dd8

package/lib/chat/infinite.js

@@ -20,9 +20,19 @@ var _chatLogic = require("./chatLogic");
 var _message = require("./message");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/**
+ * Contains the [[infiniteMessageArea]] class
+ * @packageDocumentation
+ */
+// import { findBookmarkDocument } from './bookmarks'
+// pull in first avoid cross-refs
+
+// import * as style from '../style'
+// import * as utils from '../utils'
+
+// import * as pad from '../pad'
+// import { DateFolder } from './dateFolder'
+
 // const UI = { authn, icons, ns, media, pad, $rdf, store, style, utils, widgets }
 
 function desktopNotification(str) {
@@ -50,9 +60,34 @@ function desktopNotification(str) {
 /**
  * Renders a chat message inside a `messageTable`
  */
-function insertMessageIntoTable(_x, _x2, _x3, _x4, _x5, _x6) {
-  return _insertMessageIntoTable.apply(this, arguments);
+function insertMessageIntoTable(channelObject, messageTable, message, fresh, options, userContext) {
+  var messageRow = (0, _message.renderMessageRow)(channelObject, message, fresh, options, userContext);
+
+  // const message = messageRow.AJAR_subject
+  if (options.selectedMessage && options.selectedMessage.sameTerm(message)) {
+    messageRow.style.backgroundColor = 'yellow';
+    options.selectedElement = messageRow;
+    messageTable.selectedElement = messageRow;
+  }
+  var done = false;
+  for (var ele = messageTable.firstChild;; ele = ele.nextSibling) {
+    if (!ele) {
+      // empty
+      break;
+    }
+    var newestFirst = options.newestfirst === true;
+    var dateString = messageRow.AJAR_date;
+    if (dateString > ele.AJAR_date && newestFirst || dateString < ele.AJAR_date && !newestFirst) {
+      messageTable.insertBefore(messageRow, ele);
+      done = true;
+      break;
+    }
+  }
+  if (!done) {
+    messageTable.appendChild(messageRow);
+  }
 }
+
 /**
  * Common code for a chat (discussion area of messages about something)
  * This version runs over a series of files for different time periods
@@ -75,70 +110,20 @@ function insertMessageIntoTable(_x, _x2, _x3, _x4, _x5, _x6) {
  - inlineImageHeightEms: The height (in ems) of images expaned from their URIs in the chat.
 
  */
-function _insertMessageIntoTable() {
-  _insertMessageIntoTable = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(channelObject, messageTable, message, fresh, options, userContext) {
-    var messageRow, done, ele, newestFirst, dateString;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return (0, _message.renderMessageRow)(channelObject, message, fresh, options, userContext);
-        case 2:
-          messageRow = _context.sent;
-          // const message = messageRow.AJAR_subject
-          if (options.selectedMessage && options.selectedMessage.sameTerm(message)) {
-            messageRow.style.backgroundColor = 'yellow';
-            options.selectedElement = messageRow;
-            messageTable.selectedElement = messageRow;
-          }
-          done = false;
-          ele = messageTable.firstChild;
-        case 6:
-          if (ele) {
-            _context.next = 8;
-            break;
-          }
-          return _context.abrupt("break", 17);
-        case 8:
-          newestFirst = options.newestfirst === true;
-          dateString = messageRow.AJAR_date;
-          if (!(dateString > ele.AJAR_date && newestFirst || dateString < ele.AJAR_date && !newestFirst)) {
-            _context.next = 14;
-            break;
-          }
-          messageTable.insertBefore(messageRow, ele);
-          done = true;
-          return _context.abrupt("break", 17);
-        case 14:
-          ele = ele.nextSibling;
-          _context.next = 6;
-          break;
-        case 17:
-          if (!done) {
-            messageTable.appendChild(messageRow);
-          }
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _insertMessageIntoTable.apply(this, arguments);
-}
-function infiniteMessageArea(_x7, _x8, _x9, _x10) {
+function infiniteMessageArea(_x, _x2, _x3, _x4) {
   return _infiniteMessageArea.apply(this, arguments);
 }
 function _infiniteMessageArea() {
-  _infiniteMessageArea = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(dom, wasStore, chatChannel, options) {
-    var syncMessages, _syncMessages, addMessage, _addMessage, insertPreviousMessages, _insertPreviousMessages, removePreviousMessages, createMessageTable, _createMessageTable, renderMessageTable, _renderMessageTable, addNewChatDocumentIfNewDay, _addNewChatDocumentIfNewDay, appendCurrentMessages, _appendCurrentMessages, loadMoreWhereNeeded, _loadMoreWhereNeeded, loadInitialContent, _loadInitialContent, newestFirst, channelObject, dateFolder, div, statusArea, userContext, liveMessageTable, threadRootMessage, earliest, latest, thread, threadTime, lock;
-    return _regenerator["default"].wrap(function _callee15$(_context15) {
-      while (1) switch (_context15.prev = _context15.next) {
+  _infiniteMessageArea = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(dom, wasStore, chatChannel, options) {
+    var syncMessages, addMessage, insertPreviousMessages, _insertPreviousMessages, removePreviousMessages, createMessageTable, _createMessageTable, renderMessageTable, addNewChatDocumentIfNewDay, _addNewChatDocumentIfNewDay, appendCurrentMessages, _appendCurrentMessages, loadMoreWhereNeeded, _loadMoreWhereNeeded, loadInitialContent, _loadInitialContent, newestFirst, channelObject, dateFolder, div, statusArea, userContext, liveMessageTable, earliest, latest, lock;
+    return _regenerator["default"].wrap(function _callee12$(_context12) {
+      while (1) switch (_context12.prev = _context12.next) {
         case 0:
           _loadInitialContent = function _loadInitialContent3() {
-            _loadInitialContent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
-              var yank, fixScroll, live, selectedDocument, threadRootDocument, initialDocment, now, todayDocument, selectedMessageTable, selectedDate;
-              return _regenerator["default"].wrap(function _callee14$(_context14) {
-                while (1) switch (_context14.prev = _context14.next) {
+            _loadInitialContent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
+              var yank, fixScroll, live, selectedDocument, now, todayDocument, selectedMessageTable, selectedDate;
+              return _regenerator["default"].wrap(function _callee11$(_context11) {
+                while (1) switch (_context11.prev = _context11.next) {
                   case 0:
                     fixScroll = function _fixScroll() {
                       if (options.selectedElement) {
@@ -152,59 +137,51 @@ function _infiniteMessageArea() {
                       }
                     };
                     yank = function _yank() {
-                      if (selectedMessageTable && selectedMessageTable.selectedElement) {
-                        selectedMessageTable.selectedElement.scrollIntoView({
-                          block: 'center'
-                        });
-                      }
+                      selectedMessageTable.selectedElement.scrollIntoView({
+                        block: 'center'
+                      });
                     };
                     if (options.selectedMessage) {
                       selectedDocument = options.selectedMessage.doc();
-                    }
-                    if (threadRootMessage) {
-                      threadRootDocument = threadRootMessage.doc();
-                    }
-                    initialDocment = selectedDocument || threadRootDocument;
-                    if (initialDocment) {
                       now = new Date();
                       todayDocument = dateFolder.leafDocumentFromDate(now);
-                      live = todayDocument.sameTerm(initialDocment);
+                      live = todayDocument.sameTerm(selectedDocument);
                     }
-                    if (!(initialDocment && !live)) {
-                      _context14.next = 18;
+                    if (!(options.selectedMessage && !live)) {
+                      _context11.next = 15;
                       break;
                     }
-                    selectedDate = dateFolder.dateFromLeafDocument(initialDocment);
-                    _context14.next = 10;
+                    selectedDate = dateFolder.dateFromLeafDocument(selectedDocument);
+                    _context11.next = 7;
                     return createMessageTable(selectedDate, live);
-                  case 10:
-                    selectedMessageTable = _context14.sent;
+                  case 7:
+                    selectedMessageTable = _context11.sent;
                     div.appendChild(selectedMessageTable);
                     earliest.messageTable = selectedMessageTable;
                     latest.messageTable = selectedMessageTable;
                     yank();
                     setTimeout(yank, 1000); // @@ kludge - restore position distubed by other cHANGES
-                    _context14.next = 22;
+                    _context11.next = 19;
                     break;
-                  case 18:
-                    _context14.next = 20;
+                  case 15:
+                    _context11.next = 17;
                     return appendCurrentMessages();
-                  case 20:
+                  case 17:
                     earliest.messageTable = liveMessageTable;
                     latest.messageTable = liveMessageTable;
-                  case 22:
-                    _context14.next = 24;
+                  case 19:
+                    _context11.next = 21;
                     return loadMoreWhereNeeded(null, fixScroll);
-                  case 24:
+                  case 21:
                     div.addEventListener('scroll', loadMoreWhereNeeded);
                     if (options.solo) {
                       document.body.addEventListener('scroll', loadMoreWhereNeeded);
                     }
-                  case 26:
+                  case 23:
                   case "end":
-                    return _context14.stop();
+                    return _context11.stop();
                 }
-              }, _callee14);
+              }, _callee11);
             }));
             return _loadInitialContent.apply(this, arguments);
           };
@@ -212,16 +189,16 @@ function _infiniteMessageArea() {
             return _loadInitialContent.apply(this, arguments);
           };
           _loadMoreWhereNeeded = function _loadMoreWhereNeeded3() {
-            _loadMoreWhereNeeded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(event, fixScroll) {
+            _loadMoreWhereNeeded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(event, fixScroll) {
               var freeze, magicZone, done, scrollBottom, scrollTop;
-              return _regenerator["default"].wrap(function _callee13$(_context13) {
-                while (1) switch (_context13.prev = _context13.next) {
+              return _regenerator["default"].wrap(function _callee10$(_context10) {
+                while (1) switch (_context10.prev = _context10.next) {
                   case 0:
                     if (!lock) {
-                      _context13.next = 2;
+                      _context10.next = 2;
                       break;
                     }
-                    return _context13.abrupt("return");
+                    return _context10.abrupt("return");
                   case 2:
                     lock = true;
                     freeze = !fixScroll;
@@ -229,36 +206,36 @@ function _infiniteMessageArea() {
                     // const bottom = div.scrollHeight - top - div.clientHeight
                   case 5:
                     if (!(div.scrollTop < magicZone && earliest.messageTable && !earliest.messageTable.initial && earliest.messageTable.extendBackwards)) {
-                      _context13.next = 21;
+                      _context10.next = 21;
                       break;
                     }
                     if (!(div.scrollHeight === 0)) {
-                      _context13.next = 10;
+                      _context10.next = 10;
                       break;
                     }
-                    // debug.log('    chat/loadMoreWhereNeeded: trying later...')
+                    // console.log('    chat/loadMoreWhereNeeded: trying later...')
                     setTimeout(loadMoreWhereNeeded, 2000); // couple be less
                     lock = false;
-                    return _context13.abrupt("return");
+                    return _context10.abrupt("return");
                   case 10:
-                    // debug.log('    chat/loadMoreWhereNeeded: Going now')
+                    // console.log('    chat/loadMoreWhereNeeded: Going now')
                     scrollBottom = div.scrollHeight - div.scrollTop;
                     debug.log('infinite scroll: adding above: top ' + div.scrollTop);
-                    _context13.next = 14;
+                    _context10.next = 14;
                     return earliest.messageTable.extendBackwards();
                   case 14:
-                    done = _context13.sent;
+                    done = _context10.sent;
                     if (freeze) {
                       div.scrollTop = div.scrollHeight - scrollBottom;
                     }
                     if (fixScroll) fixScroll();
                     if (!done) {
-                      _context13.next = 19;
+                      _context10.next = 19;
                       break;
                     }
-                    return _context13.abrupt("break", 21);
+                    return _context10.abrupt("break", 21);
                   case 19:
-                    _context13.next = 5;
+                    _context10.next = 5;
                     break;
                   case 21:
                     if (!(options.selectedMessage &&
@@ -268,15 +245,15 @@ function _infiniteMessageArea() {
                     latest.messageTable && !latest.messageTable["final"] &&
                     // there is more data to come
                     latest.messageTable.extendForwards)) {
-                      _context13.next = 33;
+                      _context10.next = 33;
                       break;
                     }
                     scrollTop = div.scrollTop;
                     debug.log('infinite scroll: adding below: bottom: ' + (div.scrollHeight - div.scrollTop - div.clientHeight));
-                    _context13.next = 26;
+                    _context10.next = 26;
                     return latest.messageTable.extendForwards();
                   case 26:
-                    done = _context13.sent;
+                    done = _context10.sent;
                     // then add more data on the bottom
                     if (freeze) {
                       div.scrollTop = scrollTop; // while adding below keep same things in view
@@ -284,66 +261,63 @@ function _infiniteMessageArea() {
 
                     if (fixScroll) fixScroll();
                     if (!done) {
-                      _context13.next = 31;
+                      _context10.next = 31;
                       break;
                     }
-                    return _context13.abrupt("break", 33);
+                    return _context10.abrupt("break", 33);
                   case 31:
-                    _context13.next = 21;
+                    _context10.next = 21;
                     break;
                   case 33:
                     lock = false;
                   case 34:
                   case "end":
-                    return _context13.stop();
+                    return _context10.stop();
                 }
-              }, _callee13);
+              }, _callee10);
             }));
             return _loadMoreWhereNeeded.apply(this, arguments);
           };
-          loadMoreWhereNeeded = function _loadMoreWhereNeeded2(_x20, _x21) {
+          loadMoreWhereNeeded = function _loadMoreWhereNeeded2(_x10, _x11) {
             return _loadMoreWhereNeeded.apply(this, arguments);
           };
           _appendCurrentMessages = function _appendCurrentMessage2() {
-            _appendCurrentMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
+            _appendCurrentMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
               var now, chatDocument, messageTable;
-              return _regenerator["default"].wrap(function _callee12$(_context12) {
-                while (1) switch (_context12.prev = _context12.next) {
+              return _regenerator["default"].wrap(function _callee9$(_context9) {
+                while (1) switch (_context9.prev = _context9.next) {
                   case 0:
                     now = new Date();
                     chatDocument = dateFolder.leafDocumentFromDate(now); /// ///////////////////////////////////////////////////////////
-                    _context12.next = 4;
+                    _context9.next = 4;
                     return createMessageTable(now, true);
                   case 4:
-                    messageTable = _context12.sent;
+                    messageTable = _context9.sent;
                     div.appendChild(messageTable);
-                    div.refresh = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-                      return _regenerator["default"].wrap(function _callee11$(_context11) {
-                        while (1) switch (_context11.prev = _context11.next) {
+                    div.refresh = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+                      return _regenerator["default"].wrap(function _callee8$(_context8) {
+                        while (1) switch (_context8.prev = _context8.next) {
                           case 0:
-                            _context11.next = 2;
+                            _context8.next = 2;
                             return addNewChatDocumentIfNewDay(new Date());
                           case 2:
-                            _context11.next = 4;
-                            return syncMessages(chatChannel, messageTable);
-                          case 4:
-                            // @@ livemessagetable??
+                            syncMessages(chatChannel, messageTable); // @@ livemessagetable??
                             desktopNotification(chatChannel);
-                          case 5:
+                          case 4:
                           case "end":
-                            return _context11.stop();
+                            return _context8.stop();
                         }
-                      }, _callee11);
+                      }, _callee8);
                     })); // The short chat version the live update listening is done in the pane but we do it in the widget @@
                     _solidLogic.store.updater.addDownstreamChangeListener(chatDocument, div.refresh); // Live update
                     liveMessageTable = messageTable;
                     latest.messageTable = liveMessageTable;
-                    return _context12.abrupt("return", messageTable);
+                    return _context9.abrupt("return", messageTable);
                   case 11:
                   case "end":
-                    return _context12.stop();
+                    return _context9.stop();
                 }
-              }, _callee12);
+              }, _callee9);
             }));
             return _appendCurrentMessages.apply(this, arguments);
           };
@@ -351,15 +325,15 @@ function _infiniteMessageArea() {
             return _appendCurrentMessages.apply(this, arguments);
           };
           _addNewChatDocumentIfNewDay = function _addNewChatDocumentIf2() {
-            _addNewChatDocumentIfNewDay = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
+            _addNewChatDocumentIfNewDay = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
               var newChatDocument, oldChatDocument, sts;
-              return _regenerator["default"].wrap(function _callee10$(_context10) {
-                while (1) switch (_context10.prev = _context10.next) {
+              return _regenerator["default"].wrap(function _callee7$(_context7) {
+                while (1) switch (_context7.prev = _context7.next) {
                   case 0:
                     // @@ Remove listener from previous table as it is now static
                     newChatDocument = dateFolder.leafDocumentFromDate(new Date());
                     if (newChatDocument.sameTerm(latest.messageTable.chatDocument)) {
-                      _context10.next = 7;
+                      _context7.next = 7;
                       break;
                     }
                     // It is a new day
@@ -368,7 +342,7 @@ function _infiniteMessageArea() {
                       delete liveMessageTable.inputRow;
                     }
                     oldChatDocument = latest.messageTable.chatDocument;
-                    _context10.next = 6;
+                    _context7.next = 6;
                     return appendCurrentMessages();
                   case 6:
                     // Adding a link in the document will ping listeners to add the new block too
@@ -382,322 +356,286 @@ function _infiniteMessageArea() {
                     }
                   case 7:
                   case "end":
-                    return _context10.stop();
+                    return _context7.stop();
                 }
-              }, _callee10);
+              }, _callee7);
             }));
             return _addNewChatDocumentIfNewDay.apply(this, arguments);
           };
           addNewChatDocumentIfNewDay = function _addNewChatDocumentIf() {
             return _addNewChatDocumentIfNewDay.apply(this, arguments);
           };
-          _renderMessageTable = function _renderMessageTable3() {
-            _renderMessageTable = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(date, live) {
-              var scrollBackbutton, scrollForwardButton, extendBackwards, _extendBackwards, setScrollBackbuttonIcon, extendForwards, _extendForwards, setScrollForwardButtonIcon, scrollForwardButtonHandler, _scrollForwardButtonHandler, messageTable, chatDocument, tr, test, titleTR, scrollBackbuttonCell, dateCell, scrollForwardButtonCell, sts, _iterator2, _step2, st;
-              return _regenerator["default"].wrap(function _callee9$(_context9) {
-                while (1) switch (_context9.prev = _context9.next) {
-                  case 0:
-                    _scrollForwardButtonHandler = function _scrollForwardButtonH2() {
-                      _scrollForwardButtonHandler = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(_event) {
-                        return _regenerator["default"].wrap(function _callee8$(_context8) {
-                          while (1) switch (_context8.prev = _context8.next) {
-                            case 0:
-                              if (!messageTable.extendedForwards) {
-                                _context8.next = 6;
-                                break;
-                              }
-                              removePreviousMessages(false, messageTable);
-                              messageTable.extendedForwards = false;
-                              setScrollForwardButtonIcon();
-                              _context8.next = 9;
-                              break;
-                            case 6:
-                              _context8.next = 8;
-                              return extendForwards();
-                            case 8:
-                              // async
-                              latest.messageTable.scrollIntoView(newestFirst);
-                            case 9:
-                            case "end":
-                              return _context8.stop();
-                          }
-                        }, _callee8);
-                      }));
-                      return _scrollForwardButtonHandler.apply(this, arguments);
-                    };
-                    scrollForwardButtonHandler = function _scrollForwardButtonH(_x22) {
-                      return _scrollForwardButtonHandler.apply(this, arguments);
-                    };
-                    setScrollForwardButtonIcon = function _setScrollForwardButt() {
-                      if (!scrollForwardButton) return;
-                      var sense = messageTable.extendedForwards ? !newestFirst : newestFirst; // noun_T-Block_1114657_000000.svg
-                      var scrollForwardIcon = messageTable["final"] ? 'noun_T-Block_1114657_000000.svg' : getScrollForwardButtonIcon(sense);
-                      scrollForwardButton.firstChild.setAttribute('src', _iconBase.icons.iconBase + scrollForwardIcon);
-                      function getScrollForwardButtonIcon(sense) {
-                        return !sense ? 'noun_1369241.svg' : 'noun_1369237.svg';
-                      }
-                    };
-                    _extendForwards = function _extendForwards3() {
-                      _extendForwards = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
-                        var done;
-                        return _regenerator["default"].wrap(function _callee7$(_context7) {
-                          while (1) switch (_context7.prev = _context7.next) {
-                            case 0:
-                              _context7.next = 2;
-                              return insertPreviousMessages(false);
-                            case 2:
-                              done = _context7.sent;
-                              return _context7.abrupt("return", done);
-                            case 4:
-                            case "end":
-                              return _context7.stop();
-                          }
-                        }, _callee7);
-                      }));
-                      return _extendForwards.apply(this, arguments);
-                    };
-                    extendForwards = function _extendForwards2() {
-                      return _extendForwards.apply(this, arguments);
-                    };
-                    setScrollBackbuttonIcon = function _setScrollBackbuttonI() {
-                      if (!scrollBackbutton) {
-                        return;
-                      }
-                      var sense = messageTable.extendedBack ? !newestFirst : newestFirst;
-                      var scrollBackIcon = messageTable.initial ? 'noun_T-Block_1114655_000000.svg' : getScrollbackIcon(sense);
-                      scrollBackbutton.firstChild.setAttribute('src', _iconBase.icons.iconBase + scrollBackIcon);
-                      function getScrollbackIcon(sense) {
-                        return sense ? 'noun_1369241.svg' : 'noun_1369237.svg';
-                      }
-                    };
-                    _extendBackwards = function _extendBackwards3() {
-                      _extendBackwards = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-                        var done;
-                        return _regenerator["default"].wrap(function _callee6$(_context6) {
-                          while (1) switch (_context6.prev = _context6.next) {
-                            case 0:
-                              _context6.next = 2;
-                              return insertPreviousMessages(true);
-                            case 2:
-                              done = _context6.sent;
-                              if (done) {
-                                if (scrollBackbutton) {
-                                  scrollBackbutton.firstChild.setAttribute('src', _iconBase.icons.iconBase + 'noun_T-Block_1114655_000000.svg'); // T
-                                  scrollBackbutton.disabled = true;
-                                }
-                                messageTable.initial = true;
-                              } else {
-                                messageTable.extendedBack = true;
-                              }
-                              setScrollBackbuttonIcon();
-                              return _context6.abrupt("return", done);
-                            case 6:
-                            case "end":
-                              return _context6.stop();
-                          }
-                        }, _callee6);
-                      }));
-                      return _extendBackwards.apply(this, arguments);
-                    };
-                    extendBackwards = function _extendBackwards2() {
-                      return _extendBackwards.apply(this, arguments);
-                    };
-                    scrollBackbutton = null; // was let
-                    scrollForwardButton = null; // was let
-                    /// /////////////////   Scroll down adding more above
-                    /// ///////////////////////
-                    /*
-                    options = options || {}
-                    options.authorDateOnLeft = true
-                    const newestFirst = options.newestFirst === '1' || options.newestFirst === true // hack for now
-                    const channelObject = new ChatChannel(chatChannel, options)
-                    const dateFolder = channelObject.dateFolder
-                     const div = dom.createElement('div')
-                    const statusArea = div.appendChild(dom.createElement('div'))
-                    const userContext = { dom, statusArea, div: statusArea } // logged on state, pointers to user's stuff
-                    */
-                    debug.log('Options for called message Area', options);
-                    messageTable = dom.createElement('table');
-                    messageTable.style.width = '100%'; // fill the pane div
-                    messageTable.extendBackwards = extendBackwards; // Make function available to scroll stuff
-                    messageTable.extendForwards = extendForwards; // Make function available to scroll stuff
+          renderMessageTable = function _renderMessageTable(date, live) {
+            var scrollBackbutton;
+            var scrollForwardButton;
 
-                    messageTable.date = date;
-                    chatDocument = dateFolder.leafDocumentFromDate(date);
-                    messageTable.chatDocument = chatDocument;
-                    messageTable.fresh = false;
-                    messageTable.setAttribute('style', 'width: 100%;'); // fill that div!
-                    if (live) {
-                      messageTable["final"] = true;
-                      liveMessageTable = messageTable;
-                      latest.messageTable = messageTable;
-                      tr = (0, _message.renderMessageEditor)(channelObject, messageTable, userContext, options);
-                      if (newestFirst) {
-                        messageTable.insertBefore(tr, messageTable.firstChild); // If newestFirst
+            /// /////////////////   Scroll down adding more above
+            function extendBackwards() {
+              return _extendBackwards.apply(this, arguments);
+            }
+            function _extendBackwards() {
+              _extendBackwards = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+                var done;
+                return _regenerator["default"].wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 2;
+                      return insertPreviousMessages(true);
+                    case 2:
+                      done = _context.sent;
+                      if (done) {
+                        if (scrollBackbutton) {
+                          scrollBackbutton.firstChild.setAttribute('src', _iconBase.icons.iconBase + 'noun_T-Block_1114655_000000.svg'); // T
+                          scrollBackbutton.disabled = true;
+                        }
+                        messageTable.initial = true;
                       } else {
-                        messageTable.appendChild(tr); // not newestFirst
+                        messageTable.extendedBack = true;
                       }
-
-                      messageTable.inputRow = tr;
-                    }
-
-                    /// ///// Infinite scroll
-                    //
-                    // @@ listen for swipe past end event not just button
-                    test = true;
-                    if (test) {
-                      // ws options.infinite but need for non-infinite
-                      titleTR = dom.createElement('tr');
-                      scrollBackbuttonCell = titleTR.appendChild(dom.createElement('td')); // up traingles: noun_1369237.svg
-                      // down triangles: noun_1369241.svg
-                      /*
-                      const scrollBackIcon = newestFirst
-                        ? 'noun_1369241.svg'
-                        : 'noun_1369237.svg' // down and up arrows respoctively
-                      scrollBackbutton = widgets.button(
-                        dom,
-                        icons.iconBase + scrollBackIcon,
-                        'Previous messages ...'
-                      )
-                      scrollBackbuttonCell.style = 'width:3em; height:3em;'
-                      scrollBackbutton.addEventListener('click', scrollBackbuttonHandler, false)
-                      messageTable.extendedBack = false
-                      scrollBackbuttonCell.appendChild(scrollBackbutton)
-                      setScrollBackbuttonIcon()
-                      */
-                      dateCell = titleTR.appendChild(dom.createElement('td'));
-                      dateCell.style = 'text-align: center; vertical-align: middle; color: #888; font-style: italic;';
-                      dateCell.textContent = widgets.shortDate(date.toISOString(), true); // no time, only date
-
-                      // @@@@@@@@@@@ todo move this button to other end of  message cell, o
-                      scrollForwardButtonCell = titleTR.appendChild(dom.createElement('td'));
-                      if (options.includeRemoveButton) {
-                        scrollForwardButtonCell.appendChild(widgets.cancelButton(dom, function (_e) {
-                          div.parentNode.removeChild(div);
-                        }));
+                      setScrollBackbuttonIcon();
+                      return _context.abrupt("return", done);
+                    case 6:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              return _extendBackwards.apply(this, arguments);
+            }
+            function setScrollBackbuttonIcon() {
+              if (!scrollBackbutton) {
+                return;
+              }
+              var sense = messageTable.extendedBack ? !newestFirst : newestFirst;
+              var scrollBackIcon = messageTable.initial ? 'noun_T-Block_1114655_000000.svg' : getScrollbackIcon(sense);
+              scrollBackbutton.firstChild.setAttribute('src', _iconBase.icons.iconBase + scrollBackIcon);
+              function getScrollbackIcon(sense) {
+                return sense ? 'noun_1369241.svg' : 'noun_1369237.svg';
+              }
+            }
+            function scrollBackbuttonHandler(_x8) {
+              return _scrollBackbuttonHandler.apply(this, arguments);
+            } /// ////////////// Scroll up adding more below
+            function _scrollBackbuttonHandler() {
+              _scrollBackbuttonHandler = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_event) {
+                return _regenerator["default"].wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      if (!messageTable.extendedBack) {
+                        _context2.next = 6;
+                        break;
                       }
-                      /*
-                      const scrollForwardIcon = newestFirst
-                        ? 'noun_1369241.svg'
-                        : 'noun_1369237.svg' // down and up arrows respoctively
-                      scrollForwardButton = widgets.button(
-                        dom,
-                        icons.iconBase + scrollForwardIcon,
-                        'Later messages ...'
-                      )
-                      scrollForwardButtonCell.appendChild(scrollForwardButton)
-                      scrollForwardButtonCell.style = 'width:3em; height:3em;'
-                      scrollForwardButton.addEventListener(
-                        'click',
-                        scrollForwardButtonHandler,
-                        false
-                      )
-                      messageTable.extendedForward = false
-                      setScrollForwardButtonIcon()
-                      */
-                      messageTable.extendedForwards = false;
-                      if (!newestFirst) {
-                        // opposite end from the entry field
-                        messageTable.insertBefore(titleTR, messageTable.firstChild); // If not newestFirst
+                      removePreviousMessages(true, messageTable);
+                      messageTable.extendedBack = false;
+                      setScrollBackbuttonIcon();
+                      _context2.next = 8;
+                      break;
+                    case 6:
+                      _context2.next = 8;
+                      return extendBackwards();
+                    case 8:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2);
+              }));
+              return _scrollBackbuttonHandler.apply(this, arguments);
+            }
+            function extendForwards() {
+              return _extendForwards.apply(this, arguments);
+            }
+            function _extendForwards() {
+              _extendForwards = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+                var done;
+                return _regenerator["default"].wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      _context3.next = 2;
+                      return insertPreviousMessages(false);
+                    case 2:
+                      done = _context3.sent;
+                      if (done) {
+                        scrollForwardButton.firstChild.setAttribute('src', _iconBase.icons.iconBase + 'noun_T-Block_1114655_000000.svg');
+                        scrollForwardButton.disabled = true;
+                        messageTable["final"] = true;
                       } else {
-                        messageTable.appendChild(titleTR); //  newestFirst
+                        messageTable.extendedForwards = true;
                       }
-                    }
-                    sts = _solidLogic.store.statementsMatching(null, ns.wf('message'), null, chatDocument);
-                    if (!live && sts.length === 0) {
-                      // not todays
-                      // no need buttomns at the moment
-                      // messageTable.style.visibility = 'collapse' // Hide files with no messages
-                    }
-                    _iterator2 = _createForOfIteratorHelper(sts);
-                    _context9.prev = 26;
-                    _iterator2.s();
-                  case 28:
-                    if ((_step2 = _iterator2.n()).done) {
-                      _context9.next = 34;
+                      setScrollForwardButtonIcon();
+                      return _context3.abrupt("return", done);
+                    case 6:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              }));
+              return _extendForwards.apply(this, arguments);
+            }
+            function setScrollForwardButtonIcon() {
+              var sense = messageTable.extendedForwards ? !newestFirst : newestFirst; // noun_T-Block_1114657_000000.svg
+              var scrollForwardIcon = messageTable["final"] ? 'noun_T-Block_1114657_000000.svg' : getScrollForwardButtonIcon(sense);
+              scrollForwardButton.firstChild.setAttribute('src', _iconBase.icons.iconBase + scrollForwardIcon);
+              function getScrollForwardButtonIcon(sense) {
+                return !sense ? 'noun_1369241.svg' : 'noun_1369237.svg';
+              }
+            }
+            function scrollForwardButtonHandler(_x9) {
+              return _scrollForwardButtonHandler.apply(this, arguments);
+            } /// ///////////////////////
+            /*
+            options = options || {}
+            options.authorDateOnLeft = true
+            const newestFirst = options.newestFirst === '1' || options.newestFirst === true // hack for now
+            const channelObject = new ChatChannel(chatChannel, options)
+            const dateFolder = channelObject.dateFolder
+             const div = dom.createElement('div')
+            const statusArea = div.appendChild(dom.createElement('div'))
+            const userContext = { dom, statusArea, div: statusArea } // logged on state, pointers to user's stuff
+            */
+            function _scrollForwardButtonHandler() {
+              _scrollForwardButtonHandler = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(_event) {
+                return _regenerator["default"].wrap(function _callee4$(_context4) {
+                  while (1) switch (_context4.prev = _context4.next) {
+                    case 0:
+                      if (!messageTable.extendedForwards) {
+                        _context4.next = 6;
+                        break;
+                      }
+                      removePreviousMessages(false, messageTable);
+                      messageTable.extendedForwards = false;
+                      setScrollForwardButtonIcon();
+                      _context4.next = 9;
                       break;
-                    }
-                    st = _step2.value;
-                    _context9.next = 32;
-                    return addMessage(st.object, messageTable);
-                  case 32:
-                    _context9.next = 28;
-                    break;
-                  case 34:
-                    _context9.next = 39;
-                    break;
-                  case 36:
-                    _context9.prev = 36;
-                    _context9.t0 = _context9["catch"](26);
-                    _iterator2.e(_context9.t0);
-                  case 39:
-                    _context9.prev = 39;
-                    _iterator2.f();
-                    return _context9.finish(39);
-                  case 42:
-                    messageTable.fresh = true;
+                    case 6:
+                      _context4.next = 8;
+                      return extendForwards();
+                    case 8:
+                      // async
+                      latest.messageTable.scrollIntoView(newestFirst);
+                    case 9:
+                    case "end":
+                      return _context4.stop();
+                  }
+                }, _callee4);
+              }));
+              return _scrollForwardButtonHandler.apply(this, arguments);
+            }
+            var messageTable = dom.createElement('table');
+            messageTable.extendBackwards = extendBackwards; // Make function available to scroll stuff
+            messageTable.extendForwards = extendForwards; // Make function available to scroll stuff
 
-                    // loadMessageTable(messageTable, chatDocument)
-                    messageTable.fresh = false;
-                    return _context9.abrupt("return", messageTable);
-                  case 45:
-                  case "end":
-                    return _context9.stop();
-                }
-              }, _callee9, null, [[26, 36, 39, 42]]);
-            }));
-            return _renderMessageTable.apply(this, arguments);
-          };
-          renderMessageTable = function _renderMessageTable2(_x18, _x19) {
-            return _renderMessageTable.apply(this, arguments);
+            messageTable.date = date;
+            var chatDocument = dateFolder.leafDocumentFromDate(date);
+            messageTable.chatDocument = chatDocument;
+            messageTable.fresh = false;
+            messageTable.setAttribute('style', 'width: 100%;'); // fill that div!
+            if (live) {
+              messageTable["final"] = true;
+              liveMessageTable = messageTable;
+              latest.messageTable = messageTable;
+              var tr = (0, _message.renderMessageEditor)(channelObject, messageTable, userContext, options);
+              if (newestFirst) {
+                messageTable.insertBefore(tr, messageTable.firstChild); // If newestFirst
+              } else {
+                messageTable.appendChild(tr); // not newestFirst
+              }
+
+              messageTable.inputRow = tr;
+            }
+
+            /// ///// Infinite scroll
+            //
+            // @@ listen for swipe past end event not just button
+            if (options.infinite) {
+              var scrollBackbuttonTR = dom.createElement('tr');
+              var scrollBackbuttonCell = scrollBackbuttonTR.appendChild(dom.createElement('td'));
+              // up traingles: noun_1369237.svg
+              // down triangles: noun_1369241.svg
+              var scrollBackIcon = newestFirst ? 'noun_1369241.svg' : 'noun_1369237.svg'; // down and up arrows respoctively
+              scrollBackbutton = widgets.button(dom, _iconBase.icons.iconBase + scrollBackIcon, 'Previous messages ...');
+              scrollBackbuttonCell.style = 'width:3em; height:3em;';
+              scrollBackbutton.addEventListener('click', scrollBackbuttonHandler, false);
+              messageTable.extendedBack = false;
+              scrollBackbuttonCell.appendChild(scrollBackbutton);
+              setScrollBackbuttonIcon();
+              var dateCell = scrollBackbuttonTR.appendChild(dom.createElement('td'));
+              dateCell.style = 'text-align: center; vertical-align: middle; color: #888; font-style: italic;';
+              dateCell.textContent = widgets.shortDate(date.toISOString(), true); // no time, only date
+
+              // @@@@@@@@@@@ todo move this button to other end of  message cell, o
+              var scrollForwardButtonCell = scrollBackbuttonTR.appendChild(dom.createElement('td'));
+              var scrollForwardIcon = newestFirst ? 'noun_1369241.svg' : 'noun_1369237.svg'; // down and up arrows respoctively
+              scrollForwardButton = widgets.button(dom, _iconBase.icons.iconBase + scrollForwardIcon, 'Later messages ...');
+              scrollForwardButtonCell.appendChild(scrollForwardButton);
+              scrollForwardButtonCell.style = 'width:3em; height:3em;';
+              scrollForwardButton.addEventListener('click', scrollForwardButtonHandler, false);
+              messageTable.extendedForward = false;
+              setScrollForwardButtonIcon();
+              messageTable.extendedForwards = false;
+              if (!newestFirst) {
+                // opposite end from the entry field
+                messageTable.insertBefore(scrollBackbuttonTR, messageTable.firstChild); // If not newestFirst
+              } else {
+                messageTable.appendChild(scrollBackbuttonTR); //  newestFirst
+              }
+            }
+
+            var sts = _solidLogic.store.statementsMatching(null, ns.wf('message'), null, chatDocument);
+            if (!live && sts.length === 0) {
+              // not todays
+              // no need buttomns at the moment
+              // messageTable.style.visibility = 'collapse' // Hide files with no messages
+            }
+            sts.forEach(function (st) {
+              addMessage(st.object, messageTable);
+            });
+            messageTable.fresh = true;
+
+            // loadMessageTable(messageTable, chatDocument)
+            messageTable.fresh = false;
+            return messageTable;
           };
           _createMessageTable = function _createMessageTable3() {
-            _createMessageTable = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(date, live) {
+            _createMessageTable = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(date, live) {
               var chatDocument, messageTable, statusTR;
-              return _regenerator["default"].wrap(function _callee5$(_context5) {
-                while (1) switch (_context5.prev = _context5.next) {
+              return _regenerator["default"].wrap(function _callee6$(_context6) {
+                while (1) switch (_context6.prev = _context6.next) {
                   case 0:
                     debug.log('   createMessageTable for  ' + date);
                     chatDocument = dateFolder.leafDocumentFromDate(date);
-                    _context5.prev = 2;
-                    _context5.next = 5;
+                    _context6.prev = 2;
+                    _context6.next = 5;
                     return _solidLogic.store.fetcher.load(chatDocument);
                   case 5:
-                    _context5.next = 21;
+                    _context6.next = 19;
                     break;
                   case 7:
-                    _context5.prev = 7;
-                    _context5.t0 = _context5["catch"](2);
+                    _context6.prev = 7;
+                    _context6.t0 = _context6["catch"](2);
                     messageTable = dom.createElement('table');
                     statusTR = messageTable.appendChild(dom.createElement('tr')); // ### find status in exception
-                    if (!(_context5.t0.response && _context5.t0.response.status && _context5.t0.response.status === 404)) {
-                      _context5.next = 18;
+                    if (!(_context6.t0.response && _context6.t0.response.status && _context6.t0.response.status === 404)) {
+                      _context6.next = 16;
                       break;
                     }
                     debug.log('Error 404 for chat file ' + chatDocument);
-                    _context5.next = 15;
-                    return renderMessageTable(date, live);
-                  case 15:
-                    return _context5.abrupt("return", _context5.sent);
-                  case 18:
+                    return _context6.abrupt("return", renderMessageTable(date, live));
+                  case 16:
                     debug.log('*** Error NON 404 for chat file ' + chatDocument);
-                    statusTR.appendChild(widgets.errorMessageBlock(dom, _context5.t0, 'pink'));
+                    statusTR.appendChild(widgets.errorMessageBlock(dom, _context6.t0, 'pink'));
+                  case 18:
+                    return _context6.abrupt("return", statusTR);
+                  case 19:
+                    return _context6.abrupt("return", renderMessageTable(date, live));
                   case 20:
-                    return _context5.abrupt("return", statusTR);
-                  case 21:
-                    _context5.next = 23;
-                    return renderMessageTable(date, live);
-                  case 23:
-                    return _context5.abrupt("return", _context5.sent);
-                  case 24:
                   case "end":
-                    return _context5.stop();
+                    return _context6.stop();
                 }
-              }, _callee5, null, [[2, 7]]);
+              }, _callee6, null, [[2, 7]]);
             }));
             return _createMessageTable.apply(this, arguments);
           };
-          createMessageTable = function _createMessageTable2(_x16, _x17) {
+          createMessageTable = function _createMessageTable2(_x6, _x7) {
             return _createMessageTable.apply(this, arguments);
           };
           removePreviousMessages = function _removePreviousMessag(backwards, messageTable) {
@@ -716,40 +654,32 @@ function _infiniteMessageArea() {
             extr.messageTable = messageTable;
           };
           _insertPreviousMessages = function _insertPreviousMessag2() {
-            _insertPreviousMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(backwards) {
+            _insertPreviousMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(backwards) {
               var extremity, date, live, todayDoc, doc, newMessageTable;
-              return _regenerator["default"].wrap(function _callee4$(_context4) {
-                while (1) switch (_context4.prev = _context4.next) {
+              return _regenerator["default"].wrap(function _callee5$(_context5) {
+                while (1) switch (_context5.prev = _context5.next) {
                   case 0:
                     extremity = backwards ? earliest : latest;
                     date = extremity.messageTable.date; // day in mssecs
-                    // Are we at the top of a thread?
-                    if (!(backwards && earliest.limit && date <= earliest.limit)) {
-                      _context4.next = 4;
-                      break;
-                    }
-                    return _context4.abrupt("return", true);
-                  case 4:
-                    _context4.next = 6;
+                    _context5.next = 4;
                     return dateFolder.loadPrevious(date, backwards);
-                  case 6:
-                    date = _context4.sent;
+                  case 4:
+                    date = _context5.sent;
                     // backwards
-
                     debug.log("insertPreviousMessages: from ".concat(backwards ? 'backwards' : 'forwards', " loadPrevious: ").concat(date));
                     if (!(!date && !backwards && !liveMessageTable)) {
-                      _context4.next = 11;
+                      _context5.next = 9;
                       break;
                     }
-                    _context4.next = 11;
+                    _context5.next = 9;
                     return appendCurrentMessages();
-                  case 11:
+                  case 9:
                     if (date) {
-                      _context4.next = 13;
+                      _context5.next = 11;
                       break;
                     }
-                    return _context4.abrupt("return", true);
-                  case 13:
+                    return _context5.abrupt("return", true);
+                  case 11:
                     // done
                     live = false;
                     if (!backwards) {
@@ -757,10 +687,10 @@ function _infiniteMessageArea() {
                       doc = dateFolder.leafDocumentFromDate(date);
                       live = doc.sameTerm(todayDoc); // Is this todays?
                     }
-                    _context4.next = 17;
+                    _context5.next = 15;
                     return createMessageTable(date, live);
-                  case 17:
-                    newMessageTable = _context4.sent;
+                  case 15:
+                    newMessageTable = _context5.sent;
                     extremity.messageTable = newMessageTable; // move pointer to earliest
                     if (backwards ? newestFirst : !newestFirst) {
                       // put on bottom or top
@@ -769,160 +699,62 @@ function _infiniteMessageArea() {
                       // put on top as we scroll back
                       div.insertBefore(newMessageTable, div.firstChild);
                     }
-                    return _context4.abrupt("return", live);
-                  case 21:
+                    return _context5.abrupt("return", live);
+                  case 19:
                   case "end":
-                    return _context4.stop();
+                    return _context5.stop();
                 }
-              }, _callee4);
+              }, _callee5);
             }));
             return _insertPreviousMessages.apply(this, arguments);
           };
-          insertPreviousMessages = function _insertPreviousMessag(_x15) {
+          insertPreviousMessages = function _insertPreviousMessag(_x5) {
             return _insertPreviousMessages.apply(this, arguments);
           };
-          _addMessage = function _addMessage3() {
-            _addMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(message, messageTable) {
-              var thread, id;
-              return _regenerator["default"].wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
-                  case 0:
-                    if (!((0, _chatLogic.isDeleted)(message) && !options.showDeletedMessages)) {
-                      _context3.next = 2;
-                      break;
-                    }
-                    return _context3.abrupt("return");
-                  case 2:
-                    if (!(0, _chatLogic.isReplaced)(message)) {
-                      _context3.next = 4;
-                      break;
-                    }
-                    return _context3.abrupt("return");
-                  case 4:
-                    thread = _solidLogic.store.any(null, ns.sioc('has_member'), message, message.doc());
-                    id = _solidLogic.store.any(message, ns.sioc('id'), null, message.doc());
-                    if (id && !thread) {
-                      thread = _solidLogic.store.any(null, ns.sioc('has_member'), id, message.doc());
-                    }
-                    if (!options.thread) {
-                      _context3.next = 20;
-                      break;
-                    }
-                    if (!_solidLogic.store.holds(message, ns.sioc('has_reply'), options.thread)) {
-                      _context3.next = 12;
-                      break;
-                    }
-                    // root of thread
-                    debug.log(' addMessage: displaying root of thread ' + thread);
-                    _context3.next = 18;
-                    break;
-                  case 12:
-                    if (!(thread && thread.sameTerm(options.thread))) {
-                      _context3.next = 16;
-                      break;
-                    }
-                    debug.log(' addMessage: Displaying body of thread ' + message.uri.slice(-10));
-                    _context3.next = 18;
-                    break;
-                  case 16:
-                    debug.log(' addMessage: Suppress non-thread message in thread table ' + message.uri.slice(-10));
-                    return _context3.abrupt("return");
-                  case 18:
-                    _context3.next = 26;
-                    break;
-                  case 20:
-                    if (!thread) {
-                      _context3.next = 25;
-                      break;
-                    }
-                    debug.log(' addMessage: Suppress thread message in non-thread table ' + message.uri.slice(-10));
-                    return _context3.abrupt("return");
-                  case 25:
-                    debug.log(' addMessage: Normal non-thread message in non-thread table ' + message.uri.slice(-10));
-                  case 26:
-                    _context3.next = 28;
-                    return insertMessageIntoTable(channelObject, messageTable, message, messageTable.fresh, options, userContext);
-                  case 28:
-                  case "end":
-                    return _context3.stop();
-                }
-              }, _callee3);
-            }));
-            return _addMessage.apply(this, arguments);
-          };
-          addMessage = function _addMessage2(_x13, _x14) {
-            return _addMessage.apply(this, arguments);
-          };
-          _syncMessages = function _syncMessages3() {
-            _syncMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(chatChannel, messageTable) {
-              var displayed, ele, ele2, messages, stored, _iterator, _step, m;
-              return _regenerator["default"].wrap(function _callee2$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
-                  case 0:
-                    displayed = {};
-                    for (ele = messageTable.firstChild; ele; ele = ele.nextSibling) {
-                      if (ele.AJAR_subject) {
-                        displayed[ele.AJAR_subject.uri] = true;
-                      }
-                    }
-                    messages = _solidLogic.store.each(chatChannel, ns.wf('message'), null, messageTable.chatDocument);
-                    stored = {};
-                    _iterator = _createForOfIteratorHelper(messages);
-                    _context2.prev = 5;
-                    _iterator.s();
-                  case 7:
-                    if ((_step = _iterator.n()).done) {
-                      _context2.next = 15;
-                      break;
-                    }
-                    m = _step.value;
-                    stored[m.uri] = true;
-                    if (displayed[m.uri]) {
-                      _context2.next = 13;
-                      break;
-                    }
-                    _context2.next = 13;
-                    return addMessage(m, messageTable);
-                  case 13:
-                    _context2.next = 7;
-                    break;
-                  case 15:
-                    _context2.next = 20;
-                    break;
-                  case 17:
-                    _context2.prev = 17;
-                    _context2.t0 = _context2["catch"](5);
-                    _iterator.e(_context2.t0);
-                  case 20:
-                    _context2.prev = 20;
-                    _iterator.f();
-                    return _context2.finish(20);
-                  case 23:
-                    // eslint-disable-next-line space-in-parens
-                    for (ele = messageTable.firstChild; ele;) {
-                      ele2 = ele.nextSibling;
-                      if (ele.AJAR_subject && !stored[ele.AJAR_subject.uri]) {
-                        messageTable.removeChild(ele);
-                      }
-                      ele = ele2;
-                    }
-                    for (ele = messageTable.firstChild; ele; ele = ele.nextSibling) {
-                      if (ele.AJAR_subject) {
-                        // Refresh thumbs up etc
-                        widgets.refreshTree(ele); // Things inside may have changed too
-                      }
-                    }
-                  case 25:
-                  case "end":
-                    return _context2.stop();
-                }
-              }, _callee2, null, [[5, 17, 20, 23]]);
-            }));
-            return _syncMessages.apply(this, arguments);
+          addMessage = function _addMessage(message, messageTable) {
+            var latest = (0, _chatLogic.mostRecentVersion)(message);
+            // const content = store.any(latest, ns.sioc('content'))
+            if ((0, _chatLogic.isDeleted)(latest) && !options.showDeletedMessages) {
+              return; // ignore deleted messaged -- @@ could also leave a placeholder
+            }
+
+            insertMessageIntoTable(channelObject, messageTable, message, messageTable.fresh, options, userContext); // fresh from elsewhere
           };
-          syncMessages = function _syncMessages2(_x11, _x12) {
-            return _syncMessages.apply(this, arguments);
+          syncMessages = function _syncMessages(about, messageTable) {
+            var displayed = {};
+            var ele, ele2;
+            for (ele = messageTable.firstChild; ele; ele = ele.nextSibling) {
+              if (ele.AJAR_subject) {
+                displayed[ele.AJAR_subject.uri] = true;
+              }
+            }
+            var messages = _solidLogic.store.statementsMatching(about, ns.wf('message'), null, messageTable.chatDocument).map(function (st) {
+              return st.object;
+            });
+            var stored = {};
+            messages.forEach(function (m) {
+              stored[m.uri] = true;
+              if (!displayed[m.uri]) {
+                addMessage(m, messageTable);
+              }
+            });
+
+            // eslint-disable-next-line space-in-parens
+            for (ele = messageTable.firstChild; ele;) {
+              ele2 = ele.nextSibling;
+              if (ele.AJAR_subject && !stored[ele.AJAR_subject.uri]) {
+                messageTable.removeChild(ele);
+              }
+              ele = ele2;
+            }
+            for (ele = messageTable.firstChild; ele; ele = ele.nextSibling) {
+              if (ele.AJAR_subject) {
+                // Refresh thumbs up etc
+                widgets.refreshTree(ele); // Things inside may have changed too
+              }
+            }
           };
+
           // Body of main function
 
           options = options || {};
@@ -938,33 +770,23 @@ function _infiniteMessageArea() {
             statusArea: statusArea,
             div: statusArea
           }; // logged on state, pointers to user's stuff
+          // const messageTable = dom.createElement('table') // @@ check does this go in renderMessageTable
           earliest = {
             messageTable: null
           }; // Stuff about each end of the loaded days
           latest = {
             messageTable: null
           };
-          if (options.thread) {
-            thread = options.thread;
-            threadRootMessage = _solidLogic.store.any(null, ns.sioc('has_reply'), thread, thread.doc());
-            if (threadRootMessage) {
-              threadTime = _solidLogic.store.any(threadRootMessage, ns.dct('created'), null, threadRootMessage.doc());
-              if (threadTime) {
-                earliest.limit = new Date(threadTime.value);
-                debug.log(' inifinite: thread start at ' + earliest.limit);
-              }
-            }
-          }
           lock = false;
-          _context15.next = 34;
+          _context12.next = 30;
           return loadInitialContent();
-        case 34:
-          return _context15.abrupt("return", div);
-        case 35:
+        case 30:
+          return _context12.abrupt("return", div);
+        case 31:
         case "end":
-          return _context15.stop();
+          return _context12.stop();
       }
-    }, _callee15);
+    }, _callee12);
   }));
   return _infiniteMessageArea.apply(this, arguments);
 }