diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts index b62dce19..c5c98a97 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts @@ -133,6 +133,7 @@ let state = (): DirectMessagesState => { return { lazyLoading: false, heading: true, + scrolling: false, timeline: [] } } @@ -195,9 +196,8 @@ describe('Home', () => { return { lazyLoading: false, heading: true, - timeline: [status1], - showReblogs: true, - showReplies: true + scrolling: false, + timeline: [status1] } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts index 25578d35..57bd9709 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts @@ -118,6 +118,7 @@ let state = (): TagState => { return { lazyLoading: false, heading: true, + scrolling: false, timeline: [] } } @@ -179,6 +180,7 @@ describe('Home', () => { return { lazyLoading: false, heading: true, + scrolling: false, timeline: [status1] } } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts index aec1b5a3..40e1ed62 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts @@ -119,7 +119,8 @@ let state = (): HomeState => { heading: true, timeline: [], showReblogs: true, - showReplies: true + showReplies: true, + scrolling: false } } @@ -183,7 +184,8 @@ describe('Home', () => { timeline: [status1], unreadTimeline: [], showReblogs: true, - showReplies: true + showReplies: true, + scrolling: false } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts index bb437c32..3ad353f9 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts @@ -120,6 +120,7 @@ let state = (): ShowState => { return { lazyLoading: false, heading: true, + scrolling: false, timeline: [] } } @@ -179,6 +180,7 @@ describe('Lists/Show', () => { return { lazyLoading: false, heading: true, + scrolling: false, timeline: [status1] } } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts index b2dc2cc8..ae93e44c 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts @@ -117,6 +117,7 @@ let state = (): LocalState => { return { lazyLoading: false, heading: true, + scrolling: false, timeline: [] } } @@ -178,10 +179,8 @@ describe('Home', () => { return { lazyLoading: false, heading: true, - timeline: [status1], - unreadTimeline: [], - showReblogs: true, - showReplies: true + scrolling: false, + timeline: [status1] } } }) diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts index 6c969be5..420bb56d 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts @@ -175,6 +175,7 @@ describe('Mentions', () => { return { lazyLoading: true, heading: true, + scrolling: false, mentions: [] } } @@ -191,6 +192,7 @@ describe('Mentions', () => { return { lazyLoading: false, heading: true, + scrolling: false, mentions: [mention, reblog] } } @@ -221,6 +223,7 @@ describe('Mentions', () => { return { lazyLoading: false, heading: true, + scrolling: false, mentions: [mention, favourite, reblog, follow] } } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts index 7855e398..d291e941 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts @@ -192,6 +192,7 @@ let state = (): NotificationsState => { return { lazyLoading: false, heading: true, + scrolling: false, notifications: [] } } @@ -252,6 +253,7 @@ describe('Notifications', () => { return { lazyLoading: false, heading: true, + scrolling: false, notifications: [notification1] } } diff --git a/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts b/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts index 13735fae..eb68d8df 100644 --- a/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts @@ -117,7 +117,8 @@ let state = (): PublicState => { return { lazyLoading: false, heading: true, - timeline: [] + timeline: [], + scrolling: false } } @@ -179,8 +180,7 @@ describe('Home', () => { lazyLoading: false, heading: true, timeline: [status1], - showReblogs: true, - showReplies: true + scrolling: false } } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts index 1cfb08d1..1c31b9b4 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/DirectMessages.spec.ts @@ -136,6 +136,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -150,6 +151,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, rebloggedStatus] } }) @@ -167,6 +169,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -181,6 +184,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) @@ -197,6 +201,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [status2, status1] } }) @@ -211,6 +216,7 @@ describe('TimelineSpace/Contents/DirectMessages', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts index ed347d79..551684c2 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts @@ -136,6 +136,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -150,6 +151,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, rebloggedStatus] } }) @@ -167,6 +169,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -181,6 +184,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) @@ -197,6 +201,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [status2, status1] } }) @@ -211,6 +216,7 @@ describe('TimelineSpace/Contents/Hashtag/Tag', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts index 3e736ab5..2af2796d 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Home.spec.ts @@ -98,6 +98,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [], showReblogs: true, showReplies: true @@ -125,6 +126,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status1], showReblogs: true, showReplies: true @@ -141,6 +143,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1], showReblogs: true, showReplies: true @@ -159,6 +162,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [status1], showReblogs: true, showReplies: true @@ -174,6 +178,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [status2, status1], showReblogs: true, showReplies: true @@ -192,6 +197,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status1], showReblogs: true, showReplies: true @@ -209,6 +215,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status1, status2], showReblogs: true, showReplies: true @@ -264,6 +271,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [rebloggedStatus, status2], showReblogs: true, showReplies: true @@ -283,6 +291,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status1, status2], showReblogs: true, showReplies: true @@ -333,6 +342,7 @@ describe('TimelineSpace/Contents/Home', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [rebloggedStatus, status2], showReblogs: true, showReplies: true diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts index d259bfde..6a47df74 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Lists/Show.spec.ts @@ -136,6 +136,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -150,6 +151,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, rebloggedStatus] } }) @@ -167,6 +169,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -181,6 +184,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) @@ -197,6 +201,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [status2, status1] } }) @@ -211,6 +216,7 @@ describe('TimelineSpace/Contents/Lists/Show', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts index f80b1aef..a2411913 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Local.spec.ts @@ -136,6 +136,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -150,6 +151,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, rebloggedStatus] } }) @@ -166,6 +168,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [status2, status1] } }) @@ -180,6 +183,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) @@ -196,6 +200,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [status2, status1] } }) @@ -210,6 +215,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: false, + scrolling: false, timeline: [rebloggedStatus, status2, status1] } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts index de045539..811a5c1f 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Mentions.spec.ts @@ -173,6 +173,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: true, + scrolling: false, mentions: [] } }) @@ -184,6 +185,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: true, + scrolling: false, mentions: [notification1] } }) @@ -198,6 +200,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: true, + scrolling: false, mentions: [notification2, notification1] } }) @@ -214,6 +217,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: false, + scrolling: false, mentions: [notification1] } }) @@ -228,6 +232,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: false, + scrolling: false, mentions: [notification2, notification1] } }) @@ -244,6 +249,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: false, + scrolling: false, mentions: [notification2] } }) @@ -258,6 +264,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: false, + scrolling: false, mentions: [notification2, notification1] } }) @@ -277,6 +284,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: true, + scrolling: false, mentions: [notification2, notification1] } }) @@ -290,6 +298,7 @@ describe('TimelineSpace/Contents/Mentions', () => { state = { lazyLoading: false, heading: true, + scrolling: false, mentions: [notification2, notification1] } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts index b4a41731..81e8482f 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Notifications.spec.ts @@ -175,6 +175,7 @@ describe('TimelineSpace/Contents/Notifications', () => { state = { lazyLoading: false, heading: true, + scrolling: false, notifications: [notification2, notification1] } }) @@ -199,6 +200,7 @@ describe('TimelineSpace/Contents/Notifications', () => { state = { lazyLoading: false, heading: true, + scrolling: false, notifications: [notification1] } }) @@ -213,6 +215,7 @@ describe('TimelineSpace/Contents/Notifications', () => { state = { lazyLoading: false, heading: true, + scrolling: false, notifications: [notification2, notification1] } }) @@ -229,6 +232,7 @@ describe('TimelineSpace/Contents/Notifications', () => { state = { lazyLoading: false, heading: false, + scrolling: false, notifications: [notification1] } }) @@ -242,6 +246,7 @@ describe('TimelineSpace/Contents/Notifications', () => { state = { lazyLoading: false, heading: false, + scrolling: false, notifications: [notification2, notification1] } }) diff --git a/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts b/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts index 3b1b096c..2df67083 100644 --- a/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts +++ b/spec/renderer/unit/store/TimelineSpace/Contents/Public.spec.ts @@ -136,7 +136,8 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, - timeline: [status2, status1] + timeline: [status2, status1], + scrolling: false } }) it('should be deleted', () => { @@ -150,6 +151,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: true, timeline: [status2, rebloggedStatus] } }) @@ -167,6 +169,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: true, timeline: [status2, status1] } }) @@ -181,6 +184,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: true, + scrolling: true, timeline: [rebloggedStatus, status2, status1] } }) @@ -197,6 +201,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: false, + scrolling: true, timeline: [status2, status1] } }) @@ -211,6 +216,7 @@ describe('TimelineSpace/Contents/Local', () => { state = { lazyLoading: false, heading: false, + scrolling: true, timeline: [rebloggedStatus, status2, status1] } }) diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue index dcbf1db0..08da52eb 100644 --- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue +++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue @@ -28,6 +28,7 @@