@atlaskit/editor-plugin-table 10.4.4 → 10.4.6

package/dist/esm/pm-plugins/commands/go-to-next-cell.js

@@ -1,9 +1,9 @@
-// #region Constants
-
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { goToNextCell as baseGotoNextCell, findTable } from '@atlaskit/editor-tables/utils';
+import { goToNextCell as baseGotoNextCell, findCellClosestToPos, findTable, findTableClosestToPos, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { getPluginState } from '../plugin-factory';
 import { stopKeyboardColumnResizing } from './column-resize';
 import { insertRowWithAnalytics } from './commands-with-analytics';
@@ -35,7 +35,7 @@ export var goToNextCell = function goToNextCell(editorAnalyticsAPI, ariaNotify,
       var firstCellPos = map.positionAt(0, 0, table.node) + table.start;
       var lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start;
 
-      // when tabbing backwards at first cell (top left), insert row at the start of table
+      // When tabbing backwards at first cell (top left), insert row at the start of table
       if (firstCellPos === cell.pos && direction === TAB_BACKWARD_DIRECTION) {
         insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, {
           index: 0,
@@ -44,7 +44,7 @@ export var goToNextCell = function goToNextCell(editorAnalyticsAPI, ariaNotify,
         return true;
       }
 
-      // when tabbing forwards at last cell (bottom right), insert row at the end of table
+      // When tabbing forwards at last cell (bottom right), insert row at the end of table
       if (lastCellPos === cell.pos && direction === TAB_FORWARD_DIRECTION) {
         insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, {
           index: map.height,
@@ -58,4 +58,94 @@ export var goToNextCell = function goToNextCell(editorAnalyticsAPI, ariaNotify,
       return true;
     };
   };
-};
+};
+
+/**
+ * Moves the cursor vertically from a NodeSelection within a table cell.
+ * - If content exists above/below within the cell, lets ProseMirror handle it.
+ * - Otherwise, moves to the next cell (down to start, up to last line).
+ */
+export var goToNextCellVertical = function goToNextCellVertical(direction) {
+  return function (state, dispatch) {
+    var selection = state.selection;
+    var nestedTableSelection = isSelectionTableNestedInTable(state);
+    if (!(selection instanceof NodeSelection) && !nestedTableSelection) {
+      return false; // Let ProseMirror handle other selection types
+    }
+    var table = findTable(selection);
+    var cell = findCellClosestToPos(state.doc.resolve(selection.from));
+    var selectionPos = selection.from;
+
+    // Handle when we have nested table fully selected
+    if (table && nestedTableSelection && isTableSelected(selection)) {
+      var parentTablePos = table.pos;
+      table = findTableClosestToPos(state.doc.resolve(parentTablePos));
+      cell = findCellClosestToPos(state.doc.resolve(parentTablePos));
+      selectionPos = parentTablePos;
+    }
+    if (!table || !cell || !cell.pos) {
+      return false;
+    }
+    var _state$schema$nodes2 = state.schema.nodes,
+      tableCell = _state$schema$nodes2.tableCell,
+      tableHeader = _state$schema$nodes2.tableHeader;
+
+    // Let ProseMirror handle movement within the cell if content exists above/below
+    if (cellHasContentInDirection(cell.node, cell.pos, selectionPos, direction)) {
+      return false;
+    }
+
+    // Move to the next cell vertically
+    var map = TableMap.get(table.node);
+    var nextCellPos = map.nextCell(cell.pos - table.start, 'vert', direction);
+    if (dispatch && nextCellPos) {
+      var _$nextCell$nodeAfter, _$nextCell$nodeAfter2;
+      var nextCellStart = table.start + nextCellPos;
+      var $nextCell = state.doc.resolve(nextCellStart);
+      if ((_$nextCell$nodeAfter = $nextCell.nodeAfter) !== null && _$nextCell$nodeAfter !== void 0 && _$nextCell$nodeAfter.type && [tableCell, tableHeader].includes((_$nextCell$nodeAfter2 = $nextCell.nodeAfter) === null || _$nextCell$nodeAfter2 === void 0 ? void 0 : _$nextCell$nodeAfter2.type)) {
+        var contentPos = getTargetPositionInNextCell($nextCell.nodeAfter, nextCellStart, direction);
+        dispatch(state.tr.setSelection(TextSelection.create(state.doc, contentPos)));
+        return true;
+      }
+      return false;
+    }
+    return false; // No next cell found
+  };
+};
+function cellHasContentInDirection(cellNode, cellPos, selectionPos, direction) {
+  var hasContent = false;
+  cellNode.content.forEach(function (node, offset) {
+    var nodeStart = cellPos + 1 + offset;
+    var nodeEnd = nodeStart + node.nodeSize;
+    if (direction === 1 && nodeStart > selectionPos && node.isBlock) {
+      hasContent = true; // Content below
+    } else if (direction === -1 && nodeEnd <= selectionPos && node.isBlock) {
+      hasContent = true; // Content above
+    }
+  });
+  return hasContent;
+}
+function getTargetPositionInNextCell(cellNode, nextCellStart, direction) {
+  var contentPos = nextCellStart + 1; // Default: just inside the cell
+  if (cellNode.content.size > 0) {
+    if (direction === 1) {
+      var firstChild = cellNode.firstChild;
+      if (firstChild && firstChild.isBlock) {
+        contentPos = nextCellStart + 1 + (firstChild.isLeaf ? 0 : 1); // Down: Start of first block
+      }
+    } else if (direction === -1) {
+      var lastBlock;
+      var lastOffset = 0;
+      cellNode.content.forEach(function (node, offset) {
+        if (node.isBlock) {
+          lastBlock = node;
+          lastOffset = offset;
+        }
+      });
+      if (lastBlock) {
+        contentPos = nextCellStart + 1 + lastOffset + (lastBlock.isLeaf ? 0 : lastBlock.nodeSize - 1);
+      }
+    }
+  }
+  return contentPos;
+}

package/dist/esm/pm-plugins/keymap.js

@@ -1,5 +1,5 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnAfterVO, addColumnBefore, addColumnBeforeVO, addRowAfter, addRowAfterVO, addRowBefore, addRowBeforeVO, backspace, bindKeymapWithCommand, decreaseMediaSize, deleteColumn, deleteRow, escape, focusToContextMenuTrigger, increaseMediaSize, moveColumnLeft, moveColumnRight, moveLeft, moveRight, moveRowDown, moveRowUp, nextCell, previousCell, startColumnResizing, toggleTable } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnAfterVO, addColumnBefore, addColumnBeforeVO, addRowAfter, addRowAfterVO, addRowBefore, addRowBeforeVO, backspace, bindKeymapWithCommand, decreaseMediaSize, deleteColumn, deleteRow, escape, focusToContextMenuTrigger, increaseMediaSize, moveColumnLeft, moveColumnRight, moveDown, moveLeft, moveRight, moveRowDown, moveRowUp, moveUp, nextCell, previousCell, startColumnResizing, toggleTable } from '@atlaskit/editor-common/keymaps';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
@@ -8,6 +8,7 @@ import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/
 import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from './commands';
 import { activateNextResizeArea, initiateKeyboardColumnResizing, stopKeyboardColumnResizing } from './commands/column-resize';
 import { addRowAroundSelection, changeColumnWidthByStepWithAnalytics, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from './commands/commands-with-analytics';
+import { goToNextCellVertical } from './commands/go-to-next-cell';
 import { addColumnAfter as addColumnAfterCommand, addColumnBefore as addColumnBeforeCommand, createTable, insertTableWithNestingSupport } from './commands/insert';
 export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled) {
   var _pluginInjectionApi$a;
@@ -156,6 +157,14 @@ export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProvide
   bindKeymapWithCommand(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  moveDown.common, goToNextCellVertical(1), list);
+  bindKeymapWithCommand(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  moveUp.common, goToNextCellVertical(-1), list);
+  bindKeymapWithCommand(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   decreaseMediaSize.common, changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI, api)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, !!isCommentEditor, INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
   bindKeymapWithCommand(
   // Ignored via go/ees005

package/dist/esm/ui/toolbar.js

@@ -11,8 +11,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { jsx } from '@emotion/react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { CHANGE_ALIGNMENT_REASON, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { DropdownMenuExtensionItems } from '@atlaskit/editor-common/floating-toolbar';
 import { addColumnAfter, addRowAfter, backspace, tooltip } from '@atlaskit/editor-common/keymaps';
 import commonMessages, { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { cellBackgroundColorPalette, DEFAULT_BORDER_COLOR } from '@atlaskit/editor-common/ui-color';
 import { closestElement, getChildrenInfo as _getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
@@ -23,6 +25,7 @@ import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, findTable, getSelectionRect, isSelectionType, splitCell } from '@atlaskit/editor-tables/utils';
 import AlignImageCenterIcon from '@atlaskit/icon/core/align-image-center';
 import AlignImageLeftIcon from '@atlaskit/icon/core/align-image-left';
+import CopyIcon from '@atlaskit/icon/core/copy';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
@@ -446,6 +449,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
             onBlur: clearHoverSelection()
           }]
         };
+        var isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(state);
         return {
           title: 'Table floating controls',
           getDomRef: getDomRef,
@@ -456,16 +460,59 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           },
           zIndex: akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu, separator(menu.hidden)].concat(_toConsumableArray(alignmentMenu), [separator(alignmentMenu.length === 0)], _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), [
-          // TODO: ED-26961 - editor controls to move to overflow menu
-          {
+          items: [menu, separator(menu.hidden)].concat(_toConsumableArray(alignmentMenu), [separator(alignmentMenu.length === 0)], _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), _toConsumableArray(editorExperiment('platform_editor_controls', 'control') ? [{
             type: 'extensions-placeholder',
             separator: 'end'
-          }], _toConsumableArray(editorExperiment('platform_editor_controls', 'control') ? [copyButton, {
+          }, copyButton, {
             type: 'separator'
-          }, deleteButton] : [deleteButton, {
-            type: 'separator'
-          }, copyButton])),
+          }, deleteButton] : [{
+            type: 'overflow-dropdown',
+            dropdownWidth: 220,
+            options: [{
+              type: 'custom',
+              fallback: [],
+              render: function render(editorView, dropdownOptions) {
+                var _api$extension, _api$extension2, _api$extension3;
+                if (!editorView) {
+                  return null;
+                }
+                var extensionState = api === null || api === void 0 || (_api$extension = api.extension) === null || _api$extension === void 0 || (_api$extension = _api$extension.sharedState) === null || _api$extension === void 0 ? void 0 : _api$extension.currentState();
+                var extensionApi = api === null || api === void 0 || (_api$extension2 = api.extension) === null || _api$extension2 === void 0 ? void 0 : _api$extension2.actions.api();
+                if (!extensionApi || !(extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider)) {
+                  return null;
+                }
+                return jsx(DropdownMenuExtensionItems, {
+                  node: tableObject.node,
+                  editorView: editorView,
+                  extension: {
+                    extensionProvider: extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider ? Promise.resolve(extensionState.extensionProvider) : undefined,
+                    extensionApi: api === null || api === void 0 || (_api$extension3 = api.extension) === null || _api$extension3 === void 0 ? void 0 : _api$extension3.actions.api()
+                  },
+                  dropdownOptions: dropdownOptions,
+                  disabled: function disabled(key) {
+                    return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
+                  }
+                });
+              }
+            }, {
+              title: intl.formatMessage(commonMessages.copyToClipboard),
+              onClick: function onClick() {
+                var _api$core, _api$floatingToolbar;
+                api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
+                api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType));
+                return true;
+              },
+              icon: jsx(CopyIcon, {
+                label: intl.formatMessage(commonMessages.copyToClipboard)
+              })
+            }, {
+              title: intl.formatMessage(commonMessages.delete),
+              onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
+              icon: jsx(DeleteIcon, {
+                label: intl.formatMessage(commonMessages.delete)
+              })
+            }]
+          }])),
           scrollable: true
         };
       }

