@atlaskit/editor-plugin-table 2.12.5 → 2.13.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-table
 
+## 2.13.0
+
+### Minor Changes
+
+- [`a5f5786f39b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a5f5786f39b) - Use selection plugin to hide gap cursor when table is resized
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.12.6
+
+### Patch Changes
+
+- [`1f6e908f2bd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1f6e908f2bd) - Workaround invalid getPos error occuring for TableComponent
+
 ## 2.12.5
 
 ### Patch Changes

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

@@ -35,6 +35,8 @@ 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 {};
 };

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

@@ -415,7 +415,19 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           visibility: visible ? 'visible' : 'hidden'
         };
       });
-      var isNested = (0, _utils4.isTableNested)(view.state, getPos());
+
+      /**
+       *  ED-19838
+       *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+       *  before CR6 lands in production
+       */
+      var tablePos;
+      try {
+        tablePos = getPos ? getPos() : undefined;
+      } catch (e) {
+        tablePos = undefined;
+      }
+      var isNested = (0, _utils4.isTableNested)(view.state, tablePos);
       return /*#__PURE__*/_react.default.createElement(_TableContainer.TableContainer, {
         className: (0, _classnames2.default)(_types.TableCssClassName.TABLE_CONTAINER, (_classnames = {}, (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.WITH_CONTROLS, allowControls && tableActive), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.TABLE_STICKY, this.state.stickyHeader && hasHeaderRow), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.HOVERED_DELETE_BUTTON, isInDanger), (0, _defineProperty3.default)(_classnames, _types.TableCssClassName.TABLE_SELECTED, (0, _utils2.isTableSelected)(view.state.selection)), _classnames)),
         editorView: view,

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

@@ -85,6 +85,10 @@ var ResizableTableContainer = function ResizableTableContainer(_ref2) {
     var _pluginInjectionApi$a;
     return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions.attachAnalyticsEvent(payload);
   }, [pluginInjectionApi]);
+  var displayGapCursor = (0, _react.useCallback)(function (toggle) {
+    var _pluginInjectionApi$c, _pluginInjectionApi$c2, _pluginInjectionApi$s;
+    return (_pluginInjectionApi$c = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$s = pluginInjectionApi.selection) === null || _pluginInjectionApi$s === void 0 ? void 0 : _pluginInjectionApi$s.commands.displayGapCursor(toggle))) !== null && _pluginInjectionApi$c !== void 0 ? _pluginInjectionApi$c : false;
+  }, [pluginInjectionApi]);
   var tableWidth = (0, _nodeWidth.getTableContainerWidth)(node);
   // 76 is currently an accepted padding value considering the spacing for resizer handle
   var responsiveContainerWidth = containerWidth - 76;
