Merge pull request #745 from hlyang397/support_mobile_event

carbon-design-system · Aug 13, 2020 · e16018e · e16018e
1 parent 8ed23b1
commit e16018e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/core/src/components/axes/grid-brush.ts b/packages/core/src/components/axes/grid-brush.ts
@@ -104,13 +104,15 @@ export class ChartBrush extends Component {
 					xScale.invert(selection[0]),
 					xScale.invert(selection[1])
 				];
-
 				if (
 					selection != null &&
 					event.sourceEvent != null &&
 					(event.sourceEvent.type === "mousemove" ||
 						event.sourceEvent.type === "mouseup" ||
-						event.sourceEvent.type === "mousedown")
+						event.sourceEvent.type === "mousedown" ||
+						event.sourceEvent.type === "touchstart" ||
+						event.sourceEvent.type === "touchmove" ||
+						event.sourceEvent.type === "touchend")
 				) {
 					// dispatch selection events
 					let zoomBarEventType;

diff --git a/packages/core/src/components/axes/zoom-bar.ts b/packages/core/src/components/axes/zoom-bar.ts
@@ -250,12 +250,15 @@ export class ZoomBar extends Component {
 		this.updateBrushHandle(this.getContainerSVG(), selection, newDomain);
 
 		// be aware that the value of d3.event changes during an event!
-		// update zoomDomain only if the event comes from mouse event
+		// update zoomDomain only if the event comes from mouse/touch event
 		if (
 			event.sourceEvent != null &&
 			(event.sourceEvent.type === "mousemove" ||
 				event.sourceEvent.type === "mouseup" ||
-				event.sourceEvent.type === "mousedown")
+				event.sourceEvent.type === "mousedown" ||
+				event.sourceEvent.type === "touchstart" ||
+				event.sourceEvent.type === "touchmove" ||
+				event.sourceEvent.type === "touchend")
 		) {
 			// only if zoomDomain is never set or needs update
 			if (