From 363796561885230414d60993dca8138386ef7728 Mon Sep 17 00:00:00 2001
From: Varun Patil <radialapps@gmail.com>
Date: Sat, 28 Oct 2023 02:00:58 -0700
Subject: [PATCH] viewer: directly use timeline state

Signed-off-by: Varun Patil <radialapps@gmail.com>
---
 src/components/Timeline.vue      |  2 +-
 src/components/viewer/Viewer.vue | 15 ++++++---------
 src/globals.d.ts                 |  4 ++--
 src/types.ts                     |  5 +++++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 7cf7bb08..bc4d702f 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -292,7 +292,7 @@ export default defineComponent({
           }
         }
 
-        _m.viewer.openDynamic(photo, this.list);
+        _m.viewer.openDynamic(photo, this);
       }
     },
 
diff --git a/src/components/viewer/Viewer.vue b/src/components/viewer/Viewer.vue
index 5f35c195..00759f6f 100644
--- a/src/components/viewer/Viewer.vue
+++ b/src/components/viewer/Viewer.vue
@@ -173,7 +173,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 
-import { IDay, IImageInfo, IPhoto, IRow, IRowType } from '../../types';
+import { IImageInfo, IPhoto, IRowType, TimelineState } from '../../types';
 import type { PsContent } from './types';
 
 import UserConfig from '../../mixins/UserConfig';
@@ -261,7 +261,6 @@ export default defineComponent({
     psLivePhoto: null as PsLivePhoto | null,
 
     list: [] as IPhoto[],
-    days: new Map<number, IDay>(),
     dayIds: [] as number[],
 
     globalCount: 0,
@@ -568,7 +567,6 @@ export default defineComponent({
         this.editorOpen = false;
         this.photoswipe = null;
         this.list = [];
-        this.days.clear();
         this.dayIds = [];
         this.globalCount = 0;
         this.globalAnchor = -1;
@@ -648,7 +646,7 @@ export default defineComponent({
     },
 
     /** Open using start photo and rows list */
-    async openDynamic(anchorPhoto: IPhoto, rows: IRow[]) {
+    async openDynamic(anchorPhoto: IPhoto, timeline: TimelineState) {
       const detail = anchorPhoto.d?.detail;
       if (!detail) {
         console.error('Attempted to open viewer with no detail list!');
@@ -659,14 +657,13 @@ export default defineComponent({
       const startIndex = detail.indexOf(anchorPhoto);
 
       // Get days list and map
-      for (const r of rows) {
+      for (const r of timeline.list) {
         if (r.type === IRowType.HEAD) {
           if (r.day.dayid == anchorPhoto.dayid) {
             this.globalAnchor = this.globalCount;
           }
 
           this.globalCount += r.day.count;
-          this.days.set(r.day.dayid, r.day);
           this.dayIds.push(r.day.dayid);
         }
       }
@@ -690,7 +687,7 @@ export default defineComponent({
             return {};
           }
           const prevDayId = this.dayIds[firstDayIdx - 1];
-          const prevDay = this.days.get(prevDayId);
+          const prevDay = timeline.heads.get(prevDayId)?.day;
           if (!prevDay?.detail) {
             console.error('[BUG] No detail for previous day');
             return {};
@@ -706,7 +703,7 @@ export default defineComponent({
             return {};
           }
           const nextDayId = this.dayIds[lastDayIdx + 1];
-          const nextDay = this.days.get(nextDayId);
+          const nextDay = timeline.heads.get(nextDayId)?.day;
           if (!nextDay?.detail) {
             console.error('[BUG] No detail for next day');
             return {};
@@ -727,7 +724,7 @@ export default defineComponent({
         for (let idx = dayIdx - 3; idx <= dayIdx + 3; idx++) {
           if (idx < 0 || idx >= this.dayIds.length || idx === dayIdx) continue;
 
-          const day = this.days.get(this.dayIds[idx]);
+          const day = timeline.heads.get(this.dayIds[idx])?.day;
           if (day && !day?.detail) {
             // duplicate requests are skipped by Timeline
             utils.bus.emit('memories:timeline:fetch-day', day.dayid);
diff --git a/src/globals.d.ts b/src/globals.d.ts
index dcc14bc0..01dc1c5f 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -6,7 +6,7 @@ import type { translate, translatePlural } from '@nextcloud/l10n';
 import type PlyrType from 'plyr';
 import type videojsType from 'video.js';
 
-import type { IPhoto, IRow } from './types';
+import type { IPhoto, TimelineState } from './types';
 import type { constants, initstate } from './services/utils';
 import type { GlobalRouteCheckers, routes } from './router';
 
@@ -54,7 +54,7 @@ declare global {
 
     viewer: {
       open: (photo: IPhoto) => void;
-      openDynamic: (anchorPhoto: IPhoto, rows: IRow[]) => Promise<void>;
+      openDynamic: (anchorPhoto: IPhoto, timeline: TimelineState) => Promise<void>;
       openStatic(photo: IPhoto, list: IPhoto[], thumbSize?: 256 | 512): Promise<void>;
       close: () => void;
       isOpen: boolean;
diff --git a/src/types.ts b/src/types.ts
index 2a0ea1c6..a78ecdbd 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -302,3 +302,8 @@ export type IConfig = {
   show_face_rect: boolean;
   album_list_sort: 1 | 2;
 };
+
+export interface TimelineState {
+  list: IRow[];
+  heads: Map<number, IHeadRow>;
+}