@@ -111,7 +115,8 @@ var ResizableTableContainer = function ResizableTableContainer(_ref2) {
     node: node,
     tableRef: tableRef,
     displayGuideline: displayGuideline,
-    attachAnalyticsEvent: attachAnalyticsEvent
+    attachAnalyticsEvent: attachAnalyticsEvent,
+    displayGapCursor: displayGapCursor
   }, /*#__PURE__*/_react.default.createElement(InnerContainer, {
     className: className,
     node: node

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

@@ -90,8 +90,11 @@ var TableResizer = function TableResizer(_ref) {
     node = _ref.node,
     tableRef = _ref.tableRef,
     displayGuideline = _ref.displayGuideline,
-    attachAnalyticsEvent = _ref.attachAnalyticsEvent;
+    attachAnalyticsEvent = _ref.attachAnalyticsEvent,
+    displayGapCursor = _ref.displayGapCursor;
   var currentGap = (0, _react.useRef)(0);
+  // track resizing state - use ref over state to avoid re-render
+  var isResizing = (0, _react.useRef)(false);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     snappingEnabled = _useState2[0],
@@ -120,16 +123,29 @@ var TableResizer = function TableResizer(_ref) {
       x: _snapping.defaultSnappingWidths
     } : undefined;
   }, [snappingEnabled]);
+  (0, _react.useEffect)(function () {
+    return function () {
+      // only bring back the cursor if this table was deleted - i.e. if a user was resizing, then another
+      // deleted this table
+      if (isResizing.current) {
+        displayGapCursor(true);
+        displayGuideline([]);
+      }
+    };
+  }, [displayGuideline, displayGapCursor]);
   var handleResizeStart = (0, _react.useCallback)(function () {
     startMeasure();
+    isResizing.current = true;
     var dispatch = editorView.dispatch,
       tr = editorView.state.tr;
-    dispatch(tr.setMeta(_tableWidth.pluginKey, {
+    tr.setMeta(_tableWidth.pluginKey, {
       resizing: true
-    }));
+    });
+    displayGapCursor(false);
+    dispatch(tr);
     var visibleGuidelines = getVisibleGuidelines(_guidelines.defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, editorView, startMeasure, containerWidth]);
+  }, [displayGapCursor, displayGuideline, editorView, startMeasure, containerWidth]);
   var handleResize = (0, _react.useCallback)(function (originalState, delta) {
     countFrames();
     var newWidth = originalState.width + delta.width;
@@ -151,6 +167,7 @@ var TableResizer = function TableResizer(_ref) {
     return (0, _rafSchd.default)(handleResize);
   }, [handleResize]);
   var handleResizeStop = (0, _react.useCallback)(function (originalState, delta) {
+    isResizing.current = false;
     var newWidth = originalState.width + delta.width;
     var state = editorView.state,
       dispatch = editorView.dispatch;
@@ -188,6 +205,7 @@ var TableResizer = function TableResizer(_ref) {
         resizedNode: scaledNode
       }))) === null || _attachAnalyticsEvent2 === void 0 ? void 0 : _attachAnalyticsEvent2(tr);
     }
+    displayGapCursor(true);
     dispatch(tr);
 
     // Hide guidelines when resizing stops
