Merge remote-tracking branch 'y-tsubuku/avoid_changing_block_if_a_block_is_code' into develop

ngs · ngs · commit 6d8d424bd77a · 2020-06-02T12:27:26.000+09:00
diff --git a/src/modifiers/handleBlockType.js b/src/modifiers/handleBlockType.js
@@ -20,7 +20,7 @@ const handleBlockType = (editorState, character) => {
   const line = [text.slice(0, position), character, text.slice(position)].join('');
   const blockType = RichUtils.getCurrentBlockType(editorState);
   for (let i = 1; i <= 6; i += 1) {
-    if (line.indexOf(`${sharps(i)} `) === 0) {
+    if (line.indexOf(`${sharps(i)} `) === 0 && blockType !== 'code-block') {
       return changeCurrentBlockType(editorState, blockTypes[i], line.replace(/^#+\s/, ''));
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const handleBlockType = (editorState, character) => {`
`20`	`20`	`const line = [text.slice(0, position), character, text.slice(position)].join('');`
`21`	`21`	`const blockType = RichUtils.getCurrentBlockType(editorState);`
`22`	`22`	`for (let i = 1; i <= 6; i += 1) {`
`23`		- if (line.indexOf(`${sharps(i)} `) === 0) {
	`23`	+ if (line.indexOf(`${sharps(i)} `) === 0 && blockType !== 'code-block') {
`24`	`24`	`return changeCurrentBlockType(editorState, blockTypes[i], line.replace(/^#+\s/, ''));`
`25`	`25`	`}`
`26`	`26`	`}`