- add inLink function

- add unit tests to ensure transformation is not applied when current entity is link

Author: juliankrispel

src/__test__/plugin.test.js

@@ -127,6 +127,51 @@ describe("draft-js-markdown-plugin", () => {
           expect(modifierSpy).not.toHaveBeenCalledTimes(1);
           expect(store.setEditorState).not.toHaveBeenCalled();
         });
+
+        it("does not handle if current entity is link", () => {
+          currentRawContentState = {
+            entityMap: {
+              "0": {
+                data: {
+                  href: "www.google.com",
+                  url: "http://www.google.com",
+                },
+                mutability: "MUTABLE",
+                type: "LINK",
+              },
+            },
+            blocks: [
+              {
+                key: "item1",
+                text: "what **is** going on",
+                type: "unstyled",
+                depth: 0,
+                inlineStyleRanges: [],
+                entityRanges: [
+                  {
+                    offset: 0,
+                    key: 0,
+                    length: 20,
+                  },
+                ],
+                data: {},
+              },
+            ],
+          };
+
+          currentSelectionState = currentEditorState.getSelection().merge({
+            focusOffset: 19,
+            anchorOffset: 19,
+          });
+
+          currentEditorState = createEditorState(
+            currentRawContentState,
+            currentSelectionState
+          );
+
+          expect(subject()).toBe("not-handled");
+        });
+
         it("leaves from list", () => {
           createMarkdownPlugin.__Rewire__("leaveList", modifierSpy); // eslint-disable-line no-underscore-dangle
           currentRawContentState = {
@@ -375,6 +420,51 @@ describe("draft-js-markdown-plugin", () => {
             expect(subject()).toBe("not-handled");
           });
         });
+        describe("current entity is a link", () => {
+          it("returns not-handled", () => {
+            currentRawContentState = {
+              entityMap: {
+                "0": {
+                  data: {
+                    href: "www.google.com",
+                    url: "http://www.google.com",
+                  },
+                  mutability: "MUTABLE",
+                  type: "LINK",
+                },
+              },
+              blocks: [
+                {
+                  key: "item1",
+                  text: "what **is** going on",
+                  type: "unstyled",
+                  depth: 0,
+                  inlineStyleRanges: [],
+                  entityRanges: [
+                    {
+                      offset: 0,
+                      key: 0,
+                      length: 20,
+                    },
+                  ],
+                  data: {},
+                },
+              ],
+            };
+
+            currentSelectionState = currentEditorState.getSelection().merge({
+              focusOffset: 19,
+              anchorOffset: 19,
+            });
+
+            currentEditorState = createEditorState(
+              currentRawContentState,
+              currentSelectionState
+            );
+
+            expect(subject()).toBe("not-handled");
+          });
+        });
       });
       describe("handlePastedText", () => {
         let pastedText;

src/index.js

@@ -25,6 +25,16 @@ import { CODE_BLOCK_REGEX } from "./constants";
 
 const INLINE_STYLE_CHARACTERS = [" ", "*", "_"];
 
+function inLink(editorState) {
+  const selection = editorState.getSelection();
+  const contentState = editorState.getCurrentContent();
+  const block = contentState.getBlockForKey(selection.getAnchorKey());
+  const entityKey = block.getEntityAt(selection.getFocusOffset());
+  return (
+    entityKey != null && contentState.getEntity(entityKey).getType() === "LINK"
+  );
+}
+
 function inCodeBlock(editorState) {
   const startKey = editorState.getSelection().getStartKey();
   if (startKey) {
@@ -153,6 +163,9 @@ const createMarkdownPlugin = (config = {}) => {
       return "not-handled";
     },
     handleReturn(ev, editorState, { setEditorState }) {
+      if (inLink(editorState)) return "not-handled";
+
+      const selection = editorState.getSelection();
       let newEditorState = checkReturnForState(editorState, ev);
       if (editorState !== newEditorState) {
         setEditorState(newEditorState);
@@ -175,9 +188,12 @@ const createMarkdownPlugin = (config = {}) => {
         return "not-handled";
       }
 
-      // If we're in a code block don't add markdown to it
+      // If we're in a code block - don't transform markdown
       if (inCodeBlock(editorState)) return "not-handled";
 
+      // If we're in a link - don't transform markdown
+      if (inLink(editorState)) return "not-handled";
+
       const newEditorState = checkCharacterForState(editorState, character);
       if (editorState !== newEditorState) {
         setEditorState(newEditorState);