mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-23 07:22:55 +02:00
Code Issues Releases Wiki Activity

update schema merge customizer for better merging

Browse Source
This commit is contained in:
Ian Storm Taylor
2017-11-01 00:14:30 -07:00
parent e6383cd40d
commit b8c60437db
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/slate/src/models/schema.js
View File

@@ -513,7 +513,8 @@ function resolveNodeRule(kind, type, obj) {
} }
/** /**
* A Lodash customizer for merging `kinds` and `types` arrays. * A Lodash customizer for merging schema definitions. Special cases `kinds`
* and `types` arrays to be unioned, and ignores new `null` values.
* *
* @param {Mixed} target * @param {Mixed} target
* @param {Mixed} source * @param {Mixed} source
@@ -523,6 +524,8 @@ function resolveNodeRule(kind, type, obj) {
function customizer(target, source, key) { function customizer(target, source, key) {
if (key == 'kinds' || key == 'types') { if (key == 'kinds' || key == 'types') {
return target == null ? source : target.concat(source) return target == null ? source : target.concat(source)
} else {
return source == null ? target : source
} }
} }