@atlaskit/editor-plugin-table 7.25.0 → 7.25.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-table
 
+## 7.25.2
+
+### Patch Changes
+
+- [#128275](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128275)
+  [`aa76c0502c05d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/aa76c0502c05d) -
+  Fixes an issue where the cursor doesn't appear within a table upon insertion in react 18
+
+## 7.25.1
+
+### Patch Changes
+
+- [#128458](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128458)
+  [`26e17a7d801e4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/26e17a7d801e4) -
+  ED-24514 Added ignore mutation for lazy node view
+- [#128458](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128458)
+  [`f372e089c10cf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f372e089c10cf) -
+  Fix an issue where hovering over the column divider does not show the blue hover decoration in
+  React 18
+- Updated dependencies
+
 ## 7.25.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -81,6 +81,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }
       return (0, _eventHandlers.handleMouseOut)(_this.props.view, event);
     });
+    (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "handleMouseOver", function (event) {
+      if (!(0, _eventHandlers.isTableInFocus)(_this.props.view)) {
+        return false;
+      }
+      return (0, _eventHandlers.withCellTracking)(_eventHandlers.handleMouseOver)(_this.props.view, event);
+    });
     (0, _defineProperty3.default)((0, _assertThisInitialized2.default)(_this), "handleMouseEnter", function () {
       var node = _this.props.getNode();
       var pos = _this.props.getPos();
@@ -375,6 +381,10 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         var _this$table2;
         this === null || this === void 0 || (_this$table2 = this.table) === null || _this$table2 === void 0 || _this$table2.addEventListener('mouseout', this.handleMouseOut);
       }
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_table_column_resize_hover')) {
+        var _this$table3;
+        this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.addEventListener('mouseover', this.handleMouseOver);
+      }
       var _getEditorFeatureFlag = getEditorFeatureFlags(),
         _getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
         tableWithFixedColumnWidthsOption = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2,
@@ -456,12 +466,16 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         window.removeEventListener('resize', this.handleWindowResizeDebounced);
       }
       if ((0, _platformFeatureFlags.fg)('platform.editor.table.live-pages-sorting_4malx')) {
-        var _this$table3;
-        this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.removeEventListener('mouseenter', this.handleMouseEnter);
+        var _this$table4;
+        this === null || this === void 0 || (_this$table4 = this.table) === null || _this$table4 === void 0 || _this$table4.removeEventListener('mouseenter', this.handleMouseEnter);
       }
       if ((0, _platformFeatureFlags.fg)('editor_react_18_fix_table_delete_col_decorations')) {
-        var _this$table4;
-        this === null || this === void 0 || (_this$table4 = this.table) === null || _this$table4 === void 0 || _this$table4.removeEventListener('mouseout', this.handleMouseOut);
+        var _this$table5;
+        this === null || this === void 0 || (_this$table5 = this.table) === null || _this$table5 === void 0 || _this$table5.removeEventListener('mouseout', this.handleMouseOut);
+      }
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_table_column_resize_hover')) {
+        var _this$table6;
+        this === null || this === void 0 || (_this$table6 = this.table) === null || _this$table6 === void 0 || _this$table6.removeEventListener('mouseover', this.handleMouseOver);
       }
       if (this.overflowShadowsObserver) {
         this.overflowShadowsObserver.dispose();

package/dist/cjs/nodeviews/ignore-mutation-delegate.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = function _default(mutation) {
+  var type = mutation.type,
+    _mutation$target = mutation.target,
+    nodeName = _mutation$target.nodeName,
+    firstChild = _mutation$target.firstChild;
+  if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
+    return false;
+  }
+
+  // ED-16668
+  // Do not remove this fixes an issue with windows firefox that relates to
+  // the addition of the shadow sentinels
+  if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
+    return false;
+  }
+  return true;
+};

package/dist/cjs/nodeviews/lazy-node-views.js

@@ -8,6 +8,7 @@ exports.lazyTableView = exports.lazyTableRowView = exports.lazyTableHeaderView =
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _ignoreMutationDelegate = _interopRequireDefault(require("./ignore-mutation-delegate"));
 var _table = require("./table");
 var _TableCell = _interopRequireDefault(require("./TableCell"));
 var _TableRow = _interopRequireDefault(require("./TableRow"));
@@ -46,7 +47,10 @@ var lazyTableView = exports.lazyTableView = function lazyTableView(options) {
     getNodeViewOptions: function getNodeViewOptions() {
       return options;
     },
-    loader: loader
+    loader: loader,
+    lazyNodeViewOptions: {
+      ignoreMutationDelegate: _ignoreMutationDelegate.default
+    }
   });
 };
 var lazyTableCellView = exports.lazyTableCellView = function lazyTableCellView(options) {

package/dist/cjs/nodeviews/table.js

@@ -31,6 +31,7 @@ var _tableResizing = require("../pm-plugins/table-resizing");
 var _utils = require("../pm-plugins/table-resizing/utils");
 var _tableWidth = require("../pm-plugins/table-width");
 var _utils2 = require("../utils");
+var _ignoreMutationDelegate = _interopRequireDefault(require("./ignore-mutation-delegate"));
 var _TableComponent = _interopRequireDefault(require("./TableComponent"));
 var _TableComponentWithSharedState = require("./TableComponentWithSharedState");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -261,21 +262,16 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      var type = mutation.type,
-        _mutation$target = mutation.target,
-        nodeName = _mutation$target.nodeName,
-        firstChild = _mutation$target.firstChild;
-      if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
-        return false;
-      }
-
-      // ED-16668
-      // Do not remove this fixes an issue with windows firefox that relates to
-      // the addition of the shadow sentinels
-      if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
-        return false;
+      var ignoreMutation = (0, _ignoreMutationDelegate.default)(mutation);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_table_insertion_cursor')) {
+        if (ignoreMutation) {
+          if (!this.contentDOM) {
+            return true;
+          }
+          return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+        }
       }
-      return true;
+      return ignoreMutation;
     }
   }, {
     key: "destroy",

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

@@ -279,7 +279,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
         focus: _eventHandlers.handleFocus,
         blur: _eventHandlers.handleBlur,
         mousedown: (0, _eventHandlers.withCellTracking)(_eventHandlers.handleMouseDown),
-        mouseover: (0, _eventHandlers.withCellTracking)((0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseOver)),
+        mouseover: (0, _platformFeatureFlags.fg)('platform_editor_react_18_table_column_resize_hover') ? undefined : (0, _eventHandlers.withCellTracking)((0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseOver)),
         mouseleave: _eventHandlers.handleMouseLeave,
         mouseout: (0, _platformFeatureFlags.fg)('editor_react_18_fix_table_delete_col_decorations') ? undefined : (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseOut),
         mousemove: (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseMove),

package/dist/es2019/nodeviews/TableComponent.js

@@ -14,7 +14,7 @@ import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { autoSizeTable, clearHoverSelection } from '../commands';
-import { handleMouseOut, isTableInFocus } from '../event-handlers';
+import { handleMouseOut, handleMouseOver, isTableInFocus, withCellTracking } from '../event-handlers';
 import { autoScrollerFactory } from '../pm-plugins/drag-and-drop/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { findStickyHeaderForTable, pluginKey as stickyHeadersPluginKey } from '../pm-plugins/sticky-headers';
@@ -59,6 +59,12 @@ class TableComponent extends React.Component {
       }
       return handleMouseOut(this.props.view, event);
     });
+    _defineProperty(this, "handleMouseOver", event => {
+      if (!isTableInFocus(this.props.view)) {
+        return false;
+      }
+      return withCellTracking(handleMouseOver)(this.props.view, event);
+    });
     _defineProperty(this, "handleMouseEnter", () => {
       const node = this.props.getNode();
       const pos = this.props.getPos();
@@ -359,6 +365,10 @@ class TableComponent extends React.Component {
       var _this$table2;
       this === null || this === void 0 ? void 0 : (_this$table2 = this.table) === null || _this$table2 === void 0 ? void 0 : _this$table2.addEventListener('mouseout', this.handleMouseOut);
     }
+    if (fg('platform_editor_react_18_table_column_resize_hover')) {
+      var _this$table3;
+      this === null || this === void 0 ? void 0 : (_this$table3 = this.table) === null || _this$table3 === void 0 ? void 0 : _this$table3.addEventListener('mouseover', this.handleMouseOver);
+    }
     const {
       tableWithFixedColumnWidthsOption = false,
       stickyScrollbar
@@ -440,12 +450,16 @@ class TableComponent extends React.Component {
       window.removeEventListener('resize', this.handleWindowResizeDebounced);
     }
     if (fg('platform.editor.table.live-pages-sorting_4malx')) {
-      var _this$table3;
-      this === null || this === void 0 ? void 0 : (_this$table3 = this.table) === null || _this$table3 === void 0 ? void 0 : _this$table3.removeEventListener('mouseenter', this.handleMouseEnter);
+      var _this$table4;
+      this === null || this === void 0 ? void 0 : (_this$table4 = this.table) === null || _this$table4 === void 0 ? void 0 : _this$table4.removeEventListener('mouseenter', this.handleMouseEnter);
     }
     if (fg('editor_react_18_fix_table_delete_col_decorations')) {
-      var _this$table4;
-      this === null || this === void 0 ? void 0 : (_this$table4 = this.table) === null || _this$table4 === void 0 ? void 0 : _this$table4.removeEventListener('mouseout', this.handleMouseOut);
+      var _this$table5;
+      this === null || this === void 0 ? void 0 : (_this$table5 = this.table) === null || _this$table5 === void 0 ? void 0 : _this$table5.removeEventListener('mouseout', this.handleMouseOut);
+    }
+    if (fg('platform_editor_react_18_table_column_resize_hover')) {
+      var _this$table6;
+      this === null || this === void 0 ? void 0 : (_this$table6 = this.table) === null || _this$table6 === void 0 ? void 0 : _this$table6.removeEventListener('mouseover', this.handleMouseOver);
     }
     if (this.overflowShadowsObserver) {
       this.overflowShadowsObserver.dispose();

package/dist/es2019/nodeviews/ignore-mutation-delegate.js

@@ -0,0 +1,20 @@
+export default (mutation => {
+  const {
+    type,
+    target: {
+      nodeName,
+      firstChild
+    }
+  } = mutation;
+  if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
+    return false;
+  }
+
+  // ED-16668
+  // Do not remove this fixes an issue with windows firefox that relates to
+  // the addition of the shadow sentinels
+  if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
+    return false;
+  }
+  return true;
+});

package/dist/es2019/nodeviews/lazy-node-views.js

@@ -1,5 +1,6 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import ignoreMutationDelegate from './ignore-mutation-delegate';
 // TODO: Clean up ED-23976
 import { createTableView } from './table';
 import TableCell from './TableCell';
@@ -35,7 +36,10 @@ export const lazyTableView = options => {
   return withLazyLoading({
     nodeName: 'table',
     getNodeViewOptions: () => options,
-    loader
+    loader,
+    lazyNodeViewOptions: {
+      ignoreMutationDelegate
+    }
   });
 };
 export const lazyTableCellView = options => {

package/dist/es2019/nodeviews/table.js

@@ -15,6 +15,7 @@ import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizin
 import { generateColgroup } from '../pm-plugins/table-resizing/utils';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
 import { isTableNested } from '../utils';
+import ignoreMutationDelegate from './ignore-mutation-delegate';
 import TableComponent from './TableComponent';
 import { TableComponentWithSharedState } from './TableComponentWithSharedState';
 const tableAttributes = node => {
@@ -227,24 +228,16 @@ export default class TableView extends ReactNodeView {
     });
   }
   ignoreMutation(mutation) {
-    const {
-      type,
-      target: {
-        nodeName,
-        firstChild
+    const ignoreMutation = ignoreMutationDelegate(mutation);
+    if (fg('platform_editor_react_18_table_insertion_cursor')) {
+      if (ignoreMutation) {
+        if (!this.contentDOM) {
+          return true;
+        }
+        return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
       }
-    } = mutation;
-    if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
-      return false;
-    }
-
-    // ED-16668
-    // Do not remove this fixes an issue with windows firefox that relates to
-    // the addition of the shadow sentinels
-    if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
-      return false;
     }
-    return true;
+    return ignoreMutation;
   }
   destroy() {
     var _this$eventDispatcher;

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

@@ -277,7 +277,7 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
         focus: handleFocus,
         blur: handleBlur,
         mousedown: withCellTracking(handleMouseDown),
-        mouseover: withCellTracking(whenTableInFocus(handleMouseOver)),
+        mouseover: fg('platform_editor_react_18_table_column_resize_hover') ? undefined : withCellTracking(whenTableInFocus(handleMouseOver)),
         mouseleave: handleMouseLeave,
         mouseout: fg('editor_react_18_fix_table_delete_col_decorations') ? undefined : whenTableInFocus(handleMouseOut),
         mousemove: whenTableInFocus(handleMouseMove),

package/dist/esm/nodeviews/TableComponent.js

@@ -28,7 +28,7 @@ import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { autoSizeTable, clearHoverSelection } from '../commands';
-import { handleMouseOut, isTableInFocus } from '../event-handlers';
+import { handleMouseOut, handleMouseOver, isTableInFocus, withCellTracking } from '../event-handlers';
 import { autoScrollerFactory } from '../pm-plugins/drag-and-drop/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { findStickyHeaderForTable, pluginKey as stickyHeadersPluginKey } from '../pm-plugins/sticky-headers';
@@ -74,6 +74,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }
       return handleMouseOut(_this.props.view, event);
     });
+    _defineProperty(_assertThisInitialized(_this), "handleMouseOver", function (event) {
+      if (!isTableInFocus(_this.props.view)) {
+        return false;
+      }
+      return withCellTracking(handleMouseOver)(_this.props.view, event);
+    });
     _defineProperty(_assertThisInitialized(_this), "handleMouseEnter", function () {
       var node = _this.props.getNode();
       var pos = _this.props.getPos();
@@ -368,6 +374,10 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         var _this$table2;
         this === null || this === void 0 || (_this$table2 = this.table) === null || _this$table2 === void 0 || _this$table2.addEventListener('mouseout', this.handleMouseOut);
       }
+      if (fg('platform_editor_react_18_table_column_resize_hover')) {
+        var _this$table3;
+        this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.addEventListener('mouseover', this.handleMouseOver);
+      }
       var _getEditorFeatureFlag = getEditorFeatureFlags(),
         _getEditorFeatureFlag2 = _getEditorFeatureFlag.tableWithFixedColumnWidthsOption,
         tableWithFixedColumnWidthsOption = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2,
@@ -449,12 +459,16 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         window.removeEventListener('resize', this.handleWindowResizeDebounced);
       }
       if (fg('platform.editor.table.live-pages-sorting_4malx')) {
-        var _this$table3;
-        this === null || this === void 0 || (_this$table3 = this.table) === null || _this$table3 === void 0 || _this$table3.removeEventListener('mouseenter', this.handleMouseEnter);
+        var _this$table4;
+        this === null || this === void 0 || (_this$table4 = this.table) === null || _this$table4 === void 0 || _this$table4.removeEventListener('mouseenter', this.handleMouseEnter);
       }
       if (fg('editor_react_18_fix_table_delete_col_decorations')) {
-        var _this$table4;
-        this === null || this === void 0 || (_this$table4 = this.table) === null || _this$table4 === void 0 || _this$table4.removeEventListener('mouseout', this.handleMouseOut);
+        var _this$table5;
+        this === null || this === void 0 || (_this$table5 = this.table) === null || _this$table5 === void 0 || _this$table5.removeEventListener('mouseout', this.handleMouseOut);
+      }
+      if (fg('platform_editor_react_18_table_column_resize_hover')) {
+        var _this$table6;
+        this === null || this === void 0 || (_this$table6 = this.table) === null || _this$table6 === void 0 || _this$table6.removeEventListener('mouseover', this.handleMouseOver);
       }
       if (this.overflowShadowsObserver) {
         this.overflowShadowsObserver.dispose();

package/dist/esm/nodeviews/ignore-mutation-delegate.js

@@ -0,0 +1,17 @@
+export default (function (mutation) {
+  var type = mutation.type,
+    _mutation$target = mutation.target,
+    nodeName = _mutation$target.nodeName,
+    firstChild = _mutation$target.firstChild;
+  if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
+    return false;
+  }
+
+  // ED-16668
+  // Do not remove this fixes an issue with windows firefox that relates to
+  // the addition of the shadow sentinels
+  if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
+    return false;
+  }
+  return true;
+});

package/dist/esm/nodeviews/lazy-node-views.js

@@ -1,5 +1,6 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import ignoreMutationDelegate from './ignore-mutation-delegate';
 // TODO: Clean up ED-23976
 import { createTableView } from './table';
 import TableCell from './TableCell';
@@ -35,7 +36,10 @@ export var lazyTableView = function lazyTableView(options) {
     getNodeViewOptions: function getNodeViewOptions() {
       return options;
     },
-    loader: loader
+    loader: loader,
+    lazyNodeViewOptions: {
+      ignoreMutationDelegate: ignoreMutationDelegate
+    }
   });
 };
 export var lazyTableCellView = function lazyTableCellView(options) {

package/dist/esm/nodeviews/table.js

@@ -26,6 +26,7 @@ import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizin
 import { generateColgroup } from '../pm-plugins/table-resizing/utils';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
 import { isTableNested } from '../utils';
+import ignoreMutationDelegate from './ignore-mutation-delegate';
 import TableComponent from './TableComponent';
 import { TableComponentWithSharedState } from './TableComponentWithSharedState';
 var tableAttributes = function tableAttributes(node) {
@@ -254,21 +255,16 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      var type = mutation.type,
-        _mutation$target = mutation.target,
-        nodeName = _mutation$target.nodeName,
-        firstChild = _mutation$target.firstChild;
-      if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
-        return false;
-      }
-
-      // ED-16668
-      // Do not remove this fixes an issue with windows firefox that relates to
-      // the addition of the shadow sentinels
-      if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
-        return false;
+      var ignoreMutation = ignoreMutationDelegate(mutation);
+      if (fg('platform_editor_react_18_table_insertion_cursor')) {
+        if (ignoreMutation) {
+          if (!this.contentDOM) {
+            return true;
+          }
+          return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+        }
       }
-      return true;
+      return ignoreMutation;
     }
   }, {
     key: "destroy",

package/dist/esm/pm-plugins/main.js

@@ -272,7 +272,7 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
         focus: handleFocus,
         blur: handleBlur,
         mousedown: withCellTracking(handleMouseDown),
-        mouseover: withCellTracking(whenTableInFocus(handleMouseOver)),
+        mouseover: fg('platform_editor_react_18_table_column_resize_hover') ? undefined : withCellTracking(whenTableInFocus(handleMouseOver)),
         mouseleave: handleMouseLeave,
         mouseout: fg('editor_react_18_fix_table_delete_col_decorations') ? undefined : whenTableInFocus(handleMouseOut),
         mousemove: whenTableInFocus(handleMouseMove),

package/dist/types/nodeviews/ignore-mutation-delegate.d.ts

@@ -0,0 +1,5 @@
+declare const _default: (mutation: MutationRecord | {
+    type: 'selection';
+    target: Element;
+}) => boolean;
+export default _default;

package/dist/types-ts4.5/nodeviews/ignore-mutation-delegate.d.ts

@@ -0,0 +1,5 @@
+declare const _default: (mutation: MutationRecord | {
+    type: 'selection';
+    target: Element;
+}) => boolean;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.25.0",
+	"version": "7.25.2",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -46,10 +46,10 @@
 		"@atlaskit/icon": "^22.11.0",
 		"@atlaskit/menu": "^2.10.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/pragmatic-drag-and-drop": "^1.2.0",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-		"@atlaskit/primitives": "^11.1.0",
+		"@atlaskit/primitives": "^12.0.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/toggle": "^13.2.0",
 		"@atlaskit/tokens": "^1.57.0",
@@ -125,6 +125,12 @@
 		},
 		"platform_editor_announce_cell_options_hotkeys": {
 			"type": "boolean"
+		},
+		"platform_editor_react_18_table_column_resize_hover": {
+			"type": "boolean"
+		},
+		"platform_editor_react_18_table_insertion_cursor": {
+			"type": "boolean"
 		}
 	}
 }

package/src/nodeviews/TableComponent.tsx

@@ -26,7 +26,12 @@ import type { CleanupFn } from '@atlaskit/pragmatic-drag-and-drop/types';
 import { token } from '@atlaskit/tokens';
 
 import { autoSizeTable, clearHoverSelection } from '../commands';
-import { handleMouseOut, isTableInFocus } from '../event-handlers';
+import {
+	handleMouseOut,
+	handleMouseOver,
+	isTableInFocus,
+	withCellTracking,
+} from '../event-handlers';
 import { autoScrollerFactory } from '../pm-plugins/drag-and-drop/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import type { RowStickyState, StickyPluginState } from '../pm-plugins/sticky-headers';
@@ -194,6 +199,13 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 		return handleMouseOut(this.props.view, event);
 	};
 
+	private handleMouseOver = (event: Event) => {
+		if (!isTableInFocus(this.props.view)) {
+			return false;
+		}
+		return withCellTracking(handleMouseOver)(this.props.view, event);
+	};
+
 	componentDidMount() {
 		const {
 			allowColumnResizing,
@@ -215,6 +227,9 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 		if (fg('editor_react_18_fix_table_delete_col_decorations')) {
 			this?.table?.addEventListener('mouseout', this.handleMouseOut);
 		}
+		if (fg('platform_editor_react_18_table_column_resize_hover')) {
+			this?.table?.addEventListener('mouseover', this.handleMouseOver);
+		}
 
 		const { tableWithFixedColumnWidthsOption = false, stickyScrollbar } = getEditorFeatureFlags();
 
@@ -322,6 +337,9 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 		if (fg('editor_react_18_fix_table_delete_col_decorations')) {
 			this?.table?.removeEventListener('mouseout', this.handleMouseOut);
 		}
+		if (fg('platform_editor_react_18_table_column_resize_hover')) {
+			this?.table?.removeEventListener('mouseover', this.handleMouseOver);
+		}
 
 		if (this.overflowShadowsObserver) {
 			this.overflowShadowsObserver.dispose();

package/src/nodeviews/ignore-mutation-delegate.ts

@@ -0,0 +1,28 @@
+export default (mutation: MutationRecord | { type: 'selection'; target: Element }) => {
+	const {
+		type,
+		target: { nodeName, firstChild },
+	} = mutation;
+
+	if (
+		type === 'selection' &&
+		nodeName?.toUpperCase() === 'DIV' &&
+		firstChild?.nodeName.toUpperCase() === 'TABLE'
+	) {
+		return false;
+	}
+
+	// ED-16668
+	// Do not remove this fixes an issue with windows firefox that relates to
+	// the addition of the shadow sentinels
+	if (
+		type === 'selection' &&
+		nodeName?.toUpperCase() === 'TABLE' &&
+		(firstChild?.nodeName.toUpperCase() === 'COLGROUP' ||
+			firstChild?.nodeName.toUpperCase() === 'SPAN')
+	) {
+		return false;
+	}
+
+	return true;
+};

package/src/nodeviews/lazy-node-views.ts

@@ -9,6 +9,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 
 import type { PluginInjectionAPI } from '../types';
 
+import ignoreMutationDelegate from './ignore-mutation-delegate';
 // TODO: Clean up ED-23976
 import { createTableView } from './table';
 import TableCell from './TableCell';
@@ -93,6 +94,9 @@ export const lazyTableView = (options: TableViewOptions) => {
 		nodeName: 'table',
 		getNodeViewOptions: () => options,
 		loader,
+		lazyNodeViewOptions: {
+			ignoreMutationDelegate,
+		},
 	});
 };
 

package/src/nodeviews/table.tsx

@@ -31,6 +31,7 @@ import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
 import type { PluginInjectionAPI } from '../types';
 import { isTableNested } from '../utils';
 
+import ignoreMutationDelegate from './ignore-mutation-delegate';
 import TableComponent from './TableComponent';
 import { TableComponentWithSharedState } from './TableComponentWithSharedState';
 import type { Props } from './types';
@@ -315,32 +316,16 @@ export default class TableView extends ReactNodeView<Props> {
 	}
 
 	ignoreMutation(mutation: MutationRecord | { type: 'selection'; target: Element }) {
-		const {
-			type,
-			target: { nodeName, firstChild },
-		} = mutation;
-
-		if (
-			type === 'selection' &&
-			nodeName?.toUpperCase() === 'DIV' &&
-			firstChild?.nodeName.toUpperCase() === 'TABLE'
-		) {
-			return false;
-		}
-
-		// ED-16668
-		// Do not remove this fixes an issue with windows firefox that relates to
-		// the addition of the shadow sentinels
-		if (
-			type === 'selection' &&
-			nodeName?.toUpperCase() === 'TABLE' &&
-			(firstChild?.nodeName.toUpperCase() === 'COLGROUP' ||
-				firstChild?.nodeName.toUpperCase() === 'SPAN')
-		) {
-			return false;
+		const ignoreMutation = ignoreMutationDelegate(mutation);
+		if (fg('platform_editor_react_18_table_insertion_cursor')) {
+			if (ignoreMutation) {
+				if (!this.contentDOM) {
+					return true;
+				}
+				return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
+			}
 		}
-
-		return true;
+		return ignoreMutation;
 	}
 
 	destroy() {

package/src/pm-plugins/main.ts

@@ -371,7 +371,9 @@ export const createPlugin = (
 				focus: handleFocus,
 				blur: handleBlur,
 				mousedown: withCellTracking(handleMouseDown),
-				mouseover: withCellTracking(whenTableInFocus(handleMouseOver)),
+				mouseover: fg('platform_editor_react_18_table_column_resize_hover')
+					? undefined
+					: withCellTracking(whenTableInFocus(handleMouseOver)),
 				mouseleave: handleMouseLeave,
 				mouseout: fg('editor_react_18_fix_table_delete_col_decorations')
 					? undefined