From dbee4700050d256716088d54f35893466ef8fa13 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Thu, 2 Jun 2022 22:31:24 +0900
Subject: [PATCH] refs #3301 Rewrite TimelineSpace/Contents/DirectMessages with
composition API
---
.../Contents/DirectMessages.spec.ts | 2 -
.../Contents/DirectMessages.spec.ts | 6 -
.../TimelineSpace/Contents/DirectMessages.vue | 333 +++++++-----------
.../TimelineSpace/Contents/Mentions.vue | 1 +
src/renderer/store/TimelineSpace/Contents.ts | 6 +-
.../TimelineSpace/Contents/DirectMessages.ts | 22 +-
6 files changed, 151 insertions(+), 219 deletions(-)
diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
index 583847ea..3ee8091f 100644
--- a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
@@ -135,7 +135,6 @@ let state = (): DirectMessagesState => {
return {
lazyLoading: false,
heading: true,
- scrolling: false,
timeline: []
}
}
@@ -204,7 +203,6 @@ 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 4d9cece6..d66dc7e2 100644
--- a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts
+++ b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts
@@ -139,7 +139,6 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
- scrolling: false,
timeline: [status2, status1]
}
})
@@ -154,7 +153,6 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
- scrolling: false,
timeline: [status2, rebloggedStatus]
}
})
@@ -172,7 +170,6 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
- scrolling: false,
timeline: [status2, status1]
}
})
@@ -187,7 +184,6 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: true,
- scrolling: false,
timeline: [rebloggedStatus, status2, status1]
}
})
@@ -204,7 +200,6 @@ describe('TimelineSpace/Contents/DirectMessages', () => {
state = {
lazyLoading: false,
heading: false,
- scrolling: false,
timeline: [status2, status1]
}
})
@@ -219,7 +214,6 @@ 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 3d1f6a24..3558f1c3 100644
--- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
+++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
@@ -15,7 +15,6 @@
@focusPrev="focusPrev"
@focusRight="focusSidebar"
@selectToot="focusToot(item)"
- @sizeChanged="sizeChanged"
>
@@ -29,240 +28,174 @@
-