@atlaskit/editor-plugin-table 17.3.7 → 17.3.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-table
 
+## 17.3.9
+
+### Patch Changes
+
+- [`95a9857d9f007`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/95a9857d9f007) -
+  Replaced keymaps for moving table columns/rows in the Editor behind experiment
+- Updated dependencies
+
+## 17.3.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 17.3.7
 
 ### Patch Changes

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

@@ -10,6 +10,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _preset = require("@atlaskit/editor-common/preset");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commandsWithAnalytics = require("../pm-plugins/drag-and-drop/commands-with-analytics");
 var _commands2 = require("./commands");
 var _columnResize = require("./commands/column-resize");
@@ -98,7 +99,8 @@ function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, e
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   _keymaps.addColumnAfterVO.common, (0, _insert.addColumnAfter)(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
-  if (dragAndDropEnabled) {
+  if (dragAndDropEnabled && _keymaps.moveRowDown.common && _keymaps.moveRowUp.common && _keymaps.moveColumnLeft.common && _keymaps.moveColumnRight.common) {
+    var isNewKeyMapExperiment = (0, _expValEquals.expValEquals)('editor-a11y-fy26-keyboard-move-row-column', 'isEnabled', true);
     // Move row/column shortcuts
     /**
      * NOTE: If the keyboard shortcut for moving rows or columns is changed, we need to update the handleKeyDown function
@@ -109,20 +111,24 @@ function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, e
 
     (0, _keymaps.bindKeymapWithCommand)(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? _keymaps.moveRowDown.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    _keymaps.moveRowDown.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', 1), list);
+    _keymaps.moveRowDownOld.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', 1), list);
     (0, _keymaps.bindKeymapWithCommand)(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? _keymaps.moveRowUp.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    _keymaps.moveRowUp.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', -1), list);
+    _keymaps.moveRowUpOld.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', -1), list);
     (0, _keymaps.bindKeymapWithCommand)(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? _keymaps.moveColumnLeft.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    _keymaps.moveColumnLeft.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', -1), list);
+    _keymaps.moveColumnLeftOld.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', -1), list);
     (0, _keymaps.bindKeymapWithCommand)(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? _keymaps.moveColumnRight.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    _keymaps.moveColumnRight.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', 1), list);
+    _keymaps.moveColumnRightOld.common, (0, _commandsWithAnalytics.moveSourceWithAnalyticsViaShortcut)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', 1), list);
 
     // Delete row/column shortcuts
     (0, _keymaps.bindKeymapWithCommand)(

package/dist/cjs/pm-plugins/utils/drag-menu.js

@@ -25,6 +25,7 @@ var _tableRowDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-
 var _tableRowMoveDown = _interopRequireDefault(require("@atlaskit/icon/core/table-row-move-down"));
 var _tableRowMoveUp = _interopRequireDefault(require("@atlaskit/icon/core/table-row-move-up"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _toolbar = require("../../ui/toolbar");
 var _commandsWithAnalytics = require("../commands/commands-with-analytics");
 var _commandsWithAnalytics2 = require("../drag-and-drop/commands-with-analytics");
@@ -126,6 +127,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     },
     keymap: _keymaps.addColumnAfter
   }];
+  var isNewKeymapExperiment = (0, _expValEquals.expValEquals)('editor-a11y-fy26-keyboard-move-row-column', 'isEnabled', true);
   var moveOptions = direction === 'row' ? [{
     label: 'up',
     icon: function icon() {
@@ -134,7 +136,9 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
         label: ''
       });
     },
-    keymap: _keymaps.moveRowUp,
+    keymap: isNewKeymapExperiment ? _keymaps.moveRowUp :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    _keymaps.moveRowUpOld,
     canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
@@ -148,7 +152,9 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
         label: ''
       });
     },
-    keymap: _keymaps.moveRowDown,
+    keymap: isNewKeymapExperiment ? _keymaps.moveRowDown :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    _keymaps.moveRowDownOld,
     canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
@@ -162,7 +168,9 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
         label: ''
       });
     },
-    keymap: _keymaps.moveColumnLeft,
+    keymap: isNewKeymapExperiment ? _keymaps.moveColumnLeft :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    _keymaps.moveColumnLeftOld,
     canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
@@ -176,7 +184,9 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
         label: ''
       });
     },
-    keymap: _keymaps.moveColumnRight,
+    keymap: isNewKeymapExperiment ? _keymaps.moveColumnRight :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    _keymaps.moveColumnRightOld,
     canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {

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

@@ -1,8 +1,9 @@
 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, moveDown, moveLeft, moveRight, moveRowDown, moveRowUp, moveUp, 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, moveColumnLeftOld, moveColumnLeft, moveColumnRightOld, moveColumnRight, moveDown, moveLeft, moveRight, moveRowDownOld, moveRowDown, moveRowUpOld, 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';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from './commands';
 import { activateNextResizeArea, initiateKeyboardColumnResizing, stopKeyboardColumnResizing } from './commands/column-resize';
@@ -81,7 +82,8 @@ export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProvide
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   addColumnAfterVO.common, addColumnAfterCommand(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
-  if (dragAndDropEnabled) {
+  if (dragAndDropEnabled && moveRowDown.common && moveRowUp.common && moveColumnLeft.common && moveColumnRight.common) {
+    const isNewKeyMapExperiment = expValEquals('editor-a11y-fy26-keyboard-move-row-column', 'isEnabled', true);
     // Move row/column shortcuts
     /**
      * NOTE: If the keyboard shortcut for moving rows or columns is changed, we need to update the handleKeyDown function
@@ -92,20 +94,24 @@ export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProvide
 
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveRowDown.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveRowDown.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', 1), list);
+    moveRowDownOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', 1), list);
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveRowUp.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveRowUp.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', -1), list);
+    moveRowUpOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', -1), list);
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveColumnLeft.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveColumnLeft.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', -1), list);
+    moveColumnLeftOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', -1), list);
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveColumnRight.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveColumnRight.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', 1), list);
+    moveColumnRightOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', 1), list);
 
     // Delete row/column shortcuts
     bindKeymapWithCommand(

package/dist/es2019/pm-plugins/utils/drag-menu.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, deleteColumn, deleteRow, moveColumnLeftOld, moveColumnLeft, moveColumnRightOld, moveColumnRight, moveRowDownOld, moveRowDown, moveRowUpOld, moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
 import SortAscendingIcon from '@atlaskit/icon/core/sort-ascending';
 import SortDescendingIcon from '@atlaskit/icon/core/sort-descending';
 import TableCellClearIcon from '@atlaskit/icon/core/table-cell-clear';
@@ -17,6 +17,7 @@ import TableRowDeleteIcon from '@atlaskit/icon/core/table-row-delete';
 import TableRowMoveDownIcon from '@atlaskit/icon/core/table-row-move-down';
 import TableRowMoveUpIcon from '@atlaskit/icon/core/table-row-move-up';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getClosestSelectionRect } from '../../ui/toolbar';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, sortColumnWithAnalytics } from '../commands/commands-with-analytics';
 import { moveSourceWithAnalytics } from '../drag-and-drop/commands-with-analytics';
@@ -105,13 +106,16 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedC
     }),
     keymap: addColumnAfter
   }];
+  const isNewKeymapExperiment = expValEquals('editor-a11y-fy26-keyboard-move-row-column', 'isEnabled', true);
   const moveOptions = direction === 'row' ? [{
     label: 'up',
     icon: () => /*#__PURE__*/React.createElement(TableRowMoveUpIcon, {
       spacing: 'spacious',
       label: ''
     }),
-    keymap: moveRowUp,
+    keymap: isNewKeymapExperiment ? moveRowUp :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveRowUpOld,
     canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: selectionRect => selectionRect.top - 1
@@ -121,7 +125,9 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedC
       spacing: 'spacious',
       label: ''
     }),
-    keymap: moveRowDown,
+    keymap: isNewKeymapExperiment ? moveRowDown :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveRowDownOld,
     canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: selectionRect => selectionRect.bottom
@@ -131,7 +137,9 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedC
       spacing: 'spacious',
       label: ''
     }),
