Merge branch 'virtual-scrolling-2.0' into shigusegubu-themes3

src/components/conversation/conversation.js

@@ -83,7 +83,7 @@ export default {
         router.push({ name: 'conversation', params: { statusId: id } })
       }
       setFocused(id)
-      const target = document.querySelector(`.Status[data-status-id=${id}]`)
+      const target = document.querySelector(`.Status[data-status-id="${id}"]`)
       return await scroller.scrollIntoView(target, { block: 'nearest' })
     }
 

src/components/status/status.js

@@ -597,13 +597,17 @@ const Status = {
       })
     },
   },
-  mounted() {
-    this.resizeObserver.observe(this.$el)
-  },
   unmounted() {
     this.resizeObserver.disconnect()
   },
   watch: {
+    '$refs.root': function (element) {
+      if (element) {
+        this.resizeObserver.observe(this.$refs.root)
+      } else {
+        this.resizeObserver.disconnect()
+      }
+    },
     'mainStatus.repeat_num': function (num) {
       // refetch repeats when repeat_num is changed in any way
       if (this.focused && this.repeatedBy.size !== num) {