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

feat(point): Allow grouped custom point #565

Merged
merged 1 commit into from
Aug 28, 2018
Merged

feat(point): Allow grouped custom point #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions demo/demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,22 +1824,39 @@ d3.select(".chart_area")
}
}
},
CustomPointsGrouped: {
options: {
data: {
columns: [
["data1", 30, 200, 100, 400, -150, 250],
["data2", 50, 20, 10, 40, 15, 25]
]
},
point: {
pattern: [
"<g><circle cx='10' cy='10' r='10'></circle><rect x='5' y='5' width='10' height='10'></rect></g>"
]
}
}
},
CombinationPoints: {
options: {
data: {
columns: [
["data1", 100, 400, 1000, 900, 500],
["data2", 20, 40, 500, 300, 200],
["data3", 80, 350, 800, 450, 500],
["data4", 150, 240, 300, 700, 300]
["data4", 150, 240, 300, 700, 300],
["data5", 280, 720, 160, 210, 115]
]
},
point: {
pattern: [
"circle",
"rectangle",
"<polygon points='2.5 0 0 2.5 2.5 5 5 2.5 2.5 0'></polygon>",
"<polygon points='2.5 0 0 5 5 5'></polygon>"
"<polygon points='2.5 0 0 5 5 5'></polygon>",
"<g><circle cx='10' cy='10' r='10'></circle><rect x='5' y='5' width='10' height='10'></rect></g>"
]
}
}
Expand Down
27 changes: 19 additions & 8 deletions spec/shape/shape.point-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ import CLASS from "../../src/config/classes";
describe("SHAPE POINT", () => {
let chart;
let args;
let skipEach = false;

beforeEach(function(){
if(skipEach){
return ;
}
beforeEach(() => {
chart = util.generate(args);
});

Expand All @@ -33,7 +29,7 @@ describe("SHAPE POINT", () => {
});

it("Should render svg circle elements", () => {
const target = chart.internal.svg.select(`.${CLASS.chartLine}.${CLASS.target}-data1`);
const target = chart.$.svg.select(`.${CLASS.chartLine}.${CLASS.target}-data1`);
const circlesEl = target.select(`.${CLASS.circles}-data1`).node();
const circles = circlesEl.getElementsByTagName("circle");

Expand All @@ -58,7 +54,7 @@ describe("SHAPE POINT", () => {
});

it("Should render svg rect elements", () => {
const target = chart.internal.svg.select(`.${CLASS.chartLine}.${CLASS.target}-data1`);
const target = chart.$.svg.select(`.${CLASS.chartLine}.${CLASS.target}-data1`);
const circlesEl = target.select(`.${CLASS.circles}-data1`).node();
const rects = circlesEl.getElementsByTagName("rect");

Expand All @@ -85,11 +81,26 @@ describe("SHAPE POINT", () => {
});

it("Should render svg \"use\" elements", () => {
const target = chart.internal.svg.select(`.${CLASS.chartLine}.${CLASS.target}-data1`);
const target = chart.$.svg.select(`.${CLASS.chartLine}.${CLASS.target}-data1`);
const circlesEl = target.select(`.${CLASS.circles}-data1`).node();
const polygons = circlesEl.getElementsByTagName("use");

expect(polygons.length).to.be.equal(6);
});

it("set options point.pattern", () => {
args.point.pattern = [
"<g><circle cx='10' cy='10' r='10'></circle><rect x='5' y='5' width='10' height='10'></rect></g>"
];
});

it("should be allowing to set groping nodes", () => {
const innerHTML = chart.config("point.pattern")[0]
.replace(/<\/?g>/g, "").replace(/'/g, '"');

chart.$.defs.selectAll("g").each(function() {
expect(this.innerHTML).to.be.equal(innerHTML);
});
});
});
});
22 changes: 16 additions & 6 deletions src/shape/point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
select as d3Select
} from "d3-selection";
import ChartInternal from "../internals/ChartInternal";
import {isFunction, isObjectType, extend, notEmpty} from "../internals/util";
import {isFunction, isObjectType, toArray, extend, notEmpty} from "../internals/util";

extend(ChartInternal.prototype, {
hasValidPointType(type) {
Expand All @@ -29,16 +29,22 @@ extend(ChartInternal.prototype, {
const clone = document.createElementNS(d3Namespaces.svg, node.nodeName.toLowerCase());
const attribs = node.attributes;

for (let i = 0, l = attribs.length; i < l; i++) {
const name = attribs[i].name;

for (let i = 0, name; (name = attribs[i]); i++) {
name = name.name;
clone.setAttribute(name, node.getAttribute(name));
}

clone.id = id;
clone.style.fill = "inherit";
clone.style.stroke = "inherit";

// when has child nodes
if (node.children.length) {
clone.innerHTML = toArray(node.children)
.map(v => v.outerHTML)
.join("");
}

$$.defs.node().appendChild(clone);
},

Expand Down Expand Up @@ -102,8 +108,12 @@ extend(ChartInternal.prototype, {
withTransition, flow, selectedCircles) {
const $$ = this;
const box = element.node().getBBox();
const xPosFn2 = d => xPosFn(d) - (box.width * 0.5);
const yPosFn2 = d => yPosFn(d) - (box.height * 0.5);

box.width /= 2;
box.height /= 2;

const xPosFn2 = d => xPosFn(d) - box.width;
const yPosFn2 = d => yPosFn(d) - box.height;
let mainCircles = element;

if (withTransition) {
Expand Down