actions: set _interacting = true before start

taye · taye · commit 852fe829bc6b · 2017-04-14T19:51:15.000+02:00
Close taye#503
diff --git a/src/actions/base.js b/src/actions/base.js
@@ -8,8 +8,8 @@ const actions = {
 };
 
 Interaction.signals.on('action-start', function ({ interaction, event }) {
-  firePrepared(interaction, event, 'start');
   interaction._interacting = true;
+  firePrepared(interaction, event, 'start');
 });
 
 Interaction.signals.on('action-move', function ({ interaction, event, preEnd }) {
diff --git a/tests/Interaction.js b/tests/Interaction.js
@@ -296,3 +296,55 @@ test('Interaction.start', t => {
 
   t.end();
 });
+
+test('action-{start,move,end} signal listeners', t => {
+  const Interactable  = require('../src/Interactable');
+  const Interaction   = require('../src/Interaction');
+
+  const interaction = new Interaction();
+  const element = {};
+  const interactable = new Interactable('TEST', { context: {} });
+
+  let interactingInStartListener = null;
+
+  interaction.target = interactable;
+  interaction.element = element;
+  interaction.prepared = { name: 'TEST' };
+
+  interactable.events.on('TESTstart', event => {
+    interactingInStartListener = event.interaction.interacting();
+  });
+
+  Interaction.signals.fire('action-start', { interaction, event: {} });
+
+  t.ok(interactingInStartListener, 'start event was fired correctly');
+
+  interactable.unset();
+
+  t.end();
+});
+
+test('stop interaction from start event', t => {
+  const Interactable  = require('../src/Interactable');
+  const Interaction   = require('../src/Interaction');
+
+  const interaction = new Interaction();
+  const element = {};
+  const interactable = new Interactable('TEST', { context: {} });
+
+  interaction.target = interactable;
+  interaction.element = element;
+  interaction.prepared = { name: 'TEST' };
+
+  interactable.events.on('TESTstart', event => {
+    event.interaction.stop();
+  });
+
+  Interaction.signals.fire('action-start', { interaction, event: {} });
+
+  t.notOk(interaction.interacting(), 'interaction can be stopped from start event listener');
+
+  interactable.unset();
+
+  t.end();
+});
