Fix encode/decode of void node with slate

GitbookIO · Aug 8, 2016 · df30290 · df30290
1 parent e9b1f25
commit df30290
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/lib/json/encode.js b/lib/json/encode.js
@@ -36,7 +36,10 @@ function encodeTokenToJSON(token) {
         json.data = encodeDataToJSON(data);
     }
 
-    json.tokens = encodeTokensToJSON(token.getTokens());
+    var tokens = token.getTokens();
+    if (tokens.size > 0) {
+        json.tokens = encodeTokensToJSON(tokens);
+    }
 
     return json;
 }

diff --git a/lib/slate/__tests__/block-void/back.yaml b/lib/slate/__tests__/block-void/back.yaml
@@ -0,0 +1,12 @@
+token:
+    type: doc
+    tokens:
+        - type: header_one
+          tokens:
+              - type: text
+                text: Hello
+        - type: hr
+        - type: paragraph
+          tokens:
+              - type: text
+                text: World
diff --git a/lib/slate/__tests__/block-void/expected.yaml b/lib/slate/__tests__/block-void/expected.yaml
@@ -0,0 +1,22 @@
+nodes:
+  - kind: block
+    type: header_one
+    isVoid: false
+    data: {}
+    nodes:
+      - kind: text
+        text: Hello
+        marks: []
+  - kind: block
+    type: hr
+    isVoid: true
+    data: {}
+    nodes: []
+  - kind: block
+    type: paragraph
+    isVoid: false
+    data: {}
+    nodes:
+      - kind: text
+        text: World
+        marks: []
diff --git a/lib/slate/__tests__/block-void/input.yaml b/lib/slate/__tests__/block-void/input.yaml
@@ -0,0 +1,12 @@
+token:
+    type: doc
+    tokens:
+        - type: header_one
+          tokens:
+              - type: text
+                text: Hello
+        - type: hr
+        - type: paragraph
+          tokens:
+              - type: text
+                text: World
diff --git a/lib/slate/decode.js b/lib/slate/decode.js
@@ -60,7 +60,7 @@ function decodeTokens(node) {
     return Immutable.List([
         Token.create(node.type, {
             data:   node.data,
-            tokens: decodeNodesToTokens(node.nodes)
+            tokens: node.nodes? decodeNodesToTokens(node.nodes) : []
         })
     ]);
 }