Merge branch 'master' into master

Author: jpuri

dist/html-to-draftjs.js

@@ -1,6 +1,6 @@
 {
   "name": "html-to-draftjs",
-  "version": "0.1.0-beta7",
+  "version": "0.1.0-beta11",
   "main": "dist/html-to-draftjs.js",
   "repository": {
     "type": "git",
@@ -12,10 +12,10 @@
     "babel-preset-stage-0": "^6.22.0",
     "chai": "^3.5.0",
     "draft-js": "^0.10.0",
-    "draftjs-to-html": "^0.6.3",
+    "draftjs-to-html": "^0.7.3",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
-    "react-draft-wysiwyg": "^1.7.6",
+    "react-draft-wysiwyg": "^1.10.7",
     "react-scripts": "0.9.5",
     "rimraf": "^2.6.1",
     "webpack": "^2.2.1"

package.json

@@ -18,10 +18,10 @@ class Playground extends Component {
 
   constructor(props) {
     super(props)
-    const html = '<p>123</p>'
+    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 contentBlock = htmlToDraft(html);
     if (contentBlock) {
-      const contentState = ContentState.createFromBlockArray(contentBlock.contentBlocks);
+      const contentState = ContentState.createFromBlockArray(contentBlock.contentBlocks, contentBlock.entityMap);
       const inputEditorState = EditorState.createWithContent(contentState);
       this.state = {
         inputEditorState,

src/index.js

@@ -9,6 +9,9 @@ describe('htmlToDraft test suite', () => {
     contentBlocks = htmlToDraft('<p>test</p>');
     console.log('contentBlocks', contentBlocks);
 
+    contentBlocks = htmlToDraft('<div>test</div>');
+    console.log('contentBlocks', contentBlocks);
+
     contentBlocks = htmlToDraft('<h1>test</h1>');
     console.log('contentBlocks', contentBlocks);
 

src/library/__tests__/mainTest.js

@@ -35,6 +35,7 @@ const blockRenderMap = new Map({
   },
   unstyled: {
     element: 'p',
+    aliasedElements: ['div']
   },
 });
 
@@ -47,7 +48,8 @@ export default function getBlockTypeForTag(
       return (
       (draftBlock.element === tag &&
       (!draftBlock.wrapper || draftBlock.wrapper === lastList)) ||
-      draftBlock.wrapper === tag
+      draftBlock.wrapper === tag ||
+      (draftBlock.aliasedElements && draftBlock.aliasedElements.indexOf(tag) > -1)
     )})
     .keySeq()
     .toSet()

src/library/getBlockTypeForTag.js

@@ -10,15 +10,16 @@ const getEntityId = (node) => {
       entityConfig.url = node.href;
       entityConfig.text = node.innerHTML;
       entityConfig.value = node.dataset.value;
-      entityId = Entity.create(
+      entityId = Entity.__create(
         'MENTION',
         'IMMUTABLE',
         entityConfig,
       );
     } else {
-      entityConfig.url = node.href;
+      entityConfig.url = node.getAttribute('href') || node.href;
       entityConfig.title = node.innerHTML;
-      entityId = Entity.create(
+      entityConfig.target = node.target;
+      entityId = Entity.__create(
         'LINK',
         'MUTABLE',
         entityConfig,

src/library/getEntityId.js

@@ -45,9 +45,13 @@ function genFragment(
   ) {
     const entityConfig = {};
     entityConfig.src = node.getAttribute ? node.getAttribute('src') || node.src : node.src;
+    entityConfig.alt = node.alt;
     entityConfig.height = node.style.height;
     entityConfig.width = node.style.width;
-    const entityId = Entity.create(
+    if (node.style.float) {
+      entityConfig.alignment = node.style.float;
+    }
+    const entityId = Entity.__create(
       'IMAGE',
       'MUTABLE',
       entityConfig,
@@ -63,7 +67,7 @@ function genFragment(
     entityConfig.src = node.src;
     entityConfig.height = node.height;
     entityConfig.width = node.width;
-    const entityId = Entity.create(
+    const entityId = Entity.__create(
       'EMBEDDED_LINK',
       'MUTABLE',
       entityConfig,
@@ -115,7 +119,6 @@ function genFragment(
     const sibling = child.nextSibling;
     child = sibling;
   }
-
   return { chunk };
 }
 
@@ -135,9 +138,11 @@ export default function htmlToDraft(html: string): Object {
   if (chunkData) {
     const { chunk } = chunkData;
     let entityMap = new OrderedMap({});
-    // chunk.entities && chunk.entities.forEach(entity => {
-    //   entityMap = entityMap.set(entity, Entity.get(entity));
-    // });
+    chunk.entities && chunk.entities.forEach(entity => {
+      if (entity) {
+        entityMap = entityMap.set(entity, Entity.__get(entity));
+      }
+    });
     let start = 0;
     return {
       contentBlocks: chunk.text.split('\r')