Skip to content

Commit 327fa1f

Browse files
committed
! Fix incorrect behabiour when dragging playlist item with duplicate video in the same playlist
1 parent c29b282 commit 327fa1f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
grid: layout === 'grid',
99
list: layout === 'list',
1010
draggable: isDraggable,
11-
draggedVideo: isVideoDragging && draggedVideo.videoId === data.videoId,
11+
draggedVideo: isVideoDragging && draggedVideo.videoId === data.videoId && draggedVideo.playlistItemId === data.playlistItemId,
1212
}"
1313
:draggable="isDraggable"
1414
v-on="isDraggable ? draggableEventHandlers : {}"

src/renderer/components/FtListVideoNumbered/FtListVideoNumbered.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:class="{
77
placeholder: !visible,
88
draggable: canBecomeDraggable,
9-
draggedVideo: isVideoDragging && draggedVideo.videoId === data.videoId,
9+
draggedVideo: isVideoDragging && draggedVideo.videoId === data.videoId && draggedVideo.playlistItemId === data.playlistItemId,
1010
}"
1111
:draggable="canBecomeDraggable"
1212
v-on="canBecomeDraggable ? draggableEventHandlers : {}"

src/renderer/helpers/dragAndDrop.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ export const handleDragAndDrop = (emit) => {
5050
* @type {MoveDraggedVideo}
5151
*/
5252
const moveDraggedVideo = (video, draggedVideo) => {
53-
const differentVideo = video.videoId !== draggedVideo.videoId
53+
const differentPlaylistItem = video.videoId !== draggedVideo.videoId || video.playlistItemId !== draggedVideo.playlistItemId
5454

55-
if (differentVideo) {
55+
if (differentPlaylistItem) {
5656
emit('move-dragged-video', video, draggedVideo)
5757
}
5858
}

0 commit comments

Comments
 (0)