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

Jump to bottom

Making Marker height and width configurable #245

Merged
merged 6 commits into from
Oct 7, 2019
Merged

Making Marker height and width configurable #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b8f283
Making Marker height and Width configurable
Oct 5, 2019
88d485b
Reducing line size
Oct 5, 2019
d8dcb19
Adding defaults to config file
Oct 6, 2019
6bb0ded
Make markerWidth and markerHeight numbers by default. Small note on d…
danielcaldas Oct 7, 2019
859630c
Update snapshots
danielcaldas Oct 7, 2019
2e2f127
Remove old todo not from Marker.jsx
danielcaldas Oct 7, 2019
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
2 changes: 2 additions & 0 deletions sandbox/Sandbox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ export default class Sandbox extends React.Component {
.reduce(tooltipReducer, schemaProps),
height: { "ui:readonly": "true" },
width: { "ui:readonly": "true" },
"link.markerWidth": { "ui:readonly": "true" },
"link.markerHeight": { "ui:readonly": "true" },
};

this.state = {
Expand Down
6 changes: 6 additions & 0 deletions src/components/graph/graph.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@
* ```javascript
* link.strokeWidth * (1 / transform); // transform is a zoom delta Δ value
* ```
* @param {number} [link.markerHeight=6] - <a target="_blank" href="https://developer.mozilla.org/en/docs/Web/SVG/Attribute/markerHeight">markerHeight</a>
* property for the link arrowhead height. *Note: this property can only be set in the first mount, it does not update dynamically.*
* @param {number} [link.markerWidth=6] - <a target="_blank" href="https://developer.mozilla.org/en/docs/Web/SVG/Attribute/markerWidth">markerWidth</a>
* property for the link arrowhead width. *Note: this property can only be set in the first mount, it does not update dynamically.*
* @param {string} [link.type="STRAIGHT"] - the type of line to draw, available types at this point are:
* - "STRAIGHT" <small>(default)</small> - a straight line.
* - "CURVE_SMOOTH" - a slight curve between two nodes
Expand Down Expand Up @@ -266,6 +270,8 @@ export default {
renderLabel: false,
semanticStrokeWidth: false,
strokeWidth: 1.5,
markerHeight: 6,
markerWidth: 6,
type: "STRAIGHT",
},
};
17 changes: 11 additions & 6 deletions src/components/graph/graph.renderer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,19 @@ function _renderDefs() {
const medium = small + (MARKER_MEDIUM_OFFSET * config.maxZoom) / 3;
const large = small + (MARKER_LARGE_OFFSET * config.maxZoom) / 3;

const markerProps = {
markerWidth: config.link.markerWidth,
markerHeight: config.link.markerHeight,
};

cachedDefs = (
<defs>
<Marker id={MARKERS.MARKER_S} refX={small} fill={config.link.color} />
<Marker id={MARKERS.MARKER_SH} refX={small} fill={config.link.highlightColor} />
<Marker id={MARKERS.MARKER_M} refX={medium} fill={config.link.color} />
<Marker id={MARKERS.MARKER_MH} refX={medium} fill={config.link.highlightColor} />
<Marker id={MARKERS.MARKER_L} refX={large} fill={config.link.color} />
<Marker id={MARKERS.MARKER_LH} refX={large} fill={config.link.highlightColor} />
<Marker id={MARKERS.MARKER_S} refX={small} fill={config.link.color} {...markerProps} />
<Marker id={MARKERS.MARKER_SH} refX={small} fill={config.link.highlightColor} {...markerProps} />
<Marker id={MARKERS.MARKER_M} refX={medium} fill={config.link.color} {...markerProps} />
<Marker id={MARKERS.MARKER_MH} refX={medium} fill={config.link.highlightColor} {...markerProps} />
<Marker id={MARKERS.MARKER_L} refX={large} fill={config.link.color} {...markerProps} />
<Marker id={MARKERS.MARKER_LH} refX={large} fill={config.link.highlightColor} {...markerProps} />
</defs>
);

Expand Down
5 changes: 2 additions & 3 deletions src/components/marker/Marker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import React from "react";
* <Marker id="marker-id" fill="black" />
*/
export default class Marker extends React.Component {
// TODO: make Marker configurable in the future (markerWidth, markerHeight)
render() {
return (
<marker
Expand All @@ -16,8 +15,8 @@ export default class Marker extends React.Component {
viewBox="0 -5 10 10"
refX={this.props.refX}
refY="0"
markerWidth="6"
markerHeight="6"
markerWidth={this.props.markerWidth}
danielcaldas marked this conversation as resolved.
Show resolved Hide resolved
markerHeight={this.props.markerHeight}
orient="auto"
fill={this.props.fill}
>
Expand Down
24 changes: 12 additions & 12 deletions test/graph/__snapshots__/graph.snapshot.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ exports[`Snapshot - Graph Component should match snapshot 1`] = `
className="marker"
fill="#d3d3d3"
id="marker-small"
markerHeight="6"
markerWidth="6"
markerHeight={6}
markerWidth={6}
orient="auto"
refX={16}
refY="0"
Expand All @@ -34,8 +34,8 @@ exports[`Snapshot - Graph Component should match snapshot 1`] = `
className="marker"
fill="blue"
id="marker-small-highlighted"
markerHeight="6"
markerWidth="6"
markerHeight={6}
markerWidth={6}
orient="auto"
refX={16}
refY="0"
Expand All @@ -49,8 +49,8 @@ exports[`Snapshot - Graph Component should match snapshot 1`] = `
className="marker"
fill="#d3d3d3"
id="marker-medium"
markerHeight="6"
markerWidth="6"
markerHeight={6}
markerWidth={6}
orient="auto"
refX={21.333333333333332}
refY="0"
Expand All @@ -64,8 +64,8 @@ exports[`Snapshot - Graph Component should match snapshot 1`] = `
className="marker"
fill="blue"
id="marker-medium-highlighted"
markerHeight="6"
markerWidth="6"
markerHeight={6}
markerWidth={6}
orient="auto"
refX={21.333333333333332}
refY="0"
Expand All @@ -79,8 +79,8 @@ exports[`Snapshot - Graph Component should match snapshot 1`] = `
className="marker"
fill="#d3d3d3"
id="marker-large"
markerHeight="6"
markerWidth="6"
markerHeight={6}
markerWidth={6}
orient="auto"
refX={26.666666666666664}
refY="0"
Expand All @@ -94,8 +94,8 @@ exports[`Snapshot - Graph Component should match snapshot 1`] = `
className="marker"
fill="blue"
id="marker-large-highlighted"
markerHeight="6"
markerWidth="6"
markerHeight={6}
markerWidth={6}
orient="auto"
refX={26.666666666666664}
refY="0"
Expand Down
2 changes: 0 additions & 2 deletions test/marker/__snapshots__/marker.snapshot.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ exports[`Snapshot - Marker Component should match snapshot 1`] = `
className="marker"
fill="green"
id="id"
markerHeight="6"
markerWidth="6"
orient="auto"
refX="5"
refY="0"
Expand Down