From 9984777a5bd4b400ee294ef11bc200ef789a459a Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Tue, 10 May 2016 17:47:21 +0200 Subject: [PATCH] Show connected nodes on hover, even when not matched --- client/app/scripts/charts/nodes-chart-edges.js | 11 +++++++---- client/app/scripts/charts/nodes-chart-nodes.js | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/app/scripts/charts/nodes-chart-edges.js b/client/app/scripts/charts/nodes-chart-edges.js index b643d79fa..5ee081fa1 100644 --- a/client/app/scripts/charts/nodes-chart-edges.js +++ b/client/app/scripts/charts/nodes-chart-edges.js @@ -16,10 +16,13 @@ class NodesChartEdges extends React.Component { {layoutEdges.toIndexedSeq().map(edge => { const sourceSelected = selectedNodeId === edge.get('source'); const targetSelected = selectedNodeId === edge.get('target'); - const blurred = hasSelectedNode && !sourceSelected && !targetSelected - || searchQuery && !(searchNodeMatches.has(edge.get('source')) - && searchNodeMatches.has(edge.get('target'))); + const highlighted = highlightedEdgeIds.has(edge.get('id')); const focused = hasSelectedNode && (sourceSelected || targetSelected); + const blurred = !focused + && !highlighted + && (!searchQuery + || !(searchNodeMatches.has(edge.get('source')) + && searchNodeMatches.has(edge.get('target')))); return ( ); })} diff --git a/client/app/scripts/charts/nodes-chart-nodes.js b/client/app/scripts/charts/nodes-chart-nodes.js index 878e18206..8304aa634 100644 --- a/client/app/scripts/charts/nodes-chart-nodes.js +++ b/client/app/scripts/charts/nodes-chart-nodes.js @@ -22,7 +22,8 @@ class NodesChartNodes extends React.Component { || (adjacentNodes && adjacentNodes.includes(node.get('id'))))); const setBlurred = node => node.set('blurred', selectedNodeId && !node.get('focused') - || searchQuery && !searchNodeMatches.has(node.get('id'))); + || searchQuery && !searchNodeMatches.has(node.get('id')) + && !node.get('highlighted')); // make sure blurred nodes are in the background const sortNodes = node => {