Merge pull request draft-js-plugins#169 from draft-js-plugins/event-management

nikgraf · nikgraf · commit 6d91785f5a8e · 2016-04-02T11:54:53.000-07:00
allows each plugin to bail out early and avoid the event being passed…
diff --git a/draft-js-plugins-editor/src/Editor/__test__/index.js b/draft-js-plugins-editor/src/Editor/__test__/index.js
@@ -150,6 +150,70 @@ describe('Editor', () => {
       expect(plugin.handleDrop).has.been.calledWith('command', pluginEditor.getEditorState, pluginEditor.onChange);
     });
 
+    it('calls the handle- and on-hooks of the first plugin and not the second in case it was handeled', () => {
+      const plugins = [
+        {
+          handleKeyCommand: sinon.stub().returns(true),
+          onUpArrow: sinon.stub().returns(true),
+        },
+        {
+          handleKeyCommand: sinon.spy(),
+          onUpArrow: sinon.spy(),
+        },
+      ];
+      const result = shallow(
+        <PluginEditor
+          editorState={ editorState }
+          onChange={ onChange }
+          plugins={ plugins }
+        />
+      );
+
+      const draftEditor = result.node;
+      draftEditor.props.handleKeyCommand('command');
+      expect(plugins[0].handleKeyCommand).has.been.calledOnce();
+      expect(plugins[1].handleKeyCommand).has.not.been.called();
+
+      draftEditor.props.onUpArrow();
+      expect(plugins[0].onUpArrow).has.been.calledOnce();
+      expect(plugins[1].onUpArrow).has.not.been.called();
+    });
+
+    it('calls the handle- and on-hooks of all plugins in case none handeles the command', () => {
+      const plugins = [
+        {
+          handleKeyCommand: sinon.spy(),
+          onUpArrow: sinon.spy(),
+        },
+        {
+          handleKeyCommand: sinon.spy(),
+          onUpArrow: sinon.spy(),
+        },
+        {
+          handleKeyCommand: sinon.spy(),
+          onUpArrow: sinon.spy(),
+        },
+      ];
+      const result = shallow(
+        <PluginEditor
+          editorState={ editorState }
+          onChange={ onChange }
+          plugins={ plugins }
+        />
+      );
+
+      const draftEditor = result.node;
+      draftEditor.props.handleKeyCommand('command');
+      expect(plugins[0].handleKeyCommand).has.been.calledOnce();
+      expect(plugins[1].handleKeyCommand).has.been.calledOnce();
+      expect(plugins[2].handleKeyCommand).has.been.calledOnce();
+
+      draftEditor.props.onUpArrow();
+      expect(plugins[0].onUpArrow).has.been.calledOnce();
+      expect(plugins[1].onUpArrow).has.been.calledOnce();
+      expect(plugins[2].onUpArrow).has.been.calledOnce();
+    });
+
     it('calls the fn-hooks of the plugin', () => {
       const plugins = [
         {
diff --git a/draft-js-plugins-editor/src/Editor/index.js b/draft-js-plugins-editor/src/Editor/index.js
@@ -60,7 +60,7 @@ class PluginEditor extends Component {
 
   getEditorState = () => this.props.editorState;
 
-  createHandleHooks = (methodName, plugins) => (...args) => {
+  createEventHooks = (methodName, plugins) => (...args) => {
     const newArgs = [].slice.apply(args);
     newArgs.push(this.getEditorState);
     newArgs.push(this.onChange);
@@ -73,12 +73,6 @@ class PluginEditor extends Component {
     return false;
   };
 
-  createOnHooks = (methodName, plugins) => (event) => (
-    plugins
-      .filter((plugin) => typeof plugin[methodName] === 'function')
-      .forEach((plugin) => plugin[methodName](event))
-  );
-
   createFnHooks = (methodName, plugins) => (...args) => {
     const newArgs = [].slice.apply(args);
     newArgs.push(this.getEditorState);
@@ -100,12 +94,8 @@ class PluginEditor extends Component {
       Object.keys(plugin).forEach((attrName) => {
         if (attrName === 'onChange') return;
 
-        if (attrName.indexOf('on') === 0) {
-          pluginHooks[attrName] = this.createOnHooks(attrName, plugins);
-        }
-
-        if (attrName.indexOf('handle') === 0) {
-          pluginHooks[attrName] = this.createHandleHooks(attrName, plugins);
+        if (attrName.indexOf('on') === 0 || attrName.indexOf('handle') === 0) {
+          pluginHooks[attrName] = this.createEventHooks(attrName, plugins);
         }
 
         // checks if the function ends with Fn
