Skip to content

Commit

Permalink
fix: merge plain strings props replacements
Browse files Browse the repository at this point in the history
  • Loading branch information
vvo committed Oct 21, 2015
1 parent 3bb5152 commit 7c2bf27
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
17 changes: 17 additions & 0 deletions index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,23 @@ describe(`reactElementToJSXString(ReactElement)`, () => {
reactElementToJSXString(renderer.getRenderOutput())
).toEqual(`<div>
<span />
</div>`);
});

it(`reactElementToJSXString(<div>Hello {this.props.name}</div>`, () => {
class InlineProps extends React.Component {
render() {
return <div>Hello {this.props.name}</div>
}
}

let renderer = createRenderer();
renderer.render(<InlineProps name="John" />);
let actualElement = renderer.getRenderOutput();
expect(reactElementToJSXString(actualElement))
.toEqual(
`<div>
Hello John
</div>`);
});
});
13 changes: 13 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ function toJSXString({ReactElement = null, lvl = 0, inline = false}) {
} else {
out += React.Children
.toArray(children)
.reduce(mergePlainStringChildren, [])
.map(
recurse({lvl, inline})
).join('\n' + spacer(lvl));
Expand All @@ -80,6 +81,18 @@ function toJSXString({ReactElement = null, lvl = 0, inline = false}) {
return out;
}

function mergePlainStringChildren(prev, cur, index, arr) {
var lastItem = prev[prev.length - 1];

if (typeof lastItem === 'string' && typeof cur === 'string') {
prev[prev.length - 1] += cur;
} else {
prev.push(cur);
}

return prev;
}

function formatProps(props) {
return Object
.keys(props)
Expand Down

0 comments on commit 7c2bf27

Please sign in to comment.