createPluginHooks improvements

jl- · jl- · commit 0c7f6d126056 · 2016-04-04T12:47:32.000+08:00
diff --git a/draft-js-plugins-editor/src/Editor/index.js b/draft-js-plugins-editor/src/Editor/index.js
@@ -92,22 +92,32 @@ class PluginEditor extends Component {
 
   createPluginHooks = () => {
     const pluginHooks = {};
+    const eventHookKeys = [];
+    const fnHookKeys = [];
     const plugins = this.resolvePlugins();
 
     plugins.forEach((plugin) => {
       Object.keys(plugin).forEach((attrName) => {
-        if (pluginHooks[attrName] || attrName === 'onChange') return;
-
-        if (attrName.indexOf('on') === 0 || attrName.indexOf('handle') === 0) {
-          pluginHooks[attrName] = this.createEventHooks(attrName, plugins);
+        if (attrName === 'onChange') return;
+        
+        // if `attrName` has been added as a hook key already, ignore this one
+        if(eventHookKeys.indexOf(attrName) !== -1 || fnHookKeys.indexOf(attrName) !== -1) return;
+        
+        const isEventHookKey = attrName.indexOf('on') === 0 || attrName.indexOf('handle') === 0;
+        if (isEventHookKey) {
+          eventHookKeys.push(attrName);
+          return;
         }
 
-        // checks if the function ends with Fn
-        if (attrName.length - 2 === attrName.indexOf('Fn')) {
-          pluginHooks[attrName] = this.createFnHooks(attrName, plugins);
+        // checks if the `attrName` ends with 'Fn'
+        const isFnHookKey = (attrName.length - 2 === attrName.indexOf('Fn'));
+        if (isFnHookKey) {
+          fnHookKeys.push(attrName);
         }
       });
     });
+    eventHookKeys.forEach((attrName) => pluginHooks[attrName] = this.createEventHooks(attrName, plugins));
+    fnHookKeys.forEach((attrName) => pluginHooks[attrName] = this.createFnHooks(attrName, plugins));
     return pluginHooks;
   };
 
