forked from AkkomaGang/akkoma-fe
Fix tall status expanding needing extra clicks, make tall status expand automatically in conversation when focused
This commit is contained in:
parent
bb2ee04f04
commit
0460728a8c
1 changed files with 7 additions and 4 deletions
|
@ -31,7 +31,7 @@ const Status = {
|
|||
userExpanded: false,
|
||||
preview: null,
|
||||
showPreview: false,
|
||||
showingTall: false,
|
||||
showingTall: this.inConversation && this.focused,
|
||||
expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
|
||||
? !this.$store.state.instance.collapseMessageWithSubject
|
||||
: !this.$store.state.config.collapseMessageWithSubject,
|
||||
|
@ -262,13 +262,14 @@ const Status = {
|
|||
this.userExpanded = !this.userExpanded
|
||||
},
|
||||
toggleShowMore () {
|
||||
console.log('toggleShowMore', this.showingTall)
|
||||
if (this.showingTall) {
|
||||
this.showingTall = false
|
||||
} else if (this.expandingSubject) {
|
||||
} else if (this.expandingSubject && this.status.summary) {
|
||||
this.expandingSubject = false
|
||||
} else if (this.hideTallStatus) {
|
||||
this.showingTall = true
|
||||
} else if (this.hideSubjectStatus) {
|
||||
} else if (this.hideSubjectStatus && this.status.summary) {
|
||||
this.expandingSubject = true
|
||||
}
|
||||
},
|
||||
|
@ -301,8 +302,10 @@ const Status = {
|
|||
'highlight': function (id) {
|
||||
if (this.status.id === id) {
|
||||
let rect = this.$el.getBoundingClientRect()
|
||||
if (rect.top < 100) {
|
||||
if (rect.top < 140) {
|
||||
window.scrollBy(0, rect.top - 200)
|
||||
} else if (rect.top < window.innerHeight && rect.height >= (window.innerHeight - 50)) {
|
||||
window.scrollBy(0, rect.top - 50)
|
||||
} else if (rect.bottom > window.innerHeight - 50) {
|
||||
window.scrollBy(0, rect.bottom - window.innerHeight + 50)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue