fix(brush): handle brush:highlight once when emit

antvis · May 19, 2023 · dd510a5 · dd510a5
1 parent af6e892
commit dd510a5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/__tests__/integration/api-chart-render-brush-end.spec.ts b/__tests__/integration/api-chart-render-brush-end.spec.ts
@@ -10,18 +10,24 @@ describe('chart.render', () => {
       canvas,
       container: document.createElement('div'),
     });
-    await finished;
-    await sleep(20);
-
     chart.off();
-    const fn = jest.fn();
+
+    const end = jest.fn();
+    const start = jest.fn();
+    chart.on('brush:highlight', () => {
+      start();
+    });
     chart.on('brush:end', () => {
-      fn();
+      end();
     });
+    await finished;
+    await sleep(20);
+
     button.dispatchEvent(new CustomEvent('click'));
     await rerendered;
     await sleep(20);
-    expect(fn).toBeCalledTimes(0);
+    expect(start).toBeCalledTimes(1);
+    expect(end).toBeCalledTimes(0);
   });
 
   afterAll(() => {

diff --git a/src/interaction/brushHighlight.ts b/src/interaction/brushHighlight.ts
@@ -315,7 +315,7 @@ export function brush(
   };
 
   // Update mask and invoke brushended callback.
-  const updateMask = (start, end) => {
+  const updateMask = (start, end, emit = true) => {
     const [x, y, x1, y1] = normalizeBounds(
       start[0],
       start[1],
@@ -326,7 +326,7 @@ export function brush(
     const [fx, fy, fx1, fy1] = brushRegion(x, y, x1, y1, extent);
     if (reverse) updateReverseMask(fx, fy, fx1, fy1);
     else updateNormalMask(fx, fy, fx1, fy1);
-    brushed(fx, fy, fx1, fy1);
+    if (emit) brushed(fx, fy, fx1, fy1);
     return [fx, fy, fx1, fy1];
   };
 
@@ -470,11 +470,11 @@ export function brush(
 
   return {
     mask,
-    move(x, y, x1, y1) {
+    move(x, y, x1, y1, emit = true) {
       if (!mask) initMask(x, y);
       start = [x, y];
       end = [x1, y1];
-      updateMask([x, y], [x1, y1]);
+      updateMask([x, y], [x1, y1], emit);
     },
     remove() {
       if (mask) removeMask();
@@ -648,7 +648,7 @@ export function brushHighlight(
     if (nativeEvent) return;
     const { selection } = data;
     const [x, y, x1, y1] = pixelsOf(selection, scale, coordinate);
-    brushHandler.move(x, y, x1, y1);
+    brushHandler.move(x, y, x1, y1, false);
   };
   emitter.on('brush:highlight', onHighlight);