:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
feat(workflows): drop a dragged step on the nearest + in the tile canvas (#122431)
Daniel Marchukf8c204c48889
diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/QuickAddButton.tsx b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/QuickAddButton.tsxindex 1d4971d88466..643cee69f4db 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/QuickAddButton.tsx+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/QuickAddButton.tsx@@ -16,27 +16,26 @@ export function QuickAddButton({edge,at,revealed = false,+ isDropTarget = false,}: {edge: HogFlowEdgeat: Point/** The pointer is on the arrow, so its button shows. */revealed?: boolean+ /** A dragged step is nearest to this button, so a drop lands here. */+ isDropTarget?: boolean}): JSX.Element {const buttonRef = useRef<HTMLButtonElement>(null)- const { quickAddEdgeKey, isPlacing, paletteSections } = useValues(tileCanvasLogic)- const { openQuickAdd, closeQuickAdd, addStepAt, placeAt, onDrop } = useActions(tileCanvasLogic)+ const { quickAddEdgeKey, isPlacing, paletteSections, nodeToBeAdded } = useValues(tileCanvasLogic)+ const { openQuickAdd, closeQuickAdd, addStepAt, placeAt } = useActions(tileCanvasLogic)const key = getEdgeId(edge)const isOpen = quickAddEdgeKey === key+ const stepName = nodeToBeAdded && 'data' in nodeToBeAdded ? nodeToBeAdded.data.name : nodeToBeAdded?.namereturn (<div- className="nodrag nopan pointer-events-auto absolute"+ className={cn('nodrag nopan pointer-events-auto absolute', isDropTarget && 'z-10')}style={{ transform: `translate(-50%, -50%) translate(${at.x}px, ${at.y}px)` }}- onDragOver={(event) => event.preventDefault()}- onDrop={(event) => {- event.preventDefault()- onDrop(undefined, edge)- }}><Popovervisible={isOpen}@@ -60,17 +59,32 @@ export function QuickAddButton({data-attr="workflow-tile-quick-add"onClick={() => (isPlacing ? placeAt(edge) : isOpen ? closeQuickAdd() : openQuickAdd(key))}className={cn(- 'flex size-5 cursor-pointer items-center justify-center rounded-full border bg-surface-primary text-secondary transition-all hover:scale-125 hover:border-[var(--color-accent)] hover:text-[var(--color-accent)] motion-reduce:transition-none',- isPlacing || isOpen- ? 'scale-125 border-[var(--color-accent)] text-[var(--color-accent)] shadow'- : revealed- ? 'opacity-100'- : 'opacity-0 hover:opacity-100 focus-visible:opacity-100'+ 'flex size-5 cursor-pointer items-center justify-center rounded-full border bg-surface-primary text-secondary transition-all duration-200 ease-out hover:scale-125 hover:border-[var(--color-accent)] hover:text-[var(--color-accent)] motion-reduce:transition-none',+ isDropTarget+ ? 'scale-[1.6] border-[var(--color-accent)] bg-[var(--color-accent)] text-white shadow-md'+ : isPlacing || isOpen+ ? 'scale-125 border-[var(--color-accent)] text-[var(--color-accent)] shadow'+ : revealed+ ? 'opacity-100'+ : 'opacity-0 hover:opacity-100 focus-visible:opacity-100')}><IconPlus className="text-xs" /></button></Popover>+ {isPlacing && stepName && (+ <div+ aria-hidden="true"+ className={cn(+ 'pointer-events-none absolute left-full top-1/2 ml-3 whitespace-nowrap rounded-full border border-[var(--color-accent)] bg-surface-primary px-2 py-0.5 text-xs font-semibold text-[var(--color-accent)] shadow transition-all duration-200 ease-out motion-reduce:transition-none',+ isDropTarget+ ? '-translate-y-1/2 opacity-100'+ : '-translate-x-1 -translate-y-1/2 scale-90 opacity-0'+ )}+ >+ Add {stepName} here+ </div>+ )}</div>)}diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvas.scss b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvas.scssindex 501bea557bf9..cc9ad04bccf1 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvas.scss+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvas.scss@@ -118,3 +118,13 @@outline: 2px solid var(--color-text-tertiary);outline-offset: 3px;}++.TileCanvas__edge {+ transition:+ stroke 200ms ease-out,+ stroke-width 200ms ease-out;++ @media (prefers-reduced-motion: reduce) {+ transition: none;+ }+}diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvasContent.tsx b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvasContent.tsxindex b1dd2a5cbd16..96d638646649 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvasContent.tsx+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileCanvasContent.tsx@@ -1,11 +1,13 @@-import { Background, BackgroundVariant, EdgeTypes, NodeTypes, Panel, ReactFlow } from '@xyflow/react'+import { Background, BackgroundVariant, EdgeTypes, NodeTypes, Panel, ReactFlow, useReactFlow } from '@xyflow/react'import { useActions, useValues } from 'kea'-import { KeyboardEvent, useMemo, useRef } from 'react'+import { DragEvent, KeyboardEvent, useMemo, useRef } from 'react'import { cn } from 'lib/utils/css-classes'import { themeLogic } from '~/layout/navigation-3000/themeLogic'+import { getEdgeId } from '../../edgeId'+import type { HogFlowEdge } from '../../types'import { CommandBar } from './CommandBar'import { PathChip } from './PathChip'import { PathFrame } from './PathFrame'@@ -16,7 +18,14 @@ import { TileCanvasLayoutError } from './TileCanvasLayoutError'import { tileCanvasLogic } from './tileCanvasLogic'import { TileCanvasMeasureLayer } from './TileCanvasMeasureLayer'import { CANVAS_MIN_ZOOM, hasStepMenu } from './tileCanvasModel'-import { buildCanvasEdges, buildCanvasNodes, keepUnchangedNodes, TileCanvasNode, TileEdgeType } from './tileCanvasNodes'+import {+ buildCanvasEdges,+ buildCanvasNodes,+ keepUnchangedNodes,+ nearestInsertEdge,+ TileCanvasNode,+ TileEdgeType,+} from './tileCanvasNodes'import { TileCanvasPanel } from './TileCanvasPanel'import { TileEdge } from './TileEdge'import { TileFlowNode } from './TileFlowNode'@@ -25,6 +34,8 @@ import { useCanvasViewport } from './useCanvasViewport'const NODE_TYPES = { tile: TileFlowNode, frame: PathFrame, chip: PathChip } as NodeTypesconst EDGE_TYPES = { tile: TileEdge } as EdgeTypesconst MAX_ZOOM = 1.5+/** How far from a + a dragged step still drops on it, in screen pixels. */+const DROP_REACH = 120type TileKeyCommand = 'activate' | 'menu'@@ -59,8 +70,11 @@ export function TileCanvasContent(): JSX.Element {stepMenuActionId,countOf,templateNameOf,+ nodeToBeAdded,+ dropTargetEdgeKey,} = useValues(tileCanvasLogic)- const { activateNode, openStepMenu, handlePaneClick } = useActions(tileCanvasLogic)+ const { activateNode, openStepMenu, handlePaneClick, setDropTargetEdgeKey, dropAt } = useActions(tileCanvasLogic)+ const { screenToFlowPosition, getZoom } = useReactFlow()useCanvasViewport(wrapperRef)const previousNodes = useRef<TileCanvasNode[]>([])@@ -98,6 +112,40 @@ export function TileCanvasContent(): JSX.Element {const hasMenu = (nodeId: string): boolean =>drawnGraph.nodes.some((node) => node.id === nodeId && node.kind === 'step' && hasStepMenu(node.action))+ const dropEdgeAt = (event: DragEvent<HTMLDivElement>): HogFlowEdge | null =>+ nearestInsertEdge(edges, screenToFlowPosition({ x: event.clientX, y: event.clientY }), DROP_REACH / getZoom())++ const onDragOver = (event: DragEvent<HTMLDivElement>): void => {+ if (!nodeToBeAdded) {+ return+ }+ event.preventDefault()+ event.dataTransfer.dropEffect = 'move'+ const edge = dropEdgeAt(event)+ const key = edge ? getEdgeId(edge) : null+ if (key !== dropTargetEdgeKey) {+ setDropTargetEdgeKey(key)+ }+ }++ const onDragLeave = (event: DragEvent<HTMLDivElement>): void => {+ if (!event.currentTarget.contains(event.relatedTarget as Node | null)) {+ setDropTargetEdgeKey(null)+ }+ }++ const onDrop = (event: DragEvent<HTMLDivElement>): void => {+ if (!nodeToBeAdded) {+ return+ }+ event.preventDefault()+ const edge = dropEdgeAt(event)+ setDropTargetEdgeKey(null)+ if (edge) {+ dropAt(edge)+ }+ }+const onKeyDown = (event: KeyboardEvent<HTMLDivElement>): void => {const nodeId = focusedTileId(event)const command = nodeId ? tileKeyCommand(event) : null@@ -124,6 +172,9 @@ export function TileCanvasContent(): JSX.Element {<divref={wrapperRef}onKeyDown={onKeyDown}+ onDragOver={onDragOver}+ onDragLeave={onDragLeave}+ onDrop={onDrop}className="TileCanvas__flow @container/tile-canvas relative flex min-h-0 min-w-0 grow @max-[48rem]/workflow-editor:min-h-48"><ReactFlow<TileCanvasNode, TileEdgeType>diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileEdge.tsx b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileEdge.tsxindex ecd56bd4c270..1f62570a7c97 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileEdge.tsx+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/TileEdge.tsx@@ -1,25 +1,47 @@import { EdgeLabelRenderer, EdgeProps } from '@xyflow/react'+import { useValues } from 'kea'import { useState } from 'react'+import { getEdgeId } from '../../edgeId'import { QuickAddButton } from './QuickAddButton'-import { arrowHead, EDGE_LABEL_HEIGHT, edgeLabelWidth, insertPoint, roundedPath, shortLabel } from './tileCanvasLayout'-import type { TileEdgeType } from './tileCanvasNodes'--const QUICK_ADD_GAP = 14+import {+ arrowHead,+ EDGE_LABEL_HEIGHT,+ edgeLabelWidth,+ quickAddPoint,+ roundedPath,+ shortLabel,+} from './tileCanvasLayout'+import { tileCanvasLogic } from './tileCanvasLogic'+import { edgeLabelText, type TileEdgeType } from './tileCanvasNodes'export function TileEdge({ data }: EdgeProps<TileEdgeType>): JSX.Element | null {const routed = data?.routedconst [hovered, setHovered] = useState(false)+ const { dropTargetEdgeKey } = useValues(tileCanvasLogic)if (!data || !routed) {return null}const { edge } = data- const label = edge.label && routed.label ? edge.label : undefined- const at = label && routed.label ? routed.label : insertPoint(routed.points)+ const label = edgeLabelText(edge, routed)+ const isDropTarget = !!edge.insertEdge && dropTargetEdgeKey === getEdgeId(edge.insertEdge)+ const stroke = isDropTarget ? 'var(--color-accent)' : 'var(--tile-canvas-edge)'return (<>- <path d={roundedPath(routed.points)} fill="none" stroke="var(--tile-canvas-edge)" strokeWidth={1.5} />- <path d={arrowHead(routed.points)} fill="none" stroke="var(--tile-canvas-edge)" strokeWidth={1.5} />+ <path+ d={roundedPath(routed.points)}+ className="TileCanvas__edge"+ fill="none"+ stroke={stroke}+ strokeWidth={isDropTarget ? 2 : 1.5}+ />+ <path+ d={arrowHead(routed.points)}+ className="TileCanvas__edge"+ fill="none"+ stroke={stroke}+ strokeWidth={isDropTarget ? 2 : 1.5}+ />{/* A wide invisible stroke lets the pointer find the arrow, which shows the button that adds a step on it. */}<pathd={roundedPath(routed.points)}@@ -49,7 +71,8 @@ export function TileEdge({ data }: EdgeProps<TileEdgeType>): JSX.Element | null<QuickAddButtonedge={edge.insertEdge}revealed={hovered}- at={{ x: at.x + (label ? edgeLabelWidth(label) / 2 + QUICK_ADD_GAP : 0), y: at.y }}+ isDropTarget={isDropTarget}+ at={quickAddPoint(routed, label)}/>)}</EdgeLabelRenderer>diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLayout.ts b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLayout.tsindex fe23ead4feea..1aea9aa080a9 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLayout.ts+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLayout.ts@@ -354,6 +354,16 @@ export function insertPoint(points: Point[]): Point {return best.point}+const QUICK_ADD_GAP = 14++/** Where an arrow's + sits: past its label when it has one, else in the middle of its longest straight run. */+export function quickAddPoint(routed: RoutedEdge, label: string | undefined): Point {+ if (label && routed.label) {+ return { x: routed.label.x + edgeLabelWidth(label) / 2 + QUICK_ADD_GAP, y: routed.label.y }+ }+ return insertPoint(routed.points)+}+export function entryX(points: Point[] | undefined, top: number, fallback: number): number {const crossing = (points ?? []).slice(1).find((b, index) => {const a = (points ?? [])[index]diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLogic.ts b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLogic.tsindex 63f36aba7e39..a20da54d5293 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLogic.ts+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasLogic.ts@@ -65,7 +65,7 @@ import { withLeavingStacks } from './tileCanvasNodes'export type TileCanvasPanelMode = HogFlowEditorMode | 'history'-export type StepAddSource = 'palette' | 'command bar' | 'quick add'+export type StepAddSource = 'palette' | 'command bar' | 'quick add' | 'drag'export type StepCountOf = (actionId: string) => number | undefinedexport type TemplateNameOf = (templateId: string) => string | undefined@@ -174,6 +174,7 @@ export interface tileCanvasLogicValues {commandPaletteQuery: string | nullcountOf: StepCountOfdrawnGraph: VisibleGraph+ dropTargetEdgeKey: string | nullfitRequest: numberfitsNextLayout: booleanframeSpecs: PathFrameSpec[]@@ -282,6 +283,9 @@ export interface tileCanvasLogicActions {collapsePath: (groupId: string) => {groupId: string}+ dropAt: (edge: HogFlowEdge) => {+ edge: HogFlowEdge+ }fitNextLayout: () => {value: true}@@ -351,6 +355,9 @@ export interface tileCanvasLogicActions {selectStep: (actionId: string) => {actionId: string}+ setDropTargetEdgeKey: (edgeKey: string | null) => {+ edgeKey: string | null+ }setLayout: (layout: CanvasLayout,laidOutGraph?: VisibleGraph | null@@ -494,6 +501,8 @@ export const tileCanvasLogic = kea<tileCanvasLogicType>([startPlacing: (step: CreateActionType) => ({ step }),addStepAt: (step: CreateActionType, edge: HogFlowEdge) => ({ step, edge }),placeAt: (edge: HogFlowEdge) => ({ edge }),+ setDropTargetEdgeKey: (edgeKey: string | null) => ({ edgeKey }),+ dropAt: (edge: HogFlowEdge) => ({ edge }),selectStep: (actionId: string) => ({ actionId }),revealStep: (actionId: string, openPanel: boolean = true) => ({ actionId, openPanel }),openPanel: (mode: TileCanvasPanelMode) => ({ mode }),@@ -536,6 +545,14 @@ export const tileCanvasLogic = kea<tileCanvasLogicType>([cancel: () => null,},],+ dropTargetEdgeKey: [+ null as string | null,+ {+ setDropTargetEdgeKey: (_, { edgeKey }) => edgeKey,+ setNodeToBeAdded: () => null,+ cancel: () => null,+ },+ ],quickAddEdgeKey: [null as string | null,{@@ -790,6 +807,13 @@ export const tileCanvasLogic = kea<tileCanvasLogicType>([actions.onDrop(undefined, edge)captureStepAdded('quick add', step.type)},+ dropAt: ({ edge }) => {+ const step = values.nodeToBeAdded+ if (step) {+ actions.onDrop(undefined, edge)+ captureStepAdded('drag', 'data' in step ? step.data.type : step.type)+ }+ },placeAt: ({ edge }) => {if (values.isMovingNode || values.isCopyingNode) {placeExistingStep(edge)diff --git a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasNodes.ts b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasNodes.tsindex 3017901147cd..4f67e4dba1d7 100644--- a/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasNodes.ts+++ b/products/workflows/frontend/Workflows/hogflows/editor/tile-canvas/tileCanvasNodes.ts@@ -1,7 +1,16 @@import type { Edge, Node } from '@xyflow/react'-import type { HogFlow } from '../../types'-import { Box, CanvasLayout, frameChipWidth, frameEntryX, NodeSize, PathFrameSpec, RoutedEdge } from './tileCanvasLayout'+import type { HogFlow, HogFlowEdge } from '../../types'+import {+ Box,+ CanvasLayout,+ frameChipWidth,+ frameEntryX,+ NodeSize,+ PathFrameSpec,+ quickAddPoint,+ RoutedEdge,+} from './tileCanvasLayout'import type { StepCountOf, TemplateNameOf } from './tileCanvasLogic'import {CanvasMotion,@@ -9,6 +18,7 @@ import {nodeMotion,NodeMotion,PathGroup,+ Point,VisibleEdge,VisibleGraph,VisibleNode,@@ -176,6 +186,26 @@ export function keepUnchangedNodes(previous: TileCanvasNode[], next: TileCanvasN})}+export function edgeLabelText(edge: VisibleEdge, routed: RoutedEdge): string | undefined {+ return edge.label && routed.label ? edge.label : undefined+}++/** The arrow whose + is closest to the point, if one is within reach. */+export function nearestInsertEdge(edges: TileEdgeType[], point: Point, reach: number): HogFlowEdge | null {+ let best: { edge: HogFlowEdge; distance: number } | null = null+ for (const { data } of edges) {+ if (!data?.routed || !data.edge.insertEdge) {+ continue+ }+ const at = quickAddPoint(data.routed, edgeLabelText(data.edge, data.routed))+ const distance = Math.hypot(at.x - point.x, at.y - point.y)+ if (distance <= reach && (!best || distance < best.distance)) {+ best = { edge: data.edge.insertEdge, distance }+ }+ }+ return best?.edge ?? null+}+export function buildCanvasEdges(graph: VisibleGraph, layout: CanvasLayout | null): TileEdgeType[] {return graph.edges.map((edge) => ({id: edge.id,