@atlaskit/editor-plugin-table 5.4.18 → 5.4.20

package/src/plugins/table/utils/drag-menu.ts

@@ -57,7 +57,7 @@ export interface DragMenuConfig extends DropdownOptionT<Command> {
 export const getDragMenuConfig = (
   direction: TableDirection,
   getEditorContainerWidth: GetEditorContainerWidth,
-  hasMergedCells: boolean,
+  canDrag: boolean,
   tableMap?: TableMap,
   index?: number,
   targetCellPosition?: number,
@@ -99,14 +99,14 @@ export const getDragMenuConfig = (
           {
             label: 'up',
             offset: -1,
-            canMove: canDecrease,
+            canMove: (index?: number) => canDrag && canDecrease(index),
             icon: ArrowUpIcon,
           },
           {
             label: 'down',
             offset: 1,
             canMove: (index?: number) =>
-              canIncrease(index, (tableMap?.height ?? 0) - 1),
+              canDrag && canIncrease(index, (tableMap?.height ?? 0) - 1),
             icon: ArrowDownIcon,
           },
         ]
@@ -114,14 +114,14 @@ export const getDragMenuConfig = (
           {
             label: 'left',
             offset: -1,
-            canMove: canDecrease,
+            canMove: (index?: number) => canDrag && canDecrease(index),
             icon: ArrowLeftIcon,
           },
           {
             label: 'right',
             offset: 1,
             canMove: (index?: number) =>
-              canIncrease(index, (tableMap?.width ?? 0) - 1),
+              canDrag && canIncrease(index, (tableMap?.width ?? 0) - 1),
             icon: ArrowRightIcon,
           },
         ];
@@ -196,7 +196,7 @@ export const getDragMenuConfig = (
     ...moveOptions.map(({ label, offset, canMove, icon }) => ({
       id: `move_${direction}_${label}`,
       title: `Move ${direction} ${label}`,
-      disabled: hasMergedCells || !canMove(index),
+      disabled: !canMove(index),
       icon,
       onClick: (state: EditorState, dispatch?: CommandDispatch) => {
         if (canMove(index)) {