Merge remote-tracking branch 'novenary/misc-fixes/2024-09-17' into akkowtf

src/components/conversation/conversation.js

@@ -267,11 +267,11 @@ const conversation = {
     },
     replies () {
       let i = 1
-       
+
       return reduce(this.conversation, (result, { id, in_reply_to_status_id }) => {
-         
+
         const irid = in_reply_to_status_id
-         
+
         if (irid) {
           result[irid] = result[irid] || []
           result[irid].push({
@@ -414,6 +414,11 @@ const conversation = {
     },
     toggleExpanded () {
       this.expanded = !this.expanded
+      this.$nextTick(() => {
+        if (!this.expanded) {
+          this.$el.scrollIntoView({ block: 'nearest' })
+        }
+      })
     },
     getConversationId (statusId) {
       const status = this.$store.state.statuses.allStatusesObject[statusId]

src/components/conversation/conversation.vue

@@ -278,5 +278,8 @@
   &.-expanded.status-fadein {
     margin: calc(var(--status-margin, $status-margin) / 2);
   }
+
+  /* HACK: this value was picked arbitrarily and this is likely not even the right place */
+  scroll-margin-block-start: calc(var(--navbar-height) * 2);
 }
 </style>

src/components/post_status_form/post_status_form.js

@@ -354,7 +354,10 @@ const PostStatusForm = {
         poll: {},
         mediaDescriptions: {}
       }
-      this.$refs.scopeselector.currentScope = this.newStatus.visibility
+      const scopeselector = this.$refs.scopeselector
+      if (scopeselector) {
+        scopeselector.currentScope = this.newStatus.visibility
+      }
       this.pollFormVisible = false
       this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
       this.clearPollForm()