feat(interaction): avoid event error

antvis · Apr 1, 2020 · 3ae581b · 3ae581b
1 parent 6356363
commit 3ae581b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -409,21 +409,20 @@ registerInteraction('brush-visible', {
   start: [
     {
       trigger: 'plot:mousedown',
-      action: ['rect-mask:start', 'rect-mask:show', 'element-range-highlight:start'],
+      action: ['rect-mask:start', 'rect-mask:show'],
     },
   ],
   processing: [
     {
       trigger: 'plot:mousemove',
-      action: ['rect-mask:resize','element-range-highlight:highlight'],
+      action: ['rect-mask:resize'],
     },
-    {trigger: 'mask:end',action: ['element-filter:filter']}
+    {trigger: 'mask:change',action: ['element-range-highlight:highlight']}
   ],
   end: [
     {
-      trigger: 'mouseup',
-      isEnable: isPointInView,
-      action: ['rect-mask:end', 'rect-mask:hide', 'element-range-highlight:end', 'element-range-highlight:clear'],
+      trigger: 'plot:mouseup',
+      action: ['rect-mask:end', 'rect-mask:hide','element-filter:filter', 'element-range-highlight:clear'],
     },
   ],
   rollback: [

diff --git a/src/interaction/action/element/range-state.ts b/src/interaction/action/element/range-state.ts
@@ -44,6 +44,10 @@ class ElementRangeState extends StateBase {
     } else {
       const startPoint = this.startPoint;
       const endPoint = this.isStarted ? this.getCurrentPoint() : this.endPoint;
+      // 如果没有开始，则不允许范围设置状态，保护性质
+      if (!startPoint || !endPoint) {
+        return;
+      }
       // 计算框选区域
       const box = {
         minX: Math.min(startPoint.x, endPoint.x),

diff --git a/src/interaction/grammar-interaction.ts b/src/interaction/grammar-interaction.ts
@@ -341,18 +341,21 @@ export default class GrammarInteraction extends Interaction {
       if (!callbackCaches[key]) {
         // 动态生成执行的方法，执行对应 action 的名称
         const actionCallback = (event) => {
-          context.event = event;
+          context.event = event; // 保证检测时的 event
           if (this.isAllowExcute(stepName, step)) {
             // 如果是数组时，则依次执行
             if (isArray(actionObject)) {
               each(actionObject, (obj: ActionObject) => {
+                context.event = event; // 可能触发新的事件，保证执行前的 context.event 是正确的
                 executeAction(obj);
               });
             } else {
+              context.event = event; // 保证执行前的 context.event 是正确的
               executeAction(actionObject);
             }
             this.afterExecute(stepName, step);
             if (step.callback) {
+              context.event = event; // 保证执行前的 context.event 是正确的
               step.callback(context);
             }
           } else {

diff --git a/tests/unit/interaction/action/highlight-spec.ts b/tests/unit/interaction/action/highlight-spec.ts
@@ -242,6 +242,9 @@ describe('test highlight action', () => {
         x: bbox1.x - 5,
         y: bbox1.y - 5,
       };
+      expect(() => {
+        action.highlight(); // pre test
+      }).not.toThrow();
       action.start();
       context.event = {
         x: bbox1.maxX + 5,