move plugin props into an object

nikgraf · nikgraf · commit d39c6801aec8 · 2016-03-15T18:53:06.000-07:00
diff --git a/src/hashtagPlugin/index.js b/src/hashtagPlugin/index.js
@@ -2,13 +2,14 @@ import Hashtag from './Hashtag';
 import hashtagStrategy from './hashtagStrategy';
 
 const hashtagPlugin = (config) => ({
-  // standard plugin property
-  decorators: [
-    {
-      strategy: hashtagStrategy,
-      component: (config !== undefined && config.Hashtag !== undefined ? config.Hashtag : Hashtag),
-    },
-  ],
+  pluginProps: {
+    decorators: [
+      {
+        strategy: hashtagStrategy,
+        component: (config !== undefined && config.Hashtag !== undefined ? config.Hashtag : Hashtag),
+      },
+    ],
+  },
   Hashtag,
 });
 
diff --git a/src/linkifyPlugin/index.js b/src/linkifyPlugin/index.js
@@ -2,13 +2,14 @@ import Link from './Link';
 import linkStrategy from './linkStrategy';
 
 const linkPlugin = (config) => ({
-  // standard plugin property
-  decorators: [
-    {
-      strategy: linkStrategy,
-      component: (config !== undefined && config.Link !== undefined ? config.Link : Link),
-    },
-  ],
+  pluginProps: {
+    decorators: [
+      {
+        strategy: linkStrategy,
+        component: (config !== undefined && config.Link !== undefined ? config.Link : Link),
+      },
+    ],
+  },
   Link,
 });
 
diff --git a/src/mentionPlugin/index.js b/src/mentionPlugin/index.js
@@ -23,27 +23,28 @@ const ariaProps = {
 };
 
 const metionsPlugin = (config) => ({
-  // standard plugin property
-  decorators: [
-    {
-      strategy: mentionStrategy,
-      component: Mention,
+  pluginProps: {
+    decorators: [
+      {
+        strategy: mentionStrategy,
+        component: Mention,
+      },
+      {
+        strategy: mentionSearchStrategy,
+        component: MentionSearch(config.mentions, callbacks, ariaProps),
+      },
+    ],
+    getEditorProps: () => ariaProps,
+    keyBindingFn: (keyboardEvent) => callbacks.keyBindingFn && callbacks.keyBindingFn(keyboardEvent),
+    handleKeyCommand: (command) => callbacks.handleKeyCommand && callbacks.handleKeyCommand(command),
+    onDownArrow: (keyboardEvent) => callbacks.onDownArrow && callbacks.onDownArrow(keyboardEvent),
+    onUpArrow: (keyboardEvent) => callbacks.onUpArrow && callbacks.onUpArrow(keyboardEvent),
+    onEscape: (keyboardEvent) => callbacks.onEscape && callbacks.onEscape(keyboardEvent),
+    handleReturn: (keyboardEvent) => callbacks.handleReturn && callbacks.handleReturn(keyboardEvent),
+    onChange: (editorState) => {
+      if (callbacks.onChange) return callbacks.onChange(editorState);
+      return editorState;
     },
-    {
-      strategy: mentionSearchStrategy,
-      component: MentionSearch(config.mentions, callbacks, ariaProps),
-    },
-  ],
-  getEditorProps: () => ariaProps,
-  keyBindingFn: (keyboardEvent) => callbacks.keyBindingFn && callbacks.keyBindingFn(keyboardEvent), // standard plugin callback
-  handleKeyCommand: (command) => callbacks.handleKeyCommand && callbacks.handleKeyCommand(command), // standard plugin callback
-  onDownArrow: (keyboardEvent) => callbacks.onDownArrow && callbacks.onDownArrow(keyboardEvent), // standard plugin callback
-  onUpArrow: (keyboardEvent) => callbacks.onUpArrow && callbacks.onUpArrow(keyboardEvent), // standard plugin callback
-  onEscape: (keyboardEvent) => callbacks.onEscape && callbacks.onEscape(keyboardEvent), // standard plugin callback
-  handleReturn: (keyboardEvent) => callbacks.handleReturn && callbacks.handleReturn(keyboardEvent), // standard plugin callback
-  onChange: (editorState) => {
-    if (callbacks.onChange) return callbacks.onChange(editorState);
-    return editorState;
   },
 });
 
diff --git a/src/pluginEditor/Editor/index.js b/src/pluginEditor/Editor/index.js
@@ -12,15 +12,19 @@ import {
 import createCompositeDecorator from '../utils/createCompositeDecorator';
 import moveToEndOfSelectedBlock from '../modifiers/moveToEndOfSelectedBlock';
 import moveToStartOfSelectedBlock from '../modifiers/moveToStartOfSelectedBlock';
+import { List } from 'immutable';
 
 export default class PluginEditor extends Component {
 
   // TODO add flow types & propTypes - since it's a library and people might not use flow we want to have both
 
   constructor(props) {
     super(props);
-    this.plugins = props.plugins;
-    const compositeDecorator = createCompositeDecorator(this.props.plugins, this);
+    this.plugins = List(props.plugins)
+      .filter((plugin) => plugin.pluginProps !== undefined)
+      .map((plugin) => plugin.pluginProps)
+      .toArray();
+    const compositeDecorator = createCompositeDecorator(this.plugins, this);
 
     // TODO consider triggering an onChange here to make sure the editorState is in sync
     // with the outer Editor context
diff --git a/src/stickerPlugin/index.js b/src/stickerPlugin/index.js
@@ -6,9 +6,11 @@ import sticker from './Sticker';
 import stickerSelect from './StickerSelect';
 
 const stickerPlugin = (config) => ({
+  pluginProps: {
+    blockRendererFn: blockRendererFn(config),
+    onChange: cleanupEmptyStickers,
+  },
   add: addSticker,
-  blockRendererFn: blockRendererFn(config), // standard plugin callback
-  onChange: cleanupEmptyStickers, // standard plugin callback
   remove: removeSticker,
   Sticker: sticker(config.stickers, config.hasRemove),
   StickerSelect: stickerSelect(config.stickers),
