mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-15 11:44:05 +02:00
Code Issues Releases Wiki Activity

fix: check isContentEditable of target element in ReactEditor.hasDOMNode (#3389)

Browse Source 
* fix ReactEditor.hasDOMNode

* make ReactEditor.hasDOMNode variables more clear
This commit is contained in:
Efim
2020-02-26 07:50:53 +03:00
committed by GitHub
parent 0d6271bc15
commit d8cc9fc46b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/slate-react/src/plugin/react-editor.ts
View File

@@ -149,15 +149,17 @@ export const ReactEditor = {
options: { editable?: boolean } = {} options: { editable?: boolean } = {}
): boolean { ): boolean {
const { editable = false } = options const { editable = false } = options
const el = ReactEditor.toDOMNode(editor, editor) const editorEl = ReactEditor.toDOMNode(editor, editor)
let element let targetEl
// COMPAT: In Firefox, reading `target.nodeType` will throw an error if // COMPAT: In Firefox, reading `target.nodeType` will throw an error if
// target is originating from an internal "restricted" element (e.g. a // target is originating from an internal "restricted" element (e.g. a
// stepper arrow on a number input). (2018/05/04) // stepper arrow on a number input). (2018/05/04)
// https://github.com/ianstormtaylor/slate/issues/1819 // https://github.com/ianstormtaylor/slate/issues/1819
try { try {
element = isDOMElement(target) ? target : target.parentElement targetEl = (isDOMElement(target)
? target
: target.parentElement) as HTMLElement
} catch (err) { } catch (err) {
if ( if (
!err.message.includes('Permission denied to access property "nodeType"') !err.message.includes('Permission denied to access property "nodeType"')
@@ -166,13 +168,13 @@ export const ReactEditor = {
} }
} }
if (!element) { if (!targetEl) {
return false return false
} }
return ( return (
element.closest(`[data-slate-editor]`) === el && targetEl.closest(`[data-slate-editor]`) === editorEl &&
(!editable || el.isContentEditable) (!editable || targetEl.isContentEditable)
) )
}, },