Skip to content
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.

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

[4206] Improve performance of diagram viewport change #4207

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ page[size]=3` will ask for the 3 projects following the one identified by the UR
Note that you can retrieve the URL of a page in the response header of `GET /api/rest/projects`.
Note that you may need to encode special characters like `[`(by `%5B`) and `]` (by `%5D`) in your requests.
- https://github.com/eclipse-sirius/sirius-web/issues/4381[#4381] [trees] Set activeFilterIds variable in DefaultExpandAllTreePathHandler.
- https://github.com/eclipse-sirius/sirius-web/issues/4206[#4206] [diagram] Improve performance of diagram viewport change


== v2025.1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*******************************************************************************
* Copyright (c) 2024 Obeo and others.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/

import type { ReactFlowState } from '@xyflow/react';
import { useStore } from '@xyflow/react';
import { shallow } from 'zustand/shallow';

const viewportZoomSelector = (state: ReactFlowState) => state.transform[2];

export function useViewportZoom(): number {
return useStore(viewportZoomSelector, shallow);
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
import { useRef, RefObject } from 'react';
import { useViewport } from '@xyflow/react';
import { RefObject, useRef } from 'react';
import Draggable, { DraggableData } from 'react-draggable';
import { useViewportZoom } from '../core/useViewportZoom';
import { BendPointProps, TemporaryBendPointProps } from './BendPoint.types';

export const BendPoint = ({ x, y, index, onDrag, onDragStop, onDoubleClick }: BendPointProps) => {
const { zoom } = useViewport();
const zoom = useViewportZoom();
const nodeRef = useRef<SVGCircleElement>(null);

return (
Expand All @@ -39,7 +39,7 @@ export const BendPoint = ({ x, y, index, onDrag, onDragStop, onDoubleClick }: Be
};

export const TemporaryBendPoint = ({ x, y, index, onDrag, onDragStop }: TemporaryBendPointProps) => {
const { zoom } = useViewport();
const zoom = useViewportZoom();
const nodeRef = useRef<SVGCircleElement>(null);
return (
<Draggable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
* Obeo - initial API and implementation
*******************************************************************************/
import { useMultiToast } from '@eclipse-sirius/sirius-components-core';
import { Edge, Node, useReactFlow, useViewport } from '@xyflow/react';
import { Edge, Node, useReactFlow } from '@xyflow/react';
import { LayoutOptions } from 'elkjs/lib/elk-api';
import ELK, { ElkLabel, ElkNode } from 'elkjs/lib/elk.bundled';
import { useContext } from 'react';
import { DiagramContext } from '../../contexts/DiagramContext';
import { DiagramContextValue } from '../../contexts/DiagramContext.types';
import { useDiagramDescription } from '../../contexts/useDiagramDescription';
import { useViewportZoom } from '../core/useViewportZoom';
import { EdgeData, NodeData } from '../DiagramRenderer.types';
import { ListNodeData } from '../node/ListNode.types';
import { DiagramNodeType } from '../node/NodeTypes.types';
Expand Down Expand Up @@ -119,7 +120,7 @@ const computeLabels = (

export const useArrangeAll = (reactFlowWrapper: React.MutableRefObject<HTMLDivElement | null>): UseArrangeAllValue => {
const { getNodes, getEdges, setNodes, setEdges } = useReactFlow<Node<NodeData>, Edge<EdgeData>>();
const viewport = useViewport();
const zoom = useViewportZoom();
const { layout } = useLayout();
const { synchronizeLayoutData } = useSynchronizeLayoutData();
const { diagramDescription } = useDiagramDescription();
Expand All @@ -140,7 +141,7 @@ export const useArrangeAll = (reactFlowWrapper: React.MutableRefObject<HTMLDivEl
id: parentNodeId,
layoutOptions: options,
children: nodes.map((node) => ({
labels: computeLabels(node, viewport.zoom, reactFlowWrapper),
labels: computeLabels(node, zoom, reactFlowWrapper),
...node,
})),
edges,
Expand Down Expand Up @@ -182,11 +183,7 @@ export const useArrangeAll = (reactFlowWrapper: React.MutableRefObject<HTMLDivEl
layoutedAllNodes = [...layoutedAllNodes, ...nodes.reverse()];
continue;
}
const headerVerticalFootprint: number = computeHeaderVerticalFootprint(
parentNode,
viewport.zoom,
reactFlowWrapper
);
const headerVerticalFootprint: number = computeHeaderVerticalFootprint(parentNode, zoom, reactFlowWrapper);
const subGroupNodes: Node<NodeData>[] = nodes
.filter((node) => !node.data.isBorderNode)
.map((node) => {
Expand Down
Loading