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

fix nested unwrapping with splitting

Browse Source
This commit is contained in:
Ian Storm Taylor
2019-12-13 19:12:50 -05:00
parent 00c5954f41
commit b9c441f1a4
7 changed files with 259 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/slate/src/interfaces/editor/transforms/node.ts
View File

@@ -681,13 +681,8 @@ export const NodeTransforms = {
} }
) { ) {
Editor.withoutNormalizing(editor, () => { Editor.withoutNormalizing(editor, () => {
const { const { mode = 'highest', split = false, voids = false } = options
at = editor.selection, let { at = editor.selection, match } = options
mode = 'highest',
split = false,
voids = false,
} = options
let { match } = options
if (!at) { if (!at) {
return return
@@ -697,6 +692,11 @@ export const NodeTransforms = {
match = Path.isPath(at) ? matchPath(editor, at) : 'block' match = Path.isPath(at) ? matchPath(editor, at) : 'block'
} }
if (Path.isPath(at)) {
at = Editor.range(editor, at)
}
const rangeRef = Range.isRange(at) ? Editor.rangeRef(editor, at) : null
const matches = Editor.nodes(editor, { at, match, mode, voids }) const matches = Editor.nodes(editor, { at, match, mode, voids })
const pathRefs = Array.from(matches, ([, p]) => Editor.pathRef(editor, p)) const pathRefs = Array.from(matches, ([, p]) => Editor.pathRef(editor, p))
@@ -705,8 +705,8 @@ export const NodeTransforms = {
const [node] = Editor.node(editor, path) const [node] = Editor.node(editor, path)
let range = Editor.range(editor, path) let range = Editor.range(editor, path)
if (split && Range.isRange(at)) { if (split && rangeRef) {
range = Range.intersection(at, range)! range = Range.intersection(rangeRef.current!, range)!
} }
Editor.liftNodes(editor, { Editor.liftNodes(editor, {
@@ -715,6 +715,10 @@ export const NodeTransforms = {
voids, voids,
}) })
} }
if (rangeRef) {
rangeRef.unref()
}
}) })
}, },

30
packages/slate/test/transforms/unwrapNodes/mode-all/match-ancestors.js Normal file
View File

@@ -0,0 +1,30 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const run = editor => {
Editor.unwrapNodes(editor, { match: { a: true }, mode: 'all' })
}
export const input = (
<editor>
<block a>
<block a>
<block>
<cursor />
word
</block>
</block>
</block>
</editor>
)
export const output = (
<editor>
<block>
<cursor />
word
</block>
</editor>
)

40
packages/slate/test/transforms/unwrapNodes/mode-all/match-siblings-and-parent.js Normal file
View File

@@ -0,0 +1,40 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const run = editor => {
Editor.unwrapNodes(editor, { match: { a: true }, mode: 'all' })
}
export const input = (
<editor>
<block a>
<block a>
<block>
<anchor />
one
</block>
</block>
<block a>
<block>
two
<focus />
</block>
</block>
</block>
</editor>
)
export const output = (
<editor>
<block>
<anchor />
one
</block>
<block>
two
<focus />
</block>
</editor>
)

38
packages/slate/test/transforms/unwrapNodes/mode-all/match-siblings.js Normal file
View File

@@ -0,0 +1,38 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const run = editor => {
Editor.unwrapNodes(editor, { match: { a: true }, mode: 'all' })
}
export const input = (
<editor>
<block a>
<block>
<anchor />
one
</block>
</block>
<block a>
<block>
two
<focus />
</block>
</block>
</editor>
)
export const output = (
<editor>
<block>
<anchor />
one
</block>
<block>
two
<focus />
</block>
</editor>
)

48
packages/slate/test/transforms/unwrapNodes/mode-all/match-some-siblings-and-parent-split.js Normal file
View File

@@ -0,0 +1,48 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const run = editor => {
Editor.unwrapNodes(editor, { match: { a: true }, mode: 'all', split: true })
}
export const input = (
<editor>
<block a>
<block a>
<block>
<anchor />
one
</block>
</block>
<block a>
<block>
two
<focus />
</block>
</block>
<block a>
<block>three</block>
</block>
</block>
</editor>
)
export const output = (
<editor>
<block>
<anchor />
one
</block>
<block>
two
<focus />
</block>
<block a>
<block a>
<block>three</block>
</block>
</block>
</editor>
)

46
packages/slate/test/transforms/unwrapNodes/mode-all/match-some-siblings-and-parent.js Normal file
View File

@@ -0,0 +1,46 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const run = editor => {
Editor.unwrapNodes(editor, { match: { a: true }, mode: 'all' })
}
export const input = (
<editor>
<block a>
<block a>
<block>
<anchor />
one
</block>
</block>
<block a>
<block>
two
<focus />
</block>
</block>
<block a>
<block>three</block>
</block>
</block>
</editor>
)
export const output = (
<editor>
<block>
<anchor />
one
</block>
<block>
two
<focus />
</block>
<block a>
<block>three</block>
</block>
</editor>
)

44
packages/slate/test/transforms/unwrapNodes/mode-all/match-some-siblings.js Normal file
View File

@@ -0,0 +1,44 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const run = editor => {
Editor.unwrapNodes(editor, { match: { a: true }, mode: 'all' })
}
export const input = (
<editor>
<block a>
<block>
<anchor />
one
</block>
</block>
<block a>
<block>
two
<focus />
</block>
</block>
<block a>
<block>three</block>
</block>
</editor>
)
export const output = (
<editor>
<block>
<anchor />
one
</block>
<block>
two
<focus />
</block>
<block a>
<block>three</block>
</block>
</editor>
)