@atlaskit/editor-plugin-table 5.3.13 → 5.3.15

package/src/plugins/table/ui/common-styles.ts

@@ -56,6 +56,7 @@ import {
   columnControlsDecoration,
   columnControlsLineMarker,
   DeleteButton,
+  dragInsertButtonWrapper,
   floatingColumnControls,
   HeaderButton,
   HeaderButtonDanger,
@@ -357,6 +358,8 @@ export const tableStyles = (
       ${insertRowButtonWrapper(props)}
     }
 
+    ${dragInsertButtonWrapper(props)}
+
     /* Delete button */
     ${DeleteButton(props)}
     /* Ends Delete button */
@@ -700,12 +703,64 @@ export const tableStyles = (
       )}
     }
 
-    .${ClassName.ROW_CONTROLS_WITH_DRAG} {
+    .${ClassName.DRAG_ROW_CONTROLS} {
       display: grid;
       align-items: center;
       position: absolute;
       left: -4px;
       z-index: ${akEditorUnitZIndex};
+
+      .${ClassName.DRAG_ROW_FLOATING_INSERT_DOT_WRAPPER} {
+        align-self: end;
+        position: absolute;
+        height: 100%;
+        width: 24px;
+      }
+
+      .${ClassName.DRAG_ROW_FLOATING_INSERT_DOT} {
+        position: absolute;
+        bottom: -3px;
+        left: 6px;
+        background-color: ${token(
+          'color.background.accent.gray.subtler',
+          '#C1C7D0',
+        )};
+        height: 4px;
+        width: 4px;
+        border-radius: 50%;
+      }
+    }
+
+    .${ClassName.DRAG_COLUMN_CONTROLS} {
+      .${ClassName.COLUMN_CONTROLS_INNER} {
+        height: 24px;
+        position: absolute;
+        top: ${token('space.negative.150', '-12px')};
+        z-index: ${akEditorUnitZIndex};
+      }
+
+      .${ClassName.DRAG_COLUMN_FLOATING_INSERT_DOT_WRAPPER} {
+        position: absolute;
+        height: 24px;
+        width: 100%;
+      }
+
+      .${ClassName.DRAG_COLUMN_FLOATING_INSERT_DOT} {
+        background-color: ${token(
+          'color.background.accent.gray.subtler',
+          '#C1C7D0',
+        )};
+        height: 4px;
+        width: 4px;
+        border-radius: 50%;
+        position: absolute;
+        right: -2px;
+      }
+    }
+
+    .${ClassName.CONTROLS_FLOATING_BUTTON_ROW}
+      .${ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER} {
+      bottom: -1px;
     }
 
     .${ClassName.DRAG_HANDLE_BUTTON_CONTAINER} {
@@ -719,10 +774,10 @@ export const tableStyles = (
       display: flex;
       justify-content: center;
       align-items: center;
+      outline: none !important;
 
       svg {
         rect {
-          //
           fill: ${token('color.background.accent.gray.subtlest', '#F1F2F4')};
         }
         g {

package/src/plugins/table/ui/icons/AddColLeftIcon.tsx

@@ -0,0 +1,43 @@
+import React from 'react';
+
+export const AddColLeftIcon = () => (
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="currentColor"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <rect
+      width="24"
+      height="24"
+      transform="matrix(0 -1 1 0 0 24)"
+      fill="none"
+      fillOpacity="0.01"
+    />
+    <rect
+      x="12"
+      y="18"
+      width="12"
+      height="3"
+      rx="0.5"
+      transform="rotate(-90 12 18)"
+      fill="currentColor"
+    />
+    <rect
+      x="16"
+      y="18"
+      width="12"
+      height="3"
+      rx="0.5"
+      transform="rotate(-90 16 18)"
+      fill="currentColor"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M7 11H5.99C5.72652 11.0026 5.47473 11.1092 5.28935 11.2964C5.10397 11.4837 4.99999 11.7365 5 12C5 12.556 5.444 13 5.99 13H7V14C7 14.2652 7.10536 14.5196 7.29289 14.7071C7.48043 14.8946 7.73478 15 8 15C8.26522 15 8.51957 14.8946 8.70711 14.7071C8.89464 14.5196 9 14.2652 9 14V13H10.01C10.2735 12.9974 10.5253 12.8908 10.7107 12.7036C10.896 12.5163 11 12.2635 11 12C11 11.444 10.556 11 10.01 11H9V10C9 9.73478 8.89464 9.48043 8.70711 9.29289C8.51957 9.10536 8.26522 9 8 9C7.73478 9 7.48043 9.10536 7.29289 9.29289C7.10536 9.48043 7 9.73478 7 10V11Z"
+      fill="currentColor"
+    />
+  </svg>
+);

package/src/plugins/table/ui/icons/AddColRightIcon.tsx

@@ -0,0 +1,43 @@
+import React from 'react';
+
+export const AddColRightIcon = () => (
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <rect
+      width="24"
+      height="24"
+      transform="translate(0 24) rotate(-90)"
+      fill="none"
+      fillOpacity="0.01"
+    />
+    <rect
+      x="9"
+      y="18"
+      width="12"
+      height="3"
+      rx="0.5"
+      transform="rotate(-90 9 18)"
+      fill="currentColor"
+    />
+    <rect
+      x="5"
+      y="18"
+      width="12"
+      height="3"
+      rx="0.5"
+      transform="rotate(-90 5 18)"
+      fill="currentColor"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M15 11L13.99 11C13.7265 11.0026 13.4747 11.1092 13.2893 11.2964C13.104 11.4837 13 11.7365 13 12C13 12.556 13.444 13 13.99 13L15 13L15 14C15 14.2652 15.1054 14.5196 15.2929 14.7071C15.4804 14.8946 15.7348 15 16 15C16.2652 15 16.5196 14.8946 16.7071 14.7071C16.8946 14.5196 17 14.2652 17 14L17 13L18.01 13C18.2735 12.9974 18.5253 12.8908 18.7107 12.7036C18.896 12.5163 19 12.2635 19 12C19 11.444 18.556 11 18.01 11L17 11L17 10C17 9.73478 16.8946 9.48043 16.7071 9.29289C16.5196 9.10536 16.2652 9 16 9C15.7348 9 15.4804 9.10536 15.2929 9.29289C15.1054 9.48043 15 9.73478 15 10L15 11Z"
+      fill="currentColor"
+    />
+  </svg>
+);

package/src/plugins/table/ui/icons/AddRowAboveIcon.tsx

@@ -0,0 +1,42 @@
+import React from 'react';
+
+import { token } from '@atlaskit/tokens';
+
+export const AddRowAboveIcon = () => (
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <rect
+      width="24"
+      height="24"
+      fill={token('color.border.inverse', '#FFFFFF')}
+      fillOpacity="0.01"
+    />
+    <mask
+      id="path-1-inside-1_896_17822"
+      fill={token('color.border.inverse', '#FFFFFF')}
+    >
+      <rect x="6" y="12" width="12" height="8" rx="0.5" />
+    </mask>
+    <rect
+      x="6"
+      y="12"
+      width="12"
+      height="8"
+      rx="0.5"
+      stroke="currentColor"
+      strokeWidth="4"
+      mask="url(#path-1-inside-1_896_17822)"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M13 7V5.99C12.9974 5.72652 12.8908 5.47473 12.7036 5.28935C12.5163 5.10397 12.2635 4.99999 12 5C11.444 5 11 5.444 11 5.99V7H10C9.73478 7 9.48043 7.10536 9.29289 7.29289C9.10536 7.48043 9 7.73478 9 8C9 8.26522 9.10536 8.51957 9.29289 8.70711C9.48043 8.89464 9.73478 9 10 9H11V10.01C11.0026 10.2735 11.1092 10.5253 11.2964 10.7107C11.4837 10.896 11.7365 11 12 11C12.556 11 13 10.556 13 10.01V9H14C14.2652 9 14.5196 8.89464 14.7071 8.70711C14.8946 8.51957 15 8.26522 15 8C15 7.73478 14.8946 7.48043 14.7071 7.29289C14.5196 7.10536 14.2652 7 14 7H13Z"
+      fill="currentColor"
+    />
+  </svg>
+);

package/src/plugins/table/ui/icons/AddRowBelowIcon.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+
+import { token } from '@atlaskit/tokens';
+
+export const AddRowBelowIcon = () => (
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <mask
+      id="path-1-inside-1_920_47112"
+      fill={token('color.border.inverse', '#FFFFFF')}
+    >
+      <rect x="6" y="4" width="12" height="8" rx="0.5" />
+    </mask>
+    <rect
+      x="6"
+      y="4"
+      width="12"
+      height="8"
+      rx="0.5"
+      stroke="currentColor"
+      strokeWidth="4"
+      mask="url(#path-1-inside-1_920_47112)"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M13 15V13.99C12.9974 13.7265 12.8908 13.4747 12.7036 13.2893C12.5163 13.104 12.2635 13 12 13C11.444 13 11 13.444 11 13.99V15H10C9.73478 15 9.48043 15.1054 9.29289 15.2929C9.10536 15.4804 9 15.7348 9 16C9 16.2652 9.10536 16.5196 9.29289 16.7071C9.48043 16.8946 9.73478 17 10 17H11V18.01C11.0026 18.2735 11.1092 18.5253 11.2964 18.7107C11.4837 18.896 11.7365 19 12 19C12.556 19 13 18.556 13 18.01V17H14C14.2652 17 14.5196 16.8946 14.7071 16.7071C14.8946 16.5196 15 16.2652 15 16C15 15.7348 14.8946 15.4804 14.7071 15.2929C14.5196 15.1054 14.2652 15 14 15H13Z"
+      fill="currentColor"
+    />
+  </svg>
+);

package/src/plugins/table/ui/icons/index.ts

@@ -1,2 +1,6 @@
 export { DragHandleIcon } from './DragHandleIcon';
 export { DragInMotionIcon } from './DragInMotionIcon';
+export { AddRowAboveIcon } from './AddRowAboveIcon';
+export { AddRowBelowIcon } from './AddRowBelowIcon';
+export { AddColLeftIcon } from './AddColLeftIcon';
+export { AddColRightIcon } from './AddColRightIcon';

package/src/plugins/table/ui/ui-styles.ts

@@ -180,6 +180,32 @@ const InsertButtonHover = () => css`
   }
 `;
 
+export const dragInsertButtonWrapper = (props: ThemeProps) => css`
+  .${ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER} {
+    position: absolute;
+    z-index: ${akEditorUnitZIndex + 10};
+    bottom: -5px;
+    left: 3px;
+  }
+  .${ClassName.DRAG_CONTROLS_INSERT_BUTTON} {
+    ${Button(`
+    background: ${token('elevation.surface.overlay', 'white')};
+    color: ${token('color.icon', N300)};
+    border: 1px solid ${token(
+      'color.background.accent.gray.subtler',
+      '#C1C7D0',
+    )};
+    border-radius: 50%;
+  `)}
+  }
+  .${ClassName.DRAG_CONTROLS_INSERT_BUTTON}:hover {
+    background: ${token('color.background.brand.bold', B300)};
+    border: 1px solid ${token('color.background.brand.bold', B300)};
+    color: ${token('color.icon.inverse', 'white')};
+    cursor: pointer;
+  }
+`;
+
 export const insertColumnButtonWrapper = (props: ThemeProps) => css`
   ${InsertButton()}
   ${InsertButtonHover()}
@@ -388,7 +414,7 @@ export const floatingColumnControls = (props: ThemeProps) => {
       }
     }
 
-    .${ClassName.COLUMN_CONTROLS_WITH_DRAG} {
+    .${ClassName.DRAG_COLUMN_CONTROLS} {
       box-sizing: border-box;
 
       .${ClassName.COLUMN_CONTROLS_INNER} {

package/src/plugins/table/utils/dom.ts

@@ -40,10 +40,6 @@ export const isRowControlsButton = (node: HTMLElement | null): boolean =>
   containsClassName(node, ClassName.ROW_CONTROLS_BUTTON) ||
   containsClassName(node, ClassName.NUMBERED_COLUMN_BUTTON);
 
-export const isRowDragControlsButton = (node: HTMLElement | null) =>
-  containsClassName(node, ClassName.ROW_CONTROLS_WITH_DRAG) ||
-  closestElement(node, `.${ClassName.ROW_CONTROLS_WITH_DRAG}`);
-
 export const isResizeHandleDecoration = (node: HTMLElement | null): boolean =>
   containsClassName(node, ClassName.RESIZE_HANDLE_DECORATION);
 
@@ -55,6 +51,17 @@ export const isTableContainerOrWrapper = (node: HTMLElement | null): boolean =>
   containsClassName(node, ClassName.TABLE_CONTAINER) ||
   containsClassName(node, ClassName.TABLE_NODE_WRAPPER);
 
+/** drag-and-drop classes */
+export const isRowDragControlsButton = (node: HTMLElement | null) =>
+  containsClassName(node, ClassName.DRAG_ROW_CONTROLS) ||
+  closestElement(node, `.${ClassName.DRAG_ROW_CONTROLS}`);
+
+export const isDragRowFloatingInsertDot = (node: HTMLElement | null) =>
+  containsClassName(node, ClassName.DRAG_ROW_FLOATING_INSERT_DOT_WRAPPER);
+
+export const isDragColumnFloatingInsertDot = (node: HTMLElement | null) =>
+  containsClassName(node, ClassName.DRAG_COLUMN_FLOATING_INSERT_DOT_WRAPPER);
+
 /*
  * This function returns which side of a given element the mouse cursor is,
  * using as a base the half of the width by default, for example:

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

@@ -1,13 +1,47 @@
+import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
+import {
+  addColumnAfter,
+  addColumnBefore,
+  addRowAfter,
+  addRowBefore,
+  backspace,
+  tooltip,
+} from '@atlaskit/editor-common/keymaps';
 import type {
   Command,
   CommandDispatch,
   DropdownOptionT,
+  GetEditorContainerWidth,
+  IconProps,
 } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import type { TableMap } from '@atlaskit/editor-tables/table-map';
+import type { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
+import ArrowDownIcon from '@atlaskit/icon/glyph/arrow-down';
+import ArrowLeftIcon from '@atlaskit/icon/glyph/arrow-left';
+import ArrowRightIcon from '@atlaskit/icon/glyph/arrow-right';
+import ArrowUpIcon from '@atlaskit/icon/glyph/arrow-up';
+import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
+import EditorLayoutThreeEqualIcon from '@atlaskit/icon/glyph/editor/layout-three-equal';
+import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
+import HipchatChevronDoubleDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-down';
+import HipchatChevronDoubleUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-up';
 
+import {
+  clearMultipleCells,
+  insertColumn,
+  insertRow,
+  sortByColumn,
+} from '../commands';
+import { deleteColumnsCommand } from '../commands/delete';
 import { moveSource } from '../pm-plugins/drag-and-drop/commands';
+import { deleteRows } from '../transforms';
 import type { TableDirection } from '../types';
+import {
+  AddColLeftIcon,
+  AddColRightIcon,
+  AddRowAboveIcon,
+  AddRowBelowIcon,
+} from '../ui/icons';
 
 const canDecrease = (index?: number, min: number = 0) =>
   index !== undefined && index > min;
@@ -16,39 +50,148 @@ const canIncrease = (index?: number, max: number = 0) =>
 
 export interface DragMenuConfig extends DropdownOptionT<Command> {
   id: string;
+  icon?: React.ComponentType<IconProps>;
+  keymap?: string;
 }
 
 export const getDragMenuConfig = (
   direction: TableDirection,
+  getEditorContainerWidth: GetEditorContainerWidth,
   tableMap?: TableMap,
   index?: number,
+  targetCellPosition?: number,
+  selectionRect?: Rect,
 ): DragMenuConfig[] => {
+  const addOptions =
+    direction === 'row'
+      ? [
+          {
+            label: 'above',
+            offset: 0,
+            icon: AddRowAboveIcon,
+            keymap: addRowBefore,
+          },
+          {
+            label: 'below',
+            offset: 1,
+            icon: AddRowBelowIcon,
+            keymap: addRowAfter,
+          },
+        ]
+      : [
+          {
+            label: 'left',
+            offset: 0,
+            icon: AddColLeftIcon,
+            keymap: addColumnBefore,
+          },
+          {
+            label: 'right',
+            offset: 1,
+            icon: AddColRightIcon,
+            keymap: addColumnAfter,
+          },
+        ];
   const moveOptions =
     direction === 'row'
       ? [
-          { label: 'up', offset: -1, canMove: canDecrease },
+          { label: 'up', offset: -1, canMove: canDecrease, icon: ArrowUpIcon },
           {
             label: 'down',
             offset: 1,
             canMove: (index?: number) =>
               canIncrease(index, (tableMap?.height ?? 0) - 1),
+            icon: ArrowDownIcon,
           },
         ]
       : [
-          { label: 'left', offset: -1, canMove: canDecrease },
+          {
+            label: 'left',
+            offset: -1,
+            canMove: canDecrease,
+            icon: ArrowLeftIcon,
+          },
           {
             label: 'right',
             offset: 1,
             canMove: (index?: number) =>
               canIncrease(index, (tableMap?.width ?? 0) - 1),
+            icon: ArrowRightIcon,
           },
         ];
 
+  const sortOptions =
+    direction === 'column'
+      ? [
+          {
+            label: 'increasing',
+            order: SortOrder.ASC,
+            icon: HipchatChevronDoubleUpIcon,
+          },
+          {
+            label: 'decreasing',
+            order: SortOrder.DESC,
+            icon: HipchatChevronDoubleDownIcon,
+          },
+        ]
+      : [];
   return [
-    ...moveOptions.map(({ label, offset, canMove }) => ({
+    ...addOptions.map(({ label, offset, icon, keymap }) => ({
+      id: `add_${direction}_${label}`,
+      title: `Add ${direction} ${label}`,
+      icon,
+      onClick: (state: EditorState, dispatch?: CommandDispatch) => {
+        if (direction === 'row') {
+          insertRow(index! + offset, true)(state, dispatch);
+        } else {
+          insertColumn(getEditorContainerWidth)(index! + offset)(
+            state,
+            dispatch,
+          );
+        }
+        return true;
+      },
+      keymap: keymap && tooltip(keymap),
+    })),
+    direction === 'column'
+      ? {
+          id: 'distribute_columns',
+          title: 'Distribute columns',
+          disabled: true,
+          onClick: () => {
+            return false;
+          },
+          icon: EditorLayoutThreeEqualIcon,
+        }
+      : undefined,
+    {
+      id: 'clear_cells',
+      title: 'Clear cells',
+      onClick: (state: EditorState, dispatch?: CommandDispatch) => {
+        clearMultipleCells(targetCellPosition)(state, dispatch);
+        return true;
+      },
+      icon: CrossCircleIcon,
+      keymap: tooltip(backspace),
+    },
+    {
+      id: `delete_${direction}`,
+      title: `Delete ${direction}`,
+      onClick: (state: EditorState, dispatch?: CommandDispatch) => {
+        if (direction === 'row') {
+          dispatch?.(deleteRows(selectionRect!, false)(state.tr));
+        } else {
+          deleteColumnsCommand(selectionRect!)(state, dispatch);
+        }
+        return true;
+      },
+      icon: RemoveIcon,
+    },
+    ...moveOptions.map(({ label, offset, canMove, icon }) => ({
       id: `move_${direction}_${label}`,
       title: `Move ${direction} ${label}`,
       disabled: !canMove(index),
+      icon,
       onClick: (state: EditorState, dispatch?: CommandDispatch) => {
         if (canMove(index)) {
           moveSource(
@@ -61,5 +204,15 @@ export const getDragMenuConfig = (
         return false;
       },
     })),
-  ];
+
+    ...sortOptions.map(({ label, order, icon }) => ({
+      id: `sort_column_${order}`,
+      title: `Sort ${label}`,
+      icon,
+      onClick: (state: EditorState, dispatch?: CommandDispatch) => {
+        sortByColumn(index!, order)(state, dispatch);
+        return true;
+      },
+    })),
+  ].filter(Boolean) as DragMenuConfig[];
 };

package/src/plugins/table/utils/index.ts

@@ -48,6 +48,8 @@ export {
   isTableContainerOrWrapper,
   isRowDragControlsButton,
   isRowControlsButton,
+  isDragColumnFloatingInsertDot,
+  isDragRowFloatingInsertDot,
   getColumnOrRowIndex,
   getMousePositionHorizontalRelativeByElement,
   getMousePositionVerticalRelativeByElement,

package/tsconfig.app.json

@@ -75,6 +75,9 @@
     {
       "path": "../../pragmatic-drag-and-drop/hitbox/tsconfig.app.json"
     },
+    {
+      "path": "../../pragmatic-drag-and-drop/react-beautiful-dnd-autoscroll/tsconfig.app.json"
+    },
     {
       "path": "../../design-system/primitives/tsconfig.app.json"
     },