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

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

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;
 }