fixes & cleanup

src/components/conversation/conversation.js

@@ -149,7 +149,7 @@ export default {
       return result
     }
 
-    // External virtual scrolling
+    // # External virtual scrolling
     const unsuspendableIds = ref(new Set())
     const suspendable = computed(
       () => !isExpanded.value && unsuspendableIds.value.size === 0,
@@ -176,7 +176,8 @@ export default {
       emit('suspendableStateChange', { suspend: value, id: statusId.value }),
     )
     onUnmounted(() => resizeObserver.value.disconnect())
-    // Internal virtual scrolling
+
+    // # Internal virtual scrolling
     const virtualScrollingEnabled = ref(isExpanded.value)
 
     // Placeholder heights.
@@ -194,10 +195,6 @@ export default {
       }
     })
 
-    const anchorIds = computed(
-      () => new Set([mainStatus.value?.id, currentStatus.value?.id]),
-    )
-
     // # Linear style stuff
     const isLinearView = computed(() => displayStyle.value !== 'tree')
     const linearElement = useTemplateRef('linear')
@@ -218,8 +215,6 @@ export default {
       offset,
       scrollPositionInstance: scroller,
       scrollCompensation: linearScrollCompensation,
-      anchorIds,
-      collapseMode: 'item',
       getPlaceholderHeight,
     })
     const changeSuspendStateLinearLocal = (e) => {
@@ -297,7 +292,6 @@ export default {
       resetTreeScrollVirtualization()
     })
 
-
     const treeViewIsSimple = computed(
       () => !mergedConfig.value.conversationTreeAdvanced,
     )

src/components/status/status.js

@@ -192,6 +192,9 @@ const Status = {
     user() {
       return useUsersStore().findUser(this.mainStatus.user.id)
     },
+    isTreeView() {
+      return this.mergedConfig.conversationDisplay === 'tree'
+    },
     simpleTree() {
       return !this.mergedConfig.conversationTreeAdvanced
     },

src/components/status/status.vue

@@ -235,7 +235,7 @@
                   />
                 </button>
                 <button
-                  v-if="isExpanded && !simpleTree"
+                  v-if="isExpanded && isTreeView && !simpleTree"
                   class="button-unstyled"
                   :title="$t('status.show_only_conversation_under_this')"
                   @click.prevent="$emit('dive')"

src/composables/useVirtualScrolling.js

@@ -26,8 +26,6 @@ export function useVirtualScrolling({
   // - 'item' - same as height but uses anchor element's top offset
   //   instead of whole height
   collapseMode,
-  // Anchor. Set of IDs of element relative to which do scroll compensation
-  anchorIds,
   // Placeholder height specification. Must be a function.
   // function will be called either:
   // - without arguments (for generic placeholder, i.e. buffer zone size)
@@ -215,10 +213,6 @@ export function useVirtualScrolling({
             const newBottomElement = last(newVal)
 
             return newBottomElement.top + newBottomElement.height
-          } else if (toValue(collapseMode) === 'item') {
-            const element = newVal.find(({ id }) => toValue(anchorIds).has(id))
-
-            return element.top
           } else {
             return 0
           }