diff --git a/packages/tiptap-commands/src/commands/splitToDefaultListItem.js b/packages/tiptap-commands/src/commands/splitToDefaultListItem.js new file mode 100644 index 00000000..ba4fd60e --- /dev/null +++ b/packages/tiptap-commands/src/commands/splitToDefaultListItem.js @@ -0,0 +1,73 @@ +// this is a copy of canSplit +// see https://github.com/ProseMirror/prosemirror-transform/blob/master/src/structure.js + +function canSplit(doc, pos, depth = 1, typesAfter) { + let $pos = doc.resolve(pos), base = $pos.depth - depth + let innerType = (typesAfter && typesAfter[typesAfter.length - 1]) || $pos.parent + if (base < 0 || $pos.parent.type.spec.isolating || + !$pos.parent.canReplace($pos.index(), $pos.parent.childCount) || + !innerType.type.validContent($pos.parent.content.cutByIndex($pos.index(), $pos.parent.childCount))) + return false + for (let d = $pos.depth - 1, i = depth - 2; d > base; d--, i--) { + let node = $pos.node(d), index = $pos.index(d) + if (node.type.spec.isolating) return false + let rest = node.content.cutByIndex(index, node.childCount) + let after = (typesAfter && typesAfter[i]) || node + if (after != node) rest = rest.replaceChild(0, after.type.create(after.attrs)) + + /* Change starts from here */ + // if (!node.canReplace(index + 1, node.childCount) || !after.type.validContent(rest)) + // return false + if (!node.canReplace(index + 1, node.childCount)) + return false + /* Change ends here */ + } + let index = $pos.indexAfter(base) + let baseType = typesAfter && typesAfter[0] + return $pos.node(base).canReplaceWith(index, index, baseType ? baseType.type : $pos.node(base + 1).type) +} + +// this is a copy of splitListItem +// see https://github.com/ProseMirror/prosemirror-schema-list/blob/master/src/schema-list.js + +export default function (itemType) { + return function(state, dispatch) { + let {$from, $to, node} = state.selection + if ((node && node.isBlock) || $from.depth < 2 || !$from.sameParent($to)) return false + let grandParent = $from.node(-1) + if (grandParent.type != itemType) return false + if ($from.parent.content.size == 0) { + // In an empty block. If this is a nested list, the wrapping + // list item should be split. Otherwise, bail out and let next + // command handle lifting. + if ($from.depth == 2 || $from.node(-3).type != itemType || + $from.index(-2) != $from.node(-2).childCount - 1) return false + + if (dispatch) { + let wrap = Fragment.empty, keepItem = $from.index(-1) > 0 + // Build a fragment containing empty versions of the structure + // from the outer list item to the parent node of the cursor + for (let d = $from.depth - (keepItem ? 1 : 2); d >= $from.depth - 3; d--) + wrap = Fragment.from($from.node(d).copy(wrap)) + // Add a second list item with an empty default start node + wrap = wrap.append(Fragment.from(itemType.createAndFill())) + let tr = state.tr.replace($from.before(keepItem ? null : -1), $from.after(-3), new Slice(wrap, keepItem ? 3 : 2, 2)) + tr.setSelection(state.selection.constructor.near(tr.doc.resolve($from.pos + (keepItem ? 3 : 2)))) + dispatch(tr.scrollIntoView()) + } + return true + } + let nextType = $to.pos == $from.end() ? grandParent.contentMatchAt($from.indexAfter(-1)).defaultType : null + let tr = state.tr.delete($from.pos, $to.pos) + + /* Change starts from here */ + // let types = nextType && [null, {type: nextType}] + let types = nextType && [{type: itemType}, {type: nextType}] + if (!types) types = [{type: itemType}, null] + /* Change ends here */ + + if (!canSplit(tr.doc, $from.pos, 2, types)) return false + if (dispatch) dispatch(tr.split($from.pos, 2, [{type: state.schema.nodes.todo_item, attrs: { done: false }}]).scrollIntoView()) + return true + } +} \ No newline at end of file diff --git a/packages/tiptap-commands/src/index.js b/packages/tiptap-commands/src/index.js index 6218b9d7..5738c992 100644 --- a/packages/tiptap-commands/src/index.js +++ b/packages/tiptap-commands/src/index.js @@ -40,6 +40,7 @@ import { import markInputRule from './commands/markInputRule' import removeMark from './commands/removeMark' +import splitToDefaultListItem from './commands/splitToDefaultListItem' import toggleBlockType from './commands/toggleBlockType' import toggleList from './commands/toggleList' import updateMark from './commands/updateMark' @@ -85,6 +86,7 @@ export { // custom markInputRule, removeMark, + splitToDefaultListItem, toggleBlockType, toggleList, updateMark, diff --git a/packages/tiptap-extensions/src/nodes/TodoItem.js b/packages/tiptap-extensions/src/nodes/TodoItem.js index 21342d40..c8273552 100644 --- a/packages/tiptap-extensions/src/nodes/TodoItem.js +++ b/packages/tiptap-extensions/src/nodes/TodoItem.js @@ -1,5 +1,5 @@ import { Node } from 'tiptap' -import { splitListItem, liftListItem } from 'tiptap-commands' +import { splitToDefaultListItem, liftListItem } from 'tiptap-commands' export default class TodoItemNode extends Node { @@ -58,7 +58,7 @@ export default class TodoItemNode extends Node { keys({ type }) { return { - Enter: splitListItem(type), + Enter: splitToDefaultListItem(type), 'Shift-Tab': liftListItem(type), } }