Skip to content

Fix(topology): Fix error when a group has no visible children #7304

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
tlabaj merged 1 commit into from
Apr 29, 2022
Merged

Fix(topology): Fix error when a group has no visible children #7304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions packages/react-styles/src/css/components/Topology/topology-components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,9 @@
stroke: var(--edge--active--stroke);
}

.pf-topology__edge.pf-m-dragging {
pointer-events: none;
}
.pf-topology__edge.pf-m-dragging .pf-topology__edge__link,
.pf-topology__edge.pf-m-dragging .pf-topology-connector-arrow {
stroke: var(--edge--interactive--stroke);
Expand Down
53 changes: 21 additions & 32 deletions packages/react-topology/src/components/groups/DefaultGroupExpanded.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ const DefaultGroupExpanded: React.FunctionComponent<DefaultGroupExpandedProps> =
const isHover = hover !== undefined ? hover : hovered;
const anchorRef = useSvgAnchor();
const outlineRef = useCombineRefs(dndDropRef, anchorRef);
const children = element.getNodes().filter(c => c.isVisible());
const prevPoints = React.useRef<(PointWithSize | PointTuple)[]>();
const labelLocation = React.useRef<PointWithSize>();
const pathRef = React.useRef<string>();

let parent = element.getParent();
let altGroup = false;
Expand All @@ -117,52 +117,41 @@ const DefaultGroupExpanded: React.FunctionComponent<DefaultGroupExpandedProps> =

// cast to number and coerce
const padding = maxPadding(element.getStyle<NodeStyle>().padding ?? 17);
const hullPadding = React.useCallback((point: PointWithSize | PointTuple) => (point[2] || 0) + padding, [padding]);
const hullPadding = (point: PointWithSize | PointTuple) => (point[2] || 0) + padding;

const points: (PointWithSize | PointTuple)[] = React.useMemo(() => {
if (prevPoints.current && droppable) {
return prevPoints.current;
if (!droppable || !pathRef.current || !labelLocation.current) {
const children = element.getNodes().filter(c => c.isVisible());
if (children.length === 0) {
return null;
}
const newPoints: (PointWithSize | PointTuple)[] = [];
const points: (PointWithSize | PointTuple)[] = [];
_.forEach(children, c => {
if (c.getNodeShape() === NodeShape.ellipse || c.getNodeShape() === NodeShape.circle) {
if (c.getNodeShape() === NodeShape.circle) {
const bounds = c.getBounds();
const { width, height } = bounds;
const { x, y } = bounds.getCenter();
const radius = Math.max(width, height) / 2;
newPoints.push([x, y, radius] as PointWithSize);
points.push([x, y, radius] as PointWithSize);
} else {
// add all 4 corners
const { width, height, x, y } = c.getBounds();
newPoints.push([x, y, 0] as PointWithSize);
newPoints.push([x + width, y, 0] as PointWithSize);
newPoints.push([x, y + height, 0] as PointWithSize);
newPoints.push([x + width, y + height, 0] as PointWithSize);
points.push([x, y, 0] as PointWithSize);
points.push([x + width, y, 0] as PointWithSize);
points.push([x, y + height, 0] as PointWithSize);
points.push([x + width, y + height, 0] as PointWithSize);
}
});
if (!_.isEqual(prevPoints.current, newPoints)) {
prevPoints.current = newPoints;
return newPoints;
}
return prevPoints.current;
}, [children, droppable]);

const locations: { labelLocation: PointWithSize; path: string } | undefined = React.useMemo(() => {
const hullPoints: (PointWithSize | PointTuple)[] =
points.length > 2 ? polygonHull(points as PointTuple[]) : (points as PointTuple[]);
if (!hullPoints) {
return undefined;
return null;
}

// change the box only when not dragging
return {
labelLocation: computeLabelLocation(hullPoints as PointWithSize[]),
path: hullPath(hullPoints as PointTuple[], hullPadding)
};
}, [points, hullPadding]);
pathRef.current = hullPath(hullPoints as PointTuple[], hullPadding);

if (!children.length || !locations) {
return null;
// Compute the location of the group label.
labelLocation.current = computeLabelLocation(hullPoints as PointWithSize[]);
}

const groupClassName = css(
Expand All @@ -188,14 +177,14 @@ const DefaultGroupExpanded: React.FunctionComponent<DefaultGroupExpandedProps> =
<g ref={labelHoverRef} onContextMenu={onContextMenu} onClick={onSelect} className={groupClassName}>
<Layer id={GROUPS_LAYER}>
<g ref={refs} onContextMenu={onContextMenu} onClick={onSelect} className={innerGroupClassName}>
<path ref={outlineRef} className={styles.topologyGroupBackground} d={locations.path} />
<path ref={outlineRef} className={styles.topologyGroupBackground} d={pathRef.current} />
</g>
</Layer>
{showLabel && (
<NodeLabel
className={styles.topologyGroupLabel}
x={locations.labelLocation[0]}
y={locations.labelLocation[1] + hullPadding(locations.labelLocation) + 24}
x={labelLocation.current[0]}
y={labelLocation.current[1] + hullPadding(labelLocation.current) + 24}
paddingX={8}
paddingY={5}
dragRef={dragNodeRef ? dragLabelRef : undefined}
Expand Down