1
0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-11 09:43:58 +02:00

Fix reporting of marks on a markableVoid (#5186)

Add a few unit tests for Editor.marks(), including one for markable void
that fails
This commit is contained in:
Brian Bucknam
2022-11-17 09:19:46 -08:00
committed by GitHub
parent fbc9838fd7
commit e416d00b6c
6 changed files with 118 additions and 7 deletions

View File

@@ -0,0 +1,5 @@
---
'slate': patch
---
Report marks applied to a markableVoid if selection is collapsed

View File

@@ -816,16 +816,21 @@ export const Editor: EditorInterface = {
if (anchor.offset === 0) {
const prev = Editor.previous(editor, { at: path, match: Text.isText })
const block = Editor.above(editor, {
match: n => Editor.isBlock(editor, n),
const markedVoid = Editor.above(editor, {
match: n => Editor.isVoid(editor, n) && editor.markableVoid(n),
})
if (!markedVoid) {
const block = Editor.above(editor, {
match: n => Editor.isBlock(editor, n),
})
if (prev && block) {
const [prevNode, prevPath] = prev
const [, blockPath] = block
if (prev && block) {
const [prevNode, prevPath] = prev
const [, blockPath] = block
if (Path.isAncestor(blockPath, prevPath)) {
node = prevNode as Text
if (Path.isAncestor(blockPath, prevPath)) {
node = prevNode as Text
}
}
}
}

View File

@@ -0,0 +1,21 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const input = (
<editor>
<block>
<text>word</text>
<inline void markable>
<text bold />
<cursor />
</inline>
<text />
</block>
</editor>
)
export const test = editor => {
editor.markableVoid = node => node.markable
return Editor.marks(editor)
}
export const output = { bold: true }

View File

@@ -0,0 +1,32 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const input = (
<editor>
<block>
<text>word</text>
<inline void markable>
<anchor />
<text bold />
</inline>
<text bold>
<anchor />
bold
</text>
<inline void markable>
<text bold italic />
</inline>
<text bold italic>
bold italic
<focus />
</text>
<text />
</block>
</editor>
)
export const test = editor => {
editor.markableVoid = node => node.markable
return Editor.marks(editor)
}
export const output = { bold: true }

View File

@@ -0,0 +1,24 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const input = (
<editor>
<block>
plain
<text bold>
<anchor />
bold
</text>
<text bold italic>
bold italic
<focus />
</text>
</block>
<block>block two</block>
</editor>
)
export const test = editor => {
return Editor.marks(editor)
}
export const output = { bold: true }

View File

@@ -0,0 +1,24 @@
/** @jsx jsx */
import { Editor } from 'slate'
import { jsx } from '../../..'
export const input = (
<editor>
<block>
plain
<text bold>
text that is
<cursor />
bold
</text>
<text bold italic>
bold italic
</text>
</block>
<block>block two</block>
</editor>
)
export const test = editor => {
return Editor.marks(editor)
}
export const output = { bold: true }