Fix paste behavior for code block

Author: sugarshin

src/__test__/plugin-test.js

@@ -17,9 +17,20 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
     createMarkdownShortcutsPlugin.__ResetDependency__('handleLink');
     createMarkdownShortcutsPlugin.__ResetDependency__('handleImage');
     createMarkdownShortcutsPlugin.__ResetDependency__('leaveList');
+    createMarkdownShortcutsPlugin.__ResetDependency__('changeCurrentBlockType');
+    createMarkdownShortcutsPlugin.__ResetDependency__('replaceText');
+    createMarkdownShortcutsPlugin.__ResetDependency__('checkReturnForState');
     /* eslint-enable no-underscore-dangle */
   });
 
+  const createEditorState = (rawContent, rawSelection) => {
+    const contentState = Draft.convertFromRaw(rawContent);
+    return EditorState.forceSelection(
+      EditorState.createWithContent(contentState),
+      rawSelection
+    );
+  };
+
   let plugin;
   let store;
   let currentEditorState;
@@ -67,10 +78,7 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
       store = {
         setEditorState: sinon.spy(),
         getEditorState: sinon.spy(() => {
-          const contentState = Draft.convertFromRaw(currentRawContentState);
-          currentEditorState = EditorState.forceSelection(
-            EditorState.createWithContent(contentState),
-            currentSelectionState);
+          currentEditorState = createEditorState(currentRawContentState, currentSelectionState);
           return currentEditorState;
         })
       };
@@ -179,6 +187,23 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
           expect(modifierSpy).to.have.been.calledOnce();
           expect(store.setEditorState).to.have.been.calledWith(newEditorState);
         });
+        it('handle code block closing', () => {
+          createMarkdownShortcutsPlugin.__Rewire__('changeCurrentBlockType', modifierSpy); // eslint-disable-line no-underscore-dangle
+          currentRawContentState = {
+            entityMap: {},
+            blocks: [{
+              key: 'item1',
+              text: 'foo\n```',
+              type: 'code-block',
+              depth: 0,
+              inlineStyleRanges: [],
+              entityRanges: [],
+              data: {}
+            }]
+          };
+          expect(subject()).to.equal('handled');
+          expect(modifierSpy).to.have.been.calledOnce();
+        });
         it('insert new line char from code-block', () => {
           createMarkdownShortcutsPlugin.__Rewire__('insertText', modifierSpy); // eslint-disable-line no-underscore-dangle
           currentRawContentState = {
@@ -311,6 +336,7 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
         beforeEach(() => {
           pastedText = `_hello world_
           Hello`;
+          html = undefined;
           subject = () => plugin.handlePastedText(pastedText, html, store);
         });
         [
@@ -349,6 +375,42 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
             expect(modifierSpy).to.have.been.calledWith(currentEditorState, 'hello');
           });
         });
+        describe('pasted just text with new line code', () => {
+          beforeEach(() => {
+            pastedText = 'hello\nworld';
+            const rawContentState = {
+              entityMap: {},
+              blocks: [{
+                key: 'item1',
+                text: '',
+                type: 'unstyled',
+                depth: 0,
+                inlineStyleRanges: [],
+                entityRanges: [],
+                data: {}
+              }]
+            };
+            const otherRawContentState = {
+              entityMap: {},
+              blocks: [{
+                key: 'item2',
+                text: 'H1',
+                type: 'header-one',
+                depth: 0,
+                inlineStyleRanges: [],
+                entityRanges: [],
+                data: {}
+              }]
+            };
+            /* eslint-disable no-underscore-dangle */
+            createMarkdownShortcutsPlugin.__Rewire__('replaceText', () => createEditorState(rawContentState, currentSelectionState));
+            createMarkdownShortcutsPlugin.__Rewire__('checkReturnForState', () => createEditorState(otherRawContentState, currentSelectionState));
+            /* eslint-enable no-underscore-dangle */
+          });
+          it('return handled', () => {
+            expect(subject()).to.equal('handled');
+          });
+        });
         describe('passed `html` argument', () => {
           beforeEach(() => {
             pastedText = '# hello';

src/index.js

@@ -14,6 +14,7 @@ import handleLink from './modifiers/handleLink';
 import handleImage from './modifiers/handleImage';
 import leaveList from './modifiers/leaveList';
 import insertText from './modifiers/insertText';
+import changeCurrentBlockType from './modifiers/changeCurrentBlockType';
 import createLinkDecorator from './decorators/link';
 import createImageDecorator from './decorators/image';
 import { replaceText } from './utils';
@@ -49,12 +50,17 @@ function checkReturnForState(editorState, ev) {
     (ev.ctrlKey || ev.shiftKey || ev.metaKey || ev.altKey || /^header-/.test(type))) {
     newEditorState = insertEmptyBlock(editorState);
   }
-  if (newEditorState === editorState && type === 'code-block') {
-    newEditorState = insertText(editorState, '\n');
-  }
-  if (newEditorState === editorState) {
+  if (newEditorState === editorState && type !== 'code-block' && /^```([\w-]+)?$/.test(text)) {
     newEditorState = handleNewCodeBlock(editorState);
   }
+  if (newEditorState === editorState && type === 'code-block') {
+    if (/```\s*$/.test(text)) {
+      newEditorState = changeCurrentBlockType(newEditorState, type, text.replace(/\n```\s*$/, ''));
+      newEditorState = insertEmptyBlock(newEditorState);
+    } else {
+      newEditorState = insertText(editorState, '\n');
+    }
+  }
 
   return newEditorState;
 }
@@ -148,8 +154,12 @@ const createMarkdownShortcutsPlugin = (config = {}) => {
           buffer = [];
         } else if (text[i].charCodeAt(0) === 10) {
           newEditorState = replaceText(newEditorState, buffer.join(''));
-          newEditorState = insertEmptyBlock(newEditorState);
-          newEditorState = checkReturnForState(newEditorState, {});
+          const tmpEditorState = checkReturnForState(newEditorState, {});
+          if (newEditorState === tmpEditorState) {
+            newEditorState = insertEmptyBlock(tmpEditorState);
+          } else {
+            newEditorState = tmpEditorState;
+          }
           buffer = [];
         } else if (i === text.length - 1) {
           newEditorState = replaceText(newEditorState, buffer.join('') + text[i]);