Skip to content

Commit 62a8f8d

Browse files
committed
Revert "Fix markdown parsing for italic (sstur#254)"
This reverts commit be8c9d3. This commit causes issues on safari
1 parent 847fbb4 commit 62a8f8d

File tree

4 files changed

+1
-742
lines changed

4 files changed

+1
-742
lines changed

packages/draft-js-import-markdown/src/MarkdownParser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ var inline = {
376376
reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
377377
nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
378378
strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
379-
em: /^_([\s\S]+?)(?<!\\)_|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
379+
em: /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
380380
code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
381381
br: /^ {2,}\n(?!\s*$)/,
382382
del: noop,

packages/draft-js-import-markdown/src/__tests__/stateFromMarkdown-test.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import expect from 'expect';
44
import stateFromMarkdown from '../stateFromMarkdown';
55
import {convertToRaw} from 'draft-js';
66

7-
8-
import expectedRawData from '../test-fixtures/rawData.js';
9-
import markdownValues from '../test-fixtures/markdownValues.js';
10-
117
describe('stateFromMarkdown', () => {
128
it('should create content state', () => {
139
let markdown = 'Hello World';
@@ -253,30 +249,6 @@ describe('stateFromMarkdown', () => {
253249
],
254250
});
255251
});
256-
it('should correctly parse italic words with markdown', () => {
257-
let contentState = stateFromMarkdown(markdownValues.italicTest);
258-
let rawContentState = convertToRaw(contentState);
259-
let blocks = removeKeys(rawContentState.blocks);
260-
expect([expectedRawData.italicTest]).toEqual(blocks);
261-
});
262-
it('should correctly parse italic and bold words with markdown', () => {
263-
let contentState = stateFromMarkdown(markdownValues.italicAndBoldTest);
264-
let rawContentState = convertToRaw(contentState);
265-
let blocks = removeKeys(rawContentState.blocks);
266-
expect([expectedRawData.italicAndBoldTest]).toEqual(blocks);
267-
});
268-
it('should correctly parse italic words with the "_" character in markdown', () => {
269-
let contentState = stateFromMarkdown(markdownValues.italicEscapeUnderscoreChar);
270-
let rawContentState = convertToRaw(contentState);
271-
let blocks = removeKeys(rawContentState.blocks);
272-
expect([expectedRawData.italicEscapeUnderscoreChar]).toEqual(blocks);
273-
});
274-
it('should correctly parse italic and Bold words with the "*" character in markdown', () => {
275-
let contentState = stateFromMarkdown(markdownValues.italicEscapeBoldChar);
276-
let rawContentState = convertToRaw(contentState);
277-
let blocks = removeKeys(rawContentState.blocks);
278-
expect([expectedRawData.italicEscapeBoldChar]).toEqual(blocks);
279-
});
280252
});
281253

282254
function removeKeys(blocks) {

packages/draft-js-import-markdown/src/test-fixtures/markdownValues.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)