merge-in latest develop

2 files changed, 37 insertions, 9 deletions

diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.js
new file mode 100644
index 000000000..497aa071b
--- /dev/null
+++ b/src/features/utils/ActionBinding.js
@@ -0,0 +1,29 @@
+export default class ActionBinding {
+  action;
+
+  isActive = false;
+
+  constructor(action) {
+    this.action = action;
+  }
+
+  start() {
+    if (!this.isActive) {
+      const { action } = this;
+      action[0].listen(action[1]);
+      this.isActive = true;
+    }
+  }
+
+  stop() {
+    if (this.isActive) {
+      const { action } = this;
+      action[0].off(action[1]);
+      this.isActive = false;
+    }
+  }
+}
+
+export const createActionBindings = actions => (
+  actions.map(a => new ActionBinding(a))
+);
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index d863f7464..967e745b2 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -1,4 +1,4 @@
-import Reaction from '../../stores/lib/Reaction';
+import { union } from 'lodash';
 
 export class FeatureStore {
   _actions = null;
@@ -13,25 +13,24 @@ export class FeatureStore {
   // ACTIONS
 
   _registerActions(actions) {
-    this._actions = [];
-    actions.forEach(a => this._actions.push(a));
-    this._startActions(this._actions);
+    this._actions = union(this._actions, actions);
+    this._startActions();
   }
 
   _startActions(actions = this._actions) {
-    actions.forEach(a => a[0].listen(a[1]));
+    console.log(actions);
+    actions.forEach(a => a.start());
   }
 
   _stopActions(actions = this._actions) {
-    actions.forEach(a => a[0].off(a[1]));
+    actions.forEach(a => a.stop());
   }
 
   // REACTIONS
 
   _registerReactions(reactions) {
-    this._reactions = [];
-    reactions.forEach(r => this._reactions.push(new Reaction(r)));
-    this._startReactions(this._reactions);
+    this._reactions = union(this._reactions, reactions);
+    this._startReactions();
   }
 
   _startReactions(reactions = this._reactions) {