Test case for returning key at the end of line inside code block

Author: ngs

src/__test__/plugin-test.js

@@ -167,8 +167,8 @@ describe('draft-js-markdown-shortcuts-plugin', () => {
             entityMap: {},
             blocks: [{
               key: 'item1',
-              text: '',
-              type: '```',
+              text: '```',
+              type: 'unstyled',
               depth: 0,
               inlineStyleRanges: [],
               entityRanges: [],

src/modifiers/__test__/handleNewCodeBlock-test.js

@@ -96,17 +96,17 @@ describe('handleNewCodeBlock', () => {
       }]
     };
     const contentState = Draft.convertFromRaw(beforeRawContentState);
-    const selection = new SelectionState({
-      anchorKey: 'item1',
-      anchorOffset: 21,
-      focusKey: 'item1',
-      focusOffset: 21,
-      isBackward: false,
-      hasFocus: true
-    });
-    const editorState = EditorState.forceSelection(
-      EditorState.createWithContent(contentState), selection);
     it('adds new line inside code block', () => {
+      const selection = new SelectionState({
+        anchorKey: 'item1',
+        anchorOffset: 21,
+        focusKey: 'item1',
+        focusOffset: 21,
+        isBackward: false,
+        hasFocus: true
+      });
+      const editorState = EditorState.forceSelection(
+        EditorState.createWithContent(contentState), selection);
       const newEditorState = handleNewCodeBlock(editorState);
       expect(newEditorState).not.to.equal(editorState);
       expect(
@@ -115,6 +115,25 @@ describe('handleNewCodeBlock', () => {
         afterRawContentState
       );
     });
+    it('does not add new line even inside code block', () => {
+      const selection = new SelectionState({
+        anchorKey: 'item1',
+        anchorOffset: 10,
+        focusKey: 'item1',
+        focusOffset: 10,
+        isBackward: false,
+        hasFocus: true
+      });
+      const editorState = EditorState.forceSelection(
+        EditorState.createWithContent(contentState), selection);
+      const newEditorState = handleNewCodeBlock(editorState);
+      expect(newEditorState).to.equal(editorState);
+      expect(
+        Draft.convertToRaw(newEditorState.getCurrentContent())
+      ).to.deep.equal(
+        beforeRawContentState
+      );
+    });
   });
 
   describe('in unstyled block without three backquotes', () => {

src/modifiers/handleNewCodeBlock.js

@@ -7,7 +7,8 @@ const handleNewCodeBlock = (editorState) => {
   const key = selection.getStartKey();
   const currentBlock = contentState.getBlockForKey(key);
   const matchData = /^```([\w-]+)?$/.exec(currentBlock.getText());
-  if (matchData && selection.getEndOffset() === currentBlock.getLength()) {
+  const isLast = selection.getEndOffset() === currentBlock.getLength();
+  if (matchData && isLast) {
     const data = {};
     const language = matchData[1];
     if (language) {
@@ -16,7 +17,7 @@ const handleNewCodeBlock = (editorState) => {
     return changeCurrentBlockType(editorState, 'code-block', '', data);
   }
   const type = currentBlock.getType();
-  if (type === 'code-block') {
+  if (type === 'code-block' && isLast) {
     return insertEmptyBlock(editorState, 'code-block', currentBlock.getData());
   }
   return editorState;