From 805a131c4ad9a77920b58d076d9e20cd67c91376 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 12 Apr 2023 15:19:29 -0700
Subject: [PATCH] timeline: v-for on photo component

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
---
 src/components/Timeline.vue    |  23 +++----
 src/components/frame/Photo.vue | 114 +++++++++++++++++----------------
 2 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index 81659f50..1c822edc 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -61,7 +61,8 @@
           </div>
         </div>
 
-        <div
+        <Photo
+          class="photo"
           v-else
           v-for="photo of item.photos"
           :key="photo.key"
@@ -70,18 +71,14 @@
             width: `${photo.dispW}px`,
             transform: `translate(${photo.dispX}px, ${photo.dispY}px)`,
           }"
-          class="photo"
-        >
-          <Photo
-            :data="photo"
-            :day="item.day"
-            @select="selectionManager.selectPhoto"
-            @pointerdown="selectionManager.clickPhoto(photo, $event, index)"
-            @touchstart="selectionManager.touchstartPhoto(photo, $event, index)"
-            @touchend="selectionManager.touchendPhoto(photo, $event, index)"
-            @touchmove="selectionManager.touchmovePhoto(photo, $event, index)"
-          />
-        </div>
+          :data="photo"
+          :day="item.day"
+          @select="selectionManager.selectPhoto"
+          @pointerdown="selectionManager.clickPhoto(photo, $event, index)"
+          @touchstart="selectionManager.touchstartPhoto(photo, $event, index)"
+          @touchend="selectionManager.touchendPhoto(photo, $event, index)"
+          @touchmove="selectionManager.touchmovePhoto(photo, $event, index)"
+        />
       </template>
     </RecycleScroller>
 
diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index f4f59c67..64d49fcf 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -1,64 +1,66 @@
 <template>
-  <div
-    class="p-outer fill-block"
-    :class="{
-      selected: data.flag & c.FLAG_SELECTED,
-      placeholder: data.flag & c.FLAG_PLACEHOLDER,
-      leaving: data.flag & c.FLAG_LEAVING,
-      error: data.flag & c.FLAG_LOAD_FAIL,
-    }"
-  >
-    <CheckCircle v-once :size="18" class="select" @click="toggleSelect" />
-
-    <div class="video" v-if="data.flag & c.FLAG_IS_VIDEO">
-      <span v-if="data.video_duration" class="time">
-        {{ videoDuration }}
-      </span>
-      <Video :size="22" />
-    </div>
-
+  <div class="p-outer-super">
     <div
-      class="livephoto"
-      @mouseenter.passive="playVideo"
-      @mouseleave.passive="stopVideo"
-    >
-      <LivePhoto :size="22" v-if="data.liveid" />
-    </div>
-
-    <Star :size="22" v-if="data.flag & c.FLAG_IS_FAVORITE" />
-
-    <div
-      class="img-outer fill-block"
+      class="p-outer fill-block"
       :class="{
-        'memories-livephoto': data.liveid,
+        selected: data.flag & c.FLAG_SELECTED,
+        placeholder: data.flag & c.FLAG_PLACEHOLDER,
+        leaving: data.flag & c.FLAG_LEAVING,
+        error: data.flag & c.FLAG_LOAD_FAIL,
       }"
-      @contextmenu="contextmenu"
-      @pointerdown.passive="$emit('pointerdown', $event)"
-      @touchstart.passive="$emit('touchstart', $event)"
-      @touchmove="$emit('touchmove', $event)"
-      @touchend.passive="$emit('touchend', $event)"
-      @touchcancel.passive="$emit('touchend', $event)"
     >
-      <XImg
-        v-if="src"
-        ref="ximg"
-        :class="['ximg', 'fill-block', `memories-thumb-${data.key}`]"
-        draggable="false"
-        :src="src"
-        :key="data.fileid"
-        @load="load"
-        @error="error"
-      />
-      <video
-        ref="video"
-        v-if="videoUrl"
-        :src="videoUrl"
-        preload="none"
-        muted
-        playsinline
-        disableRemotePlayback
-      />
-      <div class="overlay fill-block" />
+      <CheckCircle v-once :size="18" class="select" @click="toggleSelect" />
+
+      <div class="video" v-if="data.flag & c.FLAG_IS_VIDEO">
+        <span v-if="data.video_duration" class="time">
+          {{ videoDuration }}
+        </span>
+        <Video :size="22" />
+      </div>
+
+      <div
+        class="livephoto"
+        @mouseenter.passive="playVideo"
+        @mouseleave.passive="stopVideo"
+      >
+        <LivePhoto :size="22" v-if="data.liveid" />
+      </div>
+
+      <Star :size="22" v-if="data.flag & c.FLAG_IS_FAVORITE" />
+
+      <div
+        class="img-outer fill-block"
+        :class="{
+          'memories-livephoto': data.liveid,
+        }"
+        @contextmenu="contextmenu"
+        @pointerdown.passive="$emit('pointerdown', $event)"
+        @touchstart.passive="$emit('touchstart', $event)"
+        @touchmove="$emit('touchmove', $event)"
+        @touchend.passive="$emit('touchend', $event)"
+        @touchcancel.passive="$emit('touchend', $event)"
+      >
+        <XImg
+          v-if="src"
+          ref="ximg"
+          :class="['ximg', 'fill-block', `memories-thumb-${data.key}`]"
+          draggable="false"
+          :src="src"
+          :key="data.fileid"
+          @load="load"
+          @error="error"
+        />
+        <video
+          ref="video"
+          v-if="videoUrl"
+          :src="videoUrl"
+          preload="none"
+          muted
+          playsinline
+          disableRemotePlayback
+        />
+        <div class="overlay fill-block" />
+      </div>
     </div>
   </div>
 </template>