@atlaskit/editor-plugin-table 5.3.14 → 5.3.15

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/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[];
 };