solid-ui 2.4.26-029ae1f9 → 2.4.26-068520ea

package/lib/chat/infinite.js

@@ -129,16 +129,16 @@ function infiniteMessageArea(_x7, _x8, _x9, _x10) {
   return _infiniteMessageArea.apply(this, arguments);
 }
 function _infiniteMessageArea() {
-  _infiniteMessageArea = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(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, earliest, latest, lock;
-    return _regenerator["default"].wrap(function _callee16$(_context16) {
-      while (1) switch (_context16.prev = _context16.next) {
+  _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) {
         case 0:
           _loadInitialContent = function _loadInitialContent3() {
-            _loadInitialContent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15() {
-              var yank, fixScroll, live, selectedDocument, now, todayDocument, selectedMessageTable, selectedDate;
-              return _regenerator["default"].wrap(function _callee15$(_context15) {
-                while (1) switch (_context15.prev = _context15.next) {
+            _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) {
                   case 0:
                     fixScroll = function _fixScroll() {
                       if (options.selectedElement) {
@@ -152,51 +152,59 @@ function _infiniteMessageArea() {
                       }
                     };
                     yank = function _yank() {
-                      selectedMessageTable.selectedElement.scrollIntoView({
-                        block: 'center'
-                      });
+                      if (selectedMessageTable && selectedMessageTable.selectedElement) {
+                        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(selectedDocument);
+                      live = todayDocument.sameTerm(initialDocment);
                     }
-                    if (!(options.selectedMessage && !live)) {
-                      _context15.next = 15;
+                    if (!(initialDocment && !live)) {
+                      _context14.next = 18;
                       break;
                     }
-                    selectedDate = dateFolder.dateFromLeafDocument(selectedDocument);
-                    _context15.next = 7;
+                    selectedDate = dateFolder.dateFromLeafDocument(initialDocment);
+                    _context14.next = 10;
                     return createMessageTable(selectedDate, live);
-                  case 7:
-                    selectedMessageTable = _context15.sent;
+                  case 10:
+                    selectedMessageTable = _context14.sent;
                     div.appendChild(selectedMessageTable);
                     earliest.messageTable = selectedMessageTable;
                     latest.messageTable = selectedMessageTable;
                     yank();
                     setTimeout(yank, 1000); // @@ kludge - restore position distubed by other cHANGES
-                    _context15.next = 19;
+                    _context14.next = 22;
                     break;
-                  case 15:
-                    _context15.next = 17;
+                  case 18:
+                    _context14.next = 20;
                     return appendCurrentMessages();
-                  case 17:
+                  case 20:
                     earliest.messageTable = liveMessageTable;
                     latest.messageTable = liveMessageTable;
-                  case 19:
-                    _context15.next = 21;
+                  case 22:
+                    _context14.next = 24;
                     return loadMoreWhereNeeded(null, fixScroll);
-                  case 21:
+                  case 24:
                     div.addEventListener('scroll', loadMoreWhereNeeded);
                     if (options.solo) {
                       document.body.addEventListener('scroll', loadMoreWhereNeeded);
                     }
-                  case 23:
+                  case 26:
                   case "end":
-                    return _context15.stop();
+                    return _context14.stop();
                 }
-              }, _callee15);
+              }, _callee14);
             }));
             return _loadInitialContent.apply(this, arguments);
           };
@@ -204,16 +212,16 @@ function _infiniteMessageArea() {
             return _loadInitialContent.apply(this, arguments);
           };
           _loadMoreWhereNeeded = function _loadMoreWhereNeeded3() {
-            _loadMoreWhereNeeded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(event, fixScroll) {
+            _loadMoreWhereNeeded = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(event, fixScroll) {
               var freeze, magicZone, done, scrollBottom, scrollTop;
-              return _regenerator["default"].wrap(function _callee14$(_context14) {
-                while (1) switch (_context14.prev = _context14.next) {
+              return _regenerator["default"].wrap(function _callee13$(_context13) {
+                while (1) switch (_context13.prev = _context13.next) {
                   case 0:
                     if (!lock) {
-                      _context14.next = 2;
+                      _context13.next = 2;
                       break;
                     }
-                    return _context14.abrupt("return");
+                    return _context13.abrupt("return");
                   case 2:
                     lock = true;
                     freeze = !fixScroll;
@@ -221,36 +229,36 @@ function _infiniteMessageArea() {
                     // const bottom = div.scrollHeight - top - div.clientHeight
                   case 5:
                     if (!(div.scrollTop < magicZone && earliest.messageTable && !earliest.messageTable.initial && earliest.messageTable.extendBackwards)) {
-                      _context14.next = 21;
+                      _context13.next = 21;
                       break;
                     }
                     if (!(div.scrollHeight === 0)) {
-                      _context14.next = 10;
+                      _context13.next = 10;
                       break;
                     }
                     // debug.log('    chat/loadMoreWhereNeeded: trying later...')
                     setTimeout(loadMoreWhereNeeded, 2000); // couple be less
                     lock = false;
-                    return _context14.abrupt("return");
+                    return _context13.abrupt("return");
                   case 10:
                     // debug.log('    chat/loadMoreWhereNeeded: Going now')
                     scrollBottom = div.scrollHeight - div.scrollTop;
                     debug.log('infinite scroll: adding above: top ' + div.scrollTop);
-                    _context14.next = 14;
+                    _context13.next = 14;
                     return earliest.messageTable.extendBackwards();
                   case 14:
-                    done = _context14.sent;
+                    done = _context13.sent;
                     if (freeze) {
                       div.scrollTop = div.scrollHeight - scrollBottom;
                     }
                     if (fixScroll) fixScroll();
                     if (!done) {
-                      _context14.next = 19;
+                      _context13.next = 19;
                       break;
                     }
-                    return _context14.abrupt("break", 21);
+                    return _context13.abrupt("break", 21);
                   case 19:
-                    _context14.next = 5;
+                    _context13.next = 5;
                     break;
                   case 21:
                     if (!(options.selectedMessage &&
@@ -260,15 +268,15 @@ function _infiniteMessageArea() {
                     latest.messageTable && !latest.messageTable["final"] &&
                     // there is more data to come
                     latest.messageTable.extendForwards)) {
-                      _context14.next = 33;
+                      _context13.next = 33;
                       break;
                     }
                     scrollTop = div.scrollTop;
                     debug.log('infinite scroll: adding below: bottom: ' + (div.scrollHeight - div.scrollTop - div.clientHeight));
-                    _context14.next = 26;
+                    _context13.next = 26;
                     return latest.messageTable.extendForwards();
                   case 26:
-                    done = _context14.sent;
+                    done = _context13.sent;
                     // then add more data on the bottom
                     if (freeze) {
                       div.scrollTop = scrollTop; // while adding below keep same things in view
@@ -276,20 +284,20 @@ function _infiniteMessageArea() {
 
                     if (fixScroll) fixScroll();
                     if (!done) {
-                      _context14.next = 31;
+                      _context13.next = 31;
                       break;
                     }
-                    return _context14.abrupt("break", 33);
+                    return _context13.abrupt("break", 33);
                   case 31:
-                    _context14.next = 21;
+                    _context13.next = 21;
                     break;
                   case 33:
                     lock = false;
                   case 34:
                   case "end":
-                    return _context14.stop();
+                    return _context13.stop();
                 }
-              }, _callee14);
+              }, _callee13);
             }));
             return _loadMoreWhereNeeded.apply(this, arguments);
           };
@@ -297,45 +305,45 @@ function _infiniteMessageArea() {
             return _loadMoreWhereNeeded.apply(this, arguments);
           };
           _appendCurrentMessages = function _appendCurrentMessage2() {
-            _appendCurrentMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
+            _appendCurrentMessages = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
               var now, chatDocument, messageTable;
-              return _regenerator["default"].wrap(function _callee13$(_context13) {
-                while (1) switch (_context13.prev = _context13.next) {
+              return _regenerator["default"].wrap(function _callee12$(_context12) {
+                while (1) switch (_context12.prev = _context12.next) {
                   case 0:
                     now = new Date();
                     chatDocument = dateFolder.leafDocumentFromDate(now); /// ///////////////////////////////////////////////////////////
-                    _context13.next = 4;
+                    _context12.next = 4;
                     return createMessageTable(now, true);
                   case 4:
-                    messageTable = _context13.sent;
+                    messageTable = _context12.sent;
                     div.appendChild(messageTable);
-                    div.refresh = /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-                      return _regenerator["default"].wrap(function _callee12$(_context12) {
-                        while (1) switch (_context12.prev = _context12.next) {
+                    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) {
                           case 0:
-                            _context12.next = 2;
+                            _context11.next = 2;
                             return addNewChatDocumentIfNewDay(new Date());
                           case 2:
-                            _context12.next = 4;
+                            _context11.next = 4;
                             return syncMessages(chatChannel, messageTable);
                           case 4:
                             // @@ livemessagetable??
                             desktopNotification(chatChannel);
                           case 5:
                           case "end":
-                            return _context12.stop();
+                            return _context11.stop();
                         }
-                      }, _callee12);
+                      }, _callee11);
                     })); // 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 _context13.abrupt("return", messageTable);
+                    return _context12.abrupt("return", messageTable);
                   case 11:
                   case "end":
-                    return _context13.stop();
+                    return _context12.stop();
                 }
-              }, _callee13);
+              }, _callee12);
             }));
             return _appendCurrentMessages.apply(this, arguments);
           };
@@ -343,15 +351,15 @@ function _infiniteMessageArea() {
             return _appendCurrentMessages.apply(this, arguments);
           };
           _addNewChatDocumentIfNewDay = function _addNewChatDocumentIf2() {
-            _addNewChatDocumentIfNewDay = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
+            _addNewChatDocumentIfNewDay = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
               var newChatDocument, oldChatDocument, sts;
-              return _regenerator["default"].wrap(function _callee11$(_context11) {
-                while (1) switch (_context11.prev = _context11.next) {
+              return _regenerator["default"].wrap(function _callee10$(_context10) {
+                while (1) switch (_context10.prev = _context10.next) {
                   case 0:
                     // @@ Remove listener from previous table as it is now static
                     newChatDocument = dateFolder.leafDocumentFromDate(new Date());
                     if (newChatDocument.sameTerm(latest.messageTable.chatDocument)) {
-                      _context11.next = 7;
+                      _context10.next = 7;
                       break;
                     }
                     // It is a new day
@@ -360,7 +368,7 @@ function _infiniteMessageArea() {
                       delete liveMessageTable.inputRow;
                     }
                     oldChatDocument = latest.messageTable.chatDocument;
-                    _context11.next = 6;
+                    _context10.next = 6;
                     return appendCurrentMessages();
                   case 6:
                     // Adding a link in the document will ping listeners to add the new block too
@@ -374,9 +382,9 @@ function _infiniteMessageArea() {
                     }
                   case 7:
                   case "end":
-                    return _context11.stop();
+                    return _context10.stop();
                 }
-              }, _callee11);
+              }, _callee10);
             }));
             return _addNewChatDocumentIfNewDay.apply(this, arguments);
           };
