preserve whitespace at each block boundaries (#713)

pull/3073/head
Bryan Terce 6 years ago committed by Conduitry
parent 5d51d50613
commit fee4d351e1

@ -42,6 +42,13 @@ function link(next: Wrapper, prev: Wrapper) {
if (next) next.prev = prev;
}
function trimmable_at(child: INode, next_sibling: Wrapper): boolean {
// Whitespace is trimmable if one of the following is true:
// The child and its sibling share a common nearest each block (not at an each block boundary)
// The next sibling's previous node is an each block
return (next_sibling.node.find_nearest(/EachBlock/) === child.find_nearest(/EachBlock/)) || next_sibling.node.prev.type === 'EachBlock';
}
export default class FragmentWrapper {
nodes: Wrapper[];
@ -85,7 +92,7 @@ export default class FragmentWrapper {
if (this.nodes.length === 0) {
const should_trim = (
// @ts-ignore todo: probably error, should it be next_sibling.node.data?
next_sibling ? (next_sibling.node.type === 'Text' && /^\s/.test(next_sibling.data)) : !child.has_ancestor('EachBlock')
next_sibling ? (next_sibling.node.type === 'Text' && /^\s/.test(next_sibling.data) && trimmable_at(child, next_sibling)) : !child.has_ancestor('EachBlock')
);
if (should_trim) {

@ -0,0 +1,16 @@
const message = "the quick brown fox jumps over the lazy dog";
const expected = [...message].map(c => `<span>${c + " "}</span>`).join("");
export default {
props: {
message
},
async test({ assert, target }) {
const firstSpanList = target.children[0];
assert.equal(firstSpanList.innerHTML, expected);
const secondSpanList = target.children[1];
assert.equal(secondSpanList.innerHTML, expected);
}
};

@ -0,0 +1,11 @@
<script>
let message = "the quick brown fox jumps over the lazy dog"
</script>
<div id="first">
{#each message as char}
<span>{char} </span>
{/each}
</div>
<div id="second">{#each message as char}<span>{char} </span>{/each}</div>
Loading…
Cancel
Save