Correct positioning

This commit is contained in:
Alessandro
2025-10-13 13:26:04 +02:00
parent 482b618f49
commit bb9fe4f830
6 changed files with 33 additions and 33 deletions
@@ -1,16 +1,20 @@
import { EdgeLabelRenderer, getBezierPath, BaseEdge, EdgeProps } from '@xyflow/react'; import { getBezierPath, BaseEdge, EdgeProps, useReactFlow } from '@xyflow/react';
import { EdgeToolbar } from '@xyflow/react'; import { EdgeToolbar } from '@xyflow/react';
export function CustomEdge({ id, data, ...props }: EdgeProps) { export function CustomEdge({ id, data, ...props }: EdgeProps) {
const [edgePath, labelX, labelY] = getBezierPath(props); const [edgePath, labelX, labelY] = getBezierPath(props);
const { setEdges } = useReactFlow();
const deleteEdge = () => {
setEdges((edges) => edges.filter((edge) => edge.id !== id));
};
return ( return (
<> <>
<BaseEdge id={id} path={edgePath} /> <BaseEdge id={id} path={edgePath} />
<EdgeToolbar edgeId={id} labelX={labelX} labelY={labelY}> <EdgeToolbar edgeId={id} labelX={labelX} labelY={labelY} isVisible>
<button>delete</button> <button onClick={deleteEdge}>Delete</button>
<button>edit</button>
</EdgeToolbar> </EdgeToolbar>
</> </>
); );
@@ -1,15 +0,0 @@
import { NodeToolbar, ReactFlowState, useStore } from '@xyflow/react';
const selectedNodesSelector = (state: ReactFlowState) =>
state.nodes.filter((node) => node.selected).map((node) => node.id);
export default function SelectedNodesToolbar() {
const selectedNodeIds = useStore(selectedNodesSelector);
const isVisible = selectedNodeIds.length > 1;
return (
<NodeToolbar nodeId={selectedNodeIds} isVisible={isVisible}>
<button>Selection action</button>
</NodeToolbar>
);
}
@@ -13,7 +13,6 @@ import {
} from '@xyflow/react'; } from '@xyflow/react';
import { CustomEdge } from './CustomEdge'; import { CustomEdge } from './CustomEdge';
import SelectedNodesToolbar from './SelectedNodesToolbar';
const edgeTypes: EdgeTypes = { const edgeTypes: EdgeTypes = {
custom: CustomEdge, custom: CustomEdge,
@@ -80,7 +79,6 @@ export default function EdgeToolbarExample() {
<Background variant={BackgroundVariant.Dots} /> <Background variant={BackgroundVariant.Dots} />
<MiniMap /> <MiniMap />
<Controls /> <Controls />
<SelectedNodesToolbar />
</ReactFlow> </ReactFlow>
); );
} }
@@ -16,14 +16,15 @@ const storeSelector = (state: ReactFlowState) => ({
export function EdgeToolbar({ export function EdgeToolbar({
edgeId, edgeId,
labelX, x,
labelY, y,
children, children,
className, className,
style, style,
isVisible, isVisible,
position = Position.Top, position = Position.Top,
offset = 10, offsetX = 0,
offsetY = 0,
align = 'center', align = 'center',
...rest ...rest
}: EdgeToolbarProps) { }: EdgeToolbarProps) {
@@ -56,12 +57,11 @@ export function EdgeToolbar({
// TODO: how to get the z-index of an edge? // TODO: how to get the z-index of an edge?
const zIndex = edge.zIndex ?? 0 + 1; const zIndex = edge.zIndex ?? 0 + 1;
const transform = getEdgeToolbarTransform(labelX, labelY, { x, y, zoom }); const transform = getEdgeToolbarTransform(x, y, { x, y, zoom }, 120, offsetY);
console.log('transform', transform); console.log('transform', transform);
const wrapperStyle: CSSProperties = { const wrapperStyle: CSSProperties = {
position: 'absolute', position: 'absolute',
// TODO: offset // TODO: offset
// transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,
transform, transform,
zIndex, zIndex,
...style, ...style,
@@ -72,13 +72,12 @@ export function EdgeToolbar({
return ( return (
<EdgeLabelRenderer> <EdgeLabelRenderer>
<div <div
style={wrapperStyle} style={{ ...wrapperStyle, pointerEvents: 'all' }}
className={cc(['react-flow__edge-toolbar', className])} className={cc(['react-flow__edge-toolbar', className])}
{...rest} {...rest}
// @todo: check if we could only do this for non-prod envs // @todo: check if we could only do this for non-prod envs
data-id={`${edge.id} `} data-id={`${edge.id} `}
> >
aaa
{children} {children}
</div> </div>
</EdgeLabelRenderer> </EdgeLabelRenderer>
@@ -33,9 +33,17 @@ export type EdgeToolbarProps = HTMLAttributes<HTMLDivElement> & {
/** /**
* The `x` position of the edge label. * The `x` position of the edge label.
*/ */
labelX: number; x: number;
/** /**
* The `y` position of the edge label. * The `y` position of the edge label.
*/ */
labelY: number; y: number;
/**
* The `offsetX` position of the edge label relative to the edge in pixels.
*/
offsetX: number;
/**
* The `offsetY` position of the edge label relative to the edge in pixels.
*/
offsetY: number;
}; };
+9 -3
View File
@@ -1,6 +1,12 @@
import { Position, type Viewport, type Align } from '..'; import { type Viewport } from '..';
export function getEdgeToolbarTransform(labelX: number, labelY: number, viewport: Viewport): string { export function getEdgeToolbarTransform(
labelX: number,
labelY: number,
viewport: Viewport,
offsetX: number = 0,
offsetY: number = 0
): string {
// Position the toolbar at the edge label center (scaling is handled by EdgeLabelRenderer) // Position the toolbar at the edge label center (scaling is handled by EdgeLabelRenderer)
return `translate(${labelX}px, ${labelY}px)`; return `translate(${labelX + offsetX}px, ${labelY + offsetY}px) translate(-50%, -50%) scale(${1 / viewport.zoom})`;
} }