@@ -384,40 +392,40 @@ function _infiniteMessageArea() {
             return _addNewChatDocumentIfNewDay.apply(this, arguments);
           };
           _renderMessageTable = function _renderMessageTable3() {
-            _renderMessageTable = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(date, live) {
-              var scrollBackbutton, scrollForwardButton, extendBackwards, _extendBackwards, setScrollBackbuttonIcon, scrollBackbuttonHandler, _scrollBackbuttonHandler, extendForwards, _extendForwards, setScrollForwardButtonIcon, scrollForwardButtonHandler, _scrollForwardButtonHandler, messageTable, chatDocument, tr, test, titleTR, scrollBackbuttonCell, dateCell, scrollForwardButtonCell, sts, _iterator2, _step2, st;
-              return _regenerator["default"].wrap(function _callee10$(_context10) {
-                while (1) switch (_context10.prev = _context10.next) {
+            _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 _callee9(_event) {
-                        return _regenerator["default"].wrap(function _callee9$(_context9) {
-                          while (1) switch (_context9.prev = _context9.next) {
+                      _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) {
-                                _context9.next = 6;
+                                _context8.next = 6;
                                 break;
                               }
                               removePreviousMessages(false, messageTable);
                               messageTable.extendedForwards = false;
                               setScrollForwardButtonIcon();
-                              _context9.next = 9;
+                              _context8.next = 9;
                               break;
                             case 6:
-                              _context9.next = 8;
+                              _context8.next = 8;
                               return extendForwards();
                             case 8:
                               // async
                               latest.messageTable.scrollIntoView(newestFirst);
                             case 9:
                             case "end":
-                              return _context9.stop();
+                              return _context8.stop();
                           }
-                        }, _callee9);
+                        }, _callee8);
                       }));
                       return _scrollForwardButtonHandler.apply(this, arguments);
                     };
