fix: handle chart click as mouseUp to prevent click while brushing (o…

…pensearch-project#269)
AMoo-Miki · Jul 24, 2019 · c3e979b · c3e979b
1 parent d4728f9
commit c3e979b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/osd-charts/src/components/react_canvas/reactive_chart.tsx b/packages/osd-charts/src/components/react_canvas/reactive_chart.tsx
@@ -293,7 +293,6 @@ class Chart extends React.Component<ReactiveChartProps, ReactiveChartState> {
   };
   onStartBrusing = (event: { evt: MouseEvent }) => {
     window.addEventListener('mouseup', this.onEndBrushing);
-    this.props.chartStore!.onBrushStart();
     const { brushExtent } = this.props.chartStore!;
     const point = getPoint(event.evt, brushExtent);
     this.setState(() => ({
@@ -316,6 +315,9 @@ class Chart extends React.Component<ReactiveChartProps, ReactiveChartState> {
     if (!this.state.brushing) {
       return;
     }
+    if (!this.props.chartStore!.isBrushing.get()) {
+      this.props.chartStore!.onBrushStart();
+    }
     const { brushExtent } = this.props.chartStore!;
     const point = getPoint(event.evt, brushExtent);
     this.setState(() => ({
@@ -420,7 +422,10 @@ class Chart extends React.Component<ReactiveChartProps, ReactiveChartState> {
         onMouseLeave={() => {
           setCursorPosition(-1, -1);
         }}
-        onClick={() => {
+        onMouseUp={() => {
+          if (this.props.chartStore!.isBrushing.get()) {
+            return;
+          }
           this.props.chartStore!.handleChartClick();
         }}
         className={className}

diff --git a/packages/osd-charts/stories/interactions.tsx b/packages/osd-charts/stories/interactions.tsx
@@ -442,7 +442,11 @@ storiesOf('Interactions', module)
     const oneDay = 1000 * 60 * 60 * 24;
     return (
       <Chart className={'story-chart'}>
-        <Settings debug={boolean('debug', false)} onBrushEnd={action('onBrushEnd')} />
+        <Settings
+          debug={boolean('debug', false)}
+          onBrushEnd={action('onBrushEnd')}
+          onElementClick={action('onElementClick')}
+        />
         <Axis
           id={getAxisId('bottom')}
           position={Position.Bottom}