A link could only be removed through the menu of its port, and the line itself took no input. A transition of a state machine could only be deleted in the list of the inspector. Now the line is the handle, in a behavior's graph and between states alike. - A click on a line selects that link and draws a halo behind it. A press counts within 6 screen pixels of the line, and where two cross the one drawn last wins. - Ctrl-click or Shift-click adds a link or takes it away. The rubber band takes every line it crosses, into the same selection as the nodes and boxes it caught. - Delete or Backspace removes what is picked as one undo step. A right-click on a line offers Hide link and Delete link. - The inspector shows a picked link: the node and port at each end and the type it carries, with Hide link and Delete link below. For several it says how many. - The arrow of a transition is picked the same way, on its name too. Delete or a right-click with Delete transition removes it. - The menu of a port is unchanged, Disconnect included, as answered in the issue. - editor/graph/edgeHit.ts holds the hit test as pure functions, and editor/inspector/edgeSection.ts builds the section. The selection has a new kind edge, and node and annotation carry edgeIds. Decided here: - A hidden link has no line and is never picked this way, also while it is shown on loan. Its mark at the port stays its handle. - The menu of a line speaks about the whole selection, like the menu of a box. With nodes or boxes held alongside it reads Delete N items. - Hiding picked links lets go of them, since no line is left. - A link wins over the box it crosses, and a mark wins over a link. - A transition has no Hide entry. - With nodes or boxes in the selection the inspector keeps showing the node or box, not the link. Tests: - Gate: 201 files, 2982 tests (2967 + 15), exit 0 - e2e, full run: 1635 checks passed (1629 + 6), exit 0 - Smokes: 24 / 19 / 21, exit 0 - The full run was done for exactly this state. - 15 unit tests in tests/editor/edge-selection.test.ts - Six e2e checks with a real mouse, block 6z-xi in module 06 and 26e7 in module 26 - 12 unit counter-probes all fail tests, run on stein2 - Three browser counter-probes fail, the build went through each time: no hit on the line, no halo, a band that skips lines - Screenshots of a picked link and a picked transition looked at before the last build, none after it Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
150 lines
9.5 KiB
TypeScript
150 lines
9.5 KiB
TypeScript
import { NameTransitionCommand } from '../../core/commands/graphCommands';
|
||
import { currentNodePalette } from '../graph/NodePalette';
|
||
import { rectOf } from '../textProbe';
|
||
import { centreOf, snapButton, type HookContext } from './hookHelpers';
|
||
|
||
/** The node graphs: behaviors, state machines, particles and shaders. */
|
||
export function graphHooks({ state, editor }: HookContext) {
|
||
const { graphEditor } = editor;
|
||
return {
|
||
graph: {
|
||
current: () => graphEditor.currentAssetId,
|
||
portAt: (nodeId: string, port: string, isOutput: boolean) =>
|
||
graphEditor.canvas.portGlobal(nodeId, port, isOutput),
|
||
nodeAt: (nodeId: string) => graphEditor.canvas.nodeGlobal(nodeId),
|
||
chevronAt: (nodeId: string) => graphEditor.canvas.chevronGlobal(nodeId),
|
||
nodeLabel: (nodeId: string) => graphEditor.canvas.nodeLabel(nodeId),
|
||
nodeProblem: (nodeId: string) => graphEditor.canvas.nodeProblem(nodeId),
|
||
nodeSettings: (nodeId: string) => graphEditor.canvas.nodeSettings(nodeId),
|
||
/** Each input row as drawn: its name, and the inline value beside it while unconnected. */
|
||
nodeInputs: (nodeId: string) => graphEditor.canvas.nodeInputs(nodeId),
|
||
/** Each output row as drawn: while playing, the value it last carried in front of its name. */
|
||
nodeOutputs: (nodeId: string) => graphEditor.canvas.nodeOutputs(nodeId),
|
||
/** Beads in flight on exec edges as drawn, in graph coordinates; `progress` 0 = source, 1 = target. */
|
||
beads: () => graphEditor.canvas.beadsDrawn(),
|
||
/** Drawn rectangles on screen: what "fit" has to keep inside `canvasRect`. */
|
||
nodeRect: (nodeId: string) => graphEditor.canvas.nodeRect(nodeId),
|
||
canvasRect: () => graphEditor.canvas.canvasRect(),
|
||
/** Bare canvas below every node – where a step right-clicks to open the palette. */
|
||
emptySpot: () => graphEditor.canvas.emptySpotGlobal(),
|
||
/**
|
||
* What the open palette lists, in order. No colour check can see a ranking: the rows all
|
||
* look alike, only their order carries the answer (#43).
|
||
*/
|
||
paletteRows: () => currentNodePalette()?.rowsDrawn() ?? null,
|
||
selected: () => state.selectedNodeIds,
|
||
/** Groups and comments as drawn – text and both colours included, since no pixel says them. */
|
||
annotations: () => graphEditor.canvas.annotationsDrawn(),
|
||
/** Where one is grabbed: its title bar, or with `corner` the handle that resizes it. */
|
||
annotationAt: (id: string, corner = false) => graphEditor.canvas.annotationGlobal(id, corner),
|
||
/** The box as drawn on screen – how a check sees whether a fit brought it into view. */
|
||
annotationRect: (id: string) => graphEditor.canvas.annotationRect(id),
|
||
dropTarget: () => graphEditor.canvas.pendingDropTarget(),
|
||
danglingEdge: () => graphEditor.canvas.danglingEdgeVisible(),
|
||
edgeDrawn: (edgeId: string) => graphEditor.canvas.edgeDrawn(edgeId),
|
||
/** The colour it was stroked in: `danger` is an edge whose two ends stopped fitting (#207). */
|
||
edgeColor: (edgeId: string) => graphEditor.canvas.edgeColor(edgeId),
|
||
/** Halfway along a link on screen, and the links drawn as picked (#289). */
|
||
edgeAt: (edgeId: string) => graphEditor.canvas.edgeGlobal(edgeId),
|
||
pickedEdges: () => graphEditor.canvas.pickedEdgesDrawn(),
|
||
/** The types the node's ports are drawn with, after a shared group had its say (#207). */
|
||
portTypes: (nodeId: string) => graphEditor.canvas.portTypes(nodeId),
|
||
blockFrames: () => graphEditor.canvas.blockFrames(),
|
||
foldMark: (edgeId: string, isOutput: boolean) => graphEditor.canvas.foldMarkGlobal(edgeId, isOutput),
|
||
foldMarks: () => graphEditor.canvas.foldMarksDrawn(),
|
||
// The canvas, not the whole tab: a centre measured through the header sits above the
|
||
// drawing area.
|
||
center: () => centreOf(graphEditor.canvas),
|
||
snapping: () => graphEditor.canvas.snapEnabled,
|
||
snapButton: () => snapButton(graphEditor.snap),
|
||
zoom: () => graphEditor.canvas.zoomLevel,
|
||
crumbs: () => graphEditor.breadcrumb.crumbsDrawn(),
|
||
},
|
||
stateMachine: {
|
||
current: () => editor.stateMachineEditor.currentAssetId,
|
||
nodeAt: (nodeId: string) => editor.stateMachineEditor.canvas.nodeGlobal(nodeId),
|
||
nodeLabel: (nodeId: string) => editor.stateMachineEditor.canvas.nodeLabel(nodeId),
|
||
nodeRect: (nodeId: string) => editor.stateMachineEditor.canvas.nodeRect(nodeId),
|
||
canvasRect: () => editor.stateMachineEditor.canvas.canvasRect(),
|
||
center: () => centreOf(editor.stateMachineEditor.canvas),
|
||
snapping: () => editor.stateMachineEditor.canvas.snapEnabled,
|
||
snapButton: () => snapButton(editor.stateMachineEditor.snap),
|
||
/** Where a state's hidden pin sits; it cannot be grabbed – `portGrabbable` is the check. */
|
||
portAt: (nodeId: string, port: string, isOutput: boolean) =>
|
||
editor.stateMachineEditor.canvas.portGlobal(nodeId, port, isOutput),
|
||
portGrabbable: (nodeId: string, port: string, isOutput: boolean) =>
|
||
editor.stateMachineEditor.canvas.portGrabbable(nodeId, port, isOutput),
|
||
edgeDrawn: (edgeId: string) => editor.stateMachineEditor.canvas.edgeDrawn(edgeId),
|
||
edgeAt: (edgeId: string) => editor.stateMachineEditor.canvas.edgeGlobal(edgeId),
|
||
pickedEdges: () => editor.stateMachineEditor.canvas.pickedEdgesDrawn(),
|
||
transitionLabel: (edgeId: string) => editor.stateMachineEditor.canvas.transitionLabelDrawn(edgeId),
|
||
transitionLabelAt: (edgeId: string) => editor.stateMachineEditor.canvas.transitionLabelAt(edgeId),
|
||
hint: () => editor.stateMachineEditor.canvas.shownHint(),
|
||
/** Names a transition the way the inspector row does, for steps that need one already named. */
|
||
nameTransition: (edgeId: string, name: string) =>
|
||
state.execute(new NameTransitionCommand(editor.stateMachineEditor.currentAssetId, edgeId, name)),
|
||
dropTarget: () => editor.stateMachineEditor.canvas.pendingDropTarget(),
|
||
danglingEdge: () => editor.stateMachineEditor.canvas.danglingEdgeVisible(),
|
||
emptySpot: () => editor.stateMachineEditor.canvas.emptySpotGlobal(),
|
||
selected: () => state.selectedNodeIds,
|
||
/** The start ring and the live marks as drawn – what no colour check could tell apart. */
|
||
startRing: (nodeId: string) => editor.stateMachineEditor.canvas.startRingDrawn(nodeId),
|
||
stateMarks: () => editor.stateMachineEditor.canvas.stateMarksDrawn(),
|
||
},
|
||
particles: {
|
||
current: () => editor.particlesEditor.currentAssetId,
|
||
info: () => editor.particlesEditor.shownInfo,
|
||
snapButton: () => snapButton(editor.particlesEditor.snap),
|
||
nodeAt: (nodeId: string) => editor.particlesEditor.canvas.nodeGlobal(nodeId),
|
||
nodeLabel: (nodeId: string) => editor.particlesEditor.canvas.nodeLabel(nodeId),
|
||
nodeRect: (nodeId: string) => editor.particlesEditor.canvas.nodeRect(nodeId),
|
||
nodeProblem: (nodeId: string) => editor.particlesEditor.canvas.nodeProblem(nodeId),
|
||
canvasRect: () => editor.particlesEditor.canvas.canvasRect(),
|
||
emptySpot: () => editor.particlesEditor.canvas.emptySpotGlobal(),
|
||
center: () => centreOf(editor.particlesEditor.canvas),
|
||
/** The panel beside the graph: how many particles it draws and which second it stands at. */
|
||
preview: () => ({
|
||
count: editor.particlesEditor.preview.count,
|
||
time: Math.round(editor.particlesEditor.preview.time * 100) / 100,
|
||
holding: editor.particlesEditor.preview.holding,
|
||
}),
|
||
previewRect: () => rectOf(editor.particlesEditor.preview),
|
||
/** Hold button, time readout and slider as they are shown, not as the preview holds them. */
|
||
controls: () => editor.particlesEditor.controls,
|
||
splitterAt: () => centreOf(editor.particlesEditor.splitter),
|
||
sliderAt: () => centreOf(editor.particlesEditor.slider),
|
||
/** Jumps the preview to a second – exact, because a particle is a function of its age. */
|
||
hold: (at: number | null) => editor.particlesEditor.preview.hold(at),
|
||
},
|
||
shader: {
|
||
current: () => editor.shaderEditor.currentAssetId,
|
||
info: () => editor.shaderEditor.shownInfo,
|
||
nodeAt: (nodeId: string) => editor.shaderEditor.canvas.nodeGlobal(nodeId),
|
||
nodeLabel: (nodeId: string) => editor.shaderEditor.canvas.nodeLabel(nodeId),
|
||
nodeRect: (nodeId: string) => editor.shaderEditor.canvas.nodeRect(nodeId),
|
||
nodeProblem: (nodeId: string) => editor.shaderEditor.canvas.nodeProblem(nodeId),
|
||
nodeSettings: (nodeId: string) => editor.shaderEditor.canvas.nodeSettings(nodeId),
|
||
canvasRect: () => editor.shaderEditor.canvas.canvasRect(),
|
||
emptySpot: () => editor.shaderEditor.canvas.emptySpotGlobal(),
|
||
center: () => centreOf(editor.shaderEditor.canvas),
|
||
snapping: () => editor.shaderEditor.canvas.snapEnabled,
|
||
snapButton: () => snapButton(editor.shaderEditor.snap),
|
||
/** The panel beside the graph (#168): what it shows, its clock and the sliders' values. */
|
||
preview: () => ({
|
||
...editor.shaderEditor.controls,
|
||
holding: editor.shaderEditor.preview.holding,
|
||
seconds: Math.round(editor.shaderEditor.preview.time * 100) / 100,
|
||
}),
|
||
previewRect: () => rectOf(editor.shaderEditor.preview),
|
||
/** Where the picture sits inside the panel, in screen pixels. */
|
||
pictureRect: () => editor.shaderEditor.preview.pictureRect,
|
||
sliderAt: (key: string) => {
|
||
const slider = editor.shaderEditor.sliderOf(key);
|
||
return slider ? rectOf(slider) : null;
|
||
},
|
||
splitterAt: () => centreOf(editor.shaderEditor.splitter),
|
||
hold: (at: number | null) => editor.shaderEditor.hold(at),
|
||
},
|
||
};
|
||
}
|