-                    scrollForwardButtonHandler = function _scrollForwardButtonH(_x23) {
+                    scrollForwardButtonHandler = function _scrollForwardButtonH(_x22) {
                       return _scrollForwardButtonHandler.apply(this, arguments);
                     };
                     setScrollForwardButtonIcon = function _setScrollForwardButt() {
@@ -430,55 +438,27 @@ function _infiniteMessageArea() {
                       }
                     };
                     _extendForwards = function _extendForwards3() {
-                      _extendForwards = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+                      _extendForwards = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
                         var done;
-                        return _regenerator["default"].wrap(function _callee8$(_context8) {
-                          while (1) switch (_context8.prev = _context8.next) {
+                        return _regenerator["default"].wrap(function _callee7$(_context7) {
+                          while (1) switch (_context7.prev = _context7.next) {
                             case 0:
-                              _context8.next = 2;
+                              _context7.next = 2;
                               return insertPreviousMessages(false);
                             case 2:
-                              done = _context8.sent;
-                              return _context8.abrupt("return", done);
+                              done = _context7.sent;
+                              return _context7.abrupt("return", done);
                             case 4:
                             case "end":
-                              return _context8.stop();
+                              return _context7.stop();
                           }
-                        }, _callee8);
+                        }, _callee7);
                       }));
                       return _extendForwards.apply(this, arguments);
                     };
                     extendForwards = function _extendForwards2() {
                       return _extendForwards.apply(this, arguments);
                     };
