Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scale node labels with the node's size. #1773

Merged
merged 5 commits into from
Aug 10, 2016
+42 −14
Merged

Scale node labels with the node's size. #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5846222
Scale node labels with the node's size.
foot Aug 9, 2016
564c64e
Fixes truncating of labels
foot Aug 9, 2016
8f4b3ab
Fixes animation of node labels on focus.
foot Aug 9, 2016
4d5d0d5
Fixes origin of node-details-panel expanding animation
foot Aug 9, 2016
5cf8ee2
Move chrome-css-fix out of js into css w/ comment
foot Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions client/app/scripts/charts/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ import NodeShapeHex from './node-shape-hex';
import NodeShapeHeptagon from './node-shape-heptagon';
import NodeShapeCloud from './node-shape-cloud';
import NodeNetworksOverlay from './node-networks-overlay';
import { MIN_NODE_LABEL_SIZE, BASE_NODE_LABEL_SIZE, BASE_NODE_SIZE } from '../constants/styles';


function labelFontSize(nodeSize) {
return Math.max(MIN_NODE_LABEL_SIZE, (BASE_NODE_LABEL_SIZE / BASE_NODE_SIZE) * nodeSize);
}

function stackedShape(Shape) {
const factory = React.createFactory(NodeShapeStack);
Expand Down Expand Up @@ -56,6 +62,7 @@ class Node extends React.Component {
this.handleMouseClick = this.handleMouseClick.bind(this);
this.handleMouseEnter = this.handleMouseEnter.bind(this);
this.handleMouseLeave = this.handleMouseLeave.bind(this);
this.saveShapeRef = this.saveShapeRef.bind(this);
this.state = {
hovered: false,
matched: false
Expand All @@ -77,18 +84,18 @@ class Node extends React.Component {

render() {
const { blurred, focused, highlighted, label, matches = makeMap(), networks,
pseudo, rank, subLabel, scaleFactor, transform, zoomScale, exportingGraph,
pseudo, rank, subLabel, scaleFactor, transform, exportingGraph,
showingNetworks, stack } = this.props;
const { hovered, matched } = this.state;
const nodeScale = focused ? this.props.selectedNodeScale : this.props.nodeScale;

const color = getNodeColor(rank, label, pseudo);
const truncate = !focused && !hovered;
const labelTransform = focused ? `scale(${1 / zoomScale})` : '';
const labelWidth = nodeScale(scaleFactor * 3);
const labelOffsetX = -labelWidth / 2;
const labelDy = (showingNetworks && networks) ? 0.75 : 0.60;
const labelOffsetY = focused ? nodeScale(labelDy) : nodeScale(labelDy * scaleFactor);
const labelOffsetY = nodeScale(labelDy * scaleFactor);
const networkOffset = nodeScale(scaleFactor * 0.67);

const nodeClassName = classnames('node', {
highlighted,
Expand All @@ -104,7 +111,7 @@ class Node extends React.Component {
const NodeShapeType = getNodeShape(this.props);
const useSvgLabels = exportingGraph;
const size = nodeScale(scaleFactor);
const networkOffset = focused ? nodeScale(scaleFactor * 0.67) : nodeScale(0.67);
const fontSize = labelFontSize(size);
const mouseEvents = {
onClick: this.handleMouseClick,
onMouseEnter: this.handleMouseEnter,
Expand All @@ -119,8 +126,10 @@ class Node extends React.Component {
svgLabels(label, subLabel, labelClassName, subLabelClassName, labelOffsetY) :

<foreignObject style={{pointerEvents: 'none'}} x={labelOffsetX} y={labelOffsetY}
width={labelWidth} height="100em" transform={labelTransform}>
<div className="node-label-wrapper" style={{pointerEvents: 'all'}} {...mouseEvents}>
width={labelWidth} height="100em">
<div className="node-label-wrapper"
style={{pointerEvents: 'all', fontSize, maxWidth: labelWidth}}
{...mouseEvents}>
<div className={labelClassName}>
<MatchedText text={label} match={matches.get('label')} />
</div>
Expand All @@ -131,7 +140,7 @@ class Node extends React.Component {
</div>
</foreignObject>}

<g {...mouseEvents}>
<g {...mouseEvents} ref={this.saveShapeRef}>
<NodeShapeType
size={size}
color={color}
Expand All @@ -144,10 +153,14 @@ class Node extends React.Component {
);
}

saveShapeRef(ref) {
this.shapeRef = ref;
}

handleMouseClick(ev) {
ev.stopPropagation();
this.props.clickNode(this.props.id, this.props.label,
ReactDOM.findDOMNode(this).getBoundingClientRect());
ReactDOM.findDOMNode(this.shapeRef).getBoundingClientRect());
}

handleMouseEnter() {
Expand Down
4 changes: 2 additions & 2 deletions client/app/scripts/charts/nodes-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import timely from 'timely';

import { clickBackground } from '../actions/app-actions';
import { EDGE_ID_SEPARATOR } from '../constants/naming';
import { DETAILS_PANEL_WIDTH } from '../constants/styles';
import { DETAILS_PANEL_WIDTH, MAX_NODE_SIZE } from '../constants/styles';
import Logo from '../components/logo';
import { doLayout } from './nodes-layout';
import NodesChartElements from './nodes-chart-elements';
Expand Down Expand Up @@ -370,7 +370,7 @@ class NodesChart extends React.Component {
getNodeScale(nodes, width, height) {
const expanse = Math.min(height, width);
const nodeSize = expanse / 3; // single node should fill a third of the screen
const maxNodeSize = expanse / 10;
const maxNodeSize = Math.min(MAX_NODE_SIZE, expanse / 10);
const normalizedNodeSize = Math.min(nodeSize / Math.sqrt(nodes.size), maxNodeSize);
return this.state.nodeScale.copy().range([0, normalizedNodeSize]);
}
Expand Down
8 changes: 8 additions & 0 deletions client/app/scripts/constants/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,11 @@ export const CANVAS_MARGINS = {
right: 40,
bottom: 100,
};

//
// The base size the shapes were defined at matches nicely w/ a 14px font.
//
export const BASE_NODE_SIZE = 64;
export const MAX_NODE_SIZE = 96;
export const BASE_NODE_LABEL_SIZE = 14;
export const MIN_NODE_LABEL_SIZE = BASE_NODE_LABEL_SIZE;
15 changes: 11 additions & 4 deletions client/app/styles/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,15 @@ h2 {

.node-label {
color: @text-color;
font-size: 14px;
}

.node-label-wrapper {

//
// Base line height doesn't hop across foreignObject =/
//
line-height: 150%;

//
// inline-block so wrapper is only as wide as content.
//
Expand All @@ -390,7 +395,7 @@ h2 {

.node-sublabel {
color: @text-secondary-color;
font-size: 12px;
font-size: 0.85em;
}

&.hovered {
Expand Down Expand Up @@ -547,7 +552,7 @@ h2 {
text-align: center;

&-match {
font-size: 0.7rem;
font-size: 0.8em;

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view


&-wrapper {
display: inline-block;
Expand All @@ -564,7 +569,7 @@ h2 {

&-more {
text-transform: uppercase;
font-size: 0.6rem;
font-size: 0.7em;
color: darken(@weave-blue, 10%);
margin-top: -2px;
}
Expand Down Expand Up @@ -1162,6 +1167,7 @@ h2 {
}

&-wrapper {
pointer-events: all;
border-radius: @border-radius;
border: 1px solid @background-darker-color;
display: inline-block;
Expand Down Expand Up @@ -1275,6 +1281,7 @@ h2 {
font-size: .7rem;
border-radius: 8px;
border: 1px solid transparent;
pointer-events: none;
}

.sidebar-gridmode {
Expand Down