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

Merge branch 'master' of github.com:ianstormtaylor/slate

Browse Source
This commit is contained in:
Ian Storm Taylor
2018-09-26 13:12:42 -07:00
parent af8432f639 6813ac41b5
commit 7b4eca5e16
5 changed files with 293 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/slate-react/src/components/content.js
View File

@@ -284,8 +284,10 @@ class Content extends React.Component {
throw err
}
const allowEdit = el.isContentEditable || el.closest('[data-slate-void]')
return (
el.isContentEditable &&
allowEdit &&
(el === element || el.closest('[data-slate-editor]') === element)
)
}

6
packages/slate/src/interfaces/element.js
View File

@@ -436,8 +436,10 @@ class ElementInterface {
*/
getDecorations(stack) {
const decorations = stack.find('decorateNode', this)
const list = Decoration.createList(decorations || [])
const allDecorations = stack
.map('decorateNode', this)
.map(decorations => Decoration.createList(decorations))
const list = List(allDecorations).flatten(true)
return list
}