-                    _scrollBackbuttonHandler = function _scrollBackbuttonHand2() {
-                      _scrollBackbuttonHandler = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(_event) {
-                        return _regenerator["default"].wrap(function _callee7$(_context7) {
-                          while (1) switch (_context7.prev = _context7.next) {
-                            case 0:
-                              if (!messageTable.extendedBack) {
-                                _context7.next = 6;
-                                break;
-                              }
-                              removePreviousMessages(true, messageTable);
-                              messageTable.extendedBack = false;
-                              setScrollBackbuttonIcon();
-                              _context7.next = 8;
-                              break;
-                            case 6:
-                              _context7.next = 8;
-                              return extendBackwards();
-                            case 8:
-                            case "end":
-                              return _context7.stop();
-                          }
-                        }, _callee7);
-                      }));
-                      return _scrollBackbuttonHandler.apply(this, arguments);
-                    };
-                    scrollBackbuttonHandler = function _scrollBackbuttonHand(_x22) {
-                      return _scrollBackbuttonHandler.apply(this, arguments);
-                    };
                     setScrollBackbuttonIcon = function _setScrollBackbuttonI() {
                       if (!scrollBackbutton) {
                         return;
@@ -630,41 +610,41 @@ function _infiniteMessageArea() {
                       // messageTable.style.visibility = 'collapse' // Hide files with no messages
                     }
                     _iterator2 = _createForOfIteratorHelper(sts);
-                    _context10.prev = 28;
+                    _context9.prev = 26;
                     _iterator2.s();
-                  case 30:
+                  case 28:
                     if ((_step2 = _iterator2.n()).done) {
-                      _context10.next = 36;
+                      _context9.next = 34;
                       break;
                     }
                     st = _step2.value;
-                    _context10.next = 34;
+                    _context9.next = 32;
                     return addMessage(st.object, messageTable);
+                  case 32:
+                    _context9.next = 28;
+                    break;
                   case 34:
-                    _context10.next = 30;
+                    _context9.next = 39;
                     break;
                   case 36:
-                    _context10.next = 41;
-                    break;
-                  case 38:
-                    _context10.prev = 38;
-                    _context10.t0 = _context10["catch"](28);
-                    _iterator2.e(_context10.t0);
-                  case 41:
-                    _context10.prev = 41;
+                    _context9.prev = 36;
+                    _context9.t0 = _context9["catch"](26);
+                    _iterator2.e(_context9.t0);
+                  case 39:
+                    _context9.prev = 39;
                     _iterator2.f();
-                    return _context10.finish(41);
-                  case 44:
+                    return _context9.finish(39);
+                  case 42:
                     messageTable.fresh = true;
 
                     // loadMessageTable(messageTable, chatDocument)
                     messageTable.fresh = false;
-                    return _context10.abrupt("return", messageTable);
-                  case 47:
+                    return _context9.abrupt("return", messageTable);
+                  case 45:
                   case "end":
-                    return _context10.stop();
+                    return _context9.stop();
                 }
-              }, _callee10, null, [[28, 38, 41, 44]]);
+              }, _callee9, null, [[26, 36, 39, 42]]);
             }));
             return _renderMessageTable.apply(this, arguments);
           };
