Skip to content

Fix HTML to DOM client parser #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2016
Merged

Fix HTML to DOM client parser #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80ca2e2
Fix HTML to DOM client parser
remarkablemark Aug 24, 2016
8cd62a8
Throw an error if the first argument for the parser is not a string
remarkablemark Aug 24, 2016
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
3 changes: 3 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
* @return {ReactElement|Array}
*/
function HTMLReactParser(html, options) {
if (typeof html !== 'string') {
throw new Error('`HTMLReactParser`: The first argument must be a string.');
}
return domToReact(htmlToDOM(html), options);
}

Expand Down
35 changes: 29 additions & 6 deletions lib/html-to-dom-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,45 @@ function formatDOM(nodes, parentNode) {
* @return {Object} - The DOM nodes.
*/
function htmlToDOMClient(html) {
var root;
var match = typeof html === 'string' ? html.match(/<(.+?)>/) : null;
var tagName;
var parentNode;
var nodes;

if (match && typeof match[1] === 'string') {
tagName = match[1].toLowerCase();
}

// `DOMParser` can parse full HTML
// https://developer.mozilla.org/en-US/docs/Web/API/DOMParser
if (window.DOMParser) {
if (tagName && window.DOMParser) {
var parser = new window.DOMParser();
root = parser.parseFromString(html, 'text/html');
var doc = parser.parseFromString(html, 'text/html');

// <head> and <body> are siblings
if (tagName === 'head' || tagName === 'body') {
nodes = doc.getElementsByTagName(tagName);

// document's child nodes
} else if (tagName === 'html') {
nodes = doc.childNodes;

// get the element's parent's child nodes
// do this in case of adjacent elements
} else {
parentNode = doc.getElementsByTagName(tagName)[0].parentNode;
nodes = parentNode.childNodes;
}

// otherwise, use `innerHTML`
// but this will strip out tags like <html> and <body>
} else {
root = document.createElement('div');
root.innerHTML = html;
parentNode = document.createElement('div');
parentNode.innerHTML = html;
nodes = parentNode.childNodes;
}

return formatDOM(root.childNodes);
return formatDOM(nodes);
}

/**
Expand Down
12 changes: 12 additions & 0 deletions test/html-to-react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ describe('html-to-react', function() {
*/
describe('parser', function() {

it('throws an error if first argument is not a string', function() {
assert.throws(function() { Parser(); });

[undefined, null, {}, [], 42].forEach(function(arg) {
assert.throws(function() { Parser(arg); });
});
});

it('returns string if cannot be parsed to HTML', function() {
assert.equal(Parser('foo'), 'foo');
});

it('converts single HTML element to React', function() {
var html = data.html.single;
var reactElement = Parser(html);
Expand Down