Allow setting a defaultBlockType as object for HTML serializer (#595)

* Allow setting a defaultBlockType as object for HTML serializer

* Add test for html deserializer default block as object

* Code enhancement/compacting

src/serializers/html.js

@@ -70,6 +70,7 @@ class Html {
    * @param {Object} options
    *   @property {Array} rules
    *   @property {String} defaultBlockType
+   *   @property {String|Object} defaultBlockType
    */
 
   constructor(options = {}) {
@@ -108,11 +109,10 @@ class Html {
         return memo
       }
 
-      const block = {
+      const commonProps = {kind: 'block', nodes: [node]}
-        kind: 'block',
+      const block = this.defaultBlockType.typeof === 'string'
-        type: this.defaultBlockType,
+        ? {type: this.defaultBlockType, ...commonProps}
-        nodes: [node]
+        : {...commonProps, ...this.defaultBlockType}
-      }
 
       memo.push(block)
       return memo

test/serializers/fixtures/html/deserialize/default-block/index.js

@@ -0,0 +1,24 @@
+
+export default {
+  rules: [
+    {
+      deserialize(el, next) {
+        switch (el.tagName) {
+          case 'p': {
+            return {
+              kind: 'block',
+              type: 'paragraph',
+              nodes: next(el.children)
+            }
+          }
+        }
+      }
+    }
+  ],
+  defaultBlockType: {
+    type: 'contentBlock',
+    data: {
+      style: 'default'
+    }
+  }
+}

test/serializers/fixtures/html/deserialize/default-block/input.html

@@ -0,0 +1,2 @@
+<p>one</p>
+<div>two</div>

test/serializers/fixtures/html/deserialize/default-block/output.yaml

@@ -0,0 +1,25 @@
+data: {}
+nodes:
+  - type: paragraph
+    isVoid: false
+    data: {}
+    nodes:
+      - characters:
+          - text: o
+            marks: []
+          - text: n
+            marks: []
+          - text: e
+            marks: []
+  - type: contentBlock
+    isVoid: false
+    data: {style: default}
+    nodes:
+      - characters:
+          - text: t
+            marks: []
+          - text: w
+            marks: []
+          - text: o
+            marks: []
+