@@ -743,25 +723,33 @@ function _infiniteMessageArea() {
                   case 0:
                     extremity = backwards ? earliest : latest;
                     date = extremity.messageTable.date; // day in mssecs
-                    _context4.next = 4;
-                    return dateFolder.loadPrevious(date, backwards);
+                    // 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;
+                    return dateFolder.loadPrevious(date, backwards);
+                  case 6:
                     date = _context4.sent;
                     // backwards
+
                     debug.log("insertPreviousMessages: from ".concat(backwards ? 'backwards' : 'forwards', " loadPrevious: ").concat(date));
                     if (!(!date && !backwards && !liveMessageTable)) {
-                      _context4.next = 9;
+                      _context4.next = 11;
                       break;
                     }
-                    _context4.next = 9;
+                    _context4.next = 11;
                     return appendCurrentMessages();
-                  case 9:
+                  case 11:
                     if (date) {
-                      _context4.next = 11;
+                      _context4.next = 13;
                       break;
                     }
                     return _context4.abrupt("return", true);
-                  case 11:
+                  case 13:
                     // done
                     live = false;
                     if (!backwards) {
@@ -769,9 +757,9 @@ function _infiniteMessageArea() {
                       doc = dateFolder.leafDocumentFromDate(date);
                       live = doc.sameTerm(todayDoc); // Is this todays?
                     }
-                    _context4.next = 15;
+                    _context4.next = 17;
                     return createMessageTable(date, live);
-                  case 15:
+                  case 17:
                     newMessageTable = _context4.sent;
                     extremity.messageTable = newMessageTable; // move pointer to earliest
                     if (backwards ? newestFirst : !newestFirst) {
@@ -782,7 +770,7 @@ function _infiniteMessageArea() {
                       div.insertBefore(newMessageTable, div.firstChild);
                     }
                     return _context4.abrupt("return", live);
-                  case 19:
+                  case 21:
                   case "end":
                     return _context4.stop();
                 }
@@ -795,64 +783,66 @@ function _infiniteMessageArea() {
           };
           _addMessage = function _addMessage3() {
             _addMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(message, messageTable) {
-              var latest, thread, id;
+              var thread, id;
               return _regenerator["default"].wrap(function _callee3$(_context3) {
                 while (1) switch (_context3.prev = _context3.next) {
                   case 0:
-                    _context3.next = 2;
-                    return (0, _chatLogic.mostRecentVersion)(message);
+                    if (!((0, _chatLogic.isDeleted)(message) && !options.showDeletedMessages)) {
+                      _context3.next = 2;
+                      break;
+                    }
+                    return _context3.abrupt("return");
                   case 2:
-                    latest = _context3.sent;
-                    if (!((0, _chatLogic.isDeleted)(latest) && !options.showDeletedMessages)) {
-                      _context3.next = 5;
+                    if (!(0, _chatLogic.isReplaced)(message)) {
+                      _context3.next = 4;
                       break;
                     }
                     return _context3.abrupt("return");
-                  case 5:
+                  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 = 21;
+                      _context3.next = 20;
                       break;
                     }
                     if (!_solidLogic.store.holds(message, ns.sioc('has_reply'), options.thread)) {
-                      _context3.next = 13;
+                      _context3.next = 12;
                       break;
                     }
                     // root of thread
                     debug.log(' addMessage: displaying root of thread ' + thread);
-                    _context3.next = 19;
+                    _context3.next = 18;
                     break;
-                  case 13:
+                  case 12:
                     if (!(thread && thread.sameTerm(options.thread))) {
-                      _context3.next = 17;
+                      _context3.next = 16;
                       break;
                     }
                     debug.log(' addMessage: Displaying body of thread ' + message.uri.slice(-10));
-                    _context3.next = 19;
+                    _context3.next = 18;
                     break;
-                  case 17:
+                  case 16:
                     debug.log(' addMessage: Suppress non-thread message in thread table ' + message.uri.slice(-10));
                     return _context3.abrupt("return");
-                  case 19:
-                    _context3.next = 27;
+                  case 18:
+                    _context3.next = 26;
                     break;
-                  case 21:
+                  case 20:
                     if (!thread) {
-                      _context3.next = 26;
+                      _context3.next = 25;
                       break;
                     }
                     debug.log(' addMessage: Suppress thread message in non-thread table ' + message.uri.slice(-10));
                     return _context3.abrupt("return");
-                  case 26:
+                  case 25:
                     debug.log(' addMessage: Normal non-thread message in non-thread table ' + message.uri.slice(-10));
-                  case 27:
-                    _context3.next = 29;
+                  case 26:
+                    _context3.next = 28;
                     return insertMessageIntoTable(channelObject, messageTable, message, messageTable.fresh, options, userContext);
-                  case 29:
+                  case 28:
                   case "end":
                     return _context3.stop();
                 }
@@ -954,16 +944,27 @@ function _infiniteMessageArea() {
           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;
-          _context16.next = 33;
+          _context15.next = 34;
           return loadInitialContent();
-        case 33:
-          return _context16.abrupt("return", div);
         case 34:
+          return _context15.abrupt("return", div);
+        case 35:
         case "end":
-          return _context16.stop();
+          return _context15.stop();
       }
-    }, _callee16);
+    }, _callee15);
   }));
   return _infiniteMessageArea.apply(this, arguments);
 }