package/dist/types/pm-plugins/commands/go-to-next-cell.d.ts

@@ -3,3 +3,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { Direction } from '@atlaskit/editor-tables/types';
 export declare const goToNextCell: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, ariaNotify?: ((message: string) => void) | undefined, getIntl?: () => IntlShape) => (direction: Direction) => Command;
+/**
+ * Moves the cursor vertically from a NodeSelection within a table cell.
+ * - If content exists above/below within the cell, lets ProseMirror handle it.
+ * - Otherwise, moves to the next cell (down to start, up to last line).
+ */
+export declare const goToNextCellVertical: (direction: Direction) => Command;

package/dist/types/tablePluginType.d.ts

@@ -5,6 +5,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -45,7 +46,8 @@ export type TablePluginDependencies = [
     OptionalPlugin<AccessibilityUtilsPlugin>,
     OptionalPlugin<MediaPlugin>,
     OptionalPlugin<EditorViewModePlugin>,
-    OptionalPlugin<FeatureFlagsPlugin>
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<ExtensionPlugin>
 ];
 export type TablePlugin = NextEditorPlugin<'table', {
     pluginConfiguration: TablePluginOptions | undefined;

package/dist/types-ts4.5/pm-plugins/commands/go-to-next-cell.d.ts

@@ -3,3 +3,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { Direction } from '@atlaskit/editor-tables/types';
 export declare const goToNextCell: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, ariaNotify?: ((message: string) => void) | undefined, getIntl?: () => IntlShape) => (direction: Direction) => Command;
