Skip to content

nad-viewer: Drop nad-edge-infos from the SVG in adaptiveTextZoom mode at init #424

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

Open
sBouzols wants to merge 5 commits into
base: main
Choose a base branch
from
Open

nad-viewer: Drop nad-edge-infos from the SVG in adaptiveTextZoom mode at init #424

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39a7174
fix(nad-viewer): Drop nad-edge-infos from the SVG in adaptiveTextZoom…
sBouzols Jul 9, 2026
2712da1
update message from review
sBouzols Jul 9, 2026
d51f85b
replace existing edge infos section if exists
sBouzols Jul 10, 2026
58c4387
Merge branch 'main' into fix_adaptiveTextZoom_incompatibility_svg_wit…
sBouzols Jul 10, 2026
7848320
Merge branch 'main' into fix_adaptiveTextZoom_incompatibility_svg_wit…
sBouzols Jul 15, 2026
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
29 changes: 24 additions & 5 deletions packages/network-viewer-core/src/network-area-diagram-viewer/network-area-diagram-viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
return this.enableDragInteraction || this.onRightClickCallback != null || this.onSelectNodeCallback != null;
}

public init() {

Check failure on line 329 in packages/network-viewer-core/src/network-area-diagram-viewer/network-area-diagram-viewer.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this function to reduce its Cognitive Complexity from 19 to the 15 allowed. 


See more on https://sonarcloud.io/project/issues?id=powsybl_powsybl-network-viewer&issues=AZ9GwBgJuvxbwEcy-UdJ&open=AZ9GwBgJuvxbwEcy-UdJ&pullRequest=424
if (!this.container || !this.svgContent) return;

const dimensions: Dimensions | null = this.getDimensionsFromSvg();
Expand Down Expand Up @@ -377,7 +377,21 @@

this.textNodesSection = this.getOrCreateTextNodesSection();
this.textEdgesSection = this.getOrCreateTextEdgesSection();
this.edgeInfosSection = this.getOrCreateEdgeInfosSection();
// Ignore nad-edge-infos from the SVG in the AdaptiveTextZoom mode at init
// It will be fullfilled later in the updateAdaptiveEdgeInfos
if (this.nadViewerParameters.getAdaptiveTextZoom().enabled) {
// if the nad-edge-infos section exists in the SVG, replace it by an empty one
const existingEdgeInfos = <SVGElement>this.innerSvg?.querySelector(':scope > g.nad-edge-infos');
if (existingEdgeInfos) {
existingEdgeInfos.remove();
console.warn(
'AdaptiveTextZoom mode activated: creating nad-edge-infos from metadata and ignoring it from the SVG'
);
}
this.edgeInfosSection = this.createEmptyEdgeInfosSection();
} else {
this.edgeInfosSection = this.getOrCreateEdgeInfosSection();
}

// add events
const hasMetadata = this.diagramMetadata !== null;
Expand Down Expand Up @@ -502,12 +516,17 @@
return legendEdgesSection;
}

private createEmptyEdgeInfosSection(): SVGElement {
const edgeInfos = document.createElementNS('http://www.w3.org/2000/svg', 'g');
edgeInfos.classList.add('nad-edge-infos');
this.innerSvg?.appendChild(edgeInfos);
return edgeInfos;
}

private getOrCreateEdgeInfosSection(): SVGElement {
let edgeInfos = <SVGElement>this.innerSvg?.querySelector(':scope > g.nad-edge-infos');
const edgeInfos = <SVGElement>this.innerSvg?.querySelector(':scope > g.nad-edge-infos');
if (!edgeInfos) {
edgeInfos = document.createElementNS('http://www.w3.org/2000/svg', 'g');
edgeInfos.classList.add('nad-edge-infos');
this.innerSvg?.appendChild(edgeInfos);
return this.createEmptyEdgeInfosSection();
}
return edgeInfos;
}
Expand Down
Loading