diff --git a/packages/studio/src/components/editor/DomEditOverlay.tsx b/packages/studio/src/components/editor/DomEditOverlay.tsx index 6408546adf..a4a46af161 100644 --- a/packages/studio/src/components/editor/DomEditOverlay.tsx +++ b/packages/studio/src/components/editor/DomEditOverlay.tsx @@ -5,6 +5,7 @@ import { type DomEditSelection } from "./domEditing"; import type { PreviewMouseDownOptions } from "../../hooks/usePreviewInteraction"; import { useMarqueeGestures } from "./marqueeCommit"; import { MarqueeOverlay } from "./MarqueeOverlay"; +import type { MarqueeSelectionMode } from "../../utils/marqueeGeometry"; import { resolveDomEditGroupOverlayRect } from "./domEditOverlayGeometry"; import { useZOrderCrossedFlash, ZOrderCrossedFlash } from "./useZOrderCrossedFlash"; import { useCanvasContextMenuState } from "./useCanvasContextMenuState"; @@ -103,7 +104,7 @@ export interface DomEditOverlayProps { onToggleRecording?: () => void; onMarqueeSelect?: ( selections: DomEditSelection[], - additive: boolean, + mode: MarqueeSelectionMode, ) => DomSelectionResult | void; /** * Delete the selected canvas element. @@ -341,6 +342,7 @@ export const DomEditOverlay = memo(function DomEditOverlay({ activeCompositionPathRef, onMarqueeSelectRef, selectionRef, + groupSelectionsRef, gestures, }); diff --git a/packages/studio/src/components/editor/MarqueeOverlay.tsx b/packages/studio/src/components/editor/MarqueeOverlay.tsx index df7da60111..7be9153f81 100644 --- a/packages/studio/src/components/editor/MarqueeOverlay.tsx +++ b/packages/studio/src/components/editor/MarqueeOverlay.tsx @@ -1,10 +1,10 @@ -import type { Rect } from "../../utils/marqueeGeometry"; +import type { MarqueeBand, Rect } from "../../utils/marqueeGeometry"; export interface MarqueeOverlayProps { /** Elements the marquee currently intersects — outlined live before mouse-up. */ candidateRects: Rect[]; /** The marquee drag rectangle itself, or null when not marquee-selecting. */ - marqueeRect: Rect | null; + marqueeRect: MarqueeBand | null; } /** @@ -13,20 +13,28 @@ export interface MarqueeOverlayProps { * DomEditOverlay to keep that file under the 600-line cap. */ export function MarqueeOverlay({ candidateRects, marqueeRect }: MarqueeOverlayProps) { + const subtracting = marqueeRect?.mode === "subtract"; + const candidateClass = subtracting + ? "border-danger bg-danger/5" + : "border-studio-accent bg-studio-accent/5"; + const bandClass = subtracting + ? "border-danger bg-danger/10" + : "border-studio-accent bg-studio-accent/10"; return ( <> {candidateRects.map((r, i) => (