From a6e979f87cb56b4b10c3dbc20c0293bdb3b48253 Mon Sep 17 00:00:00 2001 From: BOUTIER Charly Date: Fri, 19 Sep 2025 16:09:39 +0200 Subject: [PATCH 1/2] Fix the mouse cursors on NADs Signed-off-by: BOUTIER Charly --- .../grid-layout/cards/diagrams/diagram-styles.ts | 14 ++++++++++++++ .../network-area-diagram-content.tsx | 3 ++- src/nad-index.css | 8 ++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/components/grid-layout/cards/diagrams/diagram-styles.ts b/src/components/grid-layout/cards/diagrams/diagram-styles.ts index f98dcb725f..27c65314be 100644 --- a/src/components/grid-layout/cards/diagrams/diagram-styles.ts +++ b/src/components/grid-layout/cards/diagrams/diagram-styles.ts @@ -104,6 +104,20 @@ export const styles = { transform: 'unset !important', }, }, + nadDefaultCursors: { + '& .nad-branch-edges .nad-edge-path, & .nad-3wt-edges .nad-edge-path, & .nad-branch-edges .nad-winding, & .nad-3wt-nodes .nad-winding, & .nad-edge-infos': + { + cursor: 'pointer', + }, + }, + nadEditModeCursors: { + '& .nad-label-box': { + cursor: 'grab', + }, + '& .nad-edge-infos': { + cursor: 'default', + }, + }, paperBorders: (theme) => ({ borderLeft: '1px solid ' + theme.palette.action.disabled, borderBottom: '1px solid ' + theme.palette.action.disabledBackground, diff --git a/src/components/grid-layout/cards/diagrams/networkAreaDiagram/network-area-diagram-content.tsx b/src/components/grid-layout/cards/diagrams/networkAreaDiagram/network-area-diagram-content.tsx index d02df3af27..5cf3924f3a 100644 --- a/src/components/grid-layout/cards/diagrams/networkAreaDiagram/network-area-diagram-content.tsx +++ b/src/components/grid-layout/cards/diagrams/networkAreaDiagram/network-area-diagram-content.tsx @@ -393,7 +393,8 @@ function NetworkAreaDiagramContent(props: NetworkAreaDiagramContentProps) { styles.divDiagram, styles.divNetworkAreaDiagram, loadFlowStatus !== RunningStatus.SUCCEED ? styles.divDiagramInvalid : undefined, - isEditNadMode && !showLabels ? styles.hideLabels : undefined + isEditNadMode && !showLabels ? styles.hideLabels : undefined, + isEditNadMode ? styles.nadEditModeCursors : styles.nadDefaultCursors )} /> Date: Mon, 22 Sep 2025 13:54:18 +0200 Subject: [PATCH 2/2] PR Review Signed-off-by: BOUTIER Charly --- src/components/grid-layout/cards/diagrams/diagram-styles.ts | 4 ++-- src/index.css | 2 ++ src/nad-index.css | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/grid-layout/cards/diagrams/diagram-styles.ts b/src/components/grid-layout/cards/diagrams/diagram-styles.ts index 27c65314be..1dbd74c7d7 100644 --- a/src/components/grid-layout/cards/diagrams/diagram-styles.ts +++ b/src/components/grid-layout/cards/diagrams/diagram-styles.ts @@ -107,11 +107,11 @@ export const styles = { nadDefaultCursors: { '& .nad-branch-edges .nad-edge-path, & .nad-3wt-edges .nad-edge-path, & .nad-branch-edges .nad-winding, & .nad-3wt-nodes .nad-winding, & .nad-edge-infos': { - cursor: 'pointer', + cursor: 'context-menu', }, }, nadEditModeCursors: { - '& .nad-label-box': { + '& .nad-label-box, & .nad-vl-nodes .nad-busnode': { cursor: 'grab', }, '& .nad-edge-infos': { diff --git a/src/index.css b/src/index.css index c02ac4d50a..b82403d03e 100644 --- a/src/index.css +++ b/src/index.css @@ -162,6 +162,7 @@ code { stroke: none; fill: black; font: 11px 'Verdana'; + cursor: context-menu !important; } .sld-graph-label { stroke: none; @@ -300,6 +301,7 @@ code { .sld-voltage-level:has(circle.sld-bus-8:hover, .sld-bus-8.sld-busbar-section:hover) .sld-bus-8.sld-busbar-section, .sld-voltage-level:has(circle.sld-bus-9:hover, .sld-bus-9.sld-busbar-section:hover) .sld-bus-9.sld-busbar-section { stroke-width: 5px; + cursor: context-menu !important; } .sld-voltage-level:has(circle.sld-bus-0:hover, .sld-bus-0.sld-busbar-section:hover) .sld-bus-0.sld-wire, .sld-voltage-level:has(circle.sld-bus-1:hover, .sld-bus-1.sld-busbar-section:hover) .sld-bus-1.sld-wire, diff --git a/src/nad-index.css b/src/nad-index.css index c72d05cdb0..924f409b62 100644 --- a/src/nad-index.css +++ b/src/nad-index.css @@ -63,7 +63,7 @@ foreignObject.nad-text-nodes { width: max-content; padding: 10px; border-radius: 10px; - cursor: pointer; + cursor: default; border: 2px solid rgba(0,0,0,0); } .nad-legend-square {