From 1036503f34cb643e28353a5e1bfe64eb0d33a05c Mon Sep 17 00:00:00 2001 From: Ian Storm Taylor Date: Wed, 8 May 2019 20:42:00 -0700 Subject: [PATCH] fix annotations toJSON to return an object --- .../test/fixtures/annotation-across-block.js | 6 +++--- .../test/fixtures/annotation-across-multiple-blocks.js | 6 +++--- packages/slate/src/models/value.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/slate-hyperscript/test/fixtures/annotation-across-block.js b/packages/slate-hyperscript/test/fixtures/annotation-across-block.js index 59e3bdb7b..50e070b31 100644 --- a/packages/slate-hyperscript/test/fixtures/annotation-across-block.js +++ b/packages/slate-hyperscript/test/fixtures/annotation-across-block.js @@ -49,8 +49,8 @@ export const output = { }, ], }, - annotations: [ - { + annotations: { + '0': { key: '0', object: 'annotation', type: 'highlight', @@ -68,5 +68,5 @@ export const output = { offset: 6, }, }, - ], + }, } diff --git a/packages/slate-hyperscript/test/fixtures/annotation-across-multiple-blocks.js b/packages/slate-hyperscript/test/fixtures/annotation-across-multiple-blocks.js index d0a648dc3..577de6e8e 100644 --- a/packages/slate-hyperscript/test/fixtures/annotation-across-multiple-blocks.js +++ b/packages/slate-hyperscript/test/fixtures/annotation-across-multiple-blocks.js @@ -66,8 +66,8 @@ export const output = { }, ], }, - annotations: [ - { + annotations: { + a: { object: 'annotation', key: 'a', type: 'highlight', @@ -85,5 +85,5 @@ export const output = { offset: 2, }, }, - ], + }, } diff --git a/packages/slate/src/models/value.js b/packages/slate/src/models/value.js index 12ccb375d..8a999969f 100644 --- a/packages/slate/src/models/value.js +++ b/packages/slate/src/models/value.js @@ -868,8 +868,8 @@ class Value extends Record(DEFAULTS) { if (options.preserveAnnotations) { object.annotations = this.annotations - .toArray() .map(a => a.toJSON(options)) + .toObject() } if (options.preserveSelection) {