@atlaskit/editor-plugin-table 10.12.8 → 10.12.9

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-table
 
+## 10.12.9
+
+### Patch Changes
+
+- [#175949](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/175949)
+  [`142db856d66fe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/142db856d66fe) -
+  ED-27516: Remove feature gate – platform_editor_table_initial_load_fix. This is the second
+  attempt, as this previously merged with broken unit tests that somehow passed CI.
+- Updated dependencies
+
 ## 10.12.8
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableRow.js

@@ -17,7 +17,6 @@ var _nesting = require("@atlaskit/editor-common/nesting");
 var _nodeVisibility = require("@atlaskit/editor-common/node-visibility");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _pluginKey = require("../pm-plugins/plugin-key");
@@ -296,6 +295,7 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
           var getSentinelBottom = function getSentinelBottom() {
             // Multiple bottom sentinels may be found if there are nested tables.
             // We need to make sure we get the last one which will belong to the parent table.
+
             var bottomSentinels = tableContainer && tableContainer.getElementsByClassName(_types.TableCssClassName.TABLE_STICKY_SENTINEL_BOTTOM);
             return (
               // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -312,66 +312,43 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
               // skip if already observed for another row on this table
               if (el && !el.dataset.isObserved) {
                 el.dataset.isObserved = 'true';
+
                 // Ignored via go/ees005
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 _this2.intersectionObserver.observe(el);
               }
             });
           };
-          if ((0, _platformFeatureFlags.fg)('platform_editor_table_initial_load_fix')) {
-            var isInitialProsemirrorToDomRender = tableContainer.hasAttribute('data-prosemirror-initial-toDOM-render');
+          var isInitialProsemirrorToDomRender = tableContainer.hasAttribute('data-prosemirror-initial-toDOM-render');
 
-            // Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
-            if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
-              // great - DOM ready, observe as normal
-              observeStickySentinels();
-            } else {
-              // concurrent loading issue - here TableRow is too eager trying to
-              // observe sentinels before they are in the DOM, use MutationObserver
-              // to wait for sentinels to be added to the parent Table node DOM
-              // then attach the IntersectionObserver
-              _this2.tableContainerObserver = new MutationObserver(function () {
-                // Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
-                // prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
-                if (!tableContainer || !tableContainer.isConnected) {
-                  tableContainer = getTableContainer();
-                }
-                if (sentinelsInDom()) {
-                  var _this2$tableContainer;
-                  observeStickySentinels();
-                  (_this2$tableContainer = _this2.tableContainerObserver) === null || _this2$tableContainer === void 0 || _this2$tableContainer.disconnect();
-                }
-              });
-              var mutatingNode = tableContainer;
-              if (mutatingNode && _this2.tableContainerObserver) {
-                _this2.tableContainerObserver.observe(mutatingNode, {
-                  subtree: true,
-                  childList: true
-                });
-              }
-            }
+          // Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
+          if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
+            // great - DOM ready, observe as normal
+            observeStickySentinels();
           } else {
-            if (sentinelsInDom()) {
-              // great - DOM ready, observe as normal
-              observeStickySentinels();
-            } else {
-              // concurrent loading issue - here TableRow is too eager trying to
-              // observe sentinels before they are in the DOM, use MutationObserver
-              // to wait for sentinels to be added to the parent Table node DOM
-              // then attach the IntersectionObserver
-              var tableContainerObserver = new MutationObserver(function () {
-                if (sentinelsInDom()) {
-                  observeStickySentinels();
-                  tableContainerObserver.disconnect();
-                }
-              });
-              var _mutatingNode = tableContainer;
-              if (_mutatingNode) {
-                tableContainerObserver.observe(_mutatingNode, {
-                  subtree: true,
-                  childList: true
-                });
+            // concurrent loading issue - here TableRow is too eager trying to
+            // observe sentinels before they are in the DOM, use MutationObserver
+            // to wait for sentinels to be added to the parent Table node DOM
+            // then attach the IntersectionObserver
+            _this2.tableContainerObserver = new MutationObserver(function () {
+              // Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
+              // prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
+
+              if (!tableContainer || !tableContainer.isConnected) {
+                tableContainer = getTableContainer();
+              }
+              if (sentinelsInDom()) {
+                var _this2$tableContainer;
+                observeStickySentinels();
+                (_this2$tableContainer = _this2.tableContainerObserver) === null || _this2$tableContainer === void 0 || _this2$tableContainer.disconnect();
               }
+            });
+            var mutatingNode = tableContainer;
+            if (mutatingNode && _this2.tableContainerObserver) {
+              _this2.tableContainerObserver.observe(mutatingNode, {
+                subtree: true,
+                childList: true
+              });
             }
           }
         }

package/dist/cjs/nodeviews/table.js

@@ -13,7 +13,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
@@ -27,7 +26,6 @@ var _pluginKey = require("../pm-plugins/drag-and-drop/plugin-key");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _pluginKey2 = require("../pm-plugins/plugin-key");
 var _pluginKey3 = require("../pm-plugins/table-resizing/plugin-key");
-var _colgroup = require("../pm-plugins/table-resizing/utils/colgroup");
 var _tableWidth = require("../pm-plugins/table-width");
 var _nodes = require("../pm-plugins/utils/nodes");
 var _TableComponent = _interopRequireDefault(require("./TableComponent"));
@@ -67,15 +65,6 @@ var handleInlineTableWidth = function handleInlineTableWidth(table, width) {
   }
   table.style.setProperty('width', "".concat(width, "px"));
 };
-
-// Remove after removing the platform_editor_table_initial_load_fix flag.
-var toDOM = function toDOM(node, props) {
-  var colgroup = '';
-  if (props.allowColumnResizing) {
-    colgroup = ['colgroup', {}].concat((0, _toConsumableArray2.default)((0, _colgroup.generateColgroup)(node)));
-  }
-  return ['table', tableAttributes(node), colgroup, ['tbody', 0]];
-};
 var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
   function TableView(props) {
     var _this;
@@ -89,37 +78,26 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
     _this.eventDispatcher = props.eventDispatcher;
     _this.options = props.options;
     _this.getEditorFeatureFlags = props.getEditorFeatureFlags;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_table_initial_load_fix')) {
-      _this.handleRef = function (node) {
-        return _this._handleTableRef(node);
-      };
-    }
+    _this.handleRef = function (node) {
+      return _this._handleTableRef(node);
+    };
     return _this;
   }
   (0, _inherits2.default)(TableView, _ReactNodeView);
   return (0, _createClass2.default)(TableView, [{
     key: "getContentDOM",
     value: function getContentDOM() {
-      var tableDOMStructure;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_table_initial_load_fix')) {
-        tableDOMStructure = (0, _toDOM.tableNodeSpecWithFixedToDOM)({
-          allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
-          tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
-          getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth
-        }).toDOM(this.node);
-      } else {
-        tableDOMStructure = toDOM(this.node, this.reactComponentProps);
-      }
+      var tableDOMStructure = (0, _toDOM.tableNodeSpecWithFixedToDOM)({
+        allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
+        tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
+        getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth
+      }).toDOM(this.node);
       var rendered = _model.DOMSerializer.renderSpec(document, tableDOMStructure);
       if (rendered.dom) {
         var _this$options, _this$options2, _this$getEditorFeatur;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_table_initial_load_fix')) {
-          var tableElement = rendered.dom.querySelector('table');
-          this.table = tableElement ? tableElement : rendered.dom;
-          this.renderedDOM = rendered.dom;
-        } else {
-          this.table = rendered.dom;
-        }
+        var tableElement = rendered.dom.querySelector('table');
+        this.table = tableElement ? tableElement : rendered.dom;
+        this.renderedDOM = rendered.dom;
         if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.isTableScalingEnabled) || (_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.isTableScalingEnabled && (_this$getEditorFeatur = this.getEditorFeatureFlags) !== null && _this$getEditorFeatur !== void 0 && _this$getEditorFeatur.call(this).tableWithFixedColumnWidthsOption && this.node.attrs.displayMode === 'fixed') {
           var tableInlineWidth = getInlineWidth(this.node, this.reactComponentProps.options, this.reactComponentProps.view.state, this.reactComponentProps.getPos(), this.reactComponentProps.allowTableResizing);
           if (tableInlineWidth) {

package/dist/es2019/nodeviews/TableRow.js

@@ -5,7 +5,6 @@ import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { nodeVisibilityManager } from '@atlaskit/editor-common/node-visibility';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
@@ -263,6 +262,7 @@ export default class TableRow extends TableNodeView {
         const getSentinelBottom = () => {
           // Multiple bottom sentinels may be found if there are nested tables.
           // We need to make sure we get the last one which will belong to the parent table.
+
           const bottomSentinels = tableContainer && tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM);
           return (
             // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -277,66 +277,43 @@ export default class TableRow extends TableNodeView {
             // skip if already observed for another row on this table
             if (el && !el.dataset.isObserved) {
               el.dataset.isObserved = 'true';
+
               // Ignored via go/ees005
               // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               this.intersectionObserver.observe(el);
             }
           });
         };
-        if (fg('platform_editor_table_initial_load_fix')) {
-          const isInitialProsemirrorToDomRender = tableContainer.hasAttribute('data-prosemirror-initial-toDOM-render');
-
-          // Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
-          if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
-            // great - DOM ready, observe as normal
-            observeStickySentinels();
-          } else {
-            // concurrent loading issue - here TableRow is too eager trying to
-            // observe sentinels before they are in the DOM, use MutationObserver
-            // to wait for sentinels to be added to the parent Table node DOM
-            // then attach the IntersectionObserver
-            this.tableContainerObserver = new MutationObserver(() => {
-              // Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
-              // prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
-              if (!tableContainer || !tableContainer.isConnected) {
-                tableContainer = getTableContainer();
-              }
-              if (sentinelsInDom()) {
-                var _this$tableContainerO;
-                observeStickySentinels();
-                (_this$tableContainerO = this.tableContainerObserver) === null || _this$tableContainerO === void 0 ? void 0 : _this$tableContainerO.disconnect();
-              }
-            });
-            const mutatingNode = tableContainer;
-            if (mutatingNode && this.tableContainerObserver) {
-              this.tableContainerObserver.observe(mutatingNode, {
-                subtree: true,
-                childList: true
-              });
-            }
-          }
+        const isInitialProsemirrorToDomRender = tableContainer.hasAttribute('data-prosemirror-initial-toDOM-render');
+
+        // Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
+        if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
+          // great - DOM ready, observe as normal
+          observeStickySentinels();
         } else {
-          if (sentinelsInDom()) {
-            // great - DOM ready, observe as normal
-            observeStickySentinels();
-          } else {
-            // concurrent loading issue - here TableRow is too eager trying to
-            // observe sentinels before they are in the DOM, use MutationObserver
-            // to wait for sentinels to be added to the parent Table node DOM
-            // then attach the IntersectionObserver
-            const tableContainerObserver = new MutationObserver(() => {
-              if (sentinelsInDom()) {
-                observeStickySentinels();
-                tableContainerObserver.disconnect();
-              }
-            });
-            const mutatingNode = tableContainer;
-            if (mutatingNode) {
-              tableContainerObserver.observe(mutatingNode, {
-                subtree: true,
-                childList: true
-              });
+          // concurrent loading issue - here TableRow is too eager trying to
+          // observe sentinels before they are in the DOM, use MutationObserver
+          // to wait for sentinels to be added to the parent Table node DOM
+          // then attach the IntersectionObserver
+          this.tableContainerObserver = new MutationObserver(() => {
+            // Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
+            // prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
+
+            if (!tableContainer || !tableContainer.isConnected) {
+              tableContainer = getTableContainer();
+            }
+            if (sentinelsInDom()) {
+              var _this$tableContainerO;
+              observeStickySentinels();
+              (_this$tableContainerO = this.tableContainerObserver) === null || _this$tableContainerO === void 0 ? void 0 : _this$tableContainerO.disconnect();
             }
+          });
+          const mutatingNode = tableContainer;
+          if (mutatingNode && this.tableContainerObserver) {
+            this.tableContainerObserver.observe(mutatingNode, {
+              subtree: true,
+              childList: true
+            });
           }
         }
       }

package/dist/es2019/nodeviews/table.js

@@ -12,7 +12,6 @@ import { pluginKey as tableDragAndDropPluginKey } from '../pm-plugins/drag-and-d
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing/plugin-key';
-import { generateColgroup } from '../pm-plugins/table-resizing/utils/colgroup';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
 import { isTableNested } from '../pm-plugins/utils/nodes';
 import TableComponent from './TableComponent';
@@ -49,15 +48,6 @@ const handleInlineTableWidth = (table, width) => {
   }
   table.style.setProperty('width', `${width}px`);
 };
-
-// Remove after removing the platform_editor_table_initial_load_fix flag.
-const toDOM = (node, props) => {
-  let colgroup = '';
-  if (props.allowColumnResizing) {
-    colgroup = ['colgroup', {}, ...generateColgroup(node)];
-  }
-  return ['table', tableAttributes(node), colgroup, ['tbody', 0]];
-};
 export default class TableView extends ReactNodeView {
   constructor(props) {
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
@@ -69,31 +59,20 @@ export default class TableView extends ReactNodeView {
     this.eventDispatcher = props.eventDispatcher;
     this.options = props.options;
     this.getEditorFeatureFlags = props.getEditorFeatureFlags;
-    if (fg('platform_editor_table_initial_load_fix')) {
-      this.handleRef = node => this._handleTableRef(node);
-    }
+    this.handleRef = node => this._handleTableRef(node);
   }
   getContentDOM() {
-    let tableDOMStructure;
-    if (fg('platform_editor_table_initial_load_fix')) {
-      tableDOMStructure = tableNodeSpecWithFixedToDOM({
-        allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
-        tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
-        getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth
-      }).toDOM(this.node);
-    } else {
-      tableDOMStructure = toDOM(this.node, this.reactComponentProps);
-    }
+    const tableDOMStructure = tableNodeSpecWithFixedToDOM({
+      allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
+      tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
+      getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth
+    }).toDOM(this.node);
     const rendered = DOMSerializer.renderSpec(document, tableDOMStructure);
     if (rendered.dom) {
       var _this$options, _this$options2, _this$getEditorFeatur;
-      if (fg('platform_editor_table_initial_load_fix')) {
-        const tableElement = rendered.dom.querySelector('table');
-        this.table = tableElement ? tableElement : rendered.dom;
-        this.renderedDOM = rendered.dom;
-      } else {
-        this.table = rendered.dom;
-      }
+      const tableElement = rendered.dom.querySelector('table');
+      this.table = tableElement ? tableElement : rendered.dom;
+      this.renderedDOM = rendered.dom;
       if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.isTableScalingEnabled) || (_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.isTableScalingEnabled && (_this$getEditorFeatur = this.getEditorFeatureFlags) !== null && _this$getEditorFeatur !== void 0 && _this$getEditorFeatur.call(this).tableWithFixedColumnWidthsOption && this.node.attrs.displayMode === 'fixed') {
         const tableInlineWidth = getInlineWidth(this.node, this.reactComponentProps.options, this.reactComponentProps.view.state, this.reactComponentProps.getPos(), this.reactComponentProps.allowTableResizing);
         if (tableInlineWidth) {

package/dist/esm/nodeviews/TableRow.js

@@ -12,7 +12,6 @@ import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { nodeVisibilityManager } from '@atlaskit/editor-common/node-visibility';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
@@ -289,6 +288,7 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
           var getSentinelBottom = function getSentinelBottom() {
             // Multiple bottom sentinels may be found if there are nested tables.
             // We need to make sure we get the last one which will belong to the parent table.
+
             var bottomSentinels = tableContainer && tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM);
             return (
               // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -305,66 +305,43 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
               // skip if already observed for another row on this table
               if (el && !el.dataset.isObserved) {
                 el.dataset.isObserved = 'true';
+
                 // Ignored via go/ees005
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 _this2.intersectionObserver.observe(el);
               }
             });
           };
-          if (fg('platform_editor_table_initial_load_fix')) {
-            var isInitialProsemirrorToDomRender = tableContainer.hasAttribute('data-prosemirror-initial-toDOM-render');
+          var isInitialProsemirrorToDomRender = tableContainer.hasAttribute('data-prosemirror-initial-toDOM-render');
 
-            // Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
-            if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
-              // great - DOM ready, observe as normal
-              observeStickySentinels();
-            } else {
-              // concurrent loading issue - here TableRow is too eager trying to
-              // observe sentinels before they are in the DOM, use MutationObserver
-              // to wait for sentinels to be added to the parent Table node DOM
-              // then attach the IntersectionObserver
-              _this2.tableContainerObserver = new MutationObserver(function () {
-                // Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
-                // prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
-                if (!tableContainer || !tableContainer.isConnected) {
-                  tableContainer = getTableContainer();
-                }
-                if (sentinelsInDom()) {
-                  var _this2$tableContainer;
-                  observeStickySentinels();
-                  (_this2$tableContainer = _this2.tableContainerObserver) === null || _this2$tableContainer === void 0 || _this2$tableContainer.disconnect();
-                }
-              });
-              var mutatingNode = tableContainer;
-              if (mutatingNode && _this2.tableContainerObserver) {
-                _this2.tableContainerObserver.observe(mutatingNode, {
-                  subtree: true,
-                  childList: true
-                });
-              }
-            }
+          // Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
+          if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
+            // great - DOM ready, observe as normal
+            observeStickySentinels();
           } else {
-            if (sentinelsInDom()) {
-              // great - DOM ready, observe as normal
-              observeStickySentinels();
-            } else {
-              // concurrent loading issue - here TableRow is too eager trying to
-              // observe sentinels before they are in the DOM, use MutationObserver
-              // to wait for sentinels to be added to the parent Table node DOM
-              // then attach the IntersectionObserver
-              var tableContainerObserver = new MutationObserver(function () {
-                if (sentinelsInDom()) {
-                  observeStickySentinels();
-                  tableContainerObserver.disconnect();
-                }
-              });
-              var _mutatingNode = tableContainer;
-              if (_mutatingNode) {
-                tableContainerObserver.observe(_mutatingNode, {
-                  subtree: true,
-                  childList: true
-                });
+            // concurrent loading issue - here TableRow is too eager trying to
+            // observe sentinels before they are in the DOM, use MutationObserver
+            // to wait for sentinels to be added to the parent Table node DOM
+            // then attach the IntersectionObserver
+            _this2.tableContainerObserver = new MutationObserver(function () {
+              // Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
+              // prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
+
+              if (!tableContainer || !tableContainer.isConnected) {
+                tableContainer = getTableContainer();
+              }
+              if (sentinelsInDom()) {
+                var _this2$tableContainer;
+                observeStickySentinels();
+                (_this2$tableContainer = _this2.tableContainerObserver) === null || _this2$tableContainer === void 0 || _this2$tableContainer.disconnect();
               }
+            });
+            var mutatingNode = tableContainer;
+            if (mutatingNode && _this2.tableContainerObserver) {
+              _this2.tableContainerObserver.observe(mutatingNode, {
+                subtree: true,
+                childList: true
+              });
             }
           }
         }

package/dist/esm/nodeviews/table.js

@@ -6,7 +6,6 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _get from "@babel/runtime/helpers/get";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
@@ -23,7 +22,6 @@ import { pluginKey as tableDragAndDropPluginKey } from '../pm-plugins/drag-and-d
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing/plugin-key';
-import { generateColgroup } from '../pm-plugins/table-resizing/utils/colgroup';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
 import { isTableNested } from '../pm-plugins/utils/nodes';
 import TableComponent from './TableComponent';
@@ -60,15 +58,6 @@ var handleInlineTableWidth = function handleInlineTableWidth(table, width) {
   }
   table.style.setProperty('width', "".concat(width, "px"));
 };
-
-// Remove after removing the platform_editor_table_initial_load_fix flag.
-var toDOM = function toDOM(node, props) {
-  var colgroup = '';
-  if (props.allowColumnResizing) {
-    colgroup = ['colgroup', {}].concat(_toConsumableArray(generateColgroup(node)));
-  }
-  return ['table', tableAttributes(node), colgroup, ['tbody', 0]];
-};
 var TableView = /*#__PURE__*/function (_ReactNodeView) {
   function TableView(props) {
     var _this;
@@ -82,37 +71,26 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
     _this.eventDispatcher = props.eventDispatcher;
     _this.options = props.options;
     _this.getEditorFeatureFlags = props.getEditorFeatureFlags;
-    if (fg('platform_editor_table_initial_load_fix')) {
-      _this.handleRef = function (node) {
-        return _this._handleTableRef(node);
-      };
-    }
+    _this.handleRef = function (node) {
+      return _this._handleTableRef(node);
+    };
     return _this;
   }
   _inherits(TableView, _ReactNodeView);
   return _createClass(TableView, [{
     key: "getContentDOM",
     value: function getContentDOM() {
-      var tableDOMStructure;
-      if (fg('platform_editor_table_initial_load_fix')) {
-        tableDOMStructure = tableNodeSpecWithFixedToDOM({
-          allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
-          tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
-          getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth
-        }).toDOM(this.node);
-      } else {
-        tableDOMStructure = toDOM(this.node, this.reactComponentProps);
-      }
+      var tableDOMStructure = tableNodeSpecWithFixedToDOM({
+        allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
+        tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
+        getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth
+      }).toDOM(this.node);
       var rendered = DOMSerializer.renderSpec(document, tableDOMStructure);
       if (rendered.dom) {
         var _this$options, _this$options2, _this$getEditorFeatur;
-        if (fg('platform_editor_table_initial_load_fix')) {
-          var tableElement = rendered.dom.querySelector('table');
-          this.table = tableElement ? tableElement : rendered.dom;
-          this.renderedDOM = rendered.dom;
-        } else {
-          this.table = rendered.dom;
-        }
+        var tableElement = rendered.dom.querySelector('table');
+        this.table = tableElement ? tableElement : rendered.dom;
+        this.renderedDOM = rendered.dom;
         if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.isTableScalingEnabled) || (_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.isTableScalingEnabled && (_this$getEditorFeatur = this.getEditorFeatureFlags) !== null && _this$getEditorFeatur !== void 0 && _this$getEditorFeatur.call(this).tableWithFixedColumnWidthsOption && this.node.attrs.displayMode === 'fixed') {
           var tableInlineWidth = getInlineWidth(this.node, this.reactComponentProps.options, this.reactComponentProps.view.state, this.reactComponentProps.getPos(), this.reactComponentProps.allowTableResizing);
           if (tableInlineWidth) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.12.8",
+	"version": "10.12.9",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,7 +32,7 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^107.1.0",
+		"@atlaskit/editor-common": "^107.2.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/primitives": "^14.9.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^8.0.0",
+		"@atlaskit/tmp-editor-statsig": "^8.2.0",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
@@ -124,9 +124,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_table_initial_load_fix": {
-			"type": "boolean"
-		},
 		"platform_editor_table_overflow_in_full_width_fix": {
 			"type": "boolean"
 		},

package/src/nodeviews/TableRow.ts

@@ -8,7 +8,6 @@ import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 import { getPluginState } from '../pm-plugins/plugin-factory';
@@ -335,6 +334,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 				const getSentinelBottom = () => {
 					// Multiple bottom sentinels may be found if there are nested tables.
 					// We need to make sure we get the last one which will belong to the parent table.
+
 					const bottomSentinels =
 						tableContainer &&
 						tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM);
@@ -354,6 +354,7 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 						// skip if already observed for another row on this table
 						if (el && !el.dataset.isObserved) {
 							el.dataset.isObserved = 'true';
+
 							// Ignored via go/ees005
 							// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 							this.intersectionObserver!.observe(el);
@@ -361,57 +362,35 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 					});
 				};
 
-				if (fg('platform_editor_table_initial_load_fix')) {
-					const isInitialProsemirrorToDomRender = tableContainer.hasAttribute(
-						'data-prosemirror-initial-toDOM-render',
-					);
+				const isInitialProsemirrorToDomRender = tableContainer.hasAttribute(
+					'data-prosemirror-initial-toDOM-render',
+				);
 
-					// Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
-					if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
-						// great - DOM ready, observe as normal
-						observeStickySentinels();
-					} else {
-						// concurrent loading issue - here TableRow is too eager trying to
-						// observe sentinels before they are in the DOM, use MutationObserver
-						// to wait for sentinels to be added to the parent Table node DOM
-						// then attach the IntersectionObserver
-						this.tableContainerObserver = new MutationObserver(() => {
-							// Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
-							// prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
-							if (!tableContainer || !tableContainer.isConnected) {
-								tableContainer = getTableContainer();
-							}
-							if (sentinelsInDom()) {
-								observeStickySentinels();
-								this.tableContainerObserver?.disconnect();
-							}
-						});
-
-						const mutatingNode = tableContainer;
-						if (mutatingNode && this.tableContainerObserver) {
-							this.tableContainerObserver.observe(mutatingNode, { subtree: true, childList: true });
-						}
-					}
+				// Sentinels may be in the DOM but they're part of the prosemirror placeholder structure which is replaced with the fully rendered React node.
+				if (sentinelsInDom() && !isInitialProsemirrorToDomRender) {
+					// great - DOM ready, observe as normal
+					observeStickySentinels();
 				} else {
-					if (sentinelsInDom()) {
-						// great - DOM ready, observe as normal
-						observeStickySentinels();
-					} else {
-						// concurrent loading issue - here TableRow is too eager trying to
-						// observe sentinels before they are in the DOM, use MutationObserver
-						// to wait for sentinels to be added to the parent Table node DOM
-						// then attach the IntersectionObserver
-						const tableContainerObserver = new MutationObserver(() => {
-							if (sentinelsInDom()) {
-								observeStickySentinels();
-								tableContainerObserver.disconnect();
-							}
-						});
-
-						const mutatingNode = tableContainer;
-						if (mutatingNode) {
-							tableContainerObserver.observe(mutatingNode, { subtree: true, childList: true });
+					// concurrent loading issue - here TableRow is too eager trying to
+					// observe sentinels before they are in the DOM, use MutationObserver
+					// to wait for sentinels to be added to the parent Table node DOM
+					// then attach the IntersectionObserver
+					this.tableContainerObserver = new MutationObserver(() => {
+						// Check if the tableContainer is still connected to the DOM. It can become disconnected when the placholder
+						// prosemirror node is replaced with the fully rendered React node (see _handleTableRef).
+
+						if (!tableContainer || !tableContainer.isConnected) {
+							tableContainer = getTableContainer();
+						}
+						if (sentinelsInDom()) {
+							observeStickySentinels();
+							this.tableContainerObserver?.disconnect();
 						}
+					});
+
+					const mutatingNode = tableContainer;
+					if (mutatingNode && this.tableContainerObserver) {
+						this.tableContainerObserver.observe(mutatingNode, { subtree: true, childList: true });
 					}
 				}
 			}

package/src/nodeviews/table.tsx

@@ -13,7 +13,7 @@ import type {
 	getPosHandlerNode,
 } from '@atlaskit/editor-common/types';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
-import type { DOMOutputSpec, Node as PmNode } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import {
 	type EditorState,
@@ -30,7 +30,6 @@ import { pluginKey as tableDragAndDropPluginKey } from '../pm-plugins/drag-and-d
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing/plugin-key';
-import { generateColgroup } from '../pm-plugins/table-resizing/utils/colgroup';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
 import { isTableNested } from '../pm-plugins/utils/nodes';
 import type { PluginInjectionAPI } from '../types';
@@ -90,15 +89,6 @@ const handleInlineTableWidth = (table: HTMLElement, width: number | undefined) =
 	table.style.setProperty('width', `${width}px`);
 };
 
-// Remove after removing the platform_editor_table_initial_load_fix flag.
-const toDOM = (node: PmNode, props: Props) => {
-	let colgroup: DOMOutputSpec = '';
-	if (props.allowColumnResizing) {
-		colgroup = ['colgroup', {}, ...generateColgroup(node)];
-	}
-	return ['table', tableAttributes(node), colgroup, ['tbody', 0]] as DOMOutputSpec;
-};
-
 export default class TableView extends ReactNodeView<Props> {
 	private table: HTMLElement | undefined;
 	private renderedDOM?: HTMLElement;
@@ -122,22 +112,15 @@ export default class TableView extends ReactNodeView<Props> {
 		this.options = props.options;
 		this.getEditorFeatureFlags = props.getEditorFeatureFlags;
 
-		if (fg('platform_editor_table_initial_load_fix')) {
-			this.handleRef = (node: HTMLElement | null) => this._handleTableRef(node);
-		}
+		this.handleRef = (node: HTMLElement | null) => this._handleTableRef(node);
 	}
 
 	getContentDOM() {
-		let tableDOMStructure;
-		if (fg('platform_editor_table_initial_load_fix')) {
-			tableDOMStructure = tableNodeSpecWithFixedToDOM({
-				allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
-				tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
-				getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth,
-			}).toDOM(this.node);
-		} else {
-			tableDOMStructure = toDOM(this.node, this.reactComponentProps as Props);
-		}
+		const tableDOMStructure = tableNodeSpecWithFixedToDOM({
+			allowColumnResizing: !!this.reactComponentProps.allowColumnResizing,
+			tableResizingEnabled: !!this.reactComponentProps.allowTableResizing,
+			getEditorContainerWidth: this.reactComponentProps.getEditorContainerWidth,
+		}).toDOM(this.node);
 
 		const rendered = DOMSerializer.renderSpec(document, tableDOMStructure) as {
 			dom: HTMLElement;
@@ -145,13 +128,9 @@ export default class TableView extends ReactNodeView<Props> {
 		};
 
 		if (rendered.dom) {
-			if (fg('platform_editor_table_initial_load_fix')) {
-				const tableElement = rendered.dom.querySelector('table');
-				this.table = tableElement ? tableElement : rendered.dom;
-				this.renderedDOM = rendered.dom;
-			} else {
-				this.table = rendered.dom;
-			}
+			const tableElement = rendered.dom.querySelector('table');
+			this.table = tableElement ? tableElement : rendered.dom;
+			this.renderedDOM = rendered.dom;
 
 			if (
 				!this.options?.isTableScalingEnabled ||