Fix Junction points post processor

Signed-off-by: Guillaume Fontorbe <[email protected]>
eclipse-sprotty · Apr 29, 2024 · 7604624 · 7604624
1 parent 0c679d4
commit 7604624
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/packages/sprotty/src/features/edge-junction/di.config.ts b/packages/sprotty/src/features/edge-junction/di.config.ts
@@ -24,6 +24,7 @@ const edgeJunctionModule = new ContainerModule(bind => {
     bind(TYPES.IEdgeRoutePostprocessor).toService(JunctionFinder);
     bind(JunctionPostProcessor).toSelf().inSingletonScope();
     bind(TYPES.IVNodePostprocessor).toService(JunctionPostProcessor);
+    bind(TYPES.HiddenVNodePostprocessor).toService(JunctionPostProcessor);
 });
 
 export default edgeJunctionModule;
diff --git a/packages/sprotty/src/features/edge-junction/junction-postprocessor.ts b/packages/sprotty/src/features/edge-junction/junction-postprocessor.ts
@@ -17,7 +17,7 @@
 import { injectable, inject } from "inversify";
 import { IVNodePostprocessor } from "../../base/views/vnode-postprocessor";
 import { VNode } from "snabbdom";
-import { Action } from "sprotty-protocol";
+import { Action, RequestBoundsAction } from "sprotty-protocol";
 import { SModelElementImpl } from "../../base/model/smodel";
 import { TYPES } from "../../base/types";
 import { ViewerOptions } from "../../base/views/viewer-options";
@@ -34,10 +34,17 @@ export class JunctionPostProcessor implements IVNodePostprocessor {
         return vnode;
     }
     postUpdate(cause?: Action | undefined): void {
-        const baseDiv = this.viewerOptions.baseDiv;
-        const svg = document.querySelector(`#${baseDiv} > svg > g`);
+        let targetDiv: string = this.viewerOptions.baseDiv;
+        let junctionSelector = `#${targetDiv} > svg > g > g.sprotty-junction`;
+
+        if (cause?.kind === RequestBoundsAction.KIND) {
+            targetDiv = this.viewerOptions.hiddenDiv;
+            junctionSelector = `#${targetDiv} > svg > g > g > g.sprotty-junction`;
+        }
+
+        const svg = document.querySelector(`#${targetDiv} > svg > g`);
         if (svg) {
-            const junctionGroups = Array.from(document.querySelectorAll('g.sprotty-junction'));
+            const junctionGroups = Array.from(document.querySelectorAll(junctionSelector));
 
             junctionGroups.forEach(junctionGroup => {
                 junctionGroup.remove();

diff --git a/packages/sprotty/src/index.ts b/packages/sprotty/src/index.ts
@@ -113,6 +113,7 @@ export * from './features/edge-intersection/intersection-finder';
 export * from './features/edge-intersection/sweepline';
 
 export * from './features/edge-junction/junction-finder';
+export * from './features/edge-junction/junction-postprocessor';
 
 export * from './features/move/model';
 export * from './features/move/move';