Separating selectedElement and draggedElement, some renaming

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
powsybl · Nov 4, 2024 · adcde8f · adcde8f
1 parent e10b9e3
commit adcde8f
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 112 deletions.
diff --git a/src/components/network-area-diagram-viewer/diagram-utils.ts b/src/components/network-area-diagram-viewer/diagram-utils.ts
@@ -204,7 +204,7 @@ export function getConverterStationPolyline(
     return getFormattedPolyline(points[0], null, points[1]);
 }
 
-// get the drabbable element, if present,
+// get the draggable element, if present,
 // from the element selected using the mouse
 export function getDraggableFrom(element: SVGElement): SVGElement | undefined {
     if (isDraggable(element)) {
@@ -214,12 +214,30 @@ export function getDraggableFrom(element: SVGElement): SVGElement | undefined {
     }
 }
 
+// get the selectable element, if present,
+// from the element selected using the mouse
+export function getSelectableFrom(element: SVGElement): SVGElement | undefined {
+    if (isSelectable(element)) {
+        return element;
+    } else if (element.parentElement) {
+        return getSelectableFrom(element.parentNode as SVGElement);
+    }
+}
+
 function isDraggable(element: SVGElement): boolean {
     return (
         hasId(element) && element.parentNode != null && classIsContainerOfDraggables(element.parentNode as SVGElement)
     );
 }
 
+function isSelectable(element: SVGElement): boolean {
+    return (
+        hasId(element) &&
+        element.parentNode != null &&
+        (element.parentNode as SVGElement).classList.contains('nad-vl-nodes')
+    );
+}
+
 function hasId(element: SVGElement): boolean {
     return typeof element.id != 'undefined' && element.id != '';
 }
@@ -398,9 +416,9 @@ export function getEdgeNameAngle(point1: Point, point2: Point): number {
 }
 
 // check if a DOM element is a text node
-export function isTextNode(element: SVGGraphicsElement | null): boolean | undefined {
+export function isTextNode(element: SVGGraphicsElement | null): boolean {
     return (
-        element != null && element.parentElement != null && element.parentElement?.classList.contains('nad-text-nodes')
+        element != null && element.parentElement != null && element.parentElement.classList.contains('nad-text-nodes')
     );
 }