- fixed utils, EditorContainer, atomic block plugin

Author: juliankrispel

packages/atomic-block/rollup.config.js

@@ -9,10 +9,11 @@ import pkg from './package.json'
 
 export default {
   external: [
-    'draft-js/lib/DraftOffsetKey',
     '@djsp/core',
     '@djsp/utils',
     'draft-js',
+    'draft-js/lib/DraftOffsetKey',
+    'react',
   ],
   input: 'src/index.js',
   output: [

packages/atomic-block/src/index.js

@@ -55,7 +55,7 @@ class AtomicBlockPlugin extends Component<Props, State> {
   constructor(props) {
     super(props)
 
-    const { registerPlugin } = this.props
+    const { registerPlugin } = props
 
     this.unregister = registerPlugin({
       blockRendererFn: this.blockRendererFn,
@@ -171,8 +171,18 @@ class AtomicBlockPlugin extends Component<Props, State> {
 
   handleReturn = (event, editorState) => {
     const { setEditorState } = this.props
+    const selection = editorState.getSelection()
+
+    const currentBlock = editorState
+      .getCurrentContent()
+      .getBlockForKey(selection.getStartKey())
+
+    if (selection.isCollapsed() && currentBlock.getType() === 'atomic') {
+      setEditorState(insertNewLine(editorState))
+      return constants.HANDLED
+    }
 
-    setEditorState(insertNewLine(editorState))
+    return constants.NOT_HANDLED
   }
 
   blockRendererFn = block => {

packages/core/src/EditorContainer.js

@@ -43,7 +43,9 @@ export const withPluginContext = <Props: {}>(
   function WithConsumer(props: Object) {
     return (
       <Context.Consumer>
-        {contextProps => <Comp {...props} {...contextProps.pluginProps} />}
+        {contextProps => {
+          return <Comp {...props} {...contextProps.pluginProps} />
+        }}
       </Context.Consumer>
     )
   }

packages/utils/package-lock.json

@@ -22,11 +22,12 @@
     "access": "public"
   },
   "devDependencies": {
-    "@djsp/core": "^0.1.3",
+    "@babel/preset-flow": "^7.0.0",
     "cross-env": "^5.1.4",
     "flow-bin": "^0.81.0",
     "flow-typed": "^2.5.1",
     "react": "^16.2.0",
+    "react-dom": "^16.6.0",
     "rollup": "^0.66.2",
     "rollup-plugin-babel": "^4.0.3",
     "rollup-plugin-commonjs": "^9.1.8",
@@ -39,6 +40,6 @@
     "draft-js": "^0.10.5"
   },
   "dependencies": {
-    "@babel/preset-flow": "^7.0.0"
+    "draft-js": "^0.10.5"
   }
 }

packages/utils/package.json

@@ -16,7 +16,7 @@ export default {
       format: 'es',
     },
   ],
-  external: ['draft-js'],
+  external: ['draft-js', 'immutable'],
   plugins: [
     external(),
     babel({

packages/utils/rollup.config.js

@@ -202,11 +202,13 @@ export function hasEntity(
 const insertBlockAfterSelection = (contentState, selectionState, newBlock) => {
   const targetKey = selectionState.getStartKey()
   const array = []
+
   contentState.getBlockMap().forEach((block, blockKey) => {
     array.push(block)
     if (blockKey !== targetKey) return
     array.push(newBlock)
   })
+
   return contentState.merge({
     blockMap: BlockMapBuilder.createFromArray(array),
     selectionBefore: selectionState,
@@ -223,12 +225,14 @@ const insertBlockAfterSelection = (contentState, selectionState, newBlock) => {
 export function insertNewLine(editorState: EditorState) {
   const contentState = editorState.getCurrentContent()
   const selectionState = editorState.getSelection()
+
   const newLineBlock = new ContentBlock({
     key: generateRandomKey(),
     type: 'unstyled',
     text: '',
     characterList: List(),
   })
+
   const withNewLine = insertBlockAfterSelection(
     contentState,
     selectionState,