@atlaskit/editor-core 172.1.2 → 172.2.0

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

@@ -1,9 +1,8 @@
 import uuid from 'uuid';
 import { DOMSerializer } from 'prosemirror-model';
 import { getCellDomAttrs, getCellAttrs } from '@atlaskit/adf-schema';
-import { getFeatureFlags } from '../../feature-flags-context';
 export default class TableCellNodeView {
-  constructor(node, view, getPos, observer) {
+  constructor(node, view, getPos, getEditorFeatureFlags, observer) {
     this.view = view;
     this.node = node;
     const {
@@ -15,7 +14,7 @@ export default class TableCellNodeView {
     this.contentDOM = contentDOM;
     const {
       mouseMoveOptimization
-    } = getFeatureFlags(view.state) || {};
+    } = getEditorFeatureFlags();
 
     if (mouseMoveOptimization && observer) {
       this.contentDOM.id = uuid();

package/dist/es2019/plugins/table/nodeviews/update-overflow-shadows.js

@@ -1,5 +1,4 @@
 import { TableCssClassName as ClassName } from '../types';
-import { getFeatureFlags } from '../../feature-flags-context';
 export const updateShadowListForStickyStyles = (heightStyle, shadows) => {
   Array.from(shadows).forEach(shadow => {
     if (shadow.classList.contains(ClassName.TABLE_STICKY_SHADOW)) {
@@ -14,10 +13,10 @@ export const updateShadowListForStickyStyles = (heightStyle, shadows) => {
  * if `overflowShadowOptimization` is enabled, this will exit early.
  */
 
-export const updateOverflowShadows = (editorState, wrapper, table, rightShadows, leftShadows) => {
-  var _getFeatureFlags;
+export const updateOverflowShadows = getEditorFeatureFlags => (editorState, wrapper, table, rightShadows, leftShadows) => {
+  var _getEditorFeatureFlag;
 
-  if (((_getFeatureFlags = getFeatureFlags(editorState)) === null || _getFeatureFlags === void 0 ? void 0 : _getFeatureFlags.tableOverflowShadowsOptimization) === true) {
+  if (((_getEditorFeatureFlag = getEditorFeatureFlags()) === null || _getEditorFeatureFlag === void 0 ? void 0 : _getEditorFeatureFlag.tableOverflowShadowsOptimization) === true) {
     return false;
   } // Right shadow
 

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

@@ -1,12 +1,13 @@
 import { keymap } from 'prosemirror-keymap';
 import { chainCommands } from 'prosemirror-commands';
 import * as keymaps from '../../../keymaps';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { createTable, goToNextCell, moveCursorBackward, triggerUnlessTableHeader } from '../commands';
 import { addRowAroundSelection, emptyMultipleCellsWithAnalytics, deleteTableIfSelectedWithAnalytics } from '../commands-with-analytics';
 import { addColumnAfter, addColumnBefore } from '../commands/insert';
+import { withEditorAnalyticsAPI } from '../utils/analytics';
 
-const createTableWithAnalytics = () => withAnalytics({
+const createTableWithAnalytics = editorAnalyticsAPI => withEditorAnalyticsAPI({
   action: ACTION.INSERTED,
   actionSubject: ACTION_SUBJECT.DOCUMENT,
   actionSubjectId: ACTION_SUBJECT_ID.TABLE,
@@ -14,20 +15,20 @@ const createTableWithAnalytics = () => withAnalytics({
     inputMethod: INPUT_METHOD.SHORTCUT
   },
   eventType: EVENT_TYPE.TRACK
-})(createTable());
+})(editorAnalyticsAPI)(createTable());
 
-export function keymapPlugin() {
+export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.nextCell.common, goToNextCell(1), list);
-  keymaps.bindKeymapWithCommand(keymaps.previousCell.common, goToNextCell(-1), list);
-  keymaps.bindKeymapWithCommand(keymaps.toggleTable.common, createTableWithAnalytics(), list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, chainCommands(deleteTableIfSelectedWithAnalytics(INPUT_METHOD.KEYBOARD), emptyMultipleCellsWithAnalytics(INPUT_METHOD.KEYBOARD)), list);
+  keymaps.bindKeymapWithCommand(keymaps.nextCell.common, goToNextCell(editorAnalyticsAPI)(1), list);
+  keymaps.bindKeymapWithCommand(keymaps.previousCell.common, goToNextCell(editorAnalyticsAPI)(-1), list);
+  keymaps.bindKeymapWithCommand(keymaps.toggleTable.common, createTableWithAnalytics(editorAnalyticsAPI), list);
+  keymaps.bindKeymapWithCommand(keymaps.backspace.common, chainCommands(deleteTableIfSelectedWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), emptyMultipleCellsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD)), list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, moveCursorBackward, list); // Add row/column shortcuts
 
-  keymaps.bindKeymapWithCommand(keymaps.addRowBefore.common, addRowAroundSelection('TOP'), list);
-  keymaps.bindKeymapWithCommand(keymaps.addRowAfter.common, addRowAroundSelection('BOTTOM'), list);
-  keymaps.bindKeymapWithCommand(keymaps.addColumnBefore.common, triggerUnlessTableHeader(addColumnBefore), list);
-  keymaps.bindKeymapWithCommand(keymaps.addColumnAfter.common, addColumnAfter, list);
+  keymaps.bindKeymapWithCommand(keymaps.addRowBefore.common, addRowAroundSelection(editorAnalyticsAPI)('TOP'), list);
+  keymaps.bindKeymapWithCommand(keymaps.addRowAfter.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
+  keymaps.bindKeymapWithCommand(keymaps.addColumnBefore.common, triggerUnlessTableHeader(addColumnBefore(getEditorContainerWidth)), list);
+  keymaps.bindKeymapWithCommand(keymaps.addColumnAfter.common, addColumnAfter(getEditorContainerWidth), list);
   return keymap(list);
 }
 export default keymapPlugin;

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

@@ -10,7 +10,7 @@ import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plu
 import { fixTables, replaceSelectedTable } from '../transforms';
 import { TableCssClassName as ClassName } from '../types';
 import { findControlsHoverDecoration, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell, transformSliceToRemoveOpenTable, updateResizeHandles } from '../utils';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
@@ -24,7 +24,7 @@ import { isHeaderRowRequired } from '../utils/paste';
 let isBreakoutEnabled;
 let isFullWidthModeEnabled;
 let wasFullWidthModeEnabled;
-export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, breakoutEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled) => {
+export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, breakoutEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, editorAnalyticsAPI) => {
   var _window;
 
   isBreakoutEnabled = breakoutEnabled;
@@ -50,8 +50,8 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
     });
   }) : undefined;
   const tableCellNodeview = pluginConfig.tableCellOptimization ? {
-    tableCell: (node, view, getPos) => new TableCellNodeView(node, view, getPos, observer),
-    tableHeader: (node, view, getPos) => new TableCellNodeView(node, view, getPos, observer)
+    tableCell: (node, view, getPos) => new TableCellNodeView(node, view, getPos, getEditorFeatureFlags, observer),
+    tableHeader: (node, view, getPos) => new TableCellNodeView(node, view, getPos, getEditorFeatureFlags, observer)
   } : {}; // Used to prevent invalid table cell spans being reported more than once per editor/document
 
   const invalidTableIds = [];
@@ -94,7 +94,7 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
 
       if (tr) {
         // "fixTables" removes empty rows as we don't allow that in schema
-        const updatedTr = handleCut(tr, oldState, newState);
+        const updatedTr = handleCut(tr, oldState, newState, editorAnalyticsAPI);
         return fixTables(updatedTr) || updatedTr;
       }
 
@@ -241,7 +241,7 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
         state,
         dispatch
       }, from, to, text) => {
-        const tr = replaceSelectedTable(state, text, INPUT_METHOD.KEYBOARD);
+        const tr = replaceSelectedTable(state, text, INPUT_METHOD.KEYBOARD, editorAnalyticsAPI);
 
         if (tr.selectionSet) {
           dispatch(tr);
@@ -256,7 +256,7 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
           isBreakoutEnabled,
           isFullWidthModeEnabled,
           wasFullWidthModeEnabled
-        })
+        }, getEditorContainerWidth, getEditorFeatureFlags)
       },
       handleDOMEvents: {
         focus: handleFocus,
@@ -265,7 +265,7 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
         mouseover: whenTableInFocus(handleMouseOver),
         mouseleave: whenTableInFocus(handleMouseLeave),
         mouseout: whenTableInFocus(handleMouseOut),
-        mousemove: whenTableInFocus(handleMouseMove, elementContentRects),
+        mousemove: whenTableInFocus(handleMouseMove(getEditorFeatureFlags), elementContentRects),
         click: whenTableInFocus(handleClick)
       },
       handleTripleClick

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

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
 import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../../../ui/consts';
@@ -8,7 +7,6 @@ import { pluginKey as tablePluginKey } from '../../plugin-key';
 import { syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../../table-resizing/utils/dom';
 import { updateStickyState } from '../commands';
 import { getTop, getTree } from './dom';
-import { getFeatureFlags } from '../../../../feature-flags-context';
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle'; // limit scroll event calls
 
@@ -27,7 +25,7 @@ export class TableRowNodeView {
     return getTree(this.dom);
   }
 
-  constructor(node, view, getPos, eventDispatcher) {
+  constructor(node, view, getPos, eventDispatcher, getEditorFeatureFlags) {
     _defineProperty(this, "colControlsOffset", 0);
 
     _defineProperty(this, "focused", false);
@@ -306,7 +304,7 @@ export class TableRowNodeView {
     this.eventDispatcher = eventDispatcher;
     this.dom = document.createElement('tr');
     this.contentDOM = this.dom;
-    const featureFlags = getFeatureFlags(view.state) || {};
+    const featureFlags = getEditorFeatureFlags();
     const {
       stickyHeadersOptimization
     } = featureFlags;
@@ -337,7 +335,7 @@ export class TableRowNodeView {
       this.topPosEditorElement = getTop(this.editorScrollableElement);
     }
 
-    this.eventDispatcher.on(widthPluginKey.key, this.onWidthPluginState);
+    this.eventDispatcher.on('widthPlugin', this.onWidthPluginState);
     this.eventDispatcher.on(tablePluginKey.key, this.onTablePluginState);
     this.listening = true;
     this.dom.addEventListener('wheel', this.headerRowMouseScroll.bind(this));
@@ -361,7 +359,7 @@ export class TableRowNodeView {
       this.editorScrollableElement.removeEventListener('scroll', this.onScroll);
     }
 
-    this.eventDispatcher.off(widthPluginKey.key, this.onWidthPluginState);
+    this.eventDispatcher.off('widthPlugin', this.onWidthPluginState);
     this.eventDispatcher.off(tablePluginKey.key, this.onTablePluginState);
     this.listening = false;
     this.dom.removeEventListener('wheel', this.headerRowMouseScroll);

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

@@ -2,14 +2,14 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { TableRowNodeView } from './nodeviews/tableRow';
 import { pluginKey } from './plugin-key';
 import { createPluginState } from './plugin-state';
-export const createPlugin = (dispatch, eventDispatcher, initialState = () => []) => {
+export const createPlugin = (dispatch, eventDispatcher, initialState = () => [], getEditorFeatureFlags) => {
   return new SafePlugin({
     state: createPluginState(dispatch, initialState),
     key: pluginKey,
     props: {
       nodeViews: {
         tableRow: (node, view, getPos) => {
-          return new TableRowNodeView(node, view, getPos, eventDispatcher);
+          return new TableRowNodeView(node, view, getPos, eventDispatcher, getEditorFeatureFlags);
         }
       }
     }

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

@@ -2,16 +2,15 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { getParentNodeWidth } from '../../../../utils/node-width';
+import { getParentNodeWidth } from '@atlaskit/editor-common/node-width';
 import { pluginKey as editorDisabledPluginKey } from '../../../editor-disabled';
-import { pluginKey as widthPluginKey } from '../../../width';
 import { updateColumnWidths } from '../../transforms';
 import { getSelectedColumnIndexes, updateResizeHandles } from '../../utils';
 import { evenColumns, setDragging, stopResizing } from './commands';
 import { getPluginState } from './plugin-factory';
 import { currentColWidth, getLayoutSize, getResizeState, pointsAtCell, resizeColumn, updateControls } from './utils';
-import { ACTION_SUBJECT, addAnalytics, EVENT_TYPE, TABLE_ACTION } from '../../../analytics';
-export const handleMouseDown = (view, event, localResizeHandlePos) => {
+import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
+export const handleMouseDown = (view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI) => {
   const {
     state,
     dispatch
@@ -37,7 +36,7 @@ export const handleMouseDown = (view, event, localResizeHandlePos) => {
     dom = dom.closest('table');
   }
 
-  const containerWidth = widthPluginKey.getState(state);
+  const containerWidth = getEditorContainerWidth();
   const parentWidth = getParentNodeWidth(start, state, containerWidth);
   let maxSize = parentWidth || getLayoutSize(dom.getAttribute('data-layout'), containerWidth.width, {});
 
@@ -126,7 +125,7 @@ export const handleMouseDown = (view, event, localResizeHandlePos) => {
 
         if (colIndex === map.width - 1) {
           const mouseUpTime = event.timeStamp;
-          tr = addAnalytics(state, tr, {
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
             action: TABLE_ACTION.ATTEMPTED_TABLE_WIDTH_CHANGE,
             actionSubject: ACTION_SUBJECT.TABLE,
             actionSubjectId: null,
@@ -137,7 +136,7 @@ export const handleMouseDown = (view, event, localResizeHandlePos) => {
               delta: Math.abs(clientX - dragging.startX)
             },
             eventType: EVENT_TYPE.UI
-          });
+          })(tr);
         }
       }
 
@@ -167,7 +166,7 @@ export const handleMouseDown = (view, event, localResizeHandlePos) => {
     const map = TableMap.get(table);
     const colIndex = map.colCount($cell.pos - $cell.start(-1)) + $cell.nodeAfter.attrs.colspan - 1;
     resizeColumn(resizeState, colIndex, clientX - dragging.startX, dom);
-    updateControls(state);
+    updateControls(getEditorFeatureFlags)(state);
     updateResizeHandles(dom);
   }
 

package/dist/es2019/plugins/table/pm-plugins/table-resizing/plugin.js

@@ -8,7 +8,7 @@ import { pluginKey } from './plugin-key';
 import { getResizeCellPos } from './utils';
 export function createPlugin(dispatch, {
   lastColumnResizable = true
-}) {
+}, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI) {
   return new SafePlugin({
     key: pluginKey,
     state: createPluginState(dispatch, {
@@ -40,7 +40,7 @@ export function createPlugin(dispatch, {
           } = getPluginState(state);
 
           if (resizeHandlePos !== null && !dragging) {
-            if (handleMouseDown(view, event, resizeHandlePos)) {
+            if (handleMouseDown(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI)) {
               const {
                 state,
                 dispatch

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

@@ -6,7 +6,7 @@ import { TableCssClassName as ClassName } from '../../../types';
 import { getRowHeights } from '../../../utils';
 import { colWidthsForRow } from '../../../utils/column-controls';
 import { getPluginState as getMainPluginState } from '../../plugin-factory';
-export const updateControls = state => {
+export const updateControls = getEditorFeatureFlags => state => {
   const {
     tableRef
   } = getMainPluginState(state);
@@ -46,7 +46,7 @@ export const updateControls = state => {
 
   const rightShadows = wrapper.parentElement.querySelectorAll(`.${ClassName.TABLE_RIGHT_SHADOW}`);
   const leftShadows = wrapper.parentElement.querySelectorAll(`.${ClassName.TABLE_LEFT_SHADOW}`);
-  updateOverflowShadows(state, wrapper, tableRef, rightShadows, leftShadows);
+  updateOverflowShadows(getEditorFeatureFlags)(state, wrapper, tableRef, rightShadows, leftShadows);
 };
 export const isClickNear = (event, click) => {
   const dx = click.x - event.clientX,

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

@@ -2,8 +2,7 @@ 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';
-import { getParentNodeWidth } from '../../../../../utils/node-width';
+import { getParentNodeWidth } from '@atlaskit/editor-common/node-width';
 export const tableLayoutToSize = {
   default: akEditorDefaultLayoutWidth,
   wide: akEditorWideLayoutWidth,
@@ -76,9 +75,10 @@ export const getTableMaxWidth = ({
   table,
   tableStart,
   state,
-  layout
+  layout,
+  getEditorContainerWidth
 }) => {
-  const containerWidth = widthPluginKey.getState(state);
+  const containerWidth = getEditorContainerWidth();
   const parentWidth = getParentNodeWidth(tableStart, state, containerWidth);
   let maxWidth = parentWidth || getLayoutSize(layout, containerWidth.width, {});
 

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

@@ -222,7 +222,7 @@ export const normaliseTableLayout = input => {
       return 'default';
   }
 };
-export const getNewResizeStateFromSelectedColumns = (rect, state, domAtPos) => {
+export const getNewResizeStateFromSelectedColumns = (rect, state, domAtPos, getEditorContainerWidth) => {
   const {
     totalRowCount,
     totalColumnCount,
@@ -245,7 +245,8 @@ export const getNewResizeStateFromSelectedColumns = (rect, state, domAtPos) => {
     table: table.node,
     tableStart: table.start,
     state,
-    layout
+    layout,
+    getEditorContainerWidth
   });
   const resizeState = getResizeState({
     minWidth: tableCellMinWidth,

package/dist/es2019/plugins/table/pm-plugins/table-selection-keymap.js

@@ -1,10 +1,10 @@
 import { keymap } from 'prosemirror-keymap';
 import { bindKeymapWithCommand, moveRight, moveLeft } from '../../../keymaps';
 import { arrowLeftFromTable, arrowRightFromTable } from '../commands/selection';
-export function tableSelectionKeymapPlugin() {
+export function tableSelectionKeymapPlugin(editorSelectionAPI) {
   const list = {};
-  bindKeymapWithCommand(moveRight.common, arrowRightFromTable, list);
-  bindKeymapWithCommand(moveLeft.common, arrowLeftFromTable, list);
+  bindKeymapWithCommand(moveRight.common, arrowRightFromTable(editorSelectionAPI)(), list);
+  bindKeymapWithCommand(moveLeft.common, arrowLeftFromTable(editorSelectionAPI)(), list);
   return keymap(list);
 }
 export default tableSelectionKeymapPlugin;

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

@@ -1,22 +1,22 @@
 import { defineMessages } from 'react-intl-next';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
-import commonMessages from '../../messages';
+import commonMessages from '@atlaskit/editor-common/messages';
 import { clearHoverSelection, hoverTable } from './commands';
 import { deleteTableWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics, insertRowWithAnalytics, deleteRowsWithAnalytics, mergeCellsWithAnalytics, splitCellWithAnalytics, deleteColumnsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, wrapTableInExpandWithAnalytics } from './commands-with-analytics';
 import { getPluginState } from './pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from './pm-plugins/table-resizing';
 import { TableCssClassName } from './types';
 import { isReferencedSource } from './utils/referentiality';
-import { INPUT_METHOD } from '../analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { findCellRectClosestToPos, findTable, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import { canMergeCells } from './transforms';
 import { splitCell } from '@atlaskit/editor-tables/utils';
 import tableMessages from './ui/messages';
 import { messages as ContextualMenuMessages } from './ui/FloatingContextualMenu/ContextualMenu';
 import { findParentDomRefOfType } from 'prosemirror-utils';
-import { closestElement } from '../../utils/dom';
-import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar'; // TODO: ED-14403 investigate why these translations don't work
-
+import { closestElement } from '@atlaskit/editor-common/utils';
+import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
+// TODO: ED-14403 investigate why these translations don't work
 export const messages = defineMessages({
   tableOptions: {
     id: 'fabric.editor.tableOptions',
@@ -46,29 +46,29 @@ export const messages = defineMessages({
 });
 export const getToolbarMenuConfig = (config, state, {
   formatMessage
-}) => {
+}, editorAnalyticsAPI) => {
   const options = [{
     id: 'editor.table.headerRow',
     title: formatMessage(messages.headerRow),
-    onClick: toggleHeaderRowWithAnalytics(),
+    onClick: toggleHeaderRowWithAnalytics(editorAnalyticsAPI),
     selected: state.isHeaderRowEnabled,
     hidden: !config.allowHeaderRow
   }, {
     id: 'editor.table.headerColumn',
     title: formatMessage(messages.headerColumn),
-    onClick: toggleHeaderColumnWithAnalytics(),
+    onClick: toggleHeaderColumnWithAnalytics(editorAnalyticsAPI),
     selected: state.isHeaderColumnEnabled,
     hidden: !config.allowHeaderColumn
   }, {
     id: 'editor.table.numberedColumn',
     title: formatMessage(messages.numberedColumn),
-    onClick: toggleNumberColumnWithAnalytics(),
+    onClick: toggleNumberColumnWithAnalytics(editorAnalyticsAPI),
     selected: state.isNumberColumnEnabled,
     hidden: !config.allowNumberColumn
   }, {
     id: 'editor.table.collapseTable',
     title: formatMessage(messages.collapseTable),
-    onClick: wrapTableInExpandWithAnalytics(),
+    onClick: wrapTableInExpandWithAnalytics(editorAnalyticsAPI),
     selected: !!state.isTableCollapsed,
     disabled: !state.canCollapseTable,
     hidden: !config.allowCollapse
@@ -86,7 +86,7 @@ export const getToolbarMenuConfig = (config, state, {
 
 export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
   formatMessage
-}) => {
+}, getEditorContainerWidth, editorAnalyticsAPI) => {
   const {
     top,
     bottom,
@@ -103,7 +103,7 @@ export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
       const index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
 
       if (index) {
-        insertColumnWithAnalytics(INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
+        insertColumnWithAnalytics(getEditorContainerWidth, editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
       }
 
       return true;
@@ -118,7 +118,7 @@ export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
       const index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.bottom;
 
       if (index) {
-        insertRowWithAnalytics(INPUT_METHOD.FLOATING_TB, {
+        insertRowWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, {
           index,
           moveCursorToInsertedRow: true
         })(state, dispatch);
@@ -137,7 +137,7 @@ export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
       const selectionRect = getClosestSelectionRect(state);
 
       if (selectionRect) {
-        deleteColumnsWithAnalytics(INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
+        deleteColumnsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
       }
 
       return true;
@@ -153,7 +153,7 @@ export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
       const selectionRect = getClosestSelectionRect(state);
 
       if (selectionRect) {
-        deleteRowsWithAnalytics(INPUT_METHOD.FLOATING_TB, selectionRect, false)(state, dispatch);
+        deleteRowsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, selectionRect, false)(state, dispatch);
       }
 
       return true;
@@ -163,13 +163,13 @@ export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
   }, {
     id: 'editor.table.mergeCells',
     title: formatMessage(ContextualMenuMessages.mergeCells),
-    onClick: mergeCellsWithAnalytics(),
+    onClick: mergeCellsWithAnalytics(editorAnalyticsAPI),
     selected: false,
     disabled: !canMergeCells(editorState.tr)
   }, {
     id: 'editor.table.splitCell',
     title: formatMessage(ContextualMenuMessages.splitCell),
-    onClick: splitCellWithAnalytics(),
+    onClick: splitCellWithAnalytics(editorAnalyticsAPI),
     selected: false,
     disabled: !splitCell(editorState)
   }, {
@@ -181,7 +181,7 @@ export const getToolbarCellOptionsConfig = (editorState, initialSelectionRect, {
       const {
         targetCellPosition
       } = getPluginState(state);
-      emptyMultipleCellsWithAnalytics(INPUT_METHOD.FLOATING_TB, targetCellPosition)(state, dispatch);
+      emptyMultipleCellsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, targetCellPosition)(state, dispatch);
       return true;
     },
     selected: false,
@@ -201,15 +201,15 @@ const getClosestSelectionRect = state => {
   return isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
 };
 
-export const getToolbarConfig = config => (state, intl) => {
+export const getToolbarConfig = (getEditorContainerWidth, editorAnalyticsAPI) => config => (state, intl) => {
   const tableObject = findTable(state.selection);
   const pluginState = getPluginState(state);
   const resizeState = tableResizingPluginKey.getState(state);
 
   if (tableObject && pluginState.editorHasFocus) {
     const nodeType = state.schema.nodes.table;
-    const menu = getToolbarMenuConfig(config, pluginState, intl);
-    const cellItems = getCellItems(config, state, intl); // Check if we need to show confirm dialog for delete button
+    const menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI);
+    const cellItems = getCellItems(config, state, intl, getEditorContainerWidth, editorAnalyticsAPI); // Check if we need to show confirm dialog for delete button
 
     let confirmDialog;
     const localId = tableObject.node.attrs.localId;
@@ -252,7 +252,7 @@ export const getToolbarConfig = config => (state, intl) => {
         type: 'button',
         appearance: 'danger',
         icon: RemoveIcon,
-        onClick: deleteTableWithAnalytics(),
+        onClick: deleteTableWithAnalytics(editorAnalyticsAPI),
         disabled: !!resizeState && !!resizeState.dragging,
         onMouseEnter: hoverTable(true),
         onMouseLeave: clearHoverSelection(),
@@ -274,14 +274,14 @@ const separator = hidden => {
 
 const getCellItems = (pluginConfig, state, {
   formatMessage
-}) => {
+}, getEditorContainerWidth, editorAnalyticsAPI) => {
   if (pluginConfig.allowCellOptionsInFloatingToolbar) {
     const initialSelectionRect = getClosestSelectionRect(state);
 
     if (initialSelectionRect) {
       const cellOptions = getToolbarCellOptionsConfig(state, initialSelectionRect, {
         formatMessage
-      });
+      }, getEditorContainerWidth, editorAnalyticsAPI);
       return [cellOptions, separator(cellOptions.hidden)];
     }
   }

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

@@ -116,7 +116,7 @@ export const updateColumnWidths = (resizeState, table, start) => tr => {
  * @returns Updated transaction with rescaled columns for a given table
  */
 
-export const rescaleColumns = (table, view) => tr => {
+export const rescaleColumns = getEditorContainerWidth => (table, view) => tr => {
   // If the table has been not been resized we skip updating the size
   // of columns here.
   if (!view || !hasTableBeenResized(table.node)) {
@@ -140,7 +140,8 @@ export const rescaleColumns = (table, view) => tr => {
     table: table.node,
     tableStart: table.start,
     state,
-    layout
+    layout,
+    getEditorContainerWidth
   });
   let resizeState = getResizeState({
     minWidth: tableCellMinWidth,

package/dist/es2019/plugins/table/transforms/replace-table.js

@@ -1,9 +1,9 @@
 import { TextSelection } from 'prosemirror-state';
 import { Slice, Fragment } from 'prosemirror-model';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
-import { addAnalytics, TABLE_ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../analytics';
+import { TABLE_ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { getSelectedTableInfo } from '../utils';
-export const replaceSelectedTable = (state, content, inputMethod) => {
+export const replaceSelectedTable = (state, content, inputMethod, editorAnalyticsAPI) => {
   if (isTableSelected(state.selection)) {
     const table = findTable(state.selection);
 
@@ -15,7 +15,7 @@ export const replaceSelectedTable = (state, content, inputMethod) => {
         totalRowCount,
         totalColumnCount
       } = getSelectedTableInfo(state.selection);
-      addAnalytics(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: TABLE_ACTION.REPLACED,
         actionSubject: ACTION_SUBJECT.TABLE,
         attributes: {
@@ -24,7 +24,7 @@ export const replaceSelectedTable = (state, content, inputMethod) => {
           inputMethod
         },
         eventType: EVENT_TYPE.TRACK
-      });
+      })(tr);
       return tr;
     }
   }

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

@@ -13,8 +13,8 @@ import { closestElement } from '../../../../utils/dom';
 import { toggleContextualMenu } from '../../commands';
 import { TableCssClassName as ClassName } from '../../types';
 import messages from '../../ui/messages';
-import { CONTENT_COMPONENT } from '../../../analytics/types';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../../analytics';
+import { CONTENT_COMPONENT } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { tableFloatingCellButtonStyles } from './styles';
 import { ErrorBoundary } from '../../../../ui/ErrorBoundary';
 export class FloatingContextualButtonInner extends React.Component {