From 9afffd418db5f7e14bca623e53b145d0c5e9763f Mon Sep 17 00:00:00 2001 From: Irwan Fario Subastian Date: Fri, 15 Jun 2018 10:53:33 +1000 Subject: [PATCH] update schema customizer to merge marks (#1839) * update schema customizer to merge marks * update comment --- packages/slate/src/models/schema.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/slate/src/models/schema.js b/packages/slate/src/models/schema.js index df2232e6e..0792b1ed9 100644 --- a/packages/slate/src/models/schema.js +++ b/packages/slate/src/models/schema.js @@ -558,8 +558,8 @@ function resolveNodeRule(object, type, obj) { } /** - * A Lodash customizer for merging schema definitions. Special cases `objects` - * and `types` arrays to be unioned, and ignores new `null` values. + * A Lodash customizer for merging schema definitions. Special cases `objects`, + * `marks` and `types` arrays to be unioned, and ignores new `null` values. * * @param {Mixed} target * @param {Mixed} source @@ -567,7 +567,7 @@ function resolveNodeRule(object, type, obj) { */ function customizer(target, source, key) { - if (key == 'objects' || key == 'types') { + if (key == 'objects' || key == 'types' || key == 'marks') { return target == null ? source : target.concat(source) } else { return source == null ? target : source