Merge branch 'main' into upgrade_lib_uuid_to_13.0.0

Author: FranckLecuyer

src/components/grid-layout/cards/diagrams/diagram-styles.ts

@@ -99,6 +99,10 @@ export const styles = {
         '& .nad-text-nodes': {
             display: 'none',
         },
+        '& .nad-busnode-highlight': {
+            filter: 'unset !important',
+            transform: 'unset !important',
+        },
     },
     paperBorders: (theme: Theme) => ({
         borderLeft: '1px solid ' + theme.palette.action.disabled,

src/components/grid-layout/cards/diagrams/networkAreaDiagram/network-area-diagram-content.tsx

@@ -140,6 +140,10 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
 
     const OnToggleHoverCallback: OnToggleNadHoverCallbackType = useCallback(
         (shouldDisplay: boolean, mousePosition: Point | null, equipmentId: string, equipmentType: string) => {
+            // Do not show the hover in edit mode
+            if (isEditNadMode) {
+                return;
+            }
             if (mousePosition) {
                 const anchorPosition = {
                     top: mousePosition.y + 10,
@@ -160,7 +164,7 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
             }
         },
 
-        [setShouldDisplayTooltip, setAnchorPosition]
+        [setShouldDisplayTooltip, setAnchorPosition, isEditNadMode]
     );
 
     const OnLeftClickCallback: OnSelectNodeCallbackType = useCallback(
@@ -303,7 +307,7 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) {
                 isEditNadMode,
                 true,
                 NAD_ZOOM_LEVELS,
-                isEditNadMode ? null : OnToggleHoverCallback,
+                OnToggleHoverCallback,
                 showEquipmentMenu,
                 false
             );

src/nad-index.css

@@ -276,6 +276,9 @@ g.nad-disconnected > g.nad-disconnected {
     z-index: 99999;
     border: 2px solid #90929477;
 }
+.nad-busnode-highlight {
+    transform: scale(1.12);
+}
 :is(.nad-zoom-0) .nad-busnode-highlight {
     transform: scale(1.12);
 }