@atlaskit/editor-plugin-table 4.2.0 → 5.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-table
 
+## 5.0.0
+
+### Major Changes
+
+- [#40750](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40750) [`fc19a7b9edd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fc19a7b9edd) - [ED-19875] Extraction of Editor Core's Selection Plugin into independent package '@atlaskit/editor-plugin-selection'.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.2.1
+
+### Patch Changes
+
+- [#40795](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40795) [`fec7aa5c761`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fec7aa5c761) - [ux] Fix distribute column resize will not been override when undefined
+
 ## 4.2.0
 
 ### Minor Changes

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

@@ -48,15 +48,14 @@ var arrowLeftFromCellSelection = function arrowLeftFromCellSelection(editorSelec
   return function (selection) {
     return function (state, dispatch) {
       if ((0, _utils.isTableSelected)(state.selection) && editorSelectionAPI) {
-        var _editorSelectionAPI$g = editorSelectionAPI.getSelectionPluginState(state),
-          selectionRelativeToNode = _editorSelectionAPI$g.selectionRelativeToNode;
-        if (selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
+        var selectionState = editorSelectionAPI.sharedState.currentState() || {};
+        if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.Start) {
           // we have full table cell selection and want to set gap cursor selection before table
           return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
-        } else if (selectionRelativeToNode === _selection.RelativeSelectionPos.End) {
+        } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.End) {
           // we have full table cell selection and want to set selection at end of last cell
           return setSelectionAtEndOfLastCell(editorSelectionAPI)(selection)(state, dispatch);
-        } else if (selectionRelativeToNode === undefined) {
+        } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === undefined) {
           // we have full table cell selection and want to set selection at start of first cell
           return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection, _selection.RelativeSelectionPos.Before)(state, dispatch);
         }
@@ -69,8 +68,8 @@ var arrowRightFromCellSelection = function arrowRightFromCellSelection(editorSel
   return function (selection) {
     return function (state, dispatch) {
       if ((0, _utils.isTableSelected)(state.selection) && editorSelectionAPI) {
-        var _editorSelectionAPI$g2 = editorSelectionAPI.getSelectionPluginState(state),
-          selectionRelativeToNode = _editorSelectionAPI$g2.selectionRelativeToNode;
+        var _ref = editorSelectionAPI.sharedState.currentState() || {},
+          selectionRelativeToNode = _ref.selectionRelativeToNode;
         if (selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
           // we have full table cell selection and want to set selection at start of first cell
           return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection)(state, dispatch);
@@ -102,9 +101,8 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(editorSelectionAPI)
       } else if (side === _selection.Side.LEFT) {
         var table = (0, _utils.findTable)(selection);
         if (table && isSelectionAtStartOfTable($from, selection) && editorSelectionAPI) {
-          var _editorSelectionAPI$g3 = editorSelectionAPI.getSelectionPluginState(state),
-            selectionRelativeToNode = _editorSelectionAPI$g3.selectionRelativeToNode;
-          if (selectionRelativeToNode === _selection.RelativeSelectionPos.Before) {
+          var selectionState = editorSelectionAPI.sharedState.currentState() || {};
+          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.Before) {
             // we have a gap cursor at start of first table cell and want to set a gap cursor selection before table
             return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
           } else {
@@ -161,9 +159,8 @@ var arrowLeftFromText = function arrowLeftFromText(editorSelectionAPI) {
         if (isSelectionAtStartOfTable($from, selection) && $from.parent.type.name === 'paragraph' && $from.depth === table.depth + 3 &&
         // + 3 for: row, cell & paragraph nodes
         editorSelectionAPI) {
-          var _editorSelectionAPI$g4 = editorSelectionAPI.getSelectionPluginState(state),
-            selectionRelativeToNode = _editorSelectionAPI$g4.selectionRelativeToNode;
-          if (selectionRelativeToNode === _selection.RelativeSelectionPos.Before) {
+          var selectionState = editorSelectionAPI.sharedState.currentState() || {};
+          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.Before) {
             // we have a text selection at start of first table cell, directly inside a top level paragraph,
             // and want to set gap cursor selection before table
             return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
@@ -211,10 +208,10 @@ var arrowRightFromText = function arrowRightFromText(editorSelectionAPI) {
  * pos in the selection plugin
  */
 var selectFullTable = function selectFullTable(editorSelectionAPI) {
-  return function (_ref) {
-    var node = _ref.node,
-      startPos = _ref.startPos,
-      dir = _ref.dir;
+  return function (_ref2) {
+    var node = _ref2.node,
+      startPos = _ref2.startPos,
+      dir = _ref2.dir;
     return function (state, dispatch) {
       var doc = state.doc;
       var _TableMap$get = _tableMap.TableMap.get(node),
@@ -231,7 +228,7 @@ var selectFullTable = function selectFullTable(editorSelectionAPI) {
         selectionRelativeToNode = _selection.RelativeSelectionPos.Start;
       }
       if (editorSelectionAPI) {
-        var tr = editorSelectionAPI.setSelectionRelativeToNode({
+        var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
           selection: fullTableSelection
         })(state);
@@ -255,7 +252,7 @@ var setSelectionAtStartOfFirstCell = function setSelectionAtStartOfFirstCell(edi
       // 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) : _state.Selection.findFrom($firstPosInsideCell, 1);
       if (editorSelectionAPI) {
-        var tr = editorSelectionAPI.setSelectionRelativeToNode({
+        var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
           selection: selectionAtStartOfCell
         })(state);
@@ -280,7 +277,7 @@ var setSelectionAtEndOfLastCell = function setSelectionAtEndOfLastCell(editorSel
       // 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) : _state.Selection.findFrom($lastPosInsideCell, -1);
       if (editorSelectionAPI) {
-        var tr = editorSelectionAPI.setSelectionRelativeToNode({
+        var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
           selection: selectionAtEndOfCell
         })(state);
@@ -302,7 +299,7 @@ var setGapCursorBeforeTable = function setGapCursorBeforeTable(editorSelectionAP
         if (_selection.GapCursorSelection.valid($beforeTablePos)) {
           var selectionBeforeTable = new _selection.GapCursorSelection($beforeTablePos, _selection.Side.LEFT);
           if (editorSelectionAPI) {
-            var tr = editorSelectionAPI.setSelectionRelativeToNode({
+            var tr = editorSelectionAPI.actions.selectNearNode({
               selectionRelativeToNode: undefined,
               selection: selectionBeforeTable
             })(state);
@@ -326,7 +323,7 @@ var setGapCursorAfterTable = function setGapCursorAfterTable(editorSelectionAPI)
         if (_selection.GapCursorSelection.valid($afterTablePos)) {
           var selectionAfterTable = new _selection.GapCursorSelection($afterTablePos, _selection.Side.RIGHT);
           if (editorSelectionAPI) {
-            var tr = editorSelectionAPI.setSelectionRelativeToNode({
+            var tr = editorSelectionAPI.actions.selectNearNode({
               selectionRelativeToNode: undefined,
               selection: selectionAfterTable
             })(state);

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

@@ -37,8 +37,6 @@ var _FloatingDeleteButton = _interopRequireDefault(require("./ui/FloatingDeleteB
 var _FloatingInsertButton = _interopRequireDefault(require("./ui/FloatingInsertButton"));
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _utils3 = require("./utils");
-// TODO: duplicated SelectionPlugin type as it's still in editor-core, doing this avoid
-// circular dependencies
 var defaultGetEditorFeatureFlags = function defaultGetEditorFeatureFlags() {
   return {};
 };
@@ -146,7 +144,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }, {
         name: 'tableSelectionKeymap',
         plugin: function plugin() {
-          return (0, _tableSelectionKeymap.tableSelectionKeymapPlugin)(options === null || options === void 0 ? void 0 : options.editorSelectionAPI);
+          return (0, _tableSelectionKeymap.tableSelectionKeymapPlugin)(api === null || api === void 0 ? void 0 : api.selection);
         }
       }, {
         name: 'tableEditing',

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.updateColumnWidths = exports.rescaleColumnsOld = exports.rescaleColumnsNew = exports.rescaleColumns = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _steps = require("@atlaskit/adf-schema/steps");
 var _styles = require("@atlaskit/editor-common/styles");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -76,7 +76,7 @@ var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidth
           var cell = table.nodeAt(pos);
           if (!seen[pos] && cell) {
             if (updatedCellsAttrs[pos]) {
-              tr.step(new _steps.SetAttrsStep(pos + start, updatedCellsAttrs[pos]));
+              tr.step(new _transform.AttrStep(pos + start, 'colwidth', updatedCellsAttrs[pos].colwidth));
             }
             seen[pos] = true;
           }

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

@@ -36,16 +36,14 @@ export const arrowRightFromTable = editorSelectionAPI => () => (state, dispatch)
 };
 const arrowLeftFromCellSelection = editorSelectionAPI => selection => (state, dispatch) => {
   if (isTableSelected(state.selection) && editorSelectionAPI) {
-    const {
-      selectionRelativeToNode
-    } = editorSelectionAPI.getSelectionPluginState(state);
-    if (selectionRelativeToNode === RelativeSelectionPos.Start) {
+    const selectionState = editorSelectionAPI.sharedState.currentState() || {};
+    if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.Start) {
       // we have full table cell selection and want to set gap cursor selection before table
       return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
-    } else if (selectionRelativeToNode === RelativeSelectionPos.End) {
+    } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.End) {
       // we have full table cell selection and want to set selection at end of last cell
       return setSelectionAtEndOfLastCell(editorSelectionAPI)(selection)(state, dispatch);
-    } else if (selectionRelativeToNode === undefined) {
+    } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === undefined) {
       // we have full table cell selection and want to set selection at start of first cell
       return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection, RelativeSelectionPos.Before)(state, dispatch);
     }
@@ -56,7 +54,7 @@ const arrowRightFromCellSelection = editorSelectionAPI => selection => (state, d
   if (isTableSelected(state.selection) && editorSelectionAPI) {
     const {
       selectionRelativeToNode
-    } = editorSelectionAPI.getSelectionPluginState(state);
+    } = editorSelectionAPI.sharedState.currentState() || {};
     if (selectionRelativeToNode === RelativeSelectionPos.Start) {
       // we have full table cell selection and want to set selection at start of first cell
       return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection)(state, dispatch);
@@ -88,10 +86,8 @@ const arrowLeftFromGapCursor = editorSelectionAPI => selection => (state, dispat
   } else if (side === Side.LEFT) {
     const table = findTable(selection);
     if (table && isSelectionAtStartOfTable($from, selection) && editorSelectionAPI) {
-      const {
-        selectionRelativeToNode
-      } = editorSelectionAPI.getSelectionPluginState(state);
-      if (selectionRelativeToNode === RelativeSelectionPos.Before) {
+      const selectionState = editorSelectionAPI.sharedState.currentState() || {};
+      if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.Before) {
         // we have a gap cursor at start of first table cell and want to set a gap cursor selection before table
         return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
       } else {
@@ -144,10 +140,8 @@ const arrowLeftFromText = editorSelectionAPI => selection => (state, dispatch) =
     if (isSelectionAtStartOfTable($from, selection) && $from.parent.type.name === 'paragraph' && $from.depth === table.depth + 3 &&
     // + 3 for: row, cell & paragraph nodes
     editorSelectionAPI) {
-      const {
-        selectionRelativeToNode
-      } = editorSelectionAPI.getSelectionPluginState(state);
-      if (selectionRelativeToNode === RelativeSelectionPos.Before) {
+      const selectionState = editorSelectionAPI.sharedState.currentState() || {};
+      if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.Before) {
         // we have a text selection at start of first table cell, directly inside a top level paragraph,
         // and want to set gap cursor selection before table
         return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
@@ -213,7 +207,7 @@ const selectFullTable = editorSelectionAPI => ({
     selectionRelativeToNode = RelativeSelectionPos.Start;
   }
   if (editorSelectionAPI) {
-    const tr = editorSelectionAPI.setSelectionRelativeToNode({
+    const tr = editorSelectionAPI.actions.selectNearNode({
       selectionRelativeToNode,
       selection: fullTableSelection
     })(state);
@@ -235,7 +229,7 @@ const setSelectionAtStartOfFirstCell = editorSelectionAPI => (selection, selecti
   // check if first pos should have a gap cursor, otherwise find closest text selection
   const selectionAtStartOfCell = GapCursorSelection.valid($firstPosInsideCell) ? new GapCursorSelection($firstPosInsideCell, Side.LEFT) : Selection.findFrom($firstPosInsideCell, 1);
   if (editorSelectionAPI) {
-    const tr = editorSelectionAPI.setSelectionRelativeToNode({
+    const tr = editorSelectionAPI.actions.selectNearNode({
       selectionRelativeToNode,
       selection: selectionAtStartOfCell
     })(state);
@@ -258,7 +252,7 @@ const setSelectionAtEndOfLastCell = editorSelectionAPI => (selection, selectionR
   // check if last pos should have a gap cursor, otherwise find closest text selection
   const selectionAtEndOfCell = GapCursorSelection.valid($lastPosInsideCell) ? new GapCursorSelection($lastPosInsideCell, Side.RIGHT) : Selection.findFrom($lastPosInsideCell, -1);
   if (editorSelectionAPI) {
-    const tr = editorSelectionAPI.setSelectionRelativeToNode({
+    const tr = editorSelectionAPI.actions.selectNearNode({
       selectionRelativeToNode,
       selection: selectionAtEndOfCell
     })(state);
@@ -276,7 +270,7 @@ const setGapCursorBeforeTable = editorSelectionAPI => () => (state, dispatch) =>
     if (GapCursorSelection.valid($beforeTablePos)) {
       const selectionBeforeTable = new GapCursorSelection($beforeTablePos, Side.LEFT);
       if (editorSelectionAPI) {
-        const tr = editorSelectionAPI.setSelectionRelativeToNode({
+        const tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: undefined,
           selection: selectionBeforeTable
         })(state);
@@ -296,7 +290,7 @@ const setGapCursorAfterTable = editorSelectionAPI => () => (state, dispatch) =>
     if (GapCursorSelection.valid($afterTablePos)) {
       const selectionAfterTable = new GapCursorSelection($afterTablePos, Side.RIGHT);
       if (editorSelectionAPI) {
-        const tr = editorSelectionAPI.setSelectionRelativeToNode({
+        const tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: undefined,
           selection: selectionAfterTable
         })(state);

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

@@ -30,9 +30,6 @@ import FloatingDeleteButton from './ui/FloatingDeleteButton';
 import FloatingInsertButton from './ui/FloatingInsertButton';
 import LayoutButton from './ui/LayoutButton';
 import { isLayoutSupported } from './utils';
-
-// TODO: duplicated SelectionPlugin type as it's still in editor-core, doing this avoid
-// circular dependencies
 const defaultGetEditorFeatureFlags = () => ({});
 /**
  * Table plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
@@ -137,7 +134,7 @@ const tablesPlugin = ({
         plugin: () => keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI)
       }, {
         name: 'tableSelectionKeymap',
-        plugin: () => tableSelectionKeymapPlugin(options === null || options === void 0 ? void 0 : options.editorSelectionAPI)
+        plugin: () => tableSelectionKeymapPlugin(api === null || api === void 0 ? void 0 : api.selection)
       }, {
         name: 'tableEditing',
         plugin: () => tableEditing({

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

@@ -1,5 +1,5 @@
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
+import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap, tableNewColumnMinWidth } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -69,7 +69,7 @@ export const updateColumnWidths = (resizeState, table, start) => tr => {
         const cell = table.nodeAt(pos);
         if (!seen[pos] && cell) {
           if (updatedCellsAttrs[pos]) {
-            tr.step(new SetAttrsStep(pos + start, updatedCellsAttrs[pos]));
+            tr.step(new AttrStep(pos + start, 'colwidth', updatedCellsAttrs[pos].colwidth));
           }
           seen[pos] = true;
         }

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

@@ -42,15 +42,14 @@ var arrowLeftFromCellSelection = function arrowLeftFromCellSelection(editorSelec
   return function (selection) {
     return function (state, dispatch) {
       if (isTableSelected(state.selection) && editorSelectionAPI) {
-        var _editorSelectionAPI$g = editorSelectionAPI.getSelectionPluginState(state),
-          selectionRelativeToNode = _editorSelectionAPI$g.selectionRelativeToNode;
-        if (selectionRelativeToNode === RelativeSelectionPos.Start) {
+        var selectionState = editorSelectionAPI.sharedState.currentState() || {};
+        if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.Start) {
           // we have full table cell selection and want to set gap cursor selection before table
           return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
-        } else if (selectionRelativeToNode === RelativeSelectionPos.End) {
+        } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.End) {
           // we have full table cell selection and want to set selection at end of last cell
           return setSelectionAtEndOfLastCell(editorSelectionAPI)(selection)(state, dispatch);
-        } else if (selectionRelativeToNode === undefined) {
+        } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === undefined) {
           // we have full table cell selection and want to set selection at start of first cell
           return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection, RelativeSelectionPos.Before)(state, dispatch);
         }
@@ -63,8 +62,8 @@ var arrowRightFromCellSelection = function arrowRightFromCellSelection(editorSel
   return function (selection) {
     return function (state, dispatch) {
       if (isTableSelected(state.selection) && editorSelectionAPI) {
-        var _editorSelectionAPI$g2 = editorSelectionAPI.getSelectionPluginState(state),
-          selectionRelativeToNode = _editorSelectionAPI$g2.selectionRelativeToNode;
+        var _ref = editorSelectionAPI.sharedState.currentState() || {},
+          selectionRelativeToNode = _ref.selectionRelativeToNode;
         if (selectionRelativeToNode === RelativeSelectionPos.Start) {
           // we have full table cell selection and want to set selection at start of first cell
           return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection)(state, dispatch);
@@ -96,9 +95,8 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(editorSelectionAPI)
       } else if (side === Side.LEFT) {
         var table = findTable(selection);
         if (table && isSelectionAtStartOfTable($from, selection) && editorSelectionAPI) {
-          var _editorSelectionAPI$g3 = editorSelectionAPI.getSelectionPluginState(state),
-            selectionRelativeToNode = _editorSelectionAPI$g3.selectionRelativeToNode;
-          if (selectionRelativeToNode === RelativeSelectionPos.Before) {
+          var selectionState = editorSelectionAPI.sharedState.currentState() || {};
+          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.Before) {
             // we have a gap cursor at start of first table cell and want to set a gap cursor selection before table
             return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
           } else {
@@ -155,9 +153,8 @@ var arrowLeftFromText = function arrowLeftFromText(editorSelectionAPI) {
         if (isSelectionAtStartOfTable($from, selection) && $from.parent.type.name === 'paragraph' && $from.depth === table.depth + 3 &&
         // + 3 for: row, cell & paragraph nodes
         editorSelectionAPI) {
-          var _editorSelectionAPI$g4 = editorSelectionAPI.getSelectionPluginState(state),
-            selectionRelativeToNode = _editorSelectionAPI$g4.selectionRelativeToNode;
-          if (selectionRelativeToNode === RelativeSelectionPos.Before) {
+          var selectionState = editorSelectionAPI.sharedState.currentState() || {};
+          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === RelativeSelectionPos.Before) {
             // we have a text selection at start of first table cell, directly inside a top level paragraph,
             // and want to set gap cursor selection before table
             return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
@@ -205,10 +202,10 @@ var arrowRightFromText = function arrowRightFromText(editorSelectionAPI) {
  * pos in the selection plugin
  */
 var selectFullTable = function selectFullTable(editorSelectionAPI) {
-  return function (_ref) {
-    var node = _ref.node,
-      startPos = _ref.startPos,
-      dir = _ref.dir;
+  return function (_ref2) {
+    var node = _ref2.node,
+      startPos = _ref2.startPos,
+      dir = _ref2.dir;
     return function (state, dispatch) {
       var doc = state.doc;
       var _TableMap$get = TableMap.get(node),
@@ -225,7 +222,7 @@ var selectFullTable = function selectFullTable(editorSelectionAPI) {
         selectionRelativeToNode = RelativeSelectionPos.Start;
       }
       if (editorSelectionAPI) {
-        var tr = editorSelectionAPI.setSelectionRelativeToNode({
+        var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
           selection: fullTableSelection
         })(state);
@@ -249,7 +246,7 @@ var setSelectionAtStartOfFirstCell = function setSelectionAtStartOfFirstCell(edi
       // check if first pos should have a gap cursor, otherwise find closest text selection
       var selectionAtStartOfCell = GapCursorSelection.valid($firstPosInsideCell) ? new GapCursorSelection($firstPosInsideCell, Side.LEFT) : Selection.findFrom($firstPosInsideCell, 1);
       if (editorSelectionAPI) {
-        var tr = editorSelectionAPI.setSelectionRelativeToNode({
+        var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
           selection: selectionAtStartOfCell
         })(state);
@@ -274,7 +271,7 @@ var setSelectionAtEndOfLastCell = function setSelectionAtEndOfLastCell(editorSel
       // check if last pos should have a gap cursor, otherwise find closest text selection
       var selectionAtEndOfCell = GapCursorSelection.valid($lastPosInsideCell) ? new GapCursorSelection($lastPosInsideCell, Side.RIGHT) : Selection.findFrom($lastPosInsideCell, -1);
       if (editorSelectionAPI) {
-        var tr = editorSelectionAPI.setSelectionRelativeToNode({
+        var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
           selection: selectionAtEndOfCell
         })(state);
@@ -296,7 +293,7 @@ var setGapCursorBeforeTable = function setGapCursorBeforeTable(editorSelectionAP
         if (GapCursorSelection.valid($beforeTablePos)) {
           var selectionBeforeTable = new GapCursorSelection($beforeTablePos, Side.LEFT);
           if (editorSelectionAPI) {
-            var tr = editorSelectionAPI.setSelectionRelativeToNode({
+            var tr = editorSelectionAPI.actions.selectNearNode({
               selectionRelativeToNode: undefined,
               selection: selectionBeforeTable
             })(state);
@@ -320,7 +317,7 @@ var setGapCursorAfterTable = function setGapCursorAfterTable(editorSelectionAPI)
         if (GapCursorSelection.valid($afterTablePos)) {
           var selectionAfterTable = new GapCursorSelection($afterTablePos, Side.RIGHT);
           if (editorSelectionAPI) {
-            var tr = editorSelectionAPI.setSelectionRelativeToNode({
+            var tr = editorSelectionAPI.actions.selectNearNode({
               selectionRelativeToNode: undefined,
               selection: selectionAfterTable
             })(state);

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

@@ -30,9 +30,6 @@ import FloatingDeleteButton from './ui/FloatingDeleteButton';
 import FloatingInsertButton from './ui/FloatingInsertButton';
 import LayoutButton from './ui/LayoutButton';
 import { isLayoutSupported } from './utils';
-
-// TODO: duplicated SelectionPlugin type as it's still in editor-core, doing this avoid
-// circular dependencies
 var defaultGetEditorFeatureFlags = function defaultGetEditorFeatureFlags() {
   return {};
 };
@@ -140,7 +137,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }, {
         name: 'tableSelectionKeymap',
         plugin: function plugin() {
-          return tableSelectionKeymapPlugin(options === null || options === void 0 ? void 0 : options.editorSelectionAPI);
+          return tableSelectionKeymapPlugin(api === null || api === void 0 ? void 0 : api.selection);
         }
       }, {
         name: 'tableEditing',

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

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
+import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap, tableNewColumnMinWidth } from '@atlaskit/editor-tables/table-map';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -70,7 +70,7 @@ export var updateColumnWidths = function updateColumnWidths(resizeState, table,
           var cell = table.nodeAt(pos);
           if (!seen[pos] && cell) {
             if (updatedCellsAttrs[pos]) {
-              tr.step(new SetAttrsStep(pos + start, updatedCellsAttrs[pos]));
+              tr.step(new AttrStep(pos + start, 'colwidth', updatedCellsAttrs[pos].colwidth));
             }
             seen[pos] = true;
           }

package/dist/types/plugins/table/commands/selection.d.ts

@@ -1,8 +1,8 @@
-import { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type tablePlugin from '../index';
 export declare enum TableSelectionDirection {
     TopToBottom = "TopToBottom",
     BottomToTop = "BottomToTop"
 }
-export declare const arrowLeftFromTable: (editorSelectionAPI: EditorSelectionAPI | undefined | null) => () => Command;
-export declare const arrowRightFromTable: (editorSelectionAPI: EditorSelectionAPI | undefined | null) => () => Command;
+export declare const arrowLeftFromTable: (editorSelectionAPI: ExtractInjectionAPI<typeof tablePlugin>['selection'] | undefined) => () => Command;
+export declare const arrowRightFromTable: (editorSelectionAPI: ExtractInjectionAPI<typeof tablePlugin>['selection'] | undefined) => () => Command;

package/dist/types/plugins/table/index.d.ts

@@ -1,9 +1,9 @@
 import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
-import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
-import type { Command, EditorCommand, GetEditorFeatureFlags, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { Command, GetEditorFeatureFlags, NextEditorPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginConfig } from './types';
 interface TablePluginOptions {
@@ -14,16 +14,9 @@ interface TablePluginOptions {
     allowContextualMenu?: boolean;
     fullWidthEnabled?: boolean;
     wasFullWidthEnabled?: boolean;
-    editorSelectionAPI?: EditorSelectionAPI;
     getEditorFeatureFlags?: GetEditorFeatureFlags;
 }
 type InsertTableAction = (analyticsPayload: AnalyticsEventPayload) => Command;
-type SelectionPlugin = NextEditorPlugin<'selection', {
-    pluginConfiguration: unknown;
-    commands: {
-        displayGapCursor: (toggle: boolean) => EditorCommand;
-    };
-}>;
 export type TablePlugin = NextEditorPlugin<'table', {
     pluginConfiguration: TablePluginOptions | undefined;
     actions: {
@@ -34,7 +27,7 @@ export type TablePlugin = NextEditorPlugin<'table', {
         ContentInsertionPlugin,
         WidthPlugin,
         GuidelinePlugin,
-        OptionalPlugin<SelectionPlugin>
+        SelectionPlugin
     ];
 }>;
 /**

package/dist/types/plugins/table/pm-plugins/table-selection-keymap.d.ts

@@ -1,4 +1,5 @@
-import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
-export declare function tableSelectionKeymapPlugin(editorSelectionAPI: EditorSelectionAPI | undefined | null): SafePlugin;
+import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type tablePlugin from '../index';
+export declare function tableSelectionKeymapPlugin(editorSelectionAPI: ExtractInjectionAPI<typeof tablePlugin>['selection'] | undefined): SafePlugin;
 export default tableSelectionKeymapPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "4.2.0",
+  "version": "5.0.0",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^32.0.0",
     "@atlaskit/custom-steps": "^0.0.2",
-    "@atlaskit/editor-common": "^76.6.0",
+    "@atlaskit/editor-common": "^76.8.0",
     "@atlaskit/editor-palette": "1.5.1",
     "@atlaskit/editor-plugin-analytics": "^0.2.0",
     "@atlaskit/editor-plugin-content-insertion": "^0.1.0",
@@ -61,6 +61,7 @@
     "@atlaskit/editor-plugin-grid": "^0.3.0",
     "@atlaskit/editor-plugin-guideline": "^0.5.0",
     "@atlaskit/editor-plugin-hyperlink": "^0.5.0",
+    "@atlaskit/editor-plugin-selection": "^0.1.0",
     "@atlaskit/editor-plugin-width": "^0.2.0",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",

package/src/__tests__/unit/analytics.ts

@@ -2,11 +2,11 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { DocBuilder } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
-import selectionPlugin from '@atlaskit/editor-core/src/plugins/selection';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { selectionPlugin } from '@atlaskit/editor-plugin-selection';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { Rect } from '@atlaskit/editor-tables/table-map';
 import type { LightEditorPlugin } from '@atlaskit/editor-test-helpers/create-prosemirror-editor';

package/src/__tests__/unit/collab.ts

@@ -1,10 +1,10 @@
 import type { DocBuilder } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
-import selectionPlugin from '@atlaskit/editor-core/src/plugins/selection';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { selectionPlugin } from '@atlaskit/editor-plugin-selection';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import { removeColumnAt } from '@atlaskit/editor-tables/utils';
 import type { LightEditorPlugin } from '@atlaskit/editor-test-helpers/create-prosemirror-editor';

package/src/__tests__/unit/commands/go-to-next-cell.ts

@@ -1,11 +1,11 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { DocBuilder } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
-import selectionPlugin from '@atlaskit/editor-core/src/plugins/selection';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { selectionPlugin } from '@atlaskit/editor-plugin-selection';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { LightEditorPlugin } from '@atlaskit/editor-test-helpers/create-prosemirror-editor';

package/src/__tests__/unit/commands/insert.ts

@@ -3,11 +3,11 @@ import type {
   GetEditorContainerWidth,
 } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
-import selectionPlugin from '@atlaskit/editor-core/src/plugins/selection';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { selectionPlugin } from '@atlaskit/editor-plugin-selection';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { LightEditorPlugin } from '@atlaskit/editor-test-helpers/create-prosemirror-editor';

package/src/__tests__/unit/commands/misc.ts

@@ -1,11 +1,11 @@
 import type { DocBuilder } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
-import selectionPlugin from '@atlaskit/editor-core/src/plugins/selection';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { selectionPlugin } from '@atlaskit/editor-plugin-selection';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { isColumnSelected } from '@atlaskit/editor-tables/utils';