@atlaskit/editor-plugin-table 1.0.1 → 1.0.3

package/dist/es2019/plugins/table/ui/FloatingContextualButton/styles.js

@@ -2,12 +2,11 @@ import { css } from '@emotion/react';
 import { B75, DN0, DN60, N0, N20, N30A, N700 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { contextualMenuTriggerSize } from '../consts';
-import { token } from '@atlaskit/tokens';
 import { themed } from '@atlaskit/theme/components';
 export const tableFloatingCellButtonStyles = props => css`
   > div {
     // Sits behind button to provide surface-color background
-    background: ${token('elevation.surface', N20)};
+    background: ${`var(--ds-surface, ${N20})`};
     border-radius: ${borderRadius()}px;
     display: flex;
     height: ${contextualMenuTriggerSize + 2}px;
@@ -15,12 +14,12 @@ export const tableFloatingCellButtonStyles = props => css`
   }
   && button {
     background: ${themed({
-  light: token('color.background.neutral', 'none'),
-  dark: token('color.background.neutral', 'none')
+  light: "var(--ds-background-neutral, none)",
+  dark: "var(--ds-background-neutral, none)"
 })(props)};
     flex-direction: column;
     margin: 2px;
-    outline: 2px solid ${token('color.border', N0)};
+    outline: 2px solid ${`var(--ds-border, ${N0})`};
     border-radius: 1px;
     padding: 0;
     height: calc(100% - 4px);
@@ -28,14 +27,14 @@ export const tableFloatingCellButtonStyles = props => css`
   }
   && button:hover {
     background: ${themed({
-  light: token('color.background.neutral.hovered', N30A),
-  dark: token('color.background.neutral.hovered', DN60)
+  light: `var(--ds-background-neutral-hovered, ${N30A})`,
+  dark: `var(--ds-background-neutral-hovered, ${DN60})`
 })(props)};
   }
   && button:active {
     background: ${themed({
-  light: token('color.background.neutral.pressed', 'rgba(179, 212, 255, 0.6)'),
-  dark: token('color.background.neutral.pressed', B75)
+  light: "var(--ds-background-neutral-pressed, rgba(179, 212, 255, 0.6))",
+  dark: `var(--ds-background-neutral-pressed, ${B75})`
 })(props)};
   }
   && button > span {
@@ -48,20 +47,20 @@ export const tableFloatingCellButtonStyles = props => css`
 export const tableFloatingCellButtonSelectedStyles = props => css`
   && button {
     background: ${themed({
-  light: token('color.background.selected', N700),
-  dark: token('color.background.selected', DN0)
+  light: `var(--ds-background-selected, ${N700})`,
+  dark: `var(--ds-background-selected, ${DN0})`
 })(props)};
   }
   && button:hover {
     background: ${themed({
-  light: token('color.background.selected.hovered', N700),
-  dark: token('color.background.selected.hovered', DN0)
+  light: `var(--ds-background-selected-hovered, ${N700})`,
+  dark: `var(--ds-background-selected-hovered, ${DN0})`
 })(props)};
   }
   && button:active {
     background: ${themed({
-  light: token('color.background.selected.pressed', N700),
-  dark: token('color.background.selected.pressed', DN0)
+  light: `var(--ds-background-selected-pressed, ${N700})`,
+  dark: `var(--ds-background-selected-pressed, ${DN0})`
 })(props)};
   }
 `;

package/dist/es2019/plugins/table/ui/FloatingContextualMenu/styles.js

@@ -4,7 +4,6 @@ import { N60A, N90 } from '@atlaskit/theme/colors';
 import { contextualMenuDropdownWidth } from '../consts';
 import { TableCssClassName as ClassName } from '../../types';
 import { borderRadius } from '@atlaskit/theme/constants';
-import { token } from '@atlaskit/tokens';
 export const cellColourPreviewStyles = selectedColor => css`
   &::before {
     background: ${selectedColor};
@@ -13,8 +12,8 @@ export const cellColourPreviewStyles = selectedColor => css`
 export const tablePopupStyles = css`
   .${ClassName.CONTEXTUAL_SUBMENU} {
     border-radius: ${borderRadius()}px;
-    background: ${token('elevation.surface.overlay', 'white')};
-    box-shadow: ${token('elevation.shadow.overlay', `0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`)};
+    background: ${"var(--ds-surface-overlay, white)"};
+    box-shadow: ${`var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`})`};
     display: block;
     position: absolute;
     top: 0;
