@atlaskit/editor-core 153.1.1 → 154.0.0

package/dist/es2019/plugins/table/event-handlers.js

@@ -2,8 +2,7 @@ import { Selection, TextSelection } from 'prosemirror-state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { cellAround, findCellRectClosestToPos, findTable, getSelectionRect, removeTable } from '@atlaskit/editor-tables/utils';
-import rafSchedule from 'raf-schd';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { isElementInTableCell, isLastItemMediaGroup, setNodeSelection } from '../../utils';
 import { closestElement } from '../../utils/dom';
 import { ACTION_SUBJECT, addAnalytics, EVENT_TYPE, TABLE_ACTION } from '../analytics';
@@ -74,7 +73,6 @@ export const handleClick = (view, event) => {
   const rowElement = closestElement(element, 'tr');
   const rowIndex = rowElement && rowElement.rowIndex;
   const cellIndex = map.width * rowIndex + colIndex;
-  const posInTable = map.map[cellIndex + 1];
   const {
     dispatch,
     state: {
@@ -90,6 +88,7 @@ export const handleClick = (view, event) => {
   /** Only if the last item is media group, insert a paragraph */
 
   if (isLastItemMediaGroup(editorElement)) {
+    const posInTable = map.map[cellIndex] + editorElement.nodeSize;
     tr.insert(posInTable + table.pos, paragraph.create());
     dispatch(tr);
     setNodeSelection(view, posInTable + table.pos);
@@ -377,8 +376,7 @@ export const whenTableInFocus = (eventHandler, elementContentRects) => (view, mo
 
   if (!hasTableNode || isDragging) {
     return false;
-  } // debounce event handler
-
+  }
 
-  return rafSchedule(eventHandler(view, mouseEvent, tableCellOptimization, elementContentRects));
+  return eventHandler(view, mouseEvent, tableCellOptimization, elementContentRects);
 };

package/dist/es2019/plugins/table/handlers.js

@@ -2,7 +2,7 @@
 import { findParentNodeOfType } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { isTextInput } from '../../utils/is-text-input';
-import { collapseSelectedTable } from './utils/collapse';
+import { isTableCollapsible } from './utils/collapse';
 import { defaultTableSelection } from './pm-plugins/default-table-selection';
 import { pluginKey as tableResizingPluginKey } from './pm-plugins/table-resizing';
 import { TableSortStep } from '@atlaskit/adf-schema/steps';
@@ -86,9 +86,8 @@ const updateCollapseHandler = ({
   }
 
   const expandNodeType = schema.nodes.expand;
-  const isTableCollapsed = expandNodeType && !!findParentNodeOfType(expandNodeType)(tr.selection); // check result of wrapping without applying it
-
-  const trCanBeCollapsed = collapseSelectedTable(tr); // We're focused on a table + we're not inside an expand
+  const isTableCollapsed = expandNodeType && !!findParentNodeOfType(expandNodeType)(tr.selection);
+  const trCanBeCollapsed = isTableCollapsible(tr).tableIsCollapsible; // We're focused on a table + we're not inside an expand
 
   const canCollapseTable = !!pluginState.tableNode && // is it already collapsed?
   !isTableCollapsed && !!trCanBeCollapsed;

package/dist/es2019/plugins/table/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { browser } from '@atlaskit/editor-common/utils';
 import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
 import { createTable } from '@atlaskit/editor-tables/utils';
 import { table, tableCell, tableHeader, tableRow } from '@atlaskit/adf-schema';
@@ -9,6 +10,7 @@ import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconTable } from '../quick-insert/assets';
 import { pluginConfig } from './create-plugin-config';
 import { createPlugin as createTableLocalIdPlugin } from './pm-plugins/table-local-id';
+import { createPlugin as createTableSafariDelayedDomSelectionSyncingWorkaroundPlugin } from './pm-plugins/safari-delayed-dom-selection-syncing-workaround';
 import { createPlugin as createDecorationsPlugin } from './pm-plugins/decorations/plugin';
 import { keymapPlugin } from './pm-plugins/keymap';
 import { tableSelectionKeymapPlugin } from './pm-plugins/table-selection-keymap';
@@ -46,7 +48,7 @@ const tablesPlugin = options => ({
   },
 
   pmPlugins() {
-    return [{
+    const plugins = [{
       name: 'table',
       plugin: ({
         dispatchAnalyticsEvent,
@@ -106,7 +108,20 @@ const tablesPlugin = options => ({
       plugin: ({
         dispatch
       }) => createTableLocalIdPlugin(dispatch)
-    }];
+    }]; // workaround for prosemirrors delayed dom selection syncing during pointer drag
+    // causing issues with table selections in Safari
+    // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+
+    if (browser.safari) {
+      plugins.push({
+        name: 'tableSafariDelayedDomSelectionSyncingWorkaround',
+        plugin: () => {
+          return createTableSafariDelayedDomSelectionSyncingWorkaroundPlugin();
+        }
+      });
+    }
+
+    return plugins;
   },
 
   contentComponent({

package/dist/es2019/plugins/table/nodeviews/TableComponent.js

@@ -3,7 +3,8 @@ import React from 'react';
 import classnames from 'classnames';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import rafSchedule from 'raf-schd';
-import { browser, calcTableWidth, tableMarginSides } from '@atlaskit/editor-common';
+import { calcTableWidth, tableMarginSides } from '@atlaskit/editor-common/styles';
+import { browser } from '@atlaskit/editor-common/utils';
 import { akEditorMobileBreakoutPoint, akEditorTableToolbarSize as tableToolbarSize } from '@atlaskit/editor-shared-styles';
 import { isValidPosition } from '../../../utils';
 import { getParentNodeWidth } from '../../../utils/node-width';
@@ -205,11 +206,7 @@ class TableComponent extends React.Component {
       const {
         width
       } = containerWidth;
-
-      if (this.frameId && window) {
-        window.cancelAnimationFrame(this.frameId);
-      }
-
+      this.scaleTableDebounced.cancel();
       scaleTable(this.table, { ...scaleOptions,
         node,
         prevNode: this.node || node,
@@ -255,7 +252,7 @@ class TableComponent extends React.Component {
       }
 
       const parentWidth = this.getParentNodeWidth();
-      this.frameId = this.scaleTableDebounced(parentWidth);
+      this.scaleTableDebounced(parentWidth);
     });
 
     _defineProperty(this, "updateTableContainerWidth", () => {
@@ -381,7 +378,7 @@ class TableComponent extends React.Component {
        */
       window.addEventListener('resize', this.handleWindowResizeDebounced);
       this.updateTableContainerWidth();
-      this.frameId = this.handleTableResizingDebounced(this.props);
+      this.handleTableResizingDebounced();
     }
 
     const currentStickyState = stickyHeadersPluginKey.getState(this.props.view.state);
@@ -399,15 +396,15 @@ class TableComponent extends React.Component {
     }
 
     this.handleScrollDebounced.cancel();
+    this.scaleTableDebounced.cancel();
+    this.handleTableResizingDebounced.cancel();
+    this.handleAutoSizeDebounced.cancel();
+    this.handleWindowResizeDebounced.cancel();
 
     if (this.props.allowColumnResizing) {
       window.removeEventListener('resize', this.handleWindowResizeDebounced);
     }
 
-    if (this.frameId && window) {
-      window.cancelAnimationFrame(this.frameId);
-    }
-
     if (this.overflowShadowsObserver) {
       this.overflowShadowsObserver.dispose();
     }
@@ -458,7 +455,7 @@ class TableComponent extends React.Component {
         updateControls(view.state);
       }
 
-      this.frameId = this.handleTableResizingDebounced(prevProps);
+      this.handleTableResizingDebounced();
     }
   }
 

package/dist/es2019/plugins/table/nodeviews/table.js

@@ -8,6 +8,7 @@ import { pluginConfig as getPluginConfig } from '../create-plugin-config';
 import { getPluginState, pluginKey } from '../pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing';
 import { generateColgroup } from '../pm-plugins/table-resizing/utils';
+import { TableMap } from '@atlaskit/editor-tables/table-map';
 import TableComponent from './TableComponent';
 import { setTableSize } from '../commands';
 import { getFeatureFlags } from '../../feature-flags-context';
@@ -142,6 +143,13 @@ export default class TableView extends ReactNodeView {
         return true;
       }
 
+      const tableMap = TableMap.get(node);
+      const nextTableMap = TableMap.get(nextNode);
+
+      if (tableMap.width !== nextTableMap.width) {
+        return true;
+      }
+
       return attrKeys.some(key => {
         return node.attrs[key] !== nextNode.attrs[key];
       });

package/dist/es2019/plugins/table/pm-plugins/main.js

@@ -1,7 +1,7 @@
 import { Plugin } from 'prosemirror-state';
 import { findParentDomRefOfType, findParentNodeOfType } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { closestElement } from '../../../utils/dom';
 import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
 import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseLeave, handleMouseMove, handleMouseOut, handleMouseOver, handleTripleClick, whenTableInFocus } from '../event-handlers';

package/dist/es2019/plugins/table/pm-plugins/safari-delayed-dom-selection-syncing-workaround.js

@@ -0,0 +1,63 @@
+import { PluginKey, Plugin } from 'prosemirror-state';
+export const tableSafariDelayedDomSelectionSyncingWorkaroundKey = new PluginKey('tableSafariDelayedDomSelectionSyncingWorkaround');
+export const createPlugin = () => {
+  // From a review of the prosemirror-view source code,
+  // the only places where a view relies on the presence
+  // of view.mouseDown are;
+  //   - when checking it's presence in selectionToDOM
+  //     to delay drag selections
+  //   - to ensure it is cleaned up when the mouseup
+  //     event is not fired in a previous mousedown event
+  // Because we are manually wiping the view.mouseDown,
+  // we manage this custom cleanup ourselves
+  let prevMouseDownDone = null;
+  return new Plugin({
+    key: tableSafariDelayedDomSelectionSyncingWorkaroundKey,
+    props: {
+      handleDOMEvents: {
+        mousedown: view => {
+          // Workaround issue in safari where table selections
+          //  do not work correctly since prosemirror delayed
+          // DOM selection syncing during pointer drag.
+          //
+          // https://github.com/ProseMirror/prosemirror-view/commit/885258b80551ac87b81601d3ed25f552aeb22293
+          // This fix removes the selectionToDOM from the view
+          // prior to selectionToDOM being called.
+          // selectionToDOM checks if there is an "active"
+          // mouseDown, and if so, it delays running logic
+          // which causes the table selections issue.
+          // The handleDOMEvents are called before ProseMirror
+          // events fired on the editable DOM element.
+          // This means the view.mouseView will not yet be
+          // created when the mousedown event starts.
+          // https://prosemirror.net/docs/ref/#view.EditorProps.handleDOMEvents
+          //
+          // Because selectionToDOM is only added to the script
+          // tasks queue following the mousedown event, we can
+          // prepend a task which will clear the mouseDown from
+          // the view. We do this using a setTimout with no
+          // interval.
+          if (prevMouseDownDone) {
+            // avoid memory leaks when the mouseup event is not fired
+            // in a previous mousedown event
+            prevMouseDownDone();
+          }
+
+          setTimeout(() => {
+            // the ts-ignores here are required due to the
+            // view.mouseDown being an internal which is
+            // not part of the views type signature
+            // @ts-ignore
+            if (view.mouseDown) {
+              // @ts-ignore
+              prevMouseDownDone = view.mouseDown.done.bind(view.mouseDown); // @ts-ignore
+
+              view.mouseDown = null;
+            }
+          });
+          return false;
+        }
+      }
+    }
+  });
+};

package/dist/es2019/plugins/table/pm-plugins/sticky-headers/nodeviews/tableRow.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { findOverflowScrollParent } from '@atlaskit/editor-common';
+import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { pluginKey as widthPluginKey } from '../../../../../plugins/width';
 import { mapChildren } from '../../../../../utils/slice';
 import { TableCssClassName as ClassName, TableCssClassName } from '../../../types';
@@ -200,8 +200,8 @@ export class TableRowNodeView {
 
     _defineProperty(this, "getCurrentTableTop", tree => this.getScrolledTableTop(tree.wrapper) + tree.table.clientHeight);
 
-    _defineProperty(this, "makeRowHeaderNotSticky", table => {
-      if (!this.isSticky) {
+    _defineProperty(this, "makeRowHeaderNotSticky", (table, isEditorDestroyed = false) => {
+      if (!this.isSticky || !table || !this.dom) {
         return;
       }
 
@@ -211,7 +211,7 @@ export class TableRowNodeView {
       this.isSticky = false;
       this.dom.style.top = '';
       table.style.removeProperty('margin-top');
-      this.emitOff();
+      this.emitOff(isEditorDestroyed);
     });
 
     _defineProperty(this, "padding", 0);
@@ -233,19 +233,22 @@ export class TableRowNodeView {
       })(this.view.state, this.view.dispatch, this.view);
     });
 
-    _defineProperty(this, "emitOff", () => {
+    _defineProperty(this, "emitOff", isEditorDestroyed => {
       if (this.top === 0 && this.padding === 0) {
         return;
       }
 
       this.top = 0;
       this.padding = 0;
-      updateStickyState({
-        pos: this.getPos(),
-        sticky: false,
-        top: this.top,
-        padding: this.padding
-      })(this.view.state, this.view.dispatch, this.view);
+
+      if (!isEditorDestroyed) {
+        updateStickyState({
+          pos: this.getPos(),
+          sticky: false,
+          top: this.top,
+          padding: this.padding
+        })(this.view.state, this.view.dispatch, this.view);
+      }
     });
 
     this.view = view;
@@ -451,10 +454,10 @@ export class TableRowNodeView {
     this.unsubscribe();
 
     if (this.tree) {
-      this.makeRowHeaderNotSticky(this.tree.table);
+      this.makeRowHeaderNotSticky(this.tree.table, true);
     }
 
-    this.emitOff();
+    this.emitOff(true);
   }
 
   ignoreMutation(mutationRecord) {

package/dist/es2019/plugins/table/pm-plugins/table-local-id.js

@@ -13,7 +13,7 @@
 import { Plugin, PluginKey } from 'prosemirror-state';
 import rafSchedule from 'raf-schd';
 import { uuid } from '@atlaskit/adf-schema';
-import { stepAdds } from '../../../utils/step';
+import { stepAddsOneOf } from '../../../utils/step';
 const pluginKey = new PluginKey('tableLocalIdPlugin');
 
 const getPluginState = state => state && pluginKey.getState(state);
@@ -23,7 +23,7 @@ const getPluginState = state => state && pluginKey.getState(state);
 
 
 const checkIsAddingTable = (transaction, nodeType) => {
-  return transaction.steps.some(step => stepAdds(step, nodeType));
+  return transaction.steps.some(step => stepAddsOneOf(step, new Set([nodeType])));
 };
 /**
  * Ensures uniqueness of `localId`s on tables being created or edited

package/dist/es2019/plugins/table/pm-plugins/table-resizing/event-handlers.js

@@ -1,6 +1,6 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { getParentNodeWidth } from '../../../../utils/node-width';
 import { pluginKey as editorDisabledPluginKey } from '../../../editor-disabled';

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/column-state.js

@@ -1,6 +1,6 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findDomRefAtPos } from 'prosemirror-utils';
-import { tableNewColumnMinWidth } from '@atlaskit/editor-common';
+import { tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
 import { contentWidth } from './content-width';
 import { unitToNumber } from './unit-to-number';
 // Reads `width` and `minWidth` of each column from DOM and returns `ColumnState` containing those values

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/dom.js

@@ -1,4 +1,5 @@
-import { browser, tableCellBorderWidth, tableCellPadding, tableMarginTop } from '@atlaskit/editor-common';
+import { tableCellBorderWidth, tableCellPadding, tableMarginTop } from '@atlaskit/editor-common/styles';
+import { browser } from '@atlaskit/editor-common/utils';
 import { closestElement, containsClassName, parsePx } from '../../../../../utils/dom';
 import { updateOverflowShadows } from '../../../nodeviews/update-overflow-shadows';
 import { TableCssClassName as ClassName } from '../../../types';

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/misc.js

@@ -1,4 +1,5 @@
-import { calcTableWidth, getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common';
+import { calcTableWidth } from '@atlaskit/editor-common/styles';
+import { getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common/ui';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorWideLayoutWidth, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { containsClassName } from '../../../../../utils';
 import { pluginKey as widthPluginKey } from '../../../../width';

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/resize-state.js

@@ -1,4 +1,5 @@
-import { calcTableColumnWidths, tableCellMinWidth, tableNewColumnMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth, tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
+import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
 import { hasTableBeenResized, insertColgroupFromNode } from './colgroup';
 import { getCellsRefsInColumn, getColumnStateFromDOM } from './column-state';
 import { syncStickyRowToTable } from './dom';

package/dist/es2019/plugins/table/pm-plugins/table-resizing/utils/scale-table.js

@@ -1,4 +1,4 @@
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { getTableWidth } from '../../../utils';
 import { getLayoutSize } from '../utils/misc';

package/dist/es2019/plugins/table/transforms/column-width.js

@@ -1,10 +1,10 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { tableNewColumnMinWidth } from '@atlaskit/editor-common';
+import { tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
 import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
 import { setMeta } from './metadata';
 import { getResizeState, normaliseTableLayout } from '../pm-plugins/table-resizing/utils/resize-state';
 import { getTableMaxWidth } from '../pm-plugins/table-resizing/utils/misc';
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { scaleTableTo } from '../pm-plugins/table-resizing/utils/scale-table';
 export const updateColumnWidths = (resizeState, table, start) => tr => {
   const map = TableMap.get(table);

package/dist/es2019/plugins/table/transforms/fix-tables.js

@@ -1,4 +1,4 @@
-import { tableCellMinWidth } from '@atlaskit/editor-common';
+import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorDefaultLayoutWidth, akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { sendLogs } from '../../../utils/sendLogs';
 import { calculateColumnWidth, contentWidth, getCellsRefsInColumn, getLayoutSize } from '../pm-plugins/table-resizing/utils';

package/dist/es2019/plugins/table/types.js

@@ -1,5 +1,5 @@
 import { tableCellSelector, tableHeaderSelector, tablePrefixSelector } from '@atlaskit/adf-schema';
-import { TableSharedCssClassName } from '@atlaskit/editor-common';
+import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
 export const RESIZE_HANDLE_AREA_DECORATION_GAP = 30;
 export let TableDecorations;
 

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

@@ -3,7 +3,7 @@ import React from 'react';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingOverlapPanelZIndex, akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import styled from 'styled-components';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { getPluginState, pluginKey } from '../../pm-plugins/plugin-factory';
 import { contextualMenuDropdownWidth, contextualMenuTriggerSize } from '../consts';

package/dist/es2019/plugins/table/ui/FloatingDeleteButton/index.js

@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getSelectionRect, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { createPortal } from 'react-dom';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';

package/dist/es2019/plugins/table/ui/FloatingInsertButton/InsertButton.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl-next';
-import { tableMarginTop } from '@atlaskit/editor-common';
+import { tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import Tooltip from '@atlaskit/tooltip';
 import * as keymaps from '../../../../keymaps';

package/dist/es2019/plugins/table/ui/FloatingInsertButton/index.js

@@ -6,7 +6,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findDomRefAtPos } from 'prosemirror-utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { injectIntl } from 'react-intl-next';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '../../../../utils/dom';
 import { INPUT_METHOD } from '../../../analytics';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';

package/dist/es2019/plugins/table/ui/LayoutButton/index.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
-import { Popup } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import commonMessages from '../../../../messages';

package/dist/es2019/plugins/table/ui/TableFloatingControls/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { hoverRows, selectRow } from '../../commands';
 import { isSelectionUpdated } from '../../utils';
 import CornerControls from './CornerControls';

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

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common';
+import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles';
 import { fontSize } from '@atlaskit/theme/constants';
 import { N40A, B300, N300, N20A, N0, R500 } from '@atlaskit/theme/colors';
 import { SelectionStyle, getSelectionStyles, akEditorSmallZIndex, akEditorTableNumberColumnWidth, akEditorStickyHeaderZIndex, akEditorTableToolbarSize, akEditorUnitZIndex, akEditorSelectedNodeClassName, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';

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

@@ -1,5 +1,5 @@
-import { B100, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } from '@atlaskit/theme/colors';
-import { tableCellBorderWidth, tableMarginTop } from '@atlaskit/editor-common';
+import { B200, B300, B75, N0, N20, R50, R400, R75, DN400, N200, DN30 } 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 { RESIZE_HANDLE_AREA_DECORATION_GAP } from '../types';
 import { themed } from '@atlaskit/theme/components';
@@ -25,7 +25,7 @@ export const tableBorderColor = themed({
 });
 export const tableFloatingControlsColor = N20;
 export const tableCellSelectedColor = B75;
-export const tableToolbarSelectedColor = B100;
+export const tableToolbarSelectedColor = B200;
 export const tableBorderSelectedColor = B300;
 export const tableCellDeleteColor = R50;
 export const tableBorderDeleteColor = R400;

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

@@ -1,5 +1,5 @@
 import { css } from 'styled-components';
-import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common';
+import { tableCellBorderWidth, tableMarginBottom, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { akEditorShadowZIndex, akEditorTableNumberColumnWidth, akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import { N40A, B300, N300, R300, N20A, N60A, N0, Y50, Y200 } from '@atlaskit/theme/colors';
 import { tableToolbarColor, tableBorderColor, tableToolbarSelectedColor, tableBorderSelectedColor, tableCellDeleteColor, tableBorderDeleteColor, tableToolbarDeleteColor, lineMarkerOffsetFromColumnControls, lineMarkerSize, columnControlsDecorationHeight, columnControlsZIndex, columnControlsSelectedZIndex, resizeHandlerAreaWidth, resizeLineWidth, resizeHandlerZIndex, tableToolbarSize, tableInsertColumnButtonSize, tableDeleteButtonSize, tableControlsSpacing } from './consts';