[block-tools] Robustify annotation conversion (#543)

* [block-tools] Ensure that we have an annotation key before putting it in as a mark * [block-tools] Ensure that marks are truthy before using them in a Slate value
sanity-io · Jan 30, 2018 · d52b31c · d52b31c
1 parent 38df4be
commit d52b31c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/@sanity/block-tools/src/converters/blocksToSlateState.js b/packages/@sanity/block-tools/src/converters/blocksToSlateState.js
@@ -57,7 +57,7 @@ function sanitySpanToRawSlateBlockNode(span, sanityBlock) {
   const range = {
     kind: 'range',
     text: text,
-    marks: decorators.map(toRawMark)
+    marks: decorators.filter(Boolean).map(toRawMark)
   }
 
   if (!annotations) {

diff --git a/packages/@sanity/block-tools/src/converters/slateStateToBlocks.js b/packages/@sanity/block-tools/src/converters/slateStateToBlocks.js
@@ -30,7 +30,7 @@ function toSanitySpan(node, sanityBlock, spanIndex) {
         Object.keys(annotations).forEach(name => {
           const annotation = annotations[name]
           const annotationKey = annotation._key
-          if (annotation) {
+          if (annotation && annotationKey) {
             sanityBlock.markDefs.push(annotation)
             annotationKeys.push(annotationKey)
           }