Grow a node with its ports, stop it flickering, draw what it reaches out to
- A node's height follows the ports on its busiest side. It is a function of the document, so `layoutGraph` reserves exactly what is drawn and nothing measured is fed back into the layout. - The three status controls now sit in slots that are there whether the control is or not. A node running many times a second mounted and unmounted the stop button on every execution, resizing the card each time. - A port bound to another flow's message is drawn as a label, naming the node at the far end and its type. Only the opposite direction was answered before. The scan behind both is now cached on the store's commit counter rather than reading every flow per request.
This commit is contained in:
@@ -15,8 +15,33 @@ export type Direction = "LR" | "TB"
|
||||
|
||||
/** `FlowNode` is `min-w-[168px] max-w-[220px]`; an endpoint is narrower. */
|
||||
const NODE_W = 220
|
||||
/** Icon row plus two text lines, as measured. */
|
||||
/** Icon row plus two text lines, as measured. The floor, not the height. */
|
||||
const NODE_H = 56
|
||||
/**
|
||||
* How much of a node's edge the ports are spread over, as a fraction.
|
||||
*
|
||||
* Shared with `FlowNode`'s `handleOffset`, which does the spreading: the
|
||||
* height below is chosen so that span has room for the ports, so the two
|
||||
* cannot be allowed to drift apart.
|
||||
*/
|
||||
export const PORT_SPAN = 0.6
|
||||
/**
|
||||
* Centre to centre between two handles. They are 12px across (`flow.css`), so
|
||||
* this leaves 6px of rim between them.
|
||||
*/
|
||||
const PORT_PITCH = 18
|
||||
|
||||
/**
|
||||
* How tall a node with this many ports on one side has to be.
|
||||
*
|
||||
* A pure function of the document — the ports are declared, so the height is
|
||||
* known before anything is drawn. That is what keeps it out of the measuring
|
||||
* problem below: nothing is fed back, so there is nothing to oscillate.
|
||||
*/
|
||||
export function nodeHeight(ports: number): number {
|
||||
return Math.max(NODE_H, Math.ceil(((ports - 1) * PORT_PITCH) / PORT_SPAN))
|
||||
}
|
||||
|
||||
/**
|
||||
* Room for the live value an edge carries (`LiveEdge`'s chip is
|
||||
* `max-w-[140px]`). Reserved on the edge itself, so dagre routes nodes around
|
||||
@@ -58,6 +83,7 @@ function build(
|
||||
edges: { source: string; target: string }[],
|
||||
direction: Direction,
|
||||
wrap: Wrap[],
|
||||
heights: Map<string, number>,
|
||||
) {
|
||||
const graph = new dagre.graphlib.Graph()
|
||||
graph.setDefaultEdgeLabel(() => ({}))
|
||||
@@ -74,7 +100,7 @@ function build(
|
||||
// Insertion order is what makes the result deterministic, so it follows the
|
||||
// document rather than whatever order the edges happen to mention nodes in.
|
||||
for (const id of ids) {
|
||||
graph.setNode(id, { width: NODE_W, height: NODE_H })
|
||||
graph.setNode(id, { width: NODE_W, height: heights.get(id) ?? NODE_H })
|
||||
}
|
||||
for (const edge of edges) {
|
||||
if (!graph.hasNode(edge.source) || !graph.hasNode(edge.target)) continue
|
||||
@@ -120,16 +146,21 @@ function wrapWideRanks(graph: ReturnType<typeof build>, ids: string[]): Wrap[] {
|
||||
/**
|
||||
* Lay the graph out and return each node's top-left corner.
|
||||
*
|
||||
* ponytail: every node is treated as 220×56 rather than measured. Measuring
|
||||
* would feed the result back into the layout and oscillate; if nodes ever grow
|
||||
* past that box, take the sizes from `node.measured` once they have settled.
|
||||
* `heights` is what a node's ports make it, from {@link nodeHeight}; anything
|
||||
* left out is the plain box. It is read from the document rather than from the
|
||||
* canvas on purpose — see that function.
|
||||
*
|
||||
* ponytail: every node is still treated as 220 wide rather than measured.
|
||||
* Measuring would feed the result back into the layout and oscillate; if nodes
|
||||
* ever grow past that, take the width from `node.measured` once it has settled.
|
||||
*/
|
||||
export function layoutGraph(
|
||||
ids: string[],
|
||||
edges: { source: string; target: string }[],
|
||||
direction: Direction,
|
||||
heights: Map<string, number> = new Map(),
|
||||
): Map<string, { x: number; y: number }> {
|
||||
let graph = build(ids, edges, direction, [])
|
||||
let graph = build(ids, edges, direction, [], heights)
|
||||
|
||||
// Running downwards, a rank wider than the screen is the one thing the
|
||||
// layout can still do something about. Wrapping one rank pushes whatever was
|
||||
@@ -142,7 +173,7 @@ export function layoutGraph(
|
||||
const more = wrapWideRanks(graph, ids)
|
||||
if (!more.length) break
|
||||
wrap.push(...more)
|
||||
graph = build(ids, edges, direction, wrap)
|
||||
graph = build(ids, edges, direction, wrap, heights)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,7 +184,7 @@ export function layoutGraph(
|
||||
return [
|
||||
id,
|
||||
node
|
||||
? { x: node.x - NODE_W / 2, y: node.y - NODE_H / 2 }
|
||||
? { x: node.x - NODE_W / 2, y: node.y - node.height / 2 }
|
||||
: { x: 0, y: 0 },
|
||||
]
|
||||
}),
|
||||
|
||||
Reference in New Issue
Block a user