A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: move selection to newly added row/column
Abdullah Atta23924a34a354
diff --git a/packages/editor/src/extensions/table/actions.ts b/packages/editor/src/extensions/table/actions.tsindex 3dcaee9b8..9e1b9777c 100644--- a/packages/editor/src/extensions/table/actions.ts+++ b/packages/editor/src/extensions/table/actions.ts@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { Editor } from "@tiptap/core";import { selectedRect, TableRect } from "@tiptap/pm/tables";-import { Transaction } from "prosemirror-state";+import { EditorState, TextSelection, Transaction } from "prosemirror-state";import { Node } from "prosemirror-model";type TableCell = {@@ -159,4 +159,47 @@ function moveCells(return tr;}-export { moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp };+function selectRow(+ tr: Transaction,+ state: EditorState,+ direction: "prev" | "next"+) {+ const rect = selectedRect(state);+ const currentCellIndex = rect.map.width * (rect.bottom - 1) + rect.right;+ const rowIndex = Math.floor(currentCellIndex / rect.map.width);+ const nextRowIndex = direction === "prev" ? rowIndex - 1 : rowIndex + 1;+ tr.setSelection(+ new TextSelection(+ tr.doc.resolve(rect.map.positionAt(nextRowIndex, rect.right, rect.table))+ )+ );+ return true;+}++function selectColumn(+ tr: Transaction,+ state: EditorState,+ direction: "prev" | "next"+) {+ const rect = selectedRect(state);+ const columnIndex = rect.right;+ const nextColumnIndex =+ direction === "prev" ? columnIndex - 1 : columnIndex + 1;+ const currentCellIndex = rect.map.width * (rect.bottom - 1) + rect.right;+ const rowIndex = Math.floor(currentCellIndex / rect.map.width);+ tr.setSelection(+ new TextSelection(+ tr.doc.resolve(rect.map.positionAt(rowIndex, nextColumnIndex, rect.table))+ )+ );+ return true;+}++export {+ moveColumnLeft,+ moveColumnRight,+ moveRowDown,+ moveRowUp,+ selectRow,+ selectColumn+};diff --git a/packages/editor/src/toolbar/tools/table.tsx b/packages/editor/src/toolbar/tools/table.tsxindex cd89d8433..547faf560 100644--- a/packages/editor/src/toolbar/tools/table.tsx+++ b/packages/editor/src/toolbar/tools/table.tsx@@ -27,7 +27,9 @@ import {moveColumnLeft as moveColumnLeftAction,moveColumnRight as moveColumnRightAction,moveRowDown as moveRowDownAction,- moveRowUp as moveRowUpAction+ moveRowUp as moveRowUpAction,+ selectColumn,+ selectRow} from "../../extensions/table/actions.js";import { MoreTools } from "../components/more-tools.js";import { menuButtonToTool, toolToMenuButton } from "./utils.js";@@ -39,6 +41,8 @@ import { useToolbarLocation } from "../stores/toolbar-store.js";import { showPopup } from "../../components/popup-presenter/index.js";import { useRefValue } from "../../hooks/use-ref-value.js";import { strings } from "@notesnook/intl";+import { selectedRect } from "@tiptap/pm/tables";+import { TextSelection } from "@tiptap/pm/state";export function TableSettings(props: ToolProps) {const { editor } = props;@@ -308,12 +312,24 @@ export function CellBorderWidth(props: ToolProps) {const insertColumnLeft = (editor: Editor): MenuButtonItem => ({...toolToMenuButton(getToolDefinition("insertColumnLeft")),- onClick: () => editor.chain().focus().addColumnBefore().run()+ onClick: () =>+ editor+ .chain()+ .focus()+ .addColumnBefore()+ .command(({ tr, state }) => selectColumn(tr, state, "prev"))+ .run()});const insertColumnRight = (editor: Editor): MenuButtonItem => ({...toolToMenuButton(getToolDefinition("insertColumnRight")),- onClick: () => editor.chain().focus().addColumnAfter().run()+ onClick: () =>+ editor+ .chain()+ .focus()+ .addColumnAfter()+ .command(({ tr, state }) => selectColumn(tr, state, "next"))+ .run()});const moveColumnLeft = (editor: Editor): MenuButtonItem => ({@@ -343,12 +359,25 @@ const mergeCells = (editor: Editor): MenuButtonItem => ({const insertRowAbove = (editor: Editor): MenuButtonItem => ({...toolToMenuButton(getToolDefinition("insertRowAbove")),- onClick: () => editor.chain().focus().addRowBefore().run()+ onClick: () =>+ editor+ .chain()+ .focus()+ .addRowBefore()+ .command(({ tr, state }) => selectRow(tr, state, "prev"))+ .run()});const insertRowBelow = (editor: Editor): MenuButtonItem => ({...toolToMenuButton(getToolDefinition("insertRowBelow")),- onClick: () => editor.chain().focus().addRowAfter().run()+ onClick: () => {+ editor+ .chain()+ .focus()+ .addRowAfter()+ .command(({ tr, state }) => selectRow(tr, state, "next"))+ .run();+ }});const moveRowUp = (editor: Editor): MenuButtonItem => ({