From 94fd53b8cb301fee6e10e3655559b7c5633d10e6 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Sat, 15 Jul 2023 17:52:26 -0400
Subject: [PATCH] feat: save scroll positions between home timelines

---
 packages/client/src/components/MkNotes.vue    | 16 ++++++++--
 packages/client/src/components/MkTimeline.vue |  2 +-
 .../src/components/global/MkPageHeader.vue    |  5 +++-
 packages/client/src/pages/timeline.vue        | 29 ++++++++++---------
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue
index 5916621840..a93c03dd00 100644
--- a/packages/client/src/components/MkNotes.vue
+++ b/packages/client/src/components/MkNotes.vue
@@ -35,13 +35,13 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref, onActivated, onDeactivated, nextTick } from "vue";
 import type { Paging } from "@/components/MkPagination.vue";
 import XNote from "@/components/MkNote.vue";
 import XList from "@/components/MkDateSeparatedList.vue";
 import MkPagination from "@/components/MkPagination.vue";
 import { i18n } from "@/i18n";
-import { scroll } from "@/scripts/scroll";
+import { getScrollPosition, scroll } from "@/scripts/scroll";
 
 const tlEl = ref<HTMLElement>();
 
@@ -60,6 +60,18 @@ defineExpose({
 	pagingComponent,
 	scrollTop,
 });
+
+let scrollContainer = $ref(tlEl.value);
+let scrollPos = $ref(0);
+
+onDeactivated(() => {
+	scrollPos =  getScrollPosition( scrollContainer );
+})
+onActivated(() => {
+	nextTick(() => {
+		scroll(scrollContainer, { top: scrollPos, behavior: "instant" });
+	})
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index a44d641847..0da0167894 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch, computed, provide, onUnmounted } from "vue";
+import { computed, provide, onUnmounted } from "vue";
 import XNotes from "@/components/MkNotes.vue";
 import MkInfo from "@/components/MkInfo.vue";
 import * as os from "@/os";
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index cd24c97fca..18d4aa1f02 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -82,7 +82,7 @@
 						active: tab.key != null && tab.key === props.tab,
 					}"
 					@mousedown="(ev) => onTabMousedown(tab, ev)"
-					@click="(ev) => onTabClick(tab, ev)"
+					@click.stop="(ev) => onTabClick(tab, ev)"
 				>
 					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
 					<span class="title">{{ tab.title }}</span>
@@ -227,6 +227,9 @@ const onClick = () => {
 };
 
 function onTabMousedown(tab: Tab, ev: MouseEvent): void {
+	if (tab.key != null && tab.key === props.tab) {
+		scrollToTop(el, { behavior: "smooth" });
+	}
 	// ユーザビリティの観点からmousedown時にはonClickは呼ばない
 	if (tab.key) {
 		emit("update:tab", tab.key);
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 930a9635af..3b9e70440f 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -31,9 +31,7 @@
 						:touch-angle="25"
 						:threshold="10"
 						:centeredSlides="true"
-						:modules="[Virtual]"
 						:space-between="20"
-						:virtual="true"
 						:allow-touch-move="
 							defaultStore.state.swipeOnMobile &&
 							(deviceKind !== 'desktop' ||
@@ -45,16 +43,18 @@
 						<swiper-slide
 							v-for="index in timelines"
 							:key="index"
-							:virtual-index="index"
+							v-slot="{ isActive }"
 						>
-							<XTimeline
-								v-if="index == timelines[swiperRef.activeIndex]"
-								ref="tl"
-								:key="src"
-								class="tl"
-								:src="src"
-								:sound="true"
-							/>
+							<KeepAlive>
+								<XTimeline
+									v-if="isActive"
+									ref="tl"
+									:key="src"
+									class="tl"
+									:src="src"
+									:sound="true"
+								/>
+							</KeepAlive>
 						</swiper-slide>
 					</swiper>
 				</div>
@@ -64,8 +64,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, onMounted } from "vue";
-import { Virtual } from "swiper/modules";
+import { computed, ref, onMounted, onUnmounted } from "vue";
 import { Swiper, SwiperSlide } from "swiper/vue";
 import XTutorial from "@/components/MkTutorialDialog.vue";
 import XTimeline from "@/components/MkTimeline.vue";
@@ -302,6 +301,10 @@ function syncSlide(index) {
 	swiperRef.slideTo(index);
 }
 
+onUnmounted(() => {
+	console.log("The timelines page has been unmounted");
+});
+
 onMounted(() => {
 	syncSlide(timelines.indexOf(swiperRef.activeIndex));
 });