@@ -42,7 +41,7 @@ export const tablePopupStyles = css`
       content: '›';
       margin-left: 4px;
       line-height: 20px;
-      color: ${token('color.icon', N90)};
+      color: ${`var(--ds-icon, ${N90})`};
     }
   }
 `;

package/dist/es2019/plugins/table/ui/common-styles.js

@@ -7,7 +7,6 @@ import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
 import { TableCssClassName as ClassName } from '../types';
 import { tableCellBackgroundColor, tableToolbarColor, tableBorderColor, tableCellSelectedColor, tableToolbarSelectedColor, tableBorderSelectedColor, tableCellDeleteColor, tableBorderDeleteColor, tableToolbarDeleteColor, tableBorderRadiusSize, tablePadding, tableScrollbarOffset, resizeHandlerAreaWidth, resizeLineWidth, tableToolbarSize, tableInsertColumnButtonSize, tableControlsSpacing, tableTextColor, stickyRowZIndex, columnControlsDecorationHeight, stickyRowOffsetTop, stickyHeaderBorderBottomWidth } from './consts';
 import { HeaderButton, HeaderButtonHover, HeaderButtonDanger, insertColumnButtonWrapper, insertRowButtonWrapper, columnControlsLineMarker, DeleteButton, OverflowShadow, columnControlsDecoration, hoveredDeleteButton, hoveredCell, hoveredWarningCell, resizeHandle, InsertMarker } from './ui-styles';
-import { token } from '@atlaskit/tokens';
 const cornerControlHeight = tableToolbarSize + 1;
 /*
   compensating for half of the insert column button
@@ -61,14 +60,14 @@ export const tableStyles = props => {
 
   return css`
   .${ClassName.LAYOUT_BUTTON} button {
-    background: ${token('color.background.neutral', N20A)};
-    color: ${token('color.icon', N300)};
+    background: ${`var(--ds-background-neutral, ${N20A})`};
+    color: ${`var(--ds-icon, ${N300})`};
     cursor: none;
   }
 
   .${ClassName.LAYOUT_BUTTON}:not(.${ClassName.IS_RESIZING}) button:hover {
-    background: ${token('color.background.neutral.hovered', B300)};
-    color: ${token('color.icon', 'white')} !important;
+    background: ${`var(--ds-background-neutral-hovered, ${B300})`};
+    color: ${"var(--ds-icon, white)"} !important;
     cursor: pointer;
   }
 
@@ -131,7 +130,7 @@ export const tableStyles = props => {
 
       position: fixed !important;
       z-index: ${akEditorStickyHeaderZIndex} !important;
-      box-shadow: 0px -${stickyRowOffsetTop}px ${token('elevation.surface', 'white')};
+      box-shadow: 0px -${stickyRowOffsetTop}px ${"var(--ds-surface, white)"};
       border-right: 0 none;
       /* top set by NumberColumn component */
     }
