From d9f44779843bbe6ce6bb77886f7c2020003a5435 Mon Sep 17 00:00:00 2001 From: Jae Sung Park Date: Tue, 19 Feb 2019 11:20:19 +0900 Subject: [PATCH] fix(chart): Correct data label text prop ref Fix on incorrect referencing on data label's text elements Fix #780 Close #781 --- spec/internals/bb-spec.js | 11 +++++++++-- spec/internals/data-spec.js | 7 +++++++ src/internals/ChartInternal.js | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/spec/internals/bb-spec.js b/spec/internals/bb-spec.js index dbb3ef1da..ff82fd02f 100644 --- a/spec/internals/bb-spec.js +++ b/spec/internals/bb-spec.js @@ -17,10 +17,17 @@ describe("Interface & initialization", () => { it("Check for initialization", () => { chart = util.generate({ + title: { + text: "test" + }, data: { columns: [ ["data1", 30] - ] + ], + labels: { + show: true + }, + type: "bar" } }); const internal = chart.internal; @@ -41,7 +48,7 @@ describe("Interface & initialization", () => { }); it("should be accessing node elements", () => { - const isD3Node = v => v && "node" in v || typeof v === "undefined"; + const isD3Node = v => v && "node" in v || false; Object.values(chart.$).forEach(v1 => { const isNode = isD3Node(v1); diff --git a/spec/internals/data-spec.js b/spec/internals/data-spec.js index e24770bca..3c54ae44e 100644 --- a/spec/internals/data-spec.js +++ b/spec/internals/data-spec.js @@ -559,6 +559,13 @@ describe("DATA", () => { }); }); }); + + it("text property shouldn't be empty", () => { + const texts = chart.$.text.texts; + + expect(texts.empty()).to.be.false; + expect(texts.size() > 0).to.be.true; + }); }); describe("on area chart", () => { diff --git a/src/internals/ChartInternal.js b/src/internals/ChartInternal.js index 2c7e804b1..8a229f298 100644 --- a/src/internals/ChartInternal.js +++ b/src/internals/ChartInternal.js @@ -404,7 +404,7 @@ export default class ChartInternal { circles: $$.mainCircle }, text: { - texts: $$.texts + texts: $$.mainText } }; }