fix(event): Fix handling for single x Axis data

- Add prevention condition when handling single x Axis event data - Update the event reference for touch environment Fix #1737
naver · Oct 23, 2020 · 84eaa6b · 84eaa6b
1 parent 95817a9
commit 84eaa6b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/ChartInternal/interactions/eventrect.ts b/src/ChartInternal/interactions/eventrect.ts
@@ -84,15 +84,12 @@ export default {
 	bindTouchOnEventRect(isMultipleX: boolean): void {
 		const $$ = this;
 		const {config, state, $el: {eventRect, svg}} = $$;
-		const event = d3Event;
 
 		const selectRect = context => {
 			if (isMultipleX) {
 				$$.selectRectForMultipleXs(context);
 			} else {
-				// const eventRect = getEventRect();
-				// const index = getIndex(eventRect);
-				const index = $$.getDataIndexFromEvent(event);
+				const index = $$.getDataIndexFromEvent(d3Event);
 
 				$$.callOverOutForTouch(index);
 
@@ -442,7 +439,7 @@ export default {
 		const $$ = ctx;
 		const {config, state, $el: {main}} = $$;
 
-		if ($$.hasArcType() || state.cancelClick) {
+		if (!d || $$.hasArcType() || state.cancelClick) {
 			state.cancelClick && (state.cancelClick = false);
 
 			return;

diff --git a/test/esm/bar-spec.ts b/test/esm/bar-spec.ts
@@ -17,8 +17,8 @@ describe("ESM bar", function() {
     const args: any = {
         data: {
             columns: [
-                ["data1", 300, 350, 300, 0, 100],
-                ["data2", 130, 100, 140, 200, 150]
+                ["data1", 30, 350, 300, 0, 100],
+                ["data2", 200, 100, 140, 200, 150]
             ],
             type: bar(),
             onclick: spy
@@ -35,8 +35,8 @@ describe("ESM bar", function() {
         const pos = getBBox(bar);
 
         fireEvent(eventRect.node(), "click", {
-            clientX: pos.x + 20,
-            clientY: pos.y + 50
+            clientX: pos.x + 10,
+            clientY: pos.y
         }, chart);
 
         expect(spy.calledOnce).to.be.true;
@@ -53,4 +53,14 @@ describe("ESM bar", function() {
 
         expect(true).to.be.ok;
     });
+
+    it("check data.onclick for bar type", () => {
+        try {
+            chart.internal.clickHandlerForSingleX(undefined, chart.internal);
+        } catch(e) {
+            expect(false).to.be.true;
+        }
+
+        expect(true).to.be.true;
+    });
 });