Merge 72a2ae7 into 3bf4bd4

lib/process-node-definitions.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var _ = require('lodash');
+var ent = require('ent');
 
 function createStyleJsonFromString(styleString) {
     if (_.isNull(styleString) || _.isUndefined(styleString) || styleString === '') {
@@ -24,7 +25,7 @@ var ProcessNodeDefinitions = function(React) {
 
     function processDefaultNode(node, children) {
         if (node.type === 'text') {
-            return node.data;
+            return ent.decode(node.data);
         } else if (node.type === 'comment') {
             // FIXME: The following doesn't work as the generated HTML results in "<!--  This is a comment  -->"
             //return '<!-- ' + node.data + ' -->';
@@ -60,4 +61,3 @@ var ProcessNodeDefinitions = function(React) {
 };
 
 module.exports = ProcessNodeDefinitions;
-

package.json

@@ -35,6 +35,7 @@
     }
   },
   "dependencies": {
+    "ent": "^2.2.0",
     "htmlparser2": "^3.8.3",
     "lodash": "^3.9.3"
   },

test/html-to-react-tests.js

@@ -11,9 +11,9 @@ describe('Html2React', function() {
     var parser = new Parser(React);
 
     before(function() {
-      console.error = function(message) {
-        throw new Error(message);
-      };
+        console.error = function(message) {
+            throw new Error(message);
+        };
     })
 
     describe('parse valid HTML', function() {
@@ -101,6 +101,15 @@ describe('Html2React', function() {
 
             assert.equal(reactHtml, htmlExpected);
         });
+
+        it('should decode character entities in text nodes', function () {
+            var htmlInput = '<div>1 &lt; 2</div>';
+
+            var reactComponent = parser.parse(htmlInput);
+            var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
+
+            assert.equal(reactHtml, htmlInput);
+        });
     });
 
     describe('parse invalid HTML', function() {