Merge pull request draft-js-plugins#159 from draft-js-plugins/remove-injectBlockProps

nikgraf · nikgraf · commit a14b4f3c1db5 · 2016-03-31T11:47:23.000-07:00
Remove inject block props
diff --git a/draft-js-dnd-plugin/src/blockRendererFn.js b/draft-js-dnd-plugin/src/blockRendererFn.js
@@ -1,5 +1,6 @@
 import { Entity } from 'draft-js';
 import removeBlock from './modifiers/removeBlock';
+import refreshEditorState from './modifiers/refreshEditorState';
 
 export default (config) => (contentBlock, getEditorState, updateEditorState) => {
   const type = contentBlock.getType();
@@ -11,6 +12,9 @@ export default (config) => (contentBlock, getEditorState, updateEditorState) =>
       props: {
         ...data,
         remove: () => updateEditorState(removeBlock(getEditorState(), contentBlock.key)),
+
+        // This is for block-alignment-wrapper, only temporarily living here
+        refreshEditorState: () => updateEditorState(refreshEditorState(getEditorState())),
       },
     };
   }
diff --git a/draft-js-dnd-plugin/src/index.js b/draft-js-dnd-plugin/src/index.js
@@ -31,6 +31,9 @@ const uploadPlugin = (config = {}) => {
     ...config,
     emitter,
     Image: decorateComponentWithProps(config.Image || Image, { theme, attachButtons }),
+
+    // This is for block-alignment-wrapper, only temporarily living here
+    refreshEditorState: (editorState, onChange) => onChange(EditorState.forceSelection(editorState, editorState.getCurrentContent().getSelectionAfter())),
   };
 
   return {
@@ -39,14 +42,6 @@ const uploadPlugin = (config = {}) => {
       blockRendererFn: blockRendererFn(blockRendererConfig),
       handleDroppedFiles: onDropFile(blockRendererConfig),
       handleDrop: onDropBlock(blockRendererConfig),
-
-      // This is for block-alignment-wrapper, only temporarily living here
-      injectBlockProps: (block, getEditorState, onChange) => {
-        const editorState = getEditorState();
-        return {
-          refreshEditorState: () => onChange(EditorState.forceSelection(editorState, editorState.getCurrentContent().getSelectionAfter())),
-        };
-      },
     },
     addListener: emitter.addListener,
     removeListener: emitter.removeListener,
diff --git a/draft-js-dnd-plugin/src/modifiers/refreshEditorState.js b/draft-js-dnd-plugin/src/modifiers/refreshEditorState.js
@@ -0,0 +1,5 @@
+import { EditorState } from 'draft-js';
+
+export default function (editorState) {
+  return EditorState.forceSelection(editorState, editorState.getCurrentContent().getSelectionAfter());
+}
diff --git a/draft-js-plugins-editor/src/Editor/index.js b/draft-js-plugins-editor/src/Editor/index.js
@@ -191,41 +191,12 @@ export default class PluginEditor extends Component {
     return command !== undefined ? command : getDefaultKeyBinding(keyboardEvent);
   };
 
-  // Inject props into blockRendererFn blocks
-  injectBlockProps(b) {
-    let props = {};
-    const block = b;
-
-    if (this.props.injectBlockProps) {
-      const result = this.props.injectBlockProps(block, this.getEditorState, this.onChange);
-      if (result) {
-        props = { ...result, ...props };
-      }
-    }
-
-    this.plugins
-        .forEach((plugin) => {
-          if (plugin.injectBlockProps) {
-            const result = plugin.injectBlockProps(block, this.getEditorState, this.onChange);
-            if (result) {
-              props = { ...result, ...props };
-            }
-          }
-
-          return undefined;
-        });
-
-    if (block.props) block.props = { ...block.props, ...props };
-    else block.props = props;
-    return block;
-  }
-
   blockRendererFn = (contentBlock) => {
     // TODO optimize to break after the first one
     if (this.props.blockRendererFn) {
       const result = this.props.blockRendererFn(contentBlock);
       if (result) {
-        return this.injectBlockProps(result);
+        return result;
       }
     }
 
@@ -234,7 +205,7 @@ export default class PluginEditor extends Component {
         if (plugin.blockRendererFn) {
           const result = plugin.blockRendererFn(contentBlock, this.getEditorState, this.onChange);
           if (result) {
-            return this.injectBlockProps(result);
+            return result;
           }
         }
 
