yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enter at beginning of first table column should insert row above

Browse Source
This commit is contained in:
Tom Moor
2023-09-14 23:34:25 -04:00
parent 411ab6b785
commit b79f86d347
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
shared/editor/commands/table.ts
View File

@@ -62,32 +62,39 @@ export function createTable(
return types.table.createChecked(null, rows);
}
export function addRowAfterAndMoveSelection({
export function addRowAndMoveSelection({
index,
}: {
index?: number;
} = {}): Command {
return (state, dispatch) => {
return (state, dispatch, view) => {
if (!isInTable(state)) {
return false;
}
if (dispatch) {
const rect = selectedRect(state);
const indexAfter = index !== undefined ? index + 1 : rect.bottom;
const tr = addRow(state.tr, rect, indexAfter);
const cells = getCellsInColumn(0)(state);
const rect = selectedRect(state);
const cells = getCellsInColumn(0)(state);
// Special case when adding row to the end of the table as the calculated
// rect does not include the row that we just added.
if (indexAfter !== rect.map.height) {
const pos = cells[Math.min(cells.length - 1, indexAfter)];
const $pos = tr.doc.resolve(pos);
dispatch(tr.setSelection(TextSelection.near($pos)));
} else {
const $pos = tr.doc.resolve(rect.tableStart + rect.table.nodeSize);
dispatch(tr.setSelection(TextSelection.near($pos)));
}
// If the cursor is at the beginning of the first column then insert row
// above instead of below.
if (rect.left === 0 && view?.endOfTextblock("backward", state)) {
const indexBefore = index !== undefined ? index - 1 : rect.top;
dispatch?.(addRow(state.tr, rect, indexBefore));
return true;
}
const indexAfter = index !== undefined ? index + 1 : rect.bottom;
const tr = addRow(state.tr, rect, indexAfter);
// Special case when adding row to the end of the table as the calculated
// rect does not include the row that we just added.
if (indexAfter !== rect.map.height) {
const pos = cells[Math.min(cells.length - 1, indexAfter)];
const $pos = tr.doc.resolve(pos);
dispatch?.(tr.setSelection(TextSelection.near($pos)));
} else {
const $pos = tr.doc.resolve(rect.tableStart + rect.table.nodeSize);
dispatch?.(tr.setSelection(TextSelection.near($pos)));
}
return true;

8
shared/editor/nodes/Table.ts
View File

@@ -15,7 +15,7 @@ import {
} from "prosemirror-tables";
import { Decoration, DecorationSet } from "prosemirror-view";
import {
addRowAfterAndMoveSelection,
addRowAndMoveSelection,
setColumnAttr,
createTable,
} from "../commands/table";
@@ -78,7 +78,7 @@ export default class Table extends Node {
addColumnBefore: () => addColumnBefore,
addColumnAfter: () => addColumnAfter,
deleteColumn: () => deleteColumn,
addRowAfter: addRowAfterAndMoveSelection,
addRowAfter: addRowAndMoveSelection,
deleteRow: () => deleteRow,
deleteTable: () => deleteTable,
toggleHeaderColumn: () => toggleHeaderColumn,
@@ -89,9 +89,9 @@ export default class Table extends Node {
keys() {
return {
Tab: chainCommands(goToNextCell(1), addRowAfterAndMoveSelection()),
Tab: chainCommands(goToNextCell(1), addRowAndMoveSelection()),
"Shift-Tab": goToNextCell(-1),
Enter: addRowAfterAndMoveSelection(),
Enter: addRowAndMoveSelection(),
};
}