Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/react-autolink.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let ReactAutolink = () => {
autolink(text, options = {}) {
if (!text) return [];

return text.split(delimiter).map(word => {
return text.split(delimiter).map((word, index) => {
let match = word.match(delimiter);
if (match) {
let url = match[0];
Expand All @@ -25,11 +25,15 @@ let ReactAutolink = () => {

return React.createElement(
'a',
assign({href: strStartsWith(url, 'http') ? url : `http://${url}`}, options),
assign({href: strStartsWith(url, 'http') ? url : `http://${url}`, key: index}, options),
url
);
} else {
return word;
return React.createElement(
'span',
{ key: index },
word
);
}
});
}
Expand Down
12 changes: 10 additions & 2 deletions test/react-autolink-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ describe("ReactAutolinkMixin", () => {

it("render", () => {
ReactDOM.render(<SampleComponent text='foo http://example.org' />, div);
let span = ReactDOM.findDOMNode(TestUtils.findRenderedDOMComponentWithTag(sampleComponent, "span"));
let span = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithTag(sampleComponent, "span")[0]);
assert.equal(
span.innerHTML,
'<span data-reactid=\".0.0.0\">foo </span><a href=\"http://example.org\" data-reactid=\".0.0.1\">http://example.org</a><span data-reactid=\".0.0.2\"></span>'
'<span data-reactid=\".0.0.$0\">foo </span><a href=\"http://example.org\" data-reactid=\".0.0.$1\">http://example.org</a><span data-reactid=\".0.0.$2\"></span>'
);
});

Expand Down Expand Up @@ -156,6 +156,14 @@ describe("ReactAutolinkMixin", () => {
assert.ok(links.length === 2);
});

it("provides keys to links", () => {
const shallowRenderer = TestUtils.createRenderer();
shallowRenderer.render(<SampleComponent text='example.org bar example.com baz' />);
component = shallowRenderer.getRenderOutput();

assert(component.props.children.props.children.every((child) => child.key))
});

it("has attributes when options are given", () => {
ReactDOM.render(<SampleComponent text='example.org' options={{target: "_blank", rel: "nofollow"}} />, div);
let link = ReactDOM.findDOMNode(TestUtils.findRenderedDOMComponentWithTag(sampleComponent, "a"));
Expand Down