The open-source CapCut alternative
fix: resolve merge conflict in draggable-item.tsx
enkeii649d5707d5fdd0
diff --git a/apps/web/src/components/ui/draggable-item.tsx b/apps/web/src/components/ui/draggable-item.tsxindex 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;}