mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-20 06:01:24 +02:00
Code Issues Releases Wiki Activity

fix schema first/last rules when nodes is empty

Browse Source
This commit is contained in:
Ian Storm Taylor
2017-10-31 23:45:05 -07:00
parent 906b499ff1
commit d2ff824e61
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,26 +304,28 @@ class Schema extends Record(DEFAULTS) {
} }
if (rule.first != null) { if (rule.first != null) {
const first = node.nodes.first() const { kinds, types } = rule.first
const child = node.nodes.first()
if (rule.first.kinds != null && !rule.first.kinds.includes(first.kind)) { if (child && kinds && !kinds.includes(child.kind)) {
return this.fail(FIRST_CHILD_KIND_INVALID, { ...ctx, child: first }) return this.fail(FIRST_CHILD_KIND_INVALID, { ...ctx, child })
} }
if (rule.first.types != null && !rule.first.types.includes(first.type)) { if (child && types && !types.includes(child.type)) {
return this.fail(FIRST_CHILD_TYPE_INVALID, { ...ctx, child: first }) return this.fail(FIRST_CHILD_TYPE_INVALID, { ...ctx, child })
} }
} }
if (rule.last != null) { if (rule.last != null) {
const last = node.nodes.last() const { kinds, types } = rule.last
const child = node.nodes.last()
if (rule.last.kinds != null && !rule.last.kinds.includes(last.kind)) { if (child && kinds && !kinds.includes(child.kind)) {
return this.fail(LAST_CHILD_KIND_INVALID, { ...ctx, child: last }) return this.fail(LAST_CHILD_KIND_INVALID, { ...ctx, child })
} }
if (rule.last.types != null && !rule.last.types.includes(last.type)) { if (child && types && !types.includes(child.type)) {
return this.fail(LAST_CHILD_TYPE_INVALID, { ...ctx, child: last }) return this.fail(LAST_CHILD_TYPE_INVALID, { ...ctx, child })
} }
} }