Skip to content

Logic for showing, scaling or hiding the tag on an edge depending on the details level of the graph #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeff-phillips-18 merged 3 commits into from
Dec 13, 2023
Merged

Logic for showing, scaling or hiding the tag on an edge depending on the details level of the graph #123

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b749f7a
Logic of showing, scaling or hiding the tag on an edge depending on t…
leandroberetta Dec 1, 2023
b7c2898
Update packages/module/src/components/edges/DefaultEdge.tsx
leandroberetta Dec 7, 2023
a0f9c53
Update packages/module/src/components/edges/DefaultEdge.tsx
leandroberetta Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions packages/module/src/components/edges/DefaultEdge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as _ from 'lodash';
import { observer } from 'mobx-react';
import { Edge, EdgeTerminalType, GraphElement, isEdge, isNode, NodeStatus } from '../../types';
import { Edge, EdgeTerminalType, GraphElement, isEdge, isNode, NodeStatus, ScaleDetailsLevel } from '../../types';
import { ConnectDragSource, OnSelect } from '../../behavior';
import { getClosestVisibleParent, useHover } from '../../utils';
import { Layer } from '../layers';
Expand All @@ -13,6 +13,7 @@ import { TOP_LAYER } from '../../const';
import DefaultConnectorTag from './DefaultConnectorTag';
import { Point } from '../../geom';
import { getConnectorStartPoint } from './terminals/terminalUtils';
import { useDetailsLevel } from '../../hooks';

interface DefaultEdgeProps {
/** Additional content added to the edge */
Expand Down Expand Up @@ -112,6 +113,8 @@ const DefaultEdgeInner: React.FunctionComponent<DefaultEdgeInnerProps> = observe
return null;
}

const detailsLevel = useDetailsLevel();

const groupClassName = css(
styles.topologyEdge,
className,
Expand All @@ -126,9 +129,8 @@ const DefaultEdgeInner: React.FunctionComponent<DefaultEdgeInnerProps> = observe

const bendpoints = element.getBendpoints();

const d = `M${startPoint.x} ${startPoint.y} ${bendpoints.map((b: Point) => `L${b.x} ${b.y} `).join('')}L${
endPoint.x
} ${endPoint.y}`;
const d = `M${startPoint.x} ${startPoint.y} ${bendpoints.map((b: Point) => `L${b.x} ${b.y} `).join('')}L${endPoint.x
} ${endPoint.y}`;

const bgStartPoint =
!startTerminalType || startTerminalType === EdgeTerminalType.none
Expand All @@ -141,6 +143,11 @@ const DefaultEdgeInner: React.FunctionComponent<DefaultEdgeInnerProps> = observe
const backgroundPath = `M${bgStartPoint[0]} ${bgStartPoint[1]} ${bendpoints
.map((b: Point) => `L${b.x} ${b.y} `)
.join('')}L${bgEndPoint[0]} ${bgEndPoint[1]}`;

const showTag = tag && (detailsLevel === ScaleDetailsLevel.high || hover);
const scale = element.getGraph().getScale();
const tagScale = hover && !(detailsLevel === ScaleDetailsLevel.high) ? Math.max(1, 1 / scale) : 1;
const tagPositionScale = hover && !(detailsLevel === ScaleDetailsLevel.high) ? Math.min(1, scale) : 1;

return (
<Layer id={dragging || hover ? TOP_LAYER : undefined}>
Expand All @@ -158,14 +165,16 @@ const DefaultEdgeInner: React.FunctionComponent<DefaultEdgeInnerProps> = observe
onMouseLeave={onHideRemoveConnector}
/>
<path className={linkClassName} d={d} style={{ animationDuration: `${edgeAnimationDuration}s` }} />
{tag && (
<DefaultConnectorTag
className={tagClass}
startPoint={element.getStartPoint()}
endPoint={element.getEndPoint()}
tag={tag}
status={tagStatus}
/>
{showTag && (
<g transform={`scale(${hover ? tagScale : 1})`}>
<DefaultConnectorTag
className={tagClass}
startPoint={element.getStartPoint().scale(tagPositionScale)}
endPoint={element.getEndPoint().scale(tagPositionScale)}
tag={tag}
status={tagStatus}
/>
</g>
)}
<DefaultConnectorTerminal
className={startTerminalClass}
Expand Down Expand Up @@ -193,7 +202,7 @@ const DefaultEdgeInner: React.FunctionComponent<DefaultEdgeInnerProps> = observe
);
});

const DefaultEdge: React.FunctionComponent<DefaultEdgeProps>= ({
const DefaultEdge: React.FunctionComponent<DefaultEdgeProps> = ({
element,
startTerminalType = EdgeTerminalType.none,
startTerminalSize = 14,
Expand Down