From 44303dc22f467a20d82bdeacd080abb5d7896726 Mon Sep 17 00:00:00 2001
From: Ian Storm Taylor <ian@ianstormtaylor.com>
Date: Mon, 13 Feb 2017 18:21:27 -0800
Subject: [PATCH] fix html serializer default block type logic

---
 src/serializers/html.js                            | 14 ++++++++++----
 .../html/deserialize/default-block/index.js        |  4 ++--
 .../html/deserialize/default-block/output.yaml     |  5 +++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/serializers/html.js b/src/serializers/html.js
index 39d5cbf68..134c6f21d 100644
--- a/src/serializers/html.js
+++ b/src/serializers/html.js
@@ -109,10 +109,16 @@ class Html {
         return memo
       }
 
-      const commonProps = {kind: 'block', nodes: [node]}
-      const block = this.defaultBlockType.typeof === 'string'
-        ? {type: this.defaultBlockType, ...commonProps}
-        : {...commonProps, ...this.defaultBlockType}
+      const { defaultBlockType } = this
+      const defaults = typeof defaultBlockType == 'string'
+        ? { type: defaultBlockType }
+        : defaultBlockType
+
+      const block = {
+        kind: 'block',
+        nodes: [node],
+        ...defaults
+      }
 
       memo.push(block)
       return memo
diff --git a/test/serializers/fixtures/html/deserialize/default-block/index.js b/test/serializers/fixtures/html/deserialize/default-block/index.js
index d1c5c1b73..830d64ab7 100644
--- a/test/serializers/fixtures/html/deserialize/default-block/index.js
+++ b/test/serializers/fixtures/html/deserialize/default-block/index.js
@@ -16,9 +16,9 @@ export default {
     }
   ],
   defaultBlockType: {
-    type: 'contentBlock',
+    type: 'default',
     data: {
-      style: 'default'
+      key: 'value'
     }
   }
 }
diff --git a/test/serializers/fixtures/html/deserialize/default-block/output.yaml b/test/serializers/fixtures/html/deserialize/default-block/output.yaml
index 0ed92925c..24b684564 100644
--- a/test/serializers/fixtures/html/deserialize/default-block/output.yaml
+++ b/test/serializers/fixtures/html/deserialize/default-block/output.yaml
@@ -11,9 +11,10 @@ nodes:
             marks: []
           - text: e
             marks: []
-  - type: contentBlock
+  - type: default
     isVoid: false
-    data: {style: default}
+    data:
+      key: value
     nodes:
       - characters:
           - text: t