Merge pull request #38 from troutowicz/header-return-fix

Only create new line after header on EOL return

Author: ngs

src/__test__/plugin-test.js

@@ -150,13 +150,21 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
               data: {}
             }]
           };
+          currentSelectionState = new SelectionState({
+            anchorKey: 'item1',
+            anchorOffset: 5,
+            focusKey: 'item1',
+            focusOffset: 5,
+            isBackward: false,
+            hasFocus: true
+          });
           expect(subject()).to.equal('handled');
           expect(modifierSpy).to.have.been.calledOnce();
           expect(store.setEditorState).to.have.been.calledWith(newEditorState);
         };
         ['one', 'two', 'three', 'four', 'five', 'six'].forEach((level) => {
           describe(`on header-${level}`, () => {
-            it('inserts new empty block', testInsertNewBlock(`header-${level}`));
+            it('inserts new empty block on end of header return', testInsertNewBlock(`header-${level}`));
           });
         });
         ['ctrlKey', 'shiftKey', 'metaKey', 'altKey'].forEach((key) => {

src/index.js

@@ -49,8 +49,9 @@ function checkReturnForState(editorState, ev) {
   if (/-list-item$/.test(type) && text === '') {
     newEditorState = leaveList(editorState);
   }
-  if (newEditorState === editorState &&
-    (ev.ctrlKey || ev.shiftKey || ev.metaKey || ev.altKey || /^header-/.test(type))) {
+  if (newEditorState === editorState
+      && (ev.ctrlKey || ev.shiftKey || ev.metaKey || ev.altKey
+          || (/^header-/.test(type) && selection.isCollapsed() && selection.getEndOffset() === text.length))) {
     newEditorState = insertEmptyBlock(editorState);
   }
   if (newEditorState === editorState && type !== 'code-block' && /^```([\w-]+)?$/.test(text)) {