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

Fix rule NO_ADJACENT_TEXT_RULE

Browse Source
This commit is contained in:
Samy Pesse
2016-10-18 22:43:18 +02:00
parent 0246c3085b
commit 808ae3c1fb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/schema.js
View File

@@ -78,7 +78,7 @@ const INLINE_CHILDREN_RULE = {
const { nodes } = inline const { nodes } = inline
const invalids = nodes.filter(n => n.kind != 'inline' && n.kind != 'text') const invalids = nodes.filter(n => n.kind != 'inline' && n.kind != 'text')
return invalids.size ? invalids : null return invalids.size ? invalids : null
}, },
normalize: (transform, inline, invalids) => { normalize: (transform, inline, invalids) => {
return invalids.reduce((t, n) => t.removeNodeByKey(n.key), transform) return invalids.reduce((t, n) => t.removeNodeByKey(n.key), transform)
} }
@@ -98,14 +98,15 @@ const NO_ADJACENT_TEXT_RULE = {
validate: (node) => { validate: (node) => {
const { nodes } = node const { nodes } = node
const invalids = nodes const invalids = nodes
.filter((n, i) => {
const next = nodes.get(i + 1)
return n.kind == 'text' && next && next.kind == 'text'
})
.map((n, i) => { .map((n, i) => {
const next = nodes.get(i + 1) const next = nodes.get(i + 1)
if (n.kind !== 'text' || !next || next.kind !== 'text') {
return
}
return [n, next] return [n, next]
}) })
.filter(Boolean)
return invalids.size ? invalids : null return invalids.size ? invalids : null
}, },

1
src/transforms/apply-operation.js
View File

@@ -48,6 +48,7 @@ export function applyOperation(transform, operation) {
const { type } = operation const { type } = operation
const fn = OPERATIONS[type] const fn = OPERATIONS[type]
console.log('apply op', type, operation);
if (!fn) { if (!fn) {
throw new Error(`Unknown operation type: "${type}".`) throw new Error(`Unknown operation type: "${type}".`)
} }