fix: Regression introduced in #176 (#179)

* addresses a problem where users couldn't drag clips #176
lulzsun · Feb 14, 2024 · 342dfee · 342dfee
1 parent b82f5e7
commit 342dfee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/ClientApp/src/components/Bookmark.tsx b/ClientApp/src/components/Bookmark.tsx
@@ -8,7 +8,7 @@ interface Props {
 
 export const Bookmark = forwardRef<HTMLDivElement, Props>(
   ({ id, time = 0, type = BookmarkType.Manual }, ref) => {
-    let className = 'grid grid-flow-col absolute rounded-lg h-full bg-yellow-400';
+    let className = 'grid grid-flow-col absolute rounded-lg h-full bg-yellow-400 bookmark';
     return (
       <div
         ref={ref}

diff --git a/ClientApp/src/pages/Player.tsx b/ClientApp/src/pages/Player.tsx
@@ -177,20 +177,8 @@ export const Player: React.FC<Props> = ({ videos }) => {
 
     // Enables clicking on the bookmark icon.
     function findBookmarkAncestorOrSelf(element: HTMLDivElement): HTMLDivElement {
-      if (element.hasAttribute('data-index')) {
-        return element;
-      }
-
-      let parentElement: HTMLElement | null = element.parentElement;
-      while (parentElement) {
-        if (parentElement.hasAttribute('data-index')) {
-          return parentElement as HTMLDivElement;
-        }
-        parentElement = parentElement.parentElement;
-      }
-
-      // If no parent with data-index was found, return the original element
-      return element;
+      const bookmarkElement = element.closest('.bookmark');
+      return bookmarkElement as HTMLDivElement || element;
     }
 
     function handleOnMouseUp(e: MouseEvent) {