From e0a5d4860a8b5c6f4be70414a83613b6509b8a78 Mon Sep 17 00:00:00 2001
From: enkeii64 <imenkei64@gmail.com>
Date: Thu, 17 Jul 2025 00:06:22 +1000
Subject: fix(ui): add tooltipText prop to PlusButton

---
 apps/web/src/components/ui/draggable-item.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'apps/web/src/components')

diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsx
index c1f81e16..6e1e4990 100644
--- a/apps/web/src/components/ui/draggable-item.tsx
+++ b/apps/web/src/components/ui/draggable-item.tsx
@@ -149,7 +149,15 @@ export function DraggableMediaItem({
   );
 }
 
-function PlusButton({ className, onClick }: { className?: string; onClick?: () => void }) {
+function PlusButton({
+  className,
+  onClick,
+  tooltipText,
+}: {
+  className?: string;
+  onClick?: () => void;
+  tooltipText?: string;
+}) {
   return (
     <Button
       size="icon"
@@ -159,6 +167,7 @@ function PlusButton({ className, onClick }: { className?: string; onClick?: () =
         e.stopPropagation();
         onClick?.();
       }}
+      title={tooltipText}
     >
       <Plus className="!size-3" />
     </Button>
-- 
cgit v1.3.1


From 7cbbbe1630db0e4edeeb11a8af42b4012b766379 Mon Sep 17 00:00:00 2001
From: enkeii64 <imenkei64@gmail.com>
Date: Thu, 17 Jul 2025 00:07:39 +1000
Subject: fix: resolve merge conflict in draggable-item.tsx

---
 apps/web/src/components/ui/draggable-item.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'apps/web/src/components')

diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsx
index 6e1e4990..2af7932a 100644
--- a/apps/web/src/components/ui/draggable-item.tsx
+++ b/apps/web/src/components/ui/draggable-item.tsx
@@ -158,7 +158,7 @@ function PlusButton({
   onClick?: () => void;
   tooltipText?: string;
 }) {
-  return (
+  const button = (
     <Button
       size="icon"
       className={cn("absolute bottom-2 right-2 size-4", className)}
@@ -172,4 +172,6 @@ function PlusButton({
       <Plus className="!size-3" />
     </Button>
   );
+
+  return button;
 }
-- 
cgit v1.3.1


From 9d5707d5fdd0e6a47622df6d9dda6db2e88f266f Mon Sep 17 00:00:00 2001
From: enkeii64 <imenkei64@gmail.com>
Date: Thu, 17 Jul 2025 00:12:41 +1000
Subject: fix: resolve merge conflict in draggable-item.tsx

---
 apps/web/src/components/ui/draggable-item.tsx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'apps/web/src/components')

diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsx
index 2af7932a..3245c7ba 100644
--- a/apps/web/src/components/ui/draggable-item.tsx
+++ b/apps/web/src/components/ui/draggable-item.tsx
@@ -2,6 +2,11 @@
 
 import { AspectRatio } from "@/components/ui/aspect-ratio";
 import { Button } from "@/components/ui/button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { ReactNode, useState, useRef, useEffect } from "react";
 import { createPortal } from "react-dom";
 import { Plus } from "lucide-react";
@@ -173,5 +178,16 @@ function PlusButton({
     </Button>
   );
 
+  if (tooltipText) {
+    return (
+      <Tooltip>
+        <TooltipTrigger asChild>{button}</TooltipTrigger>
+        <TooltipContent>
+          <p>{tooltipText}</p>
+        </TooltipContent>
+      </Tooltip>
+    );
+  }
+
   return button;
 }
-- 
cgit v1.3.1