+/**
+ * Moves the cursor vertically from a NodeSelection within a table cell.
+ * - If content exists above/below within the cell, lets ProseMirror handle it.
+ * - Otherwise, moves to the next cell (down to start, up to last line).
+ */
+export declare const goToNextCellVertical: (direction: Direction) => Command;

package/dist/types-ts4.5/tablePluginType.d.ts

@@ -5,6 +5,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -45,7 +46,8 @@ export type TablePluginDependencies = [
     OptionalPlugin<AccessibilityUtilsPlugin>,
     OptionalPlugin<MediaPlugin>,
     OptionalPlugin<EditorViewModePlugin>,
-    OptionalPlugin<FeatureFlagsPlugin>
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<ExtensionPlugin>
 ];
 export type TablePlugin = NextEditorPlugin<'table', {
     pluginConfiguration: TablePluginOptions | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.4.4",
+	"version": "10.4.6",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,13 +32,14 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^102.10.0",
+		"@atlaskit/editor-common": "^102.11.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^2.1.0",
 		"@atlaskit/editor-plugin-content-insertion": "^2.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
+		"@atlaskit/editor-plugin-extension": "5.0.7",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
 		"@atlaskit/editor-plugin-selection": "^2.1.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
@@ -51,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-		"@atlaskit/primitives": "^14.1.0",
+		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^4.1.0",
 		"@atlaskit/toggle": "^15.0.0",
@@ -152,9 +153,6 @@
 		"platform_editor_nested_tables_paste_wrap_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_post_fix_patch_4": {
-			"type": "boolean"
-		},
 		"nested_table_control_padding_with_css": {
 			"type": "boolean"
 		},

package/src/nodeviews/TableRow.ts

@@ -454,8 +454,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 		if (
 			// is Safari
 			navigator.userAgent.includes('AppleWebKit') &&
-			!navigator.userAgent.includes('Chrome') &&
-			fg('platform_editor_advanced_layouts_post_fix_patch_4')
+			!navigator.userAgent.includes('Chrome')
 		) {
 			const pos = this.getPos();
 			if (typeof pos === 'number') {

package/src/nodeviews/TableStickyScrollbar.ts

@@ -150,8 +150,8 @@ export class TableStickyScrollbar {
 			// so the boundingClientRect.top will never be less than the rootBounds.top,
 			// so we need to check if the boundingClientRect.top is less than 20% of the rootBounds.height
 			// to determine if the bottom sentinel is above the scroll area
-			(entry.boundingClientRect.top < ((entry.rootBounds?.height || 0) * 0.2) &&
-			fg('platform_editor_scroll_table_flickering_fix'));
+			(entry.boundingClientRect.top < (entry.rootBounds?.height || 0) * 0.2 &&
+				fg('platform_editor_scroll_table_flickering_fix'));
 
 		this.bottomSentinelState = sentinelIsAboveScrollArea
 			? 'above'
@@ -166,7 +166,6 @@ export class TableStickyScrollbar {
 		const sentinelIsBelowScrollArea =
 			(entry.rootBounds?.bottom || 0) < entry.boundingClientRect.top;
 
-
 		this.topSentinelState = sentinelIsBelowScrollArea
 			? 'below'
 			: entry.isIntersecting

package/src/pm-plugins/commands/go-to-next-cell.ts

@@ -1,13 +1,21 @@
-// #region Constants
 import type { IntlShape } from 'react-intl-next/src/types';
 
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import type { Command } from '@atlaskit/editor-common/types';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import type { Direction } from '@atlaskit/editor-tables/types';
-import { goToNextCell as baseGotoNextCell, findTable } from '@atlaskit/editor-tables/utils';
+import {
+	goToNextCell as baseGotoNextCell,
+	findCellClosestToPos,
+	findTable,
+	findTableClosestToPos,
+	isTableSelected,
+} from '@atlaskit/editor-tables/utils';
 
 import { getPluginState } from '../plugin-factory';
 
@@ -47,7 +55,7 @@ export const goToNextCell =
 		const firstCellPos = map.positionAt(0, 0, table.node) + table.start;
 		const lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start;
 
-		// when tabbing backwards at first cell (top left), insert row at the start of table
+		// When tabbing backwards at first cell (top left), insert row at the start of table
 		if (firstCellPos === cell.pos && direction === TAB_BACKWARD_DIRECTION) {
 			insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, {
 				index: 0,
@@ -56,7 +64,7 @@ export const goToNextCell =
 			return true;
 		}
 
-		// when tabbing forwards at last cell (bottom right), insert row at the end of table
+		// When tabbing forwards at last cell (bottom right), insert row at the end of table
 		if (lastCellPos === cell.pos && direction === TAB_FORWARD_DIRECTION) {
 			insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, {
 				index: map.height,
@@ -71,3 +79,120 @@ export const goToNextCell =
 
 		return true;
 	};
+
+/**
+ * Moves the cursor vertically from a NodeSelection within a table cell.
+ * - If content exists above/below within the cell, lets ProseMirror handle it.
+ * - Otherwise, moves to the next cell (down to start, up to last line).
+ */
+export const goToNextCellVertical =
+	(direction: Direction): Command =>
+	(state, dispatch) => {
+		const { selection } = state;
+		const nestedTableSelection = isSelectionTableNestedInTable(state);
+
+		if (!(selection instanceof NodeSelection) && !nestedTableSelection) {
+			return false; // Let ProseMirror handle other selection types
+		}
+
+		let table = findTable(selection);
+		let cell = findCellClosestToPos(state.doc.resolve(selection.from));
+		let selectionPos = selection.from;
+
+		// Handle when we have nested table fully selected
+		if (table && nestedTableSelection && isTableSelected(selection)) {
+			const parentTablePos = table.pos;
+			table = findTableClosestToPos(state.doc.resolve(parentTablePos));
+			cell = findCellClosestToPos(state.doc.resolve(parentTablePos));
+			selectionPos = parentTablePos;
+		}
+
+		if (!table || !cell || !cell.pos) {
+			return false;
+		}
+
+		const { tableCell, tableHeader } = state.schema.nodes;
+
+		// Let ProseMirror handle movement within the cell if content exists above/below
+		if (cellHasContentInDirection(cell.node, cell.pos, selectionPos, direction)) {
+			return false;
+		}
+
+		// Move to the next cell vertically
+		const map = TableMap.get(table.node);
+		const nextCellPos = map.nextCell(cell.pos - table.start, 'vert', direction);
+		if (dispatch && nextCellPos) {
+			const nextCellStart = table.start + nextCellPos;
+			const $nextCell = state.doc.resolve(nextCellStart);
+
+			if (
+				$nextCell.nodeAfter?.type &&
+				[tableCell, tableHeader].includes($nextCell.nodeAfter?.type)
+			) {
+				const contentPos = getTargetPositionInNextCell(
+					$nextCell.nodeAfter,
+					nextCellStart,
+					direction,
+				);
+
+				dispatch(state.tr.setSelection(TextSelection.create(state.doc, contentPos)));
+				return true;
+			}
+
+			return false;
+		}
+
+		return false; // No next cell found
+	};
+
+function cellHasContentInDirection(
+	cellNode: PMNode,
+	cellPos: number,
+	selectionPos: number,
+	direction: Direction,
+): boolean {
+	let hasContent = false;
+
+	cellNode.content.forEach((node: PMNode, offset: number) => {
+		const nodeStart = cellPos + 1 + offset;
+		const nodeEnd = nodeStart + node.nodeSize;
+
+		if (direction === 1 && nodeStart > selectionPos && node.isBlock) {
+			hasContent = true; // Content below
+		} else if (direction === -1 && nodeEnd <= selectionPos && node.isBlock) {
+			hasContent = true; // Content above
+		}
+	});
+
+	return hasContent;
+}
+
+function getTargetPositionInNextCell(
+	cellNode: PMNode,
+	nextCellStart: number,
+	direction: Direction,
+): number {
+	let contentPos = nextCellStart + 1; // Default: just inside the cell
+	if (cellNode.content.size > 0) {
+		if (direction === 1) {
+			const firstChild = cellNode.firstChild;
+			if (firstChild && firstChild.isBlock) {
+				contentPos = nextCellStart + 1 + (firstChild.isLeaf ? 0 : 1); // Down: Start of first block
+			}
+		} else if (direction === -1) {
+			let lastBlock: PMNode | undefined;
+			let lastOffset = 0;
+			cellNode.content.forEach((node: PMNode, offset: number) => {
+				if (node.isBlock) {
+					lastBlock = node;
+					lastOffset = offset;
+				}
+			});
+			if (lastBlock) {
+				contentPos =
+					nextCellStart + 1 + lastOffset + (lastBlock.isLeaf ? 0 : lastBlock.nodeSize - 1);
+			}
+		}
+	}
+	return contentPos;
+}

package/src/pm-plugins/keymap.ts

@@ -27,10 +27,12 @@ import {
 	increaseMediaSize,
 	moveColumnLeft,
 	moveColumnRight,
+	moveDown,
 	moveLeft,
 	moveRight,
 	moveRowDown,
 	moveRowUp,
+	moveUp,
 	nextCell,
 	previousCell,
 	startColumnResizing,
@@ -60,6 +62,7 @@ import {
 	deleteTableIfSelectedWithAnalytics,
 	emptyMultipleCellsWithAnalytics,
 } from './commands/commands-with-analytics';
+import { goToNextCellVertical } from './commands/go-to-next-cell';
 import {
 	addColumnAfter as addColumnAfterCommand,
 	addColumnBefore as addColumnBeforeCommand,
@@ -362,6 +365,22 @@ export function keymapPlugin(
 		list,
 	);
 
+	bindKeymapWithCommand(
+		// Ignored via go/ees005
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		moveDown.common!,
+		goToNextCellVertical(1),
+		list,
+	);
+
+	bindKeymapWithCommand(
+		// Ignored via go/ees005
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		moveUp.common!,
+		goToNextCellVertical(-1),
+		list,
+	);
+
 	bindKeymapWithCommand(
 		// Ignored via go/ees005
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/src/tablePluginType.ts

@@ -11,6 +11,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
@@ -80,6 +81,7 @@ export type TablePluginDependencies = [
 	OptionalPlugin<MediaPlugin>,
 	OptionalPlugin<EditorViewModePlugin>,
 	OptionalPlugin<FeatureFlagsPlugin>,
+	OptionalPlugin<ExtensionPlugin>,
 ];
 
 export type TablePlugin = NextEditorPlugin<