@@ -140,7 +139,7 @@ export const tableStyles = props => {
       position: fixed !important;
       /* needs to be above row controls */
       z-index: ${akEditorSmallZIndex} !important;
-      background: ${token('elevation.surface', 'white')};
+      background: ${"var(--ds-surface, white)"};
 
       width: ${tableToolbarSize}px;
       height: ${tableToolbarSize}px;
@@ -165,13 +164,13 @@ export const tableStyles = props => {
       z-index: ${akEditorStickyHeaderZIndex} !important;
       display: flex;
       border-left: ${tableToolbarSize}px solid
-        ${token('elevation.surface', 'white')};
+        ${"var(--ds-surface, white)"};
       margin-left: -${tableToolbarSize}px;
     }
 
     .${ClassName.TABLE_STICKY} col:first-of-type {
       /* moving rows out of a table layout does weird things in Chrome */
-      border-right: 1px solid ${token('elevation.surface', 'green')};
+      border-right: 1px solid ${"var(--ds-surface, green)"};
     }
 
     tr.sticky {
@@ -188,12 +187,12 @@ export const tableStyles = props => {
       grid-auto-flow: column;
 
       /* background for where controls apply */
-      background: ${token('elevation.surface', 'white')};
+      background: ${"var(--ds-surface, white)"};
       box-sizing: content-box;
 
       margin-top: 2px;
 
-      box-shadow: ${token('elevation.shadow.overflow', `0 6px 4px -4px ${N40A}`)};
+      box-shadow: ${`var(--ds-shadow-overflow, ${`0 6px 4px -4px ${N40A}`})`};
       margin-left: -1px;
 
       &.no-pointer-events {
@@ -279,7 +278,7 @@ export const tableStyles = props => {
 
     .${ClassName.CORNER_CONTROLS}.sticky {
       border-top: ${tableControlsSpacing - tableToolbarSize + 2}px solid
-        ${token('elevation.surface', 'white')};
+        ${"var(--ds-surface, white)"};
     }
 
     ${(_props$featureFlags = props.featureFlags) !== null && _props$featureFlags !== void 0 && _props$featureFlags.stickyHeadersOptimization ? sentinelStyles : ''}
@@ -367,7 +366,7 @@ export const tableStyles = props => {
     }
     .active .${ClassName.CONTROLS_CORNER_BUTTON} {
       border-color: ${tableBorderSelectedColor};
-      background: ${token('color.background.selected', tableToolbarSelectedColor)};
+      background: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
     }
 
     .${ClassName.TABLE_CONTAINER}[data-number-column='true'] {
@@ -381,14 +380,14 @@ export const tableStyles = props => {
 
     :not(.${ClassName.IS_RESIZING}) .${ClassName.CONTROLS_CORNER_BUTTON}:hover {
       border-color: ${tableBorderSelectedColor};
-      background: ${token('color.background.selected', tableToolbarSelectedColor)};
+      background: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
       cursor: pointer;
     }
 
     :not(.${ClassName.IS_RESIZING})
       .${ClassName.CONTROLS_CORNER_BUTTON}.${ClassName.HOVERED_CELL_IN_DANGER} {
       border-color: ${tableBorderDeleteColor};
-      background: ${token('color.background.danger', tableToolbarDeleteColor)};
+      background: ${`var(--ds-background-danger, ${tableToolbarDeleteColor})`};
     }
 
     /* Row controls */
@@ -489,10 +488,10 @@ export const tableStyles = props => {
         .${ClassName.NUMBERED_COLUMN_BUTTON}.active {
           border-bottom: 1px solid ${tableBorderSelectedColor};
           border-color: ${tableBorderSelectedColor};
-          background-color: ${token('color.background.selected', tableToolbarSelectedColor)};
+          background-color: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
           position: relative;
           z-index: ${akEditorUnitZIndex};
-          color: ${token('color.text.selected', N0)};
+          color: ${`var(--ds-text-selected, ${N0})`};
         }
       }
     }
@@ -503,16 +502,16 @@ export const tableStyles = props => {
       .${ClassName.NUMBERED_COLUMN_BUTTON}:hover {
         border-bottom: 1px solid ${tableBorderSelectedColor};
         border-color: ${tableBorderSelectedColor};
-        background-color: ${token('color.background.selected', tableToolbarSelectedColor)};
+        background-color: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
         position: relative;
         z-index: ${akEditorUnitZIndex};
-        color: ${token('color.text.selected', N0)};
+        color: ${`var(--ds-text-selected, ${N0})`};
       }
       .${ClassName.NUMBERED_COLUMN_BUTTON}.${ClassName.HOVERED_CELL_IN_DANGER} {
-        background-color: ${token('color.background.danger', tableToolbarDeleteColor)};
+        background-color: ${`var(--ds-background-danger, ${tableToolbarDeleteColor})`};
         border: 1px solid ${tableBorderDeleteColor};
         border-left: 0;
-        color: ${token('color.text.danger', R500)};
+        color: ${`var(--ds-text-danger, ${R500})`};
         position: relative;
         z-index: ${akEditorUnitZIndex};
       }

package/dist/es2019/plugins/table/ui/consts.js

@@ -1,7 +1,6 @@
 import { B200, B300, N20, R400, R75, DN400, N200, DN30, N0 } from '@atlaskit/theme/colors';
 import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableBorder, akEditorTableBorderDark, akEditorTableToolbar, akEditorTableToolbarDark, akEditorTableToolbarSize, akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
-import { token } from '@atlaskit/tokens';
 import { RESIZE_HANDLE_AREA_DECORATION_GAP } from '../types';
 import { themed } from '@atlaskit/theme/components';
 /**
@@ -11,29 +10,29 @@ import { themed } from '@atlaskit/theme/components';
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
 
 export const tableCellBackgroundColor = themed({
-  light: token('elevation.surface', N0),
-  dark: token('elevation.surface', DN30)
+  light: `var(--ds-surface, ${N0})`,
+  dark: `var(--ds-surface, ${DN30})`
 });
 export const tableToolbarColor = themed({
-  light: token('color.background.neutral.subtle', akEditorTableToolbar),
-  dark: token('color.background.neutral.subtle', akEditorTableToolbarDark)
+  light: `var(--ds-background-neutral-subtle, ${akEditorTableToolbar})`,
+  dark: `var(--ds-background-neutral-subtle, ${akEditorTableToolbarDark})`
 });
 export const tableTextColor = themed({
-  light: token('color.text.subtlest', N200),
-  dark: token('color.text.subtlest', DN400)
+  light: `var(--ds-text-subtlest, ${N200})`,
+  dark: `var(--ds-text-subtlest, ${DN400})`
 });
 export const tableBorderColor = themed({
-  light: token('color.border', akEditorTableBorder),
-  dark: token('color.border', akEditorTableBorderDark)
+  light: `var(--ds-border, ${akEditorTableBorder})`,
+  dark: `var(--ds-border, ${akEditorTableBorderDark})`
 });
-export const tableFloatingControlsColor = token('color.background.neutral', N20); // TODO: https://product-fabric.atlassian.net/browse/DSP-4461
+export const tableFloatingControlsColor = `var(--ds-background-neutral, ${N20})`; // TODO: https://product-fabric.atlassian.net/browse/DSP-4461
 
-export const tableCellSelectedColor = token('color.blanket.selected', 'rgba(179, 212, 255, 0.3)');
-export const tableToolbarSelectedColor = token('color.background.selected.bold', B200);
-export const tableBorderSelectedColor = token('color.border.selected', B300);
-export const tableCellDeleteColor = token('color.blanket.danger', 'rgba(255, 235, 230, 0.3)');
-export const tableBorderDeleteColor = token('color.border.danger', R400);
-export const tableToolbarDeleteColor = token('color.background.danger.bold', R75);
+export const tableCellSelectedColor = "var(--ds-blanket-selected, rgba(179, 212, 255, 0.3))";
+export const tableToolbarSelectedColor = `var(--ds-background-selected-bold, ${B200})`;
+export const tableBorderSelectedColor = `var(--ds-border-selected, ${B300})`;
+export const tableCellDeleteColor = "var(--ds-blanket-danger, rgba(255, 235, 230, 0.3))";
+export const tableBorderDeleteColor = `var(--ds-border-danger, ${R400})`;
+export const tableToolbarDeleteColor = `var(--ds-background-danger-bold, ${R75})`;
 export const tableBorderRadiusSize = 3;
 export const tablePadding = 8;
 export const tableScrollbarOffset = 15;

package/dist/es2019/plugins/table/ui/ui-styles.js

@@ -5,7 +5,6 @@ import { N40A, B300, N300, R300, N20A, N60A, N0, Y50, Y200 } from '@atlaskit/the
 import { tableToolbarColor, tableBorderColor, tableToolbarSelectedColor, tableBorderSelectedColor, tableCellDeleteColor, tableBorderDeleteColor, tableToolbarDeleteColor, lineMarkerSize, columnControlsDecorationHeight, columnControlsZIndex, columnControlsSelectedZIndex, resizeHandlerAreaWidth, resizeLineWidth, resizeHandlerZIndex, tableToolbarSize, tableInsertColumnButtonSize, tableDeleteButtonSize } from './consts';
 import { TableCssClassName as ClassName } from '../types';
 import { borderRadius } from '@atlaskit/theme/constants';
-import { token } from '@atlaskit/tokens';
 
 const InsertLine = cssString => css`
   .${ClassName.CONTROLS_INSERT_LINE} {
@@ -81,22 +80,22 @@ export const HeaderButton = (props, cssString) => css`
   }
 
   .active .${ClassName.CONTROLS_BUTTON} {
-    color: ${token('color.icon.inverse', N0)};
-    background-color: ${token('color.background.selected', tableToolbarSelectedColor)};
+    color: ${`var(--ds-icon-inverse, ${N0})`};
+    background-color: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
     border-color: ${tableBorderSelectedColor};
   }
 `;
 export const HeaderButtonHover = () => css`
   .${ClassName.CONTROLS_BUTTON}:hover {
-    color: ${token('color.icon.inverse', N0)};
-    background-color: ${token('color.background.selected', tableToolbarSelectedColor)};
+    color: ${`var(--ds-icon-inverse, ${N0})`};
+    background-color: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
     border-color: ${tableBorderSelectedColor};
     cursor: pointer;
   }
 `;
 export const HeaderButtonDanger = () => css`
   .${ClassName.HOVERED_CELL_IN_DANGER} .${ClassName.CONTROLS_BUTTON} {
-    background-color: ${token('color.background.danger', tableToolbarDeleteColor)};
+    background-color: ${`var(--ds-background-danger, ${tableToolbarDeleteColor})`};
     border-color: ${tableBorderDeleteColor};
     position: relative;
     z-index: ${akEditorUnitZIndex};
@@ -116,9 +115,9 @@ const InsertButton = () => css`
   }
   .${ClassName.CONTROLS_INSERT_BUTTON} {
     ${Button(`
-      background: ${token('elevation.surface.overlay', 'white')};
-      box-shadow: ${token('elevation.shadow.overlay', `0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`)};
-      color: ${token('color.icon', N300)};
+      background: ${"var(--ds-surface-overlay, white)"};
+      box-shadow: ${`var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`})`};
+      color: ${`var(--ds-icon, ${N300})`};
     `)}
   }
   .${ClassName.CONTROLS_INSERT_LINE} {
@@ -131,8 +130,8 @@ const InsertButton = () => css`
 
 const InsertButtonHover = () => css`
   .${ClassName.CONTROLS_INSERT_BUTTON}:hover {
-    background: ${token('color.background.brand.bold', B300)};
-    color: ${token('color.icon.inverse', 'white')};
+    background: ${`var(--ds-background-brand-bold, ${B300})`};
+    color: ${"var(--ds-icon-inverse, white)"};
     cursor: pointer;
   }
 `;
@@ -175,15 +174,15 @@ export const DeleteButton = css`
   .${ClassName.CONTROLS_DELETE_BUTTON_WRAP} {
     .${ClassName.CONTROLS_DELETE_BUTTON} {
       ${Button(`
-        background: ${token('color.background.neutral', N20A)};
-        color: ${token('color.icon', N300)};
+        background: ${`var(--ds-background-neutral, ${N20A})`};
+        color: ${`var(--ds-icon, ${N300})`};
       `)}
     }
   }
 
   .${ClassName.CONTROLS_DELETE_BUTTON}:hover {
-    background: ${token('color.background.danger.bold', R300)};
-    color: ${token('color.icon.inverse', 'white')};
+    background: ${`var(--ds-background-danger-bold, ${R300})`};
+    color: ${"var(--ds-icon-inverse, white)"};
     cursor: pointer;
   }
 `;
@@ -201,11 +200,11 @@ export const OverflowShadow = props => css`
     background: linear-gradient(
         to left,
         transparent 0,
-        ${token('elevation.shadow.overflow.spread', N40A)} 100%
+        ${`var(--ds-shadow-overflow-spread, ${N40A})`} 100%
       ),
       linear-gradient(
         to right,
-        ${token('elevation.shadow.overflow.perimeter', 'transparent')} 0px,
+        ${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
         transparent 1px
       );
     left: 0px;
@@ -217,11 +216,11 @@ export const OverflowShadow = props => css`
     background: linear-gradient(
         to right,
         transparent 0,
-        ${token('elevation.shadow.overflow.spread', N40A)} 100%
+        ${`var(--ds-shadow-overflow-spread, ${N40A})`} 100%
       ),
       linear-gradient(
         to left,
-        ${token('elevation.shadow.overflow.perimeter', 'transparent')} 0px,
+        ${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
         transparent 1px
       );
     left: calc(100% + 2px);
@@ -252,8 +251,8 @@ const columnHeaderButton = (props, cssString) => css`
 `;
 
 const columnHeaderButtonSelected = css`
-  color: ${token('color.text.inverse', N0)};
-  background-color: ${token('color.background.selected', tableToolbarSelectedColor)};
+  color: ${`var(--ds-text-inverse, ${N0})`};
+  background-color: ${`var(--ds-background-selected, ${tableToolbarSelectedColor})`};
   border-color: ${tableBorderSelectedColor};
   z-index: ${columnControlsSelectedZIndex};
 `;
@@ -326,7 +325,7 @@ export const columnControlsDecoration = props => css`
 
       &.${ClassName.HOVERED_CELL_IN_DANGER}
         .${ClassName.COLUMN_CONTROLS_DECORATIONS}::after {
-        background-color: ${token('color.background.danger', tableToolbarDeleteColor)};
+        background-color: ${`var(--ds-background-danger, ${tableToolbarDeleteColor})`};
         border: 1px solid ${tableBorderDeleteColor};
         border-bottom: none;
         z-index: ${akEditorUnitZIndex * 100};
@@ -372,8 +371,8 @@ export const hoveredWarningCell = css`
   :not(.${ClassName.IS_RESIZING})
     .${ClassName.TABLE_CONTAINER}:not(.${ClassName.HOVERED_DELETE_BUTTON}) {
     td.${ClassName.HOVERED_CELL_WARNING} {
-      background-color: ${token('color.background.warning', Y50)} !important; // We need to override the background-color added to the cell
-      border: 1px solid ${token('color.border.warning', Y200)};
+      background-color: ${`var(--ds-background-warning, ${Y50})`} !important; // We need to override the background-color added to the cell
+      border: 1px solid ${`var(--ds-border-warning, ${Y200})`};
     }
   }
 `;

package/dist/es2019/plugins/table/utils/decoration.js

@@ -1,4 +1,4 @@
-import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInRow, getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { Decoration } from 'prosemirror-view';
 import { nonNullable } from '@atlaskit/editor-common/utils';
@@ -43,7 +43,37 @@ export const createControlsHoverDecoration = (cells, type, tr, danger, selected)
   // to match the "clicked" selection
 
   if (danger) {
-    const rect = map.rectBetween(min - table.start, max - table.start);
+    // Find the bounding rectangle of all the given cells, also considering
+    // merged cells.
+    const {
+      recLeft,
+      recTop,
+      recRight,
+      recBottom
+    } = cells.reduce((acc, cell) => {
+      const {
+        left,
+        right,
+        bottom,
+        top
+      } = map.findCell(cell.pos - table.start); // Finding the bounding rect requires finding the min left and top positions,
+      // and the max right and bottom positions of the cells
+
+      return {
+        recLeft: Math.min(acc.recLeft, left),
+        recTop: Math.min(acc.recTop, top),
+        recRight: Math.max(acc.recRight, right),
+        recBottom: Math.max(acc.recBottom, bottom)
+      };
+    }, // +-Infinity as initialisation vars which will always be overwritten
+    // by smaller/larger values respectively
+    {
+      recLeft: Infinity,
+      recTop: Infinity,
+      recRight: -Infinity,
+      recBottom: -Infinity
+    });
+    const rect = new Rect(recLeft, recTop, recRight, recBottom);
     updatedCells = map.cellsInRect(rect).map(x => x + table.start);
   }
 

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"sideEffects": false
 }

package/dist/esm/plugins/table/toolbar.js

@@ -5,7 +5,7 @@ import { jsx } from '@emotion/react';
 import { defineMessages } from 'react-intl-next';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import commonMessages from '@atlaskit/editor-common/messages';
-import { clearHoverSelection, hoverTable, hoverColumns, hoverRows, removeDescendantNodes } from './commands';
+import { clearHoverSelection, hoverTable, hoverColumns, hoverRows, removeDescendantNodes, hoverMergedCells } from './commands';
 import { deleteTableWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics, insertRowWithAnalytics, deleteRowsWithAnalytics, mergeCellsWithAnalytics, splitCellWithAnalytics, deleteColumnsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, wrapTableInExpandWithAnalytics, sortColumnWithAnalytics, setColorWithAnalytics, distributeColumnsWidthsWithAnalytics } from './commands-with-analytics';
 import { getPluginState } from './pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from './pm-plugins/table-resizing';
@@ -229,6 +229,18 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     options.push({
       id: 'editor.table.sortColumnAsc',
       title: formatMessage(ContextualMenuMessages.sortColumnASC),
+      onMouseOver: function onMouseOver(state, dispatch) {
+        if (getMergedCellsPositions(state.tr).length !== 0) {
+          hoverMergedCells()(state, dispatch);
+          return true;
+        }
+
+        return false;
+      },
+      onMouseOut: function onMouseOut(state, dispatch) {
+        clearHoverSelection()(state, dispatch);
+        return true;
+      },
       onClick: function onClick(state, dispatch) {
         sortColumnWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, initialSelectionRect.left, SortOrder.ASC)(state, dispatch);
         return true;
@@ -240,6 +252,18 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     options.push({
       id: 'editor.table.sortColumnDesc',
       title: formatMessage(ContextualMenuMessages.sortColumnDESC),
+      onMouseOver: function onMouseOver(state, dispatch) {
+        if (getMergedCellsPositions(state.tr).length !== 0) {
+          hoverMergedCells()(state, dispatch);
+          return true;
+        }
+
+        return false;
+      },
+      onMouseOut: function onMouseOut(state, dispatch) {
+        clearHoverSelection()(state, dispatch);
+        return true;
+      },
       onClick: function onClick(state, dispatch) {
         sortColumnWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, initialSelectionRect.left, SortOrder.DESC)(state, dispatch);
         return true;

package/dist/esm/plugins/table/ui/FloatingContextualButton/styles.js

@@ -6,29 +6,28 @@ import { css } from '@emotion/react';
 import { B75, DN0, DN60, N0, N20, N30A, N700 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { contextualMenuTriggerSize } from '../consts';
-import { token } from '@atlaskit/tokens';
 import { themed } from '@atlaskit/theme/components';
 export var tableFloatingCellButtonStyles = function tableFloatingCellButtonStyles(props) {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  > div {\n    // Sits behind button to provide surface-color background\n    background: ", ";\n    border-radius: ", "px;\n    display: flex;\n    height: ", "px;\n    flex-direction: column;\n  }\n  && button {\n    background: ", ";\n    flex-direction: column;\n    margin: 2px;\n    outline: 2px solid ", ";\n    border-radius: 1px;\n    padding: 0;\n    height: calc(100% - 4px);\n    display: flex;\n  }\n  && button:hover {\n    background: ", ";\n  }\n  && button:active {\n    background: ", ";\n  }\n  && button > span {\n    margin: 0px -4px;\n  }\n  && span {\n    pointer-events: none;\n  }\n"])), token('elevation.surface', N20), borderRadius(), contextualMenuTriggerSize + 2, themed({
-    light: token('color.background.neutral', 'none'),
-    dark: token('color.background.neutral', 'none')
-  })(props), token('color.border', N0), themed({
-    light: token('color.background.neutral.hovered', N30A),
-    dark: token('color.background.neutral.hovered', DN60)
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  > div {\n    // Sits behind button to provide surface-color background\n    background: ", ";\n    border-radius: ", "px;\n    display: flex;\n    height: ", "px;\n    flex-direction: column;\n  }\n  && button {\n    background: ", ";\n    flex-direction: column;\n    margin: 2px;\n    outline: 2px solid ", ";\n    border-radius: 1px;\n    padding: 0;\n    height: calc(100% - 4px);\n    display: flex;\n  }\n  && button:hover {\n    background: ", ";\n  }\n  && button:active {\n    background: ", ";\n  }\n  && button > span {\n    margin: 0px -4px;\n  }\n  && span {\n    pointer-events: none;\n  }\n"])), "var(--ds-surface, ".concat(N20, ")"), borderRadius(), contextualMenuTriggerSize + 2, themed({
+    light: "var(--ds-background-neutral, none)",
+    dark: "var(--ds-background-neutral, none)"
+  })(props), "var(--ds-border, ".concat(N0, ")"), themed({
+    light: "var(--ds-background-neutral-hovered, ".concat(N30A, ")"),
+    dark: "var(--ds-background-neutral-hovered, ".concat(DN60, ")")
   })(props), themed({
-    light: token('color.background.neutral.pressed', 'rgba(179, 212, 255, 0.6)'),
-    dark: token('color.background.neutral.pressed', B75)
+    light: "var(--ds-background-neutral-pressed, rgba(179, 212, 255, 0.6))",
+    dark: "var(--ds-background-neutral-pressed, ".concat(B75, ")")
   })(props));
 };
 export var tableFloatingCellButtonSelectedStyles = function tableFloatingCellButtonSelectedStyles(props) {
   return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  && button {\n    background: ", ";\n  }\n  && button:hover {\n    background: ", ";\n  }\n  && button:active {\n    background: ", ";\n  }\n"])), themed({
-    light: token('color.background.selected', N700),
-    dark: token('color.background.selected', DN0)
+    light: "var(--ds-background-selected, ".concat(N700, ")"),
+    dark: "var(--ds-background-selected, ".concat(DN0, ")")
   })(props), themed({
-    light: token('color.background.selected.hovered', N700),
-    dark: token('color.background.selected.hovered', DN0)
+    light: "var(--ds-background-selected-hovered, ".concat(N700, ")"),
+    dark: "var(--ds-background-selected-hovered, ".concat(DN0, ")")
   })(props), themed({
-    light: token('color.background.selected.pressed', N700),
-    dark: token('color.background.selected.pressed', DN0)
+    light: "var(--ds-background-selected-pressed, ".concat(N700, ")"),
+    dark: "var(--ds-background-selected-pressed, ".concat(DN0, ")")
   })(props));
 };

package/dist/esm/plugins/table/ui/FloatingContextualMenu/styles.js

@@ -8,8 +8,7 @@ import { N60A, N90 } from '@atlaskit/theme/colors';
 import { contextualMenuDropdownWidth } from '../consts';
 import { TableCssClassName as ClassName } from '../../types';
 import { borderRadius } from '@atlaskit/theme/constants';
-import { token } from '@atlaskit/tokens';
 export var cellColourPreviewStyles = function cellColourPreviewStyles(selectedColor) {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &::before {\n    background: ", ";\n  }\n"])), selectedColor);
 };
-export var tablePopupStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .", " {\n    border-radius: ", "px;\n    background: ", ";\n    box-shadow: ", ";\n    display: block;\n    position: absolute;\n    top: 0;\n    left: ", "px;\n    padding: 8px;\n\n    > div {\n      padding: 0;\n    }\n  }\n\n  .", " {\n    display: flex;\n\n    &::before {\n      content: '';\n      display: block;\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      width: 20px;\n      height: 20px;\n    }\n\n    &::after {\n      content: '\u203A';\n      margin-left: 4px;\n      line-height: 20px;\n      color: ", ";\n    }\n  }\n"])), ClassName.CONTEXTUAL_SUBMENU, borderRadius(), token('elevation.surface.overlay', 'white'), token('elevation.shadow.overlay', "0 4px 8px -2px ".concat(N60A, ", 0 0 1px ").concat(N60A)), contextualMenuDropdownWidth, ClassName.CONTEXTUAL_MENU_ICON, tableBackgroundBorderColor, borderRadius(), token('color.icon', N90));
+export var tablePopupStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .", " {\n    border-radius: ", "px;\n    background: ", ";\n    box-shadow: ", ";\n    display: block;\n    position: absolute;\n    top: 0;\n    left: ", "px;\n    padding: 8px;\n\n    > div {\n      padding: 0;\n    }\n  }\n\n  .", " {\n    display: flex;\n\n    &::before {\n      content: '';\n      display: block;\n      border: 1px solid ", ";\n      border-radius: ", "px;\n      width: 20px;\n      height: 20px;\n    }\n\n    &::after {\n      content: '\u203A';\n      margin-left: 4px;\n      line-height: 20px;\n      color: ", ";\n    }\n  }\n"])), ClassName.CONTEXTUAL_SUBMENU, borderRadius(), "var(--ds-surface-overlay, white)", "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N60A, ", 0 0 1px ").concat(N60A), ")"), contextualMenuDropdownWidth, ClassName.CONTEXTUAL_MENU_ICON, tableBackgroundBorderColor, borderRadius(), "var(--ds-icon, ".concat(N90, ")"));