fix(message list): cannot read property 'clientHeight' of null

chatscope · Apr 3, 2021 · 705ede2 · 705ede2
1 parent 8a10751
commit 705ede2
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/components/MessageList/MessageList.jsx b/src/components/MessageList/MessageList.jsx
@@ -59,23 +59,25 @@ class MessageListInner extends React.Component {
       window.requestAnimationFrame(() => {
         const list = this.containerRef.current;
 
-        const currentHeight = list.clientHeight;
+        if (list) {
+          const currentHeight = list.clientHeight;
 
-        const diff = currentHeight - this.lastClientHeight;
+          const diff = currentHeight - this.lastClientHeight;
 
-        if (diff >= 1) {
-          // Because fractional
+          if (diff >= 1) {
+            // Because fractional
 
-          if (this.preventScrollTop === false) {
-            list.scrollTop = Math.round(list.scrollTop) - diff;
+            if (this.preventScrollTop === false) {
+              list.scrollTop = Math.round(list.scrollTop) - diff;
+            }
+          } else {
+            list.scrollTop = list.scrollTop - diff;
           }
-        } else {
-          list.scrollTop = list.scrollTop - diff;
-        }
 
-        this.lastClientHeight = list.clientHeight;
+          this.lastClientHeight = list.clientHeight;
 
-        this.scrollRef.current.updateScroll();
+          this.scrollRef.current.updateScroll();
+        }
 
         this.resizeTicking = false;
       });