gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update Slate shortcode handling to include paragraph

Browse Source
This commit is contained in:
Shawn Erquhart 2017-07-29 23:03:03 -04:00
parent 9174e56414
commit ca60a6b8c9
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/Widgets/Markdown/unified.js
View File

@ -20,8 +20,6 @@ import hastFromString from 'hast-util-from-string';
import hastToMdastHandlerAll from 'hast-util-to-mdast/all'; import hastToMdastHandlerAll from 'hast-util-to-mdast/all';
import { reduce, capitalize } from 'lodash'; import { reduce, capitalize } from 'lodash';
const shortcodeAttributePrefix = 'ncp';
/** /**
* Remove empty nodes, including the top level parents of deeply nested empty nodes. * Remove empty nodes, including the top level parents of deeply nested empty nodes.
*/ */
@ -306,19 +304,18 @@ const remarkToSlatePlugin = () => {
return { nodes }; return { nodes };
} }
/**
* Convert MDAST shortcode nodes to Slate 'shortcode' type nodes.
*/
if (get(node, ['data', 'shortcode'])) {
const { data } = node;
const nodes = [ toTextNode('') ];
return { kind: 'block', type: 'shortcode', data, isVoid: true, nodes };
}
// Process raw html as text, since it's valid markdown // Process raw html as text, since it's valid markdown
if (['text', 'html'].includes(node.type)) { if (['text', 'html'].includes(node.type)) {
const { value, data } = node; return toTextNode(node.value, node.data);
const shortcode = get(data, 'shortcode');
if (shortcode) {
const isBlock = parent.type === 'paragraph' && siblings.length === 1;
data.shortcodeValue = value;
if (isBlock) {
return { kind: 'block', type: 'shortcode', data, isVoid: true, nodes: [toTextNode('')] };
}
}
return toTextNode(value, data);
} }
if (node.type === 'inlineCode') { if (node.type === 'inlineCode') {
@ -534,11 +531,9 @@ export const slateToRemark = raw => {
} }
if (node.type === 'shortcode') { if (node.type === 'shortcode') {
return u('html', { data: node.data }, node.data.shortcodeValue); const { data } = node;
} const textNode = u('html', data.shortcodeValue);
return u('paragraph', { data }, [ textNode ]);
if (node.type === 'shortcode-wrapper') {
return u('paragraph', children);
} }
if (node.type.startsWith('heading')) { if (node.type.startsWith('heading')) {