-    keymap: moveColumnLeft,
+    keymap: isNewKeymapExperiment ? moveColumnLeft :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveColumnLeftOld,
     canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: selectionRect => selectionRect.left - 1
@@ -141,7 +149,9 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedC
       spacing: 'spacious',
       label: ''
     }),
-    keymap: moveColumnRight,
+    keymap: isNewKeymapExperiment ? moveColumnRight :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveColumnRightOld,
     canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: selectionRect => selectionRect.right

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

@@ -1,8 +1,9 @@
 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, moveDown, moveLeft, moveRight, moveRowDown, moveRowUp, moveUp, 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, moveColumnLeftOld, moveColumnLeft, moveColumnRightOld, moveColumnRight, moveDown, moveLeft, moveRight, moveRowDownOld, moveRowDown, moveRowUpOld, 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';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from './commands';
 import { activateNextResizeArea, initiateKeyboardColumnResizing, stopKeyboardColumnResizing } from './commands/column-resize';
@@ -91,7 +92,8 @@ export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProvide
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   addColumnAfterVO.common, addColumnAfterCommand(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
-  if (dragAndDropEnabled) {
+  if (dragAndDropEnabled && moveRowDown.common && moveRowUp.common && moveColumnLeft.common && moveColumnRight.common) {
+    var isNewKeyMapExperiment = expValEquals('editor-a11y-fy26-keyboard-move-row-column', 'isEnabled', true);
     // Move row/column shortcuts
     /**
      * NOTE: If the keyboard shortcut for moving rows or columns is changed, we need to update the handleKeyDown function
@@ -102,20 +104,24 @@ export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProvide
 
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveRowDown.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveRowDown.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', 1), list);
+    moveRowDownOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', 1), list);
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveRowUp.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveRowUp.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', -1), list);
+    moveRowUpOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-row', -1), list);
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveColumnLeft.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveColumnLeft.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', -1), list);
+    moveColumnLeftOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', -1), list);
     bindKeymapWithCommand(
     // Ignored via go/ees005
+    isNewKeyMapExperiment ? moveColumnRight.common :
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    moveColumnRight.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', 1), list);
+    moveColumnRightOld.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)('table-column', 1), list);
 
     // Delete row/column shortcuts
     bindKeymapWithCommand(

package/dist/esm/pm-plugins/utils/drag-menu.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, deleteColumn, deleteRow, moveColumnLeftOld, moveColumnLeft, moveColumnRightOld, moveColumnRight, moveRowDownOld, moveRowDown, moveRowUpOld, moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
 import SortAscendingIcon from '@atlaskit/icon/core/sort-ascending';
 import SortDescendingIcon from '@atlaskit/icon/core/sort-descending';
 import TableCellClearIcon from '@atlaskit/icon/core/table-cell-clear';
@@ -18,6 +18,7 @@ import TableRowDeleteIcon from '@atlaskit/icon/core/table-row-delete';
 import TableRowMoveDownIcon from '@atlaskit/icon/core/table-row-move-down';
 import TableRowMoveUpIcon from '@atlaskit/icon/core/table-row-move-up';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getClosestSelectionRect } from '../../ui/toolbar';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, sortColumnWithAnalytics } from '../commands/commands-with-analytics';
 import { moveSourceWithAnalytics } from '../drag-and-drop/commands-with-analytics';
@@ -119,6 +120,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     },
     keymap: addColumnAfter
   }];
+  var isNewKeymapExperiment = expValEquals('editor-a11y-fy26-keyboard-move-row-column', 'isEnabled', true);
   var moveOptions = direction === 'row' ? [{
     label: 'up',
     icon: function icon() {
@@ -127,7 +129,9 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
         label: ''
       });
     },
-    keymap: moveRowUp,
+    keymap: isNewKeymapExperiment ? moveRowUp :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveRowUpOld,
     canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
@@ -141,7 +145,9 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
         label: ''
       });
     },
-    keymap: moveRowDown,
+    keymap: isNewKeymapExperiment ? moveRowDown :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveRowDownOld,
     canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
@@ -155,7 +161,9 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
         label: ''
       });
     },
-    keymap: moveColumnLeft,
+    keymap: isNewKeymapExperiment ? moveColumnLeft :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveColumnLeftOld,
     canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
@@ -169,7 +177,9 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
         label: ''
       });
     },
-    keymap: moveColumnRight,
+    keymap: isNewKeymapExperiment ? moveColumnRight :
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    moveColumnRightOld,
     canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {

package/dist/types/pm-plugins/commands/toggle.d.ts

@@ -4,7 +4,7 @@ import type { Command } from '@atlaskit/editor-common/types';
  * Table layout toggle logic
  * default -> wide -> full-width -> default
  */
-export declare const getNextLayout: (currentLayout: TableLayout) => "wide" | "full-width" | "default";
+export declare const getNextLayout: (currentLayout: TableLayout) => "default" | "full-width" | "wide";
 export declare const toggleHeaderRow: Command;
 export declare const toggleHeaderColumn: Command;
 export declare const toggleNumberColumn: Command;

package/dist/types-ts4.5/pm-plugins/commands/toggle.d.ts

@@ -4,7 +4,7 @@ import type { Command } from '@atlaskit/editor-common/types';
  * Table layout toggle logic
  * default -> wide -> full-width -> default
  */
-export declare const getNextLayout: (currentLayout: TableLayout) => "wide" | "full-width" | "default";
+export declare const getNextLayout: (currentLayout: TableLayout) => "default" | "full-width" | "wide";
 export declare const toggleHeaderRow: Command;
 export declare const toggleHeaderColumn: Command;
 export declare const toggleNumberColumn: Command;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "17.3.7",
+	"version": "17.3.9",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^7.0.0",
 		"@atlaskit/editor-plugin-content-insertion": "^7.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^9.0.0",
-		"@atlaskit/editor-plugin-extension": "10.0.10",
+		"@atlaskit/editor-plugin-extension": "10.0.12",
 		"@atlaskit/editor-plugin-guideline": "^7.0.0",
 		"@atlaskit/editor-plugin-interaction": "^14.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^4.0.0",
@@ -57,7 +57,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^21.0.0",
+		"@atlaskit/tmp-editor-statsig": "^23.0.0",
 		"@atlaskit/toggle": "^15.2.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
@@ -70,7 +70,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.11.0",
+		"@atlaskit/editor-common": "^111.12.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"