From 05fda6e0ed3fbdf88f8e5d9aaac4cef28d2b3078 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Mon, 6 Jun 2022 23:14:00 +0900
Subject: [PATCH] refs #3301 Fix scrolling in DirectMessages
---
.../Contents/DirectMessages.spec.ts | 2 +
.../Contents/DirectMessages.spec.ts | 6 +++
.../TimelineSpace/Contents/DirectMessages.vue | 54 ++++++++++++++++++-
.../TimelineSpace/Contents/DirectMessages.ts | 8 ++-
4 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
index 3ee8091f..583847ea 100644
--- a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
@@ -135,6 +135,7 @@ let state = (): DirectMessagesState => {
return {
lazyLoading: false,
heading: true,
+ scrolling: false,
timeline: []
}
}
@@ -203,6 +204,7 @@ describe('Home', () => {
return {
lazyLoading: false,
heading: true,
+ scrolling: false,
timeline: [status1]
}
}
diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts
index d66dc7e2..4d9cece6 100644
--- a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts
+++ b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts
@@ -139,6 +139,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
+ scrolling: false,
timeline: [status2, status1]
}
})
@@ -153,6 +154,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
+ scrolling: false,
timeline: [status2, rebloggedStatus]
}
})
@@ -170,6 +172,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
+ scrolling: false,
timeline: [status2, status1]
}
})
@@ -184,6 +187,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
+ scrolling: false,
timeline: [rebloggedStatus, status2, status1]
}
})
@@ -200,6 +204,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: false,
+ scrolling: false,
timeline: [status2, status1]
}
})
@@ -214,6 +219,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: false,
+ scrolling: false,
timeline: [rebloggedStatus, status2, status1]
}
})
diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
index 3558f1c3..cbd798e0 100644
--- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
+++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
@@ -15,6 +15,7 @@
@focusPrev="focusPrev"
@focusRight="focusSidebar"
@selectToot="focusToot(item)"
+ @sizeChanged="sizeChanged"
>
@@ -30,6 +31,7 @@