Merge branch 'main' into feature/new-highlight-extension

This commit is contained in:
Philipp Kühn
2020-11-05 22:35:46 +01:00
22 changed files with 295 additions and 177 deletions

View File

@@ -4,7 +4,7 @@ import getMarkType from '../utils/getMarkType'
import getMarkRange from '../utils/getMarkRange'
export default (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, state, dispatch }) => {
const { selection, doc } = tr
const { selection } = tr
let { from, to } = selection
const { $from, empty } = selection
const type = getMarkType(typeOrName, state.schema)
@@ -18,11 +18,12 @@ export default (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, sta
}
}
const hasMark = doc.rangeHasMark(from, to, type)
// TODO: toggleMark?
// const hasMark = doc.rangeHasMark(from, to, type)
if (hasMark && dispatch) {
tr.removeMark(from, to, type)
}
// if (hasMark && dispatch) {
// tr.removeMark(from, to, type)
// }
if (dispatch) {
tr.addMark(from, to, type.create(attrs))