@atlaskit/editor-plugin-table 2.6.3 → 2.6.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-table
 
+## 2.6.5
+
+### Patch Changes
+
+- [`4e6f1bf8511`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e6f1bf8511) - [ED-19233] Import prosemirror libraries from internal facade package
+- Updated dependencies
+
+## 2.6.4
+
+### Patch Changes
+
+- [`467515ad237`](https://bitbucket.org/atlassian/atlassian-frontend/commits/467515ad237) - [ux] ED-17628 Maximum table width is calculated using table node to make adding columns behabiour similar to current behaviuor when custom table widths is enabled.
+
 ## 2.6.3
 
 ### Patch Changes

package/dist/cjs/plugins/table/commands/clear.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.clearSelection = exports.clearMultipleCells = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 // #region Imports
 
@@ -29,7 +29,7 @@ var clearMultipleCells = function clearMultipleCells(targetCellPosition) {
     }
     if (tr.docChanged && cursorPos) {
       var $pos = tr.doc.resolve(tr.mapping.map(cursorPos));
-      var textSelection = _prosemirrorState.Selection.findFrom($pos, 1, true);
+      var textSelection = _state.Selection.findFrom($pos, 1, true);
       if (textSelection) {
         tr.setSelection(textSelection);
       }
@@ -44,7 +44,7 @@ var clearMultipleCells = function clearMultipleCells(targetCellPosition) {
 exports.clearMultipleCells = clearMultipleCells;
 var clearSelection = function clearSelection(state, dispatch) {
   if (dispatch) {
-    dispatch(state.tr.setSelection(_prosemirrorState.Selection.near(state.selection.$from)).setMeta('addToHistory', false));
+    dispatch(state.tr.setSelection(_state.Selection.near(state.selection.$from)).setMeta('addToHistory', false));
   }
   return true;
 };

package/dist/cjs/plugins/table/commands/go-to-next-cell.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.goToNextCell = void 0;
-var _prosemirrorUtils = require("prosemirror-utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
-var _utils = require("@atlaskit/editor-tables/utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
 var _commandsWithAnalytics = require("../commands-with-analytics");
 // #region Constants
 
@@ -16,7 +16,7 @@ var TAB_BACKWARD_DIRECTION = -1;
 var goToNextCell = function goToNextCell(editorAnalyticsAPI) {
   return function (direction) {
     return function (state, dispatch) {
-      var table = (0, _utils.findTable)(state.selection);
+      var table = (0, _utils2.findTable)(state.selection);
       if (!table) {
         return false;
       }
@@ -24,7 +24,7 @@ var goToNextCell = function goToNextCell(editorAnalyticsAPI) {
       var _state$schema$nodes = state.schema.nodes,
         tableCell = _state$schema$nodes.tableCell,
         tableHeader = _state$schema$nodes.tableHeader;
-      var cell = (0, _prosemirrorUtils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
+      var cell = (0, _utils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
       var firstCellPos = map.positionAt(0, 0, table.node) + table.start;
       var lastCellPos = map.positionAt(map.height - 1, map.width - 1, table.node) + table.start;
 
@@ -46,7 +46,7 @@ var goToNextCell = function goToNextCell(editorAnalyticsAPI) {
         return true;
       }
       if (dispatch) {
-        return (0, _utils.goToNextCell)(direction)(state, dispatch);
+        return (0, _utils2.goToNextCell)(direction)(state, dispatch);
       }
       return true;
     };

package/dist/cjs/plugins/table/commands/insert.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.addColumnAfter = void 0;
 exports.addColumnAt = addColumnAt;
 exports.insertRow = exports.insertColumn = exports.createTable = exports.addColumnBefore = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
 var _steps = require("@atlaskit/adf-schema/steps");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
-var _utils = require("@atlaskit/editor-tables/utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
 var _columnWidth = require("../transforms/column-width");
-var _utils2 = require("../utils");
+var _utils3 = require("../utils");
 var _getAllowAddColumnCustomStep = require("../utils/get-allow-add-column-custom-step");
 // #region Imports
 
@@ -20,7 +20,7 @@ var _getAllowAddColumnCustomStep = require("../utils/get-allow-add-column-custom
 
 function addColumnAtCustomStep(column) {
   return function (tr) {
-    var table = (0, _utils.findTable)(tr.selection);
+    var table = (0, _utils2.findTable)(tr.selection);
     if (table) {
       return tr.step(_steps.AddColumnStep.create(tr.doc, table.pos, column));
     }
@@ -36,9 +36,9 @@ function addColumnAt(getEditorContainerWidth) {
       if (allowAddColumnCustomStep) {
         updatedTr = addColumnAtCustomStep(column)(updatedTr);
       } else {
-        updatedTr = (0, _utils.addColumnAt)(column)(updatedTr);
+        updatedTr = (0, _utils2.addColumnAt)(column)(updatedTr);
       }
-      var table = (0, _utils.findTable)(updatedTr.selection);
+      var table = (0, _utils2.findTable)(updatedTr.selection);
       if (table) {
         // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
         updatedTr = (0, _columnWidth.rescaleColumns)(getEditorContainerWidth)(table, view)(updatedTr);
@@ -52,12 +52,12 @@ function addColumnAt(getEditorContainerWidth) {
 // Command to add a column before the column with the selection.
 var addColumnBefore = function addColumnBefore(getEditorContainerWidth) {
   return function (state, dispatch, view) {
-    var table = (0, _utils.findTable)(state.selection);
+    var table = (0, _utils2.findTable)(state.selection);
     if (!table) {
       return false;
     }
     if (dispatch) {
-      var rect = (0, _utils.selectedRect)(state);
+      var rect = (0, _utils2.selectedRect)(state);
       dispatch(addColumnAt(getEditorContainerWidth)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
     }
     return true;
@@ -69,12 +69,12 @@ var addColumnBefore = function addColumnBefore(getEditorContainerWidth) {
 exports.addColumnBefore = addColumnBefore;
 var addColumnAfter = function addColumnAfter(getEditorContainerWidth) {
   return function (state, dispatch, view) {
-    var table = (0, _utils.findTable)(state.selection);
+    var table = (0, _utils2.findTable)(state.selection);
     if (!table) {
       return false;
     }
     if (dispatch) {
-      var rect = (0, _utils.selectedRect)(state);
+      var rect = (0, _utils2.selectedRect)(state);
       dispatch(addColumnAt(getEditorContainerWidth)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
     }
     return true;
@@ -87,14 +87,14 @@ var insertColumn = function insertColumn(getEditorContainerWidth) {
   return function (column) {
     return function (state, dispatch, view) {
       var tr = addColumnAt(getEditorContainerWidth)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
-      var table = (0, _utils.findTable)(tr.selection);
+      var table = (0, _utils2.findTable)(tr.selection);
       if (!table) {
         return false;
       }
       // move the cursor to the newly created column
       var pos = _tableMap.TableMap.get(table.node).positionAt(0, column, table.node);
       if (dispatch) {
-        dispatch(tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.start + pos))));
+        dispatch(tr.setSelection(_state.Selection.near(tr.doc.resolve(table.start + pos))));
       }
       return true;
     };
@@ -104,7 +104,7 @@ exports.insertColumn = insertColumn;
 var insertRow = function insertRow(row, moveCursorToTheNewRow) {
   return function (state, dispatch) {
     // Don't clone the header row
-    var headerRowEnabled = (0, _utils2.checkIfHeaderRowEnabled)(state.selection);
+    var headerRowEnabled = (0, _utils3.checkIfHeaderRowEnabled)(state.selection);
     var clonePreviousRow = headerRowEnabled && row > 1 || !headerRowEnabled && row > 0;
 
     // When the table have header row
@@ -112,8 +112,8 @@ var insertRow = function insertRow(row, moveCursorToTheNewRow) {
     if (row === 0 && headerRowEnabled) {
       return false;
     }
-    var tr = clonePreviousRow ? (0, _utils2.copyPreviousRow)(state.schema)(row)(state.tr) : (0, _utils.addRowAt)(row)(state.tr);
-    var table = (0, _utils.findTable)(tr.selection);
+    var tr = clonePreviousRow ? (0, _utils3.copyPreviousRow)(state.schema)(row)(state.tr) : (0, _utils2.addRowAt)(row)(state.tr);
+    var table = (0, _utils2.findTable)(tr.selection);
     if (!table) {
       return false;
     }
@@ -122,7 +122,7 @@ var insertRow = function insertRow(row, moveCursorToTheNewRow) {
       if (moveCursorToTheNewRow) {
         // move the cursor to the newly created row
         var pos = _tableMap.TableMap.get(table.node).positionAt(row, 0, table.node);
-        tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.start + pos)));
+        tr.setSelection(_state.Selection.near(tr.doc.resolve(table.start + pos)));
       } else {
         tr.setSelection(selection.map(tr.doc, tr.mapping));
       }
@@ -134,11 +134,11 @@ var insertRow = function insertRow(row, moveCursorToTheNewRow) {
 exports.insertRow = insertRow;
 var createTable = function createTable() {
   return function (state, dispatch) {
-    var table = (0, _utils.createTable)({
+    var table = (0, _utils2.createTable)({
       schema: state.schema
     });
     if (dispatch) {
-      dispatch((0, _prosemirrorUtils.safeInsert)(table)(state.tr).scrollIntoView());
+      dispatch((0, _utils.safeInsert)(table)(state.tr).scrollIntoView());
     }
     return true;
   };

package/dist/cjs/plugins/table/commands/misc.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.triggerUnlessTableHeader = exports.transformSliceToRemoveColumnsWidths = exports.transformSliceToAddTableHeaders = exports.transformSliceRemoveCellBackgroundColor = exports.showInsertRowButton = exports.showInsertColumnButton = exports.setTableRef = exports.setMultipleCellAttrs = exports.setEditorFocus = exports.setCellAttr = exports.selectRow = exports.selectColumn = exports.moveCursorBackward = exports.hideInsertColumnOrRowButton = exports.deleteTableIfSelected = exports.deleteTable = exports.convertFirstRowToHeader = exports.autoSizeTable = exports.addResizeHandleDecorations = exports.addBoldInEmptyHeaderCells = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorState = require("prosemirror-state");
 var _utils = require("@atlaskit/editor-common/utils");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
@@ -101,7 +101,7 @@ var triggerUnlessTableHeader = function triggerUnlessTableHeader(command) {
   return function (state, dispatch, view) {
     var selection = state.selection,
       tableHeader = state.schema.nodes.tableHeader;
-    if (selection instanceof _prosemirrorState.TextSelection) {
+    if (selection instanceof _state.TextSelection) {
       var cell = (0, _utils2.findCellClosestToPos)(selection.$from);
       if (cell && cell.node.type !== tableHeader) {
         return command(state, dispatch, view);
@@ -234,7 +234,7 @@ var moveCursorBackward = function moveCursorBackward(state, dispatch) {
   var tr = state.tr;
   var lastCellPos = (cut || 0) - 4;
   // need to move cursor inside the table to be able to calculate table's offset
-  tr.setSelection(new _prosemirrorState.TextSelection(state.doc.resolve(lastCellPos)));
+  tr.setSelection(new _state.TextSelection(state.doc.resolve(lastCellPos)));
   var $from = tr.selection.$from;
   var start = $from.start(-1);
   var pos = start + $from.parent.nodeSize - 1;
@@ -242,7 +242,7 @@ var moveCursorBackward = function moveCursorBackward(state, dispatch) {
   // move cursor to the last cell
   // it doesn't join node before (last cell) with node after (content after the cursor)
   // due to ridiculous amount of PM code that would have been required to overwrite
-  tr.setSelection(new _prosemirrorState.TextSelection(state.doc.resolve(pos)));
+  tr.setSelection(new _state.TextSelection(state.doc.resolve(pos)));
 
   // if we are inside an empty paragraph not at the end of the doc we delete it
   var cursorNode = $cursor.node();

package/dist/cjs/plugins/table/commands/selection.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.arrowRightFromTable = exports.arrowLeftFromTable = exports.TableSelectionDirection = void 0;
-var _prosemirrorState = require("prosemirror-state");
 var _selection = require("@atlaskit/editor-common/selection");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
@@ -23,7 +23,7 @@ var arrowLeftFromTable = function arrowLeftFromTable(editorSelectionAPI) {
         return arrowLeftFromCellSelection(editorSelectionAPI)(selection)(state, dispatch);
       } else if (selection instanceof _selection.GapCursorSelection) {
         return arrowLeftFromGapCursor(editorSelectionAPI)(selection)(state, dispatch);
-      } else if (selection instanceof _prosemirrorState.TextSelection) {
+      } else if (selection instanceof _state.TextSelection) {
         return arrowLeftFromText(editorSelectionAPI)(selection)(state, dispatch);
       }
       return false;
@@ -39,7 +39,7 @@ var arrowRightFromTable = function arrowRightFromTable(editorSelectionAPI) {
         return arrowRightFromCellSelection(editorSelectionAPI)(selection)(state, dispatch);
       } else if (selection instanceof _selection.GapCursorSelection) {
         return arrowRightFromGapCursor(editorSelectionAPI)(selection)(state, dispatch);
-      } else if (selection instanceof _prosemirrorState.TextSelection) {
+      } else if (selection instanceof _state.TextSelection) {
         return arrowRightFromText(editorSelectionAPI)(selection)(state, dispatch);
       }
       return false;
@@ -256,7 +256,7 @@ var setSelectionAtStartOfFirstCell = function setSelectionAtStartOfFirstCell(edi
       var $firstPosInsideCell = state.doc.resolve($firstCell.pos + 1);
 
       // check if first pos should have a gap cursor, otherwise find closest text selection
-      var selectionAtStartOfCell = _selection.GapCursorSelection.valid($firstPosInsideCell) ? new _selection.GapCursorSelection($firstPosInsideCell, _selection.Side.LEFT) : _prosemirrorState.Selection.findFrom($firstPosInsideCell, 1);
+      var selectionAtStartOfCell = _selection.GapCursorSelection.valid($firstPosInsideCell) ? new _selection.GapCursorSelection($firstPosInsideCell, _selection.Side.LEFT) : _state.Selection.findFrom($firstPosInsideCell, 1);
       if (editorSelectionAPI) {
         var tr = editorSelectionAPI.setSelectionRelativeToNode({
           selectionRelativeToNode: selectionRelativeToNode,
@@ -281,7 +281,7 @@ var setSelectionAtEndOfLastCell = function setSelectionAtEndOfLastCell(editorSel
       var $lastPosInsideCell = state.doc.resolve(lastPosInsideCell);
 
       // check if last pos should have a gap cursor, otherwise find closest text selection
-      var selectionAtEndOfCell = _selection.GapCursorSelection.valid($lastPosInsideCell) ? new _selection.GapCursorSelection($lastPosInsideCell, _selection.Side.RIGHT) : _prosemirrorState.Selection.findFrom($lastPosInsideCell, -1);
+      var selectionAtEndOfCell = _selection.GapCursorSelection.valid($lastPosInsideCell) ? new _selection.GapCursorSelection($lastPosInsideCell, _selection.Side.RIGHT) : _state.Selection.findFrom($lastPosInsideCell, -1);
       if (editorSelectionAPI) {
         var tr = editorSelectionAPI.setSelectionRelativeToNode({
           selectionRelativeToNode: selectionRelativeToNode,

package/dist/cjs/plugins/table/commands/sort.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sortByColumn = void 0;
-var _prosemirrorState = require("prosemirror-state");
 var _steps = require("@atlaskit/adf-schema/steps");
 var _utils = require("@atlaskit/editor-common/utils");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
@@ -65,7 +65,7 @@ var sortByColumn = function sortByColumn(columnIndex) {
       order: order
     };
     tr.step(new _steps.TableSortStep(table.pos, prev, next));
-    return tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(table.start + pos)));
+    return tr.setSelection(_state.Selection.near(tr.doc.resolve(table.start + pos)));
   });
 };
 exports.sortByColumn = sortByColumn;

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

@@ -8,9 +8,9 @@ exports.handleMouseOver = exports.handleMouseOut = exports.handleMouseMove = exp
 exports.handleTripleClick = handleTripleClick;
 exports.whenTableInFocus = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _prosemirrorState = require("prosemirror-state");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
+var _state5 = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
@@ -262,10 +262,10 @@ function handleTripleClick(view, pos) {
   }
   var cell = state.doc.nodeAt($cellPos.pos);
   if (cell) {
-    var selFrom = _prosemirrorState.Selection.findFrom($cellPos, 1, true);
-    var selTo = _prosemirrorState.Selection.findFrom(state.doc.resolve($cellPos.pos + cell.nodeSize), -1, true);
+    var selFrom = _state5.Selection.findFrom($cellPos, 1, true);
+    var selTo = _state5.Selection.findFrom(state.doc.resolve($cellPos.pos + cell.nodeSize), -1, true);
     if (selFrom && selTo) {
-      dispatch(state.tr.setSelection(new _prosemirrorState.TextSelection(selFrom.$from, selTo.$to)));
+      dispatch(state.tr.setSelection(new _state5.TextSelection(selFrom.$from, selTo.$to)));
       return true;
     }
   }

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

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleDocOrSelectionChanged = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorUtils = require("prosemirror-utils");
 var _steps = require("@atlaskit/adf-schema/steps");
 var _utils = require("@atlaskit/editor-common/utils");
-var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils3 = require("@atlaskit/editor-tables/utils");
 var _defaultTableSelection = require("./pm-plugins/default-table-selection");
 var _tableResizing = require("./pm-plugins/table-resizing");
 var _collapse = require("./utils/collapse");
@@ -42,7 +42,7 @@ var updateTargetCellPosition = function updateTargetCellPosition(_ref) {
     var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
       tableCell = _tr$doc$type$schema$n.tableCell,
       tableHeader = _tr$doc$type$schema$n.tableHeader;
-    var cell = (0, _prosemirrorUtils.findParentNodeOfType)([tableCell, tableHeader])(tr.selection);
+    var cell = (0, _utils2.findParentNodeOfType)([tableCell, tableHeader])(tr.selection);
     var targetCellPosition = cell ? cell.pos : undefined;
     if (pluginState.targetCellPosition === targetCellPosition) {
       return pluginState;
@@ -88,7 +88,7 @@ var updateCollapseHandler = function updateCollapseHandler(_ref3) {
       return pluginState;
     }
     var expandNodeType = schema.nodes.expand;
-    var isTableCollapsed = expandNodeType && !!(0, _prosemirrorUtils.findParentNodeOfType)(expandNodeType)(tr.selection);
+    var isTableCollapsed = expandNodeType && !!(0, _utils2.findParentNodeOfType)(expandNodeType)(tr.selection);
     var trCanBeCollapsed = (0, _collapse.isTableCollapsible)(tr).tableIsCollapsible;
 
     // We're focused on a table + we're not inside an expand
@@ -121,7 +121,7 @@ var buildPluginState = function buildPluginState(builders) {
 var handleDocOrSelectionChanged = function handleDocOrSelectionChanged(tr, pluginState) {
   return buildPluginState([updateTargetCellPosition, updateTableNodePluginState, updateCollapseHandler])({
     tr: tr,
-    table: (0, _utils2.findTable)(tr.selection)
+    table: (0, _utils3.findTable)(tr.selection)
   })(pluginState);
 };
 exports.handleDocOrSelectionChanged = handleDocOrSelectionChanged;

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

@@ -16,10 +16,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
-var _prosemirrorModel = require("prosemirror-model");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _createPluginConfig = require("../create-plugin-config");
@@ -73,7 +73,7 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
   (0, _createClass2.default)(TableView, [{
     key: "getContentDOM",
     value: function getContentDOM() {
-      var rendered = _prosemirrorModel.DOMSerializer.renderSpec(document, toDOM(this.node, this.reactComponentProps));
+      var rendered = _model.DOMSerializer.renderSpec(document, toDOM(this.node, this.reactComponentProps));
       if (rendered.dom) {
         this.table = rendered.dom;
       }

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

@@ -8,9 +8,9 @@ exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _prosemirrorModel = require("prosemirror-model");
 var _uuid = _interopRequireDefault(require("uuid"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var DEFAULT_COL_SPAN = 1;
 var DEFAULT_ROW_SPAN = 1;
 var TableCellNodeView = /*#__PURE__*/function () {
@@ -18,7 +18,7 @@ var TableCellNodeView = /*#__PURE__*/function () {
     (0, _classCallCheck2.default)(this, TableCellNodeView);
     this.view = view;
     this.node = node;
-    var _DOMSerializer$render = _prosemirrorModel.DOMSerializer.renderSpec(document, node.type.spec.toDOM(node)),
+    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, node.type.spec.toDOM(node)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.getPos = getPos;

package/dist/cjs/plugins/table/pm-plugins/decorations/plugin.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.handleDocOrSelectionChanged = exports.getDecorations = exports.createPlugin = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorView = require("prosemirror-view");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _pluginKey = require("../plugin-key");
 var _tableWidth = require("../table-width");
 var _utils = require("./utils");
-var pluginKey = new _prosemirrorState.PluginKey('tableDecorationsPlugin');
+var pluginKey = new _state.PluginKey('tableDecorationsPlugin');
 exports.pluginKey = pluginKey;
 var getDecorations = function getDecorations(state) {
   return pluginKey.getState(state);
@@ -25,7 +25,7 @@ var handleDocOrSelectionChanged = function handleDocOrSelectionChanged(tr, decor
 
   // Remove column controls when resizing
   if (isResizing) {
-    return _prosemirrorView.DecorationSet.empty;
+    return _view.DecorationSet.empty;
   } else if (tr.docChanged || tr.selection instanceof _cellSelection.CellSelection || changedResizing) {
     return (0, _utils.buildColumnControlsDecorations)({
       decorationSet: decorationSet,
@@ -47,7 +47,7 @@ var createPlugin = function createPlugin() {
   return new _safePlugin.SafePlugin({
     state: {
       init: function init() {
-        return _prosemirrorView.DecorationSet.empty;
+        return _view.DecorationSet.empty;
       },
       apply: function apply(tr, decorationSet, oldState, newState) {
         var pluginState = decorationSet;

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

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorCommands = require("prosemirror-commands");
-var _prosemirrorKeymap = require("prosemirror-keymap");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
-var _commands = require("../commands");
+var _commands = require("@atlaskit/editor-prosemirror/commands");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _commands2 = require("../commands");
 var _commandsWithAnalytics = require("../commands-with-analytics");
 var _insert = require("../commands/insert");
 var _analytics2 = require("../utils/analytics");
@@ -25,22 +25,22 @@ var createTableWithAnalytics = function createTableWithAnalytics(editorAnalytics
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     },
     eventType: _analytics.EVENT_TYPE.TRACK
-  })(editorAnalyticsAPI)((0, _commands.createTable)());
+  })(editorAnalyticsAPI)((0, _commands2.createTable)());
 };
 function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.nextCell.common, (0, _commands.goToNextCell)(editorAnalyticsAPI)(1), list);
-  keymaps.bindKeymapWithCommand(keymaps.previousCell.common, (0, _commands.goToNextCell)(editorAnalyticsAPI)(-1), list);
+  keymaps.bindKeymapWithCommand(keymaps.nextCell.common, (0, _commands2.goToNextCell)(editorAnalyticsAPI)(1), list);
+  keymaps.bindKeymapWithCommand(keymaps.previousCell.common, (0, _commands2.goToNextCell)(editorAnalyticsAPI)(-1), list);
   keymaps.bindKeymapWithCommand(keymaps.toggleTable.common, createTableWithAnalytics(editorAnalyticsAPI), list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, (0, _prosemirrorCommands.chainCommands)((0, _commandsWithAnalytics.deleteTableIfSelectedWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD), (0, _commandsWithAnalytics.emptyMultipleCellsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD)), list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, _commands.moveCursorBackward, list);
+  keymaps.bindKeymapWithCommand(keymaps.backspace.common, (0, _commands.chainCommands)((0, _commandsWithAnalytics.deleteTableIfSelectedWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD), (0, _commandsWithAnalytics.emptyMultipleCellsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD)), list);
+  keymaps.bindKeymapWithCommand(keymaps.backspace.common, _commands2.moveCursorBackward, list);
 
   // Add row/column shortcuts
   keymaps.bindKeymapWithCommand(keymaps.addRowBefore.common, (0, _commandsWithAnalytics.addRowAroundSelection)(editorAnalyticsAPI)('TOP'), list);
   keymaps.bindKeymapWithCommand(keymaps.addRowAfter.common, (0, _commandsWithAnalytics.addRowAroundSelection)(editorAnalyticsAPI)('BOTTOM'), list);
-  keymaps.bindKeymapWithCommand(keymaps.addColumnBefore.common, (0, _commands.triggerUnlessTableHeader)((0, _insert.addColumnBefore)(getEditorContainerWidth)), list);
+  keymaps.bindKeymapWithCommand(keymaps.addColumnBefore.common, (0, _commands2.triggerUnlessTableHeader)((0, _insert.addColumnBefore)(getEditorContainerWidth)), list);
   keymaps.bindKeymapWithCommand(keymaps.addColumnAfter.common, (0, _insert.addColumnAfter)(getEditorContainerWidth), list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }
 var _default = keymapPlugin;
 exports.default = _default;

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

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorUtils = require("prosemirror-utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
-var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils3 = require("@atlaskit/editor-tables/utils");
 var _commands = require("../commands");
 var _misc = require("../commands/misc");
 var _eventHandlers = require("../event-handlers");
@@ -21,7 +21,7 @@ var _tableCell = _interopRequireDefault(require("../nodeviews/tableCell"));
 var _plugin = require("../pm-plugins/decorations/plugin");
 var _transforms2 = require("../transforms");
 var _types = require("../types");
-var _utils3 = require("../utils");
+var _utils4 = require("../utils");
 var _paste = require("../utils/paste");
 var _defaultTableSelection = require("./default-table-selection");
 var _pluginFactory = require("./plugin-factory");
@@ -123,24 +123,24 @@ var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, porta
           var tableRef;
           var tableNode;
           if (pluginState.editorHasFocus) {
-            var parent = (0, _prosemirrorUtils.findParentDomRefOfType)(state.schema.nodes.table, domAtPos)(selection);
+            var parent = (0, _utils2.findParentDomRefOfType)(state.schema.nodes.table, domAtPos)(selection);
             if (parent) {
               tableRef = parent.querySelector('table') || undefined;
             }
-            tableNode = (0, _utils2.findTable)(state.selection);
+            tableNode = (0, _utils3.findTable)(state.selection);
           }
           if (pluginState.tableRef !== tableRef) {
             (0, _commands.setTableRef)(tableRef)(state, dispatch);
           }
           if (pluginState.tableNode !== tableNode) {
-            (0, _utils3.updateResizeHandles)(tableRef);
+            (0, _utils4.updateResizeHandles)(tableRef);
           }
           if (pluginState.editorHasFocus && pluginState.tableRef) {
             var _ref = state.selection,
               $cursor = _ref.$cursor;
             if ($cursor) {
               // Only update bold when it's a cursor
-              var tableCellHeader = (0, _prosemirrorUtils.findParentNodeOfType)(state.schema.nodes.tableHeader)(state.selection);
+              var tableCellHeader = (0, _utils2.findParentNodeOfType)(state.schema.nodes.tableHeader)(state.selection);
               if (tableCellHeader) {
                 (0, _commands.addBoldInEmptyHeaderCells)(tableCellHeader)(state, dispatch);
               }
@@ -168,7 +168,7 @@ var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, porta
         if (!(0, _coreUtils.insideTable)(editorState) && (0, _paste.isHeaderRowRequired)(editorState)) {
           slice = (0, _misc.transformSliceToAddTableHeaders)(slice, schema);
         }
-        slice = (0, _utils3.transformSliceToFixHardBreakProblemOnCopyFromCell)(slice, schema);
+        slice = (0, _utils4.transformSliceToFixHardBreakProblemOnCopyFromCell)(slice, schema);
 
         // We do this separately, so it also applies to drag/drop events
         // This needs to go before `transformSliceToRemoveOpenExpand`
@@ -179,11 +179,11 @@ var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, porta
         slice = (0, _transforms.transformSliceToRemoveOpenExpand)(slice, schema);
 
         /** If a partial paste of table, paste only table's content */
-        slice = (0, _utils3.transformSliceToRemoveOpenTable)(slice, schema);
+        slice = (0, _utils4.transformSliceToRemoveOpenTable)(slice, schema);
 
         /** If a partial paste of bodied extension, paste only text */
         slice = (0, _transforms.transformSliceToRemoveOpenBodiedExtension)(slice, schema);
-        slice = (0, _utils3.transformSliceToCorrectEmptyTableCells)(slice, schema);
+        slice = (0, _utils4.transformSliceToCorrectEmptyTableCells)(slice, schema);
         if (!pluginConfig.allowColumnResizing) {
           slice = (0, _misc.transformSliceToRemoveColumnsWidths)(slice, schema);
         }
@@ -199,7 +199,7 @@ var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, porta
         var state = _ref2.state,
           dispatch = _ref2.dispatch;
         var decorationSet = _plugin.pluginKey.getState(state);
-        if ((0, _utils3.findControlsHoverDecoration)(decorationSet).length) {
+        if ((0, _utils4.findControlsHoverDecoration)(decorationSet).length) {
           (0, _commands.clearHoverSelection)()(state, dispatch);
         }
 
@@ -218,7 +218,7 @@ var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, porta
         // when typing into a sticky header cell, we don't want to scroll
         // back to the top of the table if the user has already scrolled down
         var tableHeader = view.state.schema.nodes.tableHeader;
-        var domRef = (0, _prosemirrorUtils.findParentDomRefOfType)(tableHeader, view.domAtPos.bind(view))(view.state.selection);
+        var domRef = (0, _utils2.findParentDomRefOfType)(tableHeader, view.domAtPos.bind(view))(view.state.selection);
         var maybeTr = (0, _utils.closestElement)(domRef, 'tr');
         return maybeTr ? maybeTr.classList.contains('sticky') : false;
       },

package/dist/cjs/plugins/table/pm-plugins/plugin-key.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var pluginKey = new _prosemirrorState.PluginKey('tablePlugin');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('tablePlugin');
 exports.pluginKey = pluginKey;