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

distinguish between newline and soft break in editor

Browse Source
This commit is contained in:
Shawn Erquhart 2017-09-03 11:36:30 -04:00
parent aa14a663e0
commit cd111f3a3d
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Widgets/Markdown/serializers/remarkSlate.js
View File

@ -239,7 +239,7 @@ function convertNode(node, nodes) {
* line breaks within a text node. * line breaks within a text node.
*/ */
case 'break': { case 'break': {
return createText('\n'); return createText('\n', { isBreak: true });
} }
/** /**

27
src/components/Widgets/Markdown/serializers/slateRemark.js
View File

@ -56,24 +56,6 @@ function processCodeMark(markTypes) {
} }
/**
* Returns an array of one or more MDAST text nodes of the given type, derived
* from the text received. Certain transformations, such as line breaks, cause
* multiple nodes to be returned.
*/
function createTextNodes(text, type = 'html') {
/**
* Split the text string at line breaks, then map each substring to an array
* pair consisting of an MDAST text node followed by a break node. This will
* result in nested arrays, so we use `flatMap` to produce a flattened array,
* and `initial` to leave off the superfluous trailing break.
*/
const brokenText = text.split('\n');
const toPair = str => [u(type, str), u('break')];
return initial(flatMap(brokenText, toPair));
}
/** /**
* Wraps a text node in one or more mark nodes by placing the text node in an * Wraps a text node in one or more mark nodes by placing the text node in an
* array and using that as the `children` value of a mark node. The resulting * array and using that as the `children` value of a mark node. The resulting
@ -143,12 +125,15 @@ function wrapTextWithMarks(textNode, markTypes) {
*/ */
function convertTextNode(node) { function convertTextNode(node) {
if (get(node.data, 'isBreak')) {
return u('break');
}
/** /**
* If the Slate text node has no "ranges" property, just return an equivalent * If the Slate text node has no "ranges" property, just return an equivalent
* MDAST node. * MDAST node.
*/ */
if (!node.ranges) { if (!node.ranges) {
return createTextNodes(node.text); return u('html', node.text);
} }
/** /**
@ -172,13 +157,13 @@ function convertTextNode(node) {
/** /**
* Create the base text node. * Create the base text node.
*/ */
const textNodes = createTextNodes(text, textNodeType); const textNode = u(textNodeType, text);
/** /**
* Recursively wrap the base text node in the individual mark nodes, if * Recursively wrap the base text node in the individual mark nodes, if
* any exist. * any exist.
*/ */
return textNodes.map(textNode => wrapTextWithMarks(textNode, filteredMarkTypes)); return wrapTextWithMarks(textNode, filteredMarkTypes);
}); });
/** /**