@@ -195,7 +213,7 @@ var TableResizer = function TableResizer(_ref) {
     updateWidth(newWidth);
     scheduleResize.cancel();
     return newWidth;
-  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
+  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
   var isTableSelected = ((_findTable = (0, _utils.findTable)((_editorView$state = editorView.state) === null || _editorView$state === void 0 ? void 0 : _editorView$state.selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) === getPos();
   return /*#__PURE__*/_react.default.createElement(_resizer.ResizerNext, {
     enable: handles,

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

@@ -157,11 +157,11 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
           /**
            *  ED-19810
            *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-           *  before CR6 lands in production
+           *  directly to confluence since this bug is now in production.
            */
           var tablePos;
           try {
-            tablePos = typeof props.getPos === 'function' ? props.getPos() : undefined;
+            tablePos = props.getPos ? props.getPos() : undefined;
           } catch (e) {
             tablePos = undefined;
           }

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

@@ -28,6 +28,9 @@ 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`

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

@@ -407,7 +407,19 @@ class TableComponent extends React.Component {
     const shadowStyle = memoizeOne(visible => ({
       visibility: visible ? 'visible' : 'hidden'
     }));
-    const isNested = isTableNested(view.state, getPos());
+
+    /**
+     *  ED-19838
+     *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+     *  before CR6 lands in production
+     */
+    let tablePos;
+    try {
+      tablePos = getPos ? getPos() : undefined;
+    } catch (e) {
+      tablePos = undefined;
+    }
+    const isNested = isTableNested(view.state, tablePos);
     return /*#__PURE__*/React.createElement(TableContainer, {
       className: classnames(ClassName.TABLE_CONTAINER, {
         [ClassName.WITH_CONTROLS]: allowControls && tableActive,

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

@@ -76,6 +76,10 @@ export const ResizableTableContainer = ({
     var _pluginInjectionApi$a;
     return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions.attachAnalyticsEvent(payload);
   }, [pluginInjectionApi]);
+  const displayGapCursor = useCallback(toggle => {
+    var _pluginInjectionApi$c, _pluginInjectionApi$c2, _pluginInjectionApi$s;
+    return (_pluginInjectionApi$c = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$s = pluginInjectionApi.selection) === null || _pluginInjectionApi$s === void 0 ? void 0 : _pluginInjectionApi$s.commands.displayGapCursor(toggle))) !== null && _pluginInjectionApi$c !== void 0 ? _pluginInjectionApi$c : false;
+  }, [pluginInjectionApi]);
   const tableWidth = getTableContainerWidth(node);
   // 76 is currently an accepted padding value considering the spacing for resizer handle
   const responsiveContainerWidth = containerWidth - 76;
@@ -102,7 +106,8 @@ export const ResizableTableContainer = ({
     node: node,
     tableRef: tableRef,
     displayGuideline: displayGuideline,
-    attachAnalyticsEvent: attachAnalyticsEvent
+    attachAnalyticsEvent: attachAnalyticsEvent,
+    displayGapCursor: displayGapCursor
   }, /*#__PURE__*/React.createElement(InnerContainer, {
     className: className,
     node: node

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

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import rafSchd from 'raf-schd';
 import { defineMessages, useIntl } from 'react-intl-next';
 import { getGuidelinesWithHighlights } from '@atlaskit/editor-common/guideline';
@@ -75,10 +75,13 @@ export const TableResizer = ({
   node,
   tableRef,
   displayGuideline,
-  attachAnalyticsEvent
+  attachAnalyticsEvent,
+  displayGapCursor
 }) => {
   var _findTable, _editorView$state;
   const currentGap = useRef(0);
+  // track resizing state - use ref over state to avoid re-render
+  const isResizing = useRef(false);
   const [snappingEnabled, setSnappingEnabled] = useState(false);
   const {
     formatMessage
@@ -106,20 +109,33 @@ export const TableResizer = ({
   const guidelineSnaps = useMemo(() => snappingEnabled ? {
     x: defaultSnappingWidths
   } : undefined, [snappingEnabled]);
+  useEffect(() => {
+    return () => {
+      // only bring back the cursor if this table was deleted - i.e. if a user was resizing, then another
+      // deleted this table
+      if (isResizing.current) {
+        displayGapCursor(true);
+        displayGuideline([]);
+      }
+    };
+  }, [displayGuideline, displayGapCursor]);
   const handleResizeStart = useCallback(() => {
     startMeasure();
+    isResizing.current = true;
     const {
       dispatch,
       state: {
         tr
       }
     } = editorView;
-    dispatch(tr.setMeta(tableWidthPluginKey, {
+    tr.setMeta(tableWidthPluginKey, {
       resizing: true
-    }));
+    });
+    displayGapCursor(false);
+    dispatch(tr);
     const visibleGuidelines = getVisibleGuidelines(defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, editorView, startMeasure, containerWidth]);
+  }, [displayGapCursor, displayGuideline, editorView, startMeasure, containerWidth]);
   const handleResize = useCallback((originalState, delta) => {
     countFrames();
     const newWidth = originalState.width + delta.width;
@@ -139,6 +155,7 @@ export const TableResizer = ({
   }, [editorView, getPos, node, tableRef, updateWidth, updateActiveGuidelines, countFrames]);
   const scheduleResize = useMemo(() => rafSchd(handleResize), [handleResize]);
   const handleResizeStop = useCallback((originalState, delta) => {
+    isResizing.current = false;
     const newWidth = originalState.width + delta.width;
     const {
       state,
@@ -179,6 +196,7 @@ export const TableResizer = ({
         resizedNode: scaledNode
       }))) === null || _attachAnalyticsEvent2 === void 0 ? void 0 : _attachAnalyticsEvent2(tr);
     }
+    displayGapCursor(true);
     dispatch(tr);
 
     // Hide guidelines when resizing stops
@@ -186,7 +204,7 @@ export const TableResizer = ({
     updateWidth(newWidth);
     scheduleResize.cancel();
     return newWidth;
-  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
+  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
   const isTableSelected = ((_findTable = findTable((_editorView$state = editorView.state) === null || _editorView$state === void 0 ? void 0 : _editorView$state.selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) === getPos();
   return /*#__PURE__*/React.createElement(ResizerNext, {
     enable: handles,

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

@@ -129,11 +129,11 @@ export default class TableView extends ReactNodeView {
         /**
          *  ED-19810
          *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-         *  before CR6 lands in production
+         *  directly to confluence since this bug is now in production.
          */
         let tablePos;
         try {
-          tablePos = typeof props.getPos === 'function' ? props.getPos() : undefined;
+          tablePos = props.getPos ? props.getPos() : undefined;
         } catch (e) {
           tablePos = undefined;
         }

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

@@ -28,6 +28,9 @@ 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 {};
 };

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

@@ -408,7 +408,19 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           visibility: visible ? 'visible' : 'hidden'
         };
       });
-      var isNested = isTableNested(view.state, getPos());
+
+      /**
+       *  ED-19838
+       *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+       *  before CR6 lands in production
+       */
+      var tablePos;
+      try {
+        tablePos = getPos ? getPos() : undefined;
+      } catch (e) {
+        tablePos = undefined;
+      }
+      var isNested = isTableNested(view.state, tablePos);
       return /*#__PURE__*/React.createElement(TableContainer, {
         className: classnames(ClassName.TABLE_CONTAINER, (_classnames = {}, _defineProperty(_classnames, ClassName.WITH_CONTROLS, allowControls && tableActive), _defineProperty(_classnames, ClassName.TABLE_STICKY, this.state.stickyHeader && hasHeaderRow), _defineProperty(_classnames, ClassName.HOVERED_DELETE_BUTTON, isInDanger), _defineProperty(_classnames, ClassName.TABLE_SELECTED, isTableSelected(view.state.selection)), _classnames)),
         editorView: view,

package/dist/esm/plugins/table/nodeviews/TableContainer.js

@@ -74,6 +74,10 @@ export var ResizableTableContainer = function ResizableTableContainer(_ref2) {
     var _pluginInjectionApi$a;
     return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions.attachAnalyticsEvent(payload);
   }, [pluginInjectionApi]);
+  var displayGapCursor = useCallback(function (toggle) {
+    var _pluginInjectionApi$c, _pluginInjectionApi$c2, _pluginInjectionApi$s;
+    return (_pluginInjectionApi$c = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.core) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$s = pluginInjectionApi.selection) === null || _pluginInjectionApi$s === void 0 ? void 0 : _pluginInjectionApi$s.commands.displayGapCursor(toggle))) !== null && _pluginInjectionApi$c !== void 0 ? _pluginInjectionApi$c : false;
+  }, [pluginInjectionApi]);
   var tableWidth = getTableContainerWidth(node);
   // 76 is currently an accepted padding value considering the spacing for resizer handle
   var responsiveContainerWidth = containerWidth - 76;
@@ -100,7 +104,8 @@ export var ResizableTableContainer = function ResizableTableContainer(_ref2) {
     node: node,
     tableRef: tableRef,
     displayGuideline: displayGuideline,
-    attachAnalyticsEvent: attachAnalyticsEvent
+    attachAnalyticsEvent: attachAnalyticsEvent,
+    displayGapCursor: displayGapCursor
   }, /*#__PURE__*/React.createElement(InnerContainer, {
     className: className,
     node: node

package/dist/esm/plugins/table/nodeviews/TableResizer.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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 React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import rafSchd from 'raf-schd';
 import { defineMessages, useIntl } from 'react-intl-next';
 import { getGuidelinesWithHighlights } from '@atlaskit/editor-common/guideline';
@@ -80,8 +80,11 @@ export var TableResizer = function TableResizer(_ref) {
     node = _ref.node,
     tableRef = _ref.tableRef,
     displayGuideline = _ref.displayGuideline,
-    attachAnalyticsEvent = _ref.attachAnalyticsEvent;
+    attachAnalyticsEvent = _ref.attachAnalyticsEvent,
+    displayGapCursor = _ref.displayGapCursor;
   var currentGap = useRef(0);
+  // track resizing state - use ref over state to avoid re-render
+  var isResizing = useRef(false);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     snappingEnabled = _useState2[0],
@@ -110,16 +113,29 @@ export var TableResizer = function TableResizer(_ref) {
       x: defaultSnappingWidths
     } : undefined;
   }, [snappingEnabled]);
+  useEffect(function () {
+    return function () {
+      // only bring back the cursor if this table was deleted - i.e. if a user was resizing, then another
+      // deleted this table
+      if (isResizing.current) {
+        displayGapCursor(true);
+        displayGuideline([]);
+      }
+    };
+  }, [displayGuideline, displayGapCursor]);
   var handleResizeStart = useCallback(function () {
     startMeasure();
+    isResizing.current = true;
     var dispatch = editorView.dispatch,
       tr = editorView.state.tr;
-    dispatch(tr.setMeta(tableWidthPluginKey, {
+    tr.setMeta(tableWidthPluginKey, {
       resizing: true
-    }));
+    });
+    displayGapCursor(false);
+    dispatch(tr);
     var visibleGuidelines = getVisibleGuidelines(defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, editorView, startMeasure, containerWidth]);
+  }, [displayGapCursor, displayGuideline, editorView, startMeasure, containerWidth]);
   var handleResize = useCallback(function (originalState, delta) {
     countFrames();
     var newWidth = originalState.width + delta.width;
@@ -141,6 +157,7 @@ export var TableResizer = function TableResizer(_ref) {
     return rafSchd(handleResize);
   }, [handleResize]);
   var handleResizeStop = useCallback(function (originalState, delta) {
+    isResizing.current = false;
     var newWidth = originalState.width + delta.width;
     var state = editorView.state,
       dispatch = editorView.dispatch;
@@ -178,6 +195,7 @@ export var TableResizer = function TableResizer(_ref) {
         resizedNode: scaledNode
       }))) === null || _attachAnalyticsEvent2 === void 0 ? void 0 : _attachAnalyticsEvent2(tr);
     }
+    displayGapCursor(true);
     dispatch(tr);
 
     // Hide guidelines when resizing stops
@@ -185,7 +203,7 @@ export var TableResizer = function TableResizer(_ref) {
     updateWidth(newWidth);
     scheduleResize.cancel();
     return newWidth;
-  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
+  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
   var isTableSelected = ((_findTable = findTable((_editorView$state = editorView.state) === null || _editorView$state === void 0 ? void 0 : _editorView$state.selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) === getPos();
   return /*#__PURE__*/React.createElement(ResizerNext, {
     enable: handles,

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

@@ -150,11 +150,11 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
           /**
            *  ED-19810
            *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
-           *  before CR6 lands in production
+           *  directly to confluence since this bug is now in production.
            */
           var tablePos;
           try {
-            tablePos = typeof props.getPos === 'function' ? props.getPos() : undefined;
+            tablePos = props.getPos ? props.getPos() : undefined;
           } catch (e) {
             tablePos = undefined;
           }

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

@@ -1,6 +1,6 @@
 import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
-import type { Command, GetEditorFeatureFlags, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, GetEditorFeatureFlags, NextEditorPlugin, OptionalPlugin } 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';
@@ -17,6 +17,12 @@ interface TablePluginOptions {
     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: {
@@ -26,7 +32,8 @@ export type TablePlugin = NextEditorPlugin<'table', {
         AnalyticsPlugin,
         ContentInsertionPlugin,
         WidthPlugin,
-        GuidelinePlugin
+        GuidelinePlugin,
+        OptionalPlugin<SelectionPlugin>
     ];
 }>;
 /**

package/dist/types/plugins/table/nodeviews/TableResizer.d.ts

@@ -15,6 +15,7 @@ interface TableResizerProps {
     tableRef: HTMLTableElement;
     displayGuideline: (guideline: GuidelineConfig[]) => boolean;
     attachAnalyticsEvent: (payload: TableEventPayload) => ((tr: Transaction) => boolean) | undefined;
+    displayGapCursor: (toggle: boolean) => boolean;
 }
-export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
+export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, displayGapCursor, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
 export {};

package/dist/types-ts4.5/plugins/table/index.d.ts

@@ -1,6 +1,6 @@
 import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
-import type { Command, GetEditorFeatureFlags, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, GetEditorFeatureFlags, NextEditorPlugin, OptionalPlugin } 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';
@@ -17,6 +17,12 @@ interface TablePluginOptions {
     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: {
@@ -26,7 +32,8 @@ export type TablePlugin = NextEditorPlugin<'table', {
         AnalyticsPlugin,
         ContentInsertionPlugin,
         WidthPlugin,
-        GuidelinePlugin
+        GuidelinePlugin,
+        OptionalPlugin<SelectionPlugin>
     ];
 }>;
 /**

package/dist/types-ts4.5/plugins/table/nodeviews/TableResizer.d.ts

@@ -15,6 +15,7 @@ interface TableResizerProps {
     tableRef: HTMLTableElement;
     displayGuideline: (guideline: GuidelineConfig[]) => boolean;
     attachAnalyticsEvent: (payload: TableEventPayload) => ((tr: Transaction) => boolean) | undefined;
+    displayGapCursor: (toggle: boolean) => boolean;
 }
-export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
+export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, displayGapCursor, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "2.12.5",
+  "version": "2.13.0",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/platform-feature-flags": "^0.2.1",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.18.0",
+    "@atlaskit/tokens": "^1.21.0",
     "@atlaskit/tooltip": "^17.8.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",

package/report.api.md

@@ -19,10 +19,12 @@ import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { Command } from '@atlaskit/editor-common/types';
 import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
+import type { EditorCommand } from '@atlaskit/editor-common/types';
 import type { EditorSelectionAPI } from '@atlaskit/editor-common/selection';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { TableLayout } from '@atlaskit/adf-schema';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 
@@ -80,6 +82,17 @@ interface PluginConfig {
   tableRenderOptimization?: boolean;
 }
 
+// @public (undocumented)
+type SelectionPlugin = NextEditorPlugin<
+  'selection',
+  {
+    pluginConfiguration: unknown;
+    commands: {
+      displayGapCursor: (toggle: boolean) => EditorCommand;
+    };
+  }
+>;
+
 // @public (undocumented)
 export type TablePlugin = NextEditorPlugin<
   'table',
@@ -93,6 +106,7 @@ export type TablePlugin = NextEditorPlugin<
       ContentInsertionPlugin,
       WidthPlugin,
       GuidelinePlugin,
+      OptionalPlugin<SelectionPlugin>,
     ];
   }
 >;

package/src/__tests__/unit/analytics.ts

@@ -1,5 +1,6 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+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';
@@ -99,6 +100,7 @@ describe('Table analytic events', () => {
         .add(contentInsertionPlugin)
         .add(widthPlugin)
         .add(guidelinePlugin)
+        .add(selectionPlugin)
         .add([tablePlugin, { tableOptions }]),
       pluginKey,
     });

package/src/__tests__/unit/collab.ts

@@ -1,3 +1,4 @@
+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';
@@ -45,6 +46,7 @@ describe('Tables with Collab editing', () => {
         .add(contentInsertionPlugin)
         .add(widthPlugin)
         .add(guidelinePlugin)
+        .add(selectionPlugin)
         .add([tablePlugin, { tableOptions }]),
       pluginKey: tablePluginKey,
     });

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

@@ -1,4 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+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';
@@ -41,6 +42,7 @@ describe('table plugin: goToNextCell', () => {
     .add(contentInsertionPlugin)
     .add(widthPlugin)
     .add(guidelinePlugin)
+    .add(selectionPlugin)
     .add(tablePlugin);
   const editor = (doc: DocBuilder) =>
     createEditor<TablePluginState, PluginKey, typeof preset>({