Skip to content
Merged
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
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@mui/material": "^5.18.0",
"@mui/x-charts": "^7.29.1",
"@mui/x-tree-view": "^7.29.1",
"@powsybl/network-viewer": "1.11.0",
"@powsybl/network-viewer": "1.12.0",
"@reduxjs/toolkit": "^2.9.0",
"@svgdotjs/svg.js": "^3.2.4",
"@xyflow/react": "^12.8.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
DiagramMetadata,
OnToggleNadHoverCallbackType,
OnSelectNodeCallbackType,
NadViewerParametersOptions,
} from '@powsybl/network-viewer';
import LinearProgress from '@mui/material/LinearProgress';
import Box from '@mui/material/Box';
Expand Down Expand Up @@ -293,41 +294,32 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {

useLayoutEffect(() => {
if (props.svg && svgRef.current) {
const nadViewerParameters: NadViewerParametersOptions = {
minWidth: MIN_WIDTH,
minHeight: MIN_HEIGHT,
maxWidth: MAX_WIDTH_NETWORK_AREA_DIAGRAM,
maxHeight: MAX_HEIGHT_NETWORK_AREA_DIAGRAM,
enableDragInteraction: isEditNadMode,
enableLevelOfDetail: true,
zoomLevels: NAD_ZOOM_LEVELS,
addButtons: false,
onMoveNodeCallback: onMoveNodeCallback,
onMoveTextNodeCallback: onMoveTextNodeCallback,
onSelectNodeCallback: OnLeftClickCallback,
onToggleHoverCallback: OnToggleHoverCallback,
onRightClickCallback: showEquipmentMenu,
initialViewBox: diagramViewerRef?.current?.getViewBox(),
};
const diagramViewer = new NetworkAreaDiagramViewer(
svgRef.current,
props.svg,
props.svgMetadata ?? null,
MIN_WIDTH,
MIN_HEIGHT,
MAX_WIDTH_NETWORK_AREA_DIAGRAM,
MAX_HEIGHT_NETWORK_AREA_DIAGRAM,
onMoveNodeCallback,
onMoveTextNodeCallback,
OnLeftClickCallback,
isEditNadMode,
true,
NAD_ZOOM_LEVELS,
OnToggleHoverCallback,
showEquipmentMenu,
false
nadViewerParameters
);

// Update the diagram-pane's list of sizes with the width and height from the backend
diagramSizeSetter(diagramId, props.svgType, diagramViewer.getWidth(), diagramViewer.getHeight());

// If a previous diagram was loaded and the diagram's size remained the same, we keep
// the user's zoom and scroll state for the current render.
if (
diagramViewerRef.current &&
diagramViewer.getWidth() === diagramViewerRef.current.getWidth() &&
diagramViewer.getHeight() === diagramViewerRef.current.getHeight()
) {
const viewBox = diagramViewerRef.current.getViewBox();
if (viewBox) {
diagramViewer.setViewBox(viewBox);
}
}

// Repositioning the nodes with specified positions
if (props.customPositions.length > 0) {
props.customPositions.forEach((position) => {
Expand Down
Loading