From d173b101e3c9d48d59d380f4433dbea53dae5c89 Mon Sep 17 00:00:00 2001
From: Mohamed Bassem <me@mbassem.com>
Date: Sun, 14 Sep 2025 09:48:52 +0000
Subject: fix(web): fix error when attempting to merge tags. fixes #1938

---
 apps/web/components/dashboard/tags/TagPill.tsx | 5 ++++-
 apps/web/package.json                          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'apps/web')

diff --git a/apps/web/components/dashboard/tags/TagPill.tsx b/apps/web/components/dashboard/tags/TagPill.tsx
index 81d700cd..2da97b2e 100644
--- a/apps/web/components/dashboard/tags/TagPill.tsx
+++ b/apps/web/components/dashboard/tags/TagPill.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useRef, useState } from "react";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
@@ -23,6 +23,7 @@ export function TagPill({
   onOpenDialog: (tag: { id: string; name: string }) => void;
 }) {
   const [isHovered, setIsHovered] = useState(false);
+  const draggableRef = useRef<HTMLDivElement>(null);
 
   const handleMouseOver = () => setIsHovered(true);
   const handleMouseOut = () => setIsHovered(false);
@@ -74,6 +75,7 @@ export function TagPill({
       onFocus={handleMouseOver}
       onMouseOut={handleMouseOut}
       onBlur={handleMouseOut}
+      ref={draggableRef}
     >
       <Link
         className={
@@ -111,6 +113,7 @@ export function TagPill({
       disabled={!isDraggable}
       defaultClassNameDragging={"position-relative z-10 pointer-events-none"}
       position={{ x: 0, y: 0 }}
+      nodeRef={draggableRef}
     >
       {pill}
     </Draggable>
diff --git a/apps/web/package.json b/apps/web/package.json
index 7e9fe9d9..c18884cb 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -78,7 +78,7 @@
     "react": "^19.1.0",
     "react-day-picker": "^9.7.0",
     "react-dom": "^19.1.0",
-    "react-draggable": "^4.4.6",
+    "react-draggable": "^4.5.0",
     "react-dropzone": "^14.2.3",
     "react-error-boundary": "^5.0.0",
     "react-hook-form": "^7.57.0",
-- 
cgit v1.2.3-70-g09d2