Merge pull request #76 from withspectrum/unsticky-inline-styles

Don't auto-insert spaces, unsticky inline styles

Author: mxstbr

package.json

@@ -1,6 +1,6 @@
 {
   "name": "draft-js-markdown-plugin",
-  "version": "2.0.0",
+  "version": "2.0.1-0",
   "description": "A DraftJS plugin for supporting Markdown syntax shortcuts, fork of draft-js-markdown-shortcuts-plugin",
   "main": "lib/index.js",
   "scripts": {

src/modifiers/__test__/handleInlineStyle-test.js

@@ -68,7 +68,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -129,7 +129,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -174,7 +174,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello TL;DR:  style",
+            text: "hello TL;DR: style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -219,7 +219,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -270,7 +270,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -320,7 +320,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -365,7 +365,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [
@@ -419,7 +419,7 @@ describe("handleInlineStyle", () => {
         blocks: [
           {
             key: "item1",
-            text: "hello inline  style",
+            text: "hello inline style",
             type: "unstyled",
             depth: 0,
             inlineStyleRanges: [

src/modifiers/changeCurrentInlineStyle.js

@@ -1,3 +1,4 @@
+import { OrderedSet } from "immutable";
 import { EditorState, SelectionState, Modifier } from "draft-js";
 
 const changeCurrentInlineStyle = (editorState, matchArr, style) => {
@@ -60,7 +61,10 @@ const changeCurrentInlineStyle = (editorState, matchArr, style) => {
     "change-inline-style"
   );
 
-  return EditorState.forceSelection(newEditorState, afterSelection);
+  return EditorState.setInlineStyleOverride(
+    EditorState.forceSelection(newEditorState, afterSelection),
+    OrderedSet.of("")
+  );
 };
 
 export default changeCurrentInlineStyle;

src/modifiers/handleInlineStyle.js

@@ -52,8 +52,6 @@ const handleInlineStyle = (
 
     if (character === "\n") {
       newContentState = Modifier.splitBlock(newContentState, selection);
-    } else {
-      newContentState = Modifier.insertText(newContentState, selection, " ");
     }
 
     newEditorState = EditorState.push(