Bug fix and upgrade

Author: jpuri

dist/html-to-draftjs.js

@@ -1,6 +1,6 @@
 {
   "name": "html-to-draftjs",
-  "version": "0.1.0-beta12",
+  "version": "0.1.0-beta14",
   "main": "dist/html-to-draftjs.js",
   "repository": {
     "type": "git",

package.json

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import { Editor } from 'react-draft-wysiwyg';
-import { convertToRaw, ContentState, EditorState, convertFromHTML } from 'draft-js';
+import { convertToRaw, ContentState, EditorState } from 'draft-js';
 import draftToHtml from 'draftjs-to-html';
 import htmlToDraft from './library';
 import '../node_modules/react-draft-wysiwyg/dist/react-draft-wysiwyg.css';
@@ -18,7 +18,7 @@ class Playground extends Component {
 
   constructor(props) {
     super(props)
-    const html = '<p>123</p><p></p><img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSvGBbRtzgNfNaHPP9X28Gj6OQF0l6ZaiqgxJlujX5QsE5g35Or18WijxY3" alt="undefined" style="float:none;height: auto;width: auto"/><p>456</p>'
+    const html = '';
     const contentBlock = htmlToDraft(html);
     if (contentBlock) {
       const contentState = ContentState.createFromBlockArray(contentBlock.contentBlocks, contentBlock.entityMap);

src/index.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import { CharacterMetadata, ContentBlock, genKey, Entity } from 'draft-js';
-import { List, OrderedMap, OrderedSet } from 'immutable';
+import { Map, List, OrderedMap, OrderedSet } from 'immutable';
 import getSafeBodyFromHTML from './getSafeBodyFromHTML';
 import {
   createTextChunk,
@@ -146,34 +146,33 @@ export default function htmlToDraft(html: string): Object {
     let start = 0;
     return {
       contentBlocks: chunk.text.split('\r')
-      .map(
-        (textBlock, ii) => {
-          const end = start + textBlock.length;
-          const inlines = chunk && chunk.inlines.slice(start, end);
-          const entities = chunk && chunk.entities.slice(start, end);
-          const characterList = new List(
-            inlines.map((style, index) => {
-              const data = { style, entity: null };
-              if (entities[index]) {
-                data.entity = entities[index];
-              }
-              return CharacterMetadata.create(data);
-            }),
-          );
-          start = end;
-          return new ContentBlock({
-            key: genKey(),
-            type: chunk && chunk.blocks[ii].type,
-            depth: chunk && chunk.blocks[ii].depth,
-            data: chunk && chunk.blocks[ii].data,
-            text: textBlock,
-            characterList,
-          });
-        },
-      ),
+        .map(
+          (textBlock, ii) => {
+            const end = start + textBlock.length;
+            const inlines = chunk && chunk.inlines.slice(start, end);
+            const entities = chunk && chunk.entities.slice(start, end);
+            const characterList = new List(
+              inlines.map((style, index) => {
+                const data = { style, entity: null };
+                if (entities[index]) {
+                  data.entity = entities[index];
+                }
+                return CharacterMetadata.create(data);
+              }),
+            );
+            start = end;
+            return new ContentBlock({
+              key: genKey(),
+              type: (chunk && chunk.blocks[ii] && chunk.blocks[ii].type) || 'unstyled',
+              depth: chunk && chunk.blocks[ii] && chunk.blocks[ii].depth,
+              data: (chunk && chunk.blocks[ii] && chunk.blocks[ii].data) || new Map({}),
+              text: textBlock,
+              characterList,
+            });
+          },
+        ),
       entityMap,
     };
-    return null;
   }
   return null;
 }