@atlaskit/editor-plugin-table 7.3.6 → 7.3.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-table
 
+## 7.3.7
+
+### Patch Changes
+
+- [#70116](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70116) [`31f1fa8d4ba3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/31f1fa8d4ba3) - Removed Feature Flag for platform.editor.table.alternative-sticky-header-logic
+- Updated dependencies
+
 ## 7.3.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableRow.js

@@ -15,8 +15,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _pluginKey = require("../pm-plugins/plugin-key");
 var _commands = require("../pm-plugins/sticky-headers/commands");
@@ -280,88 +278,32 @@ var TableRow = exports.default = /*#__PURE__*/function (_ref) {
     key: "createIntersectionObserver",
     value: function createIntersectionObserver() {
       var _this4 = this;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.alternative-sticky-header-logic')) {
-        this.intersectionObserver = new IntersectionObserver(function (entries, _) {
-          var _this4$editorScrollab, _this4$editorScrollab2;
-          // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
-          // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
-          // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
-          var rootBounds = (_this4$editorScrollab = _this4.editorScrollableElement) === null || _this4$editorScrollab === void 0 || (_this4$editorScrollab2 = _this4$editorScrollab.getBoundingClientRect) === null || _this4$editorScrollab2 === void 0 ? void 0 : _this4$editorScrollab2.call(_this4$editorScrollab);
-          entries.forEach(function (entry) {
-            var target = entry.target,
-              isIntersecting = entry.isIntersecting,
-              boundingClientRect = entry.boundingClientRect;
-            // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
-            var targetKey = target.classList.contains(_types.TableCssClassName.TABLE_STICKY_SENTINEL_TOP) ? 'top' : 'bottom';
-            // Cache the latest sentinel information
-            _this4.sentinelData[targetKey] = {
-              isIntersecting: isIntersecting,
-              boundingClientRect: boundingClientRect,
-              rootBounds: rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds
-            };
-            // Keep the other sentinels rootBounds in sync with this latest one
-            _this4.sentinelData[targetKey === 'top' ? 'bottom' : targetKey].rootBounds = rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds;
-          });
-          _this4.refreshStickyState();
-        }, {
-          threshold: 0,
-          root: this.editorScrollableElement
-        });
-      } else {
-        this.intersectionObserver = new IntersectionObserver(function (entries, _) {
-          var tree = (0, _dom2.getTree)(_this4.dom);
-          if (!tree) {
-            return;
-          }
-          var table = tree.table;
-          if (table.rows.length < 2) {
-            // ED-19307 - When there's only one row in a table the top & bottom sentinels become inverted. This creates some nasty visiblity
-            // toggling side-effects because the intersection observers gets confused.
-            return;
-          }
-          entries.forEach(function (entry) {
-            var _entry$rootBounds;
-            var target = entry.target;
-
-            // if the rootBounds has 0 height, e.g. confluence preview mode, we do nothing.
-            if (((_entry$rootBounds = entry.rootBounds) === null || _entry$rootBounds === void 0 ? void 0 : _entry$rootBounds.height) === 0) {
-              return;
-            }
-            if (target.classList.contains(_types.TableCssClassName.TABLE_STICKY_SENTINEL_TOP)) {
-              var _entry$rootBounds2;
-              var sentinelIsBelowScrollArea = (((_entry$rootBounds2 = entry.rootBounds) === null || _entry$rootBounds2 === void 0 ? void 0 : _entry$rootBounds2.bottom) || 0) < entry.boundingClientRect.bottom;
-              if (!entry.isIntersecting && !sentinelIsBelowScrollArea) {
-                var _entry$rootBounds3;
-                tree && _this4.makeHeaderRowSticky(tree, (_entry$rootBounds3 = entry.rootBounds) === null || _entry$rootBounds3 === void 0 ? void 0 : _entry$rootBounds3.top);
-                _this4.lastStickyTimestamp = Date.now();
-              } else {
-                table && _this4.makeRowHeaderNotSticky(table);
-              }
-            }
-            if (target.classList.contains(_types.TableCssClassName.TABLE_STICKY_SENTINEL_BOTTOM)) {
-              var _entry$rootBounds4;
-              var sentinelIsAboveScrollArea = entry.boundingClientRect.top - _this4.dom.offsetHeight < (((_entry$rootBounds4 = entry.rootBounds) === null || _entry$rootBounds4 === void 0 ? void 0 : _entry$rootBounds4.top) || 0);
-              if (table && !entry.isIntersecting && sentinelIsAboveScrollArea) {
-                // Not a perfect solution, but need to this code specific for FireFox ED-19177
-                if (_utils.browser.gecko) {
-                  if (_this4.lastStickyTimestamp && Date.now() - _this4.lastStickyTimestamp > _consts.STICKY_HEADER_TOGGLE_TOLERANCE_MS) {
-                    _this4.makeRowHeaderNotSticky(table);
-                  }
-                } else {
-                  _this4.makeRowHeaderNotSticky(table);
-                }
-              } else if (entry.isIntersecting && sentinelIsAboveScrollArea) {
-                var _entry$rootBounds5;
-                tree && _this4.makeHeaderRowSticky(tree, entry === null || entry === void 0 || (_entry$rootBounds5 = entry.rootBounds) === null || _entry$rootBounds5 === void 0 ? void 0 : _entry$rootBounds5.top);
-                _this4.lastStickyTimestamp = Date.now();
-              }
-            }
-            return;
-          });
-        }, {
-          root: this.editorScrollableElement
+      this.intersectionObserver = new IntersectionObserver(function (entries, _) {
+        var _this4$editorScrollab, _this4$editorScrollab2;
+        // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
+        // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
+        // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
+        var rootBounds = (_this4$editorScrollab = _this4.editorScrollableElement) === null || _this4$editorScrollab === void 0 || (_this4$editorScrollab2 = _this4$editorScrollab.getBoundingClientRect) === null || _this4$editorScrollab2 === void 0 ? void 0 : _this4$editorScrollab2.call(_this4$editorScrollab);
+        entries.forEach(function (entry) {
+          var target = entry.target,
+            isIntersecting = entry.isIntersecting,
+            boundingClientRect = entry.boundingClientRect;
+          // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
+          var targetKey = target.classList.contains(_types.TableCssClassName.TABLE_STICKY_SENTINEL_TOP) ? 'top' : 'bottom';
+          // Cache the latest sentinel information
+          _this4.sentinelData[targetKey] = {
+            isIntersecting: isIntersecting,
+            boundingClientRect: boundingClientRect,
+            rootBounds: rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds
+          };
+          // Keep the other sentinels rootBounds in sync with this latest one
+          _this4.sentinelData[targetKey === 'top' ? 'bottom' : targetKey].rootBounds = rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds;
         });
-      }
+        _this4.refreshStickyState();
+      }, {
+        threshold: 0,
+        root: this.editorScrollableElement
+      });
     }
   }, {
     key: "refreshStickyState",

package/dist/cjs/ui/common-styles.js

@@ -58,7 +58,7 @@ var tableStickyHeaderFirefoxFixStyle = function tableStickyHeaderFirefoxFixStyle
     This fixes a bug which occurs in firefox when the first row becomes sticky.
     see https://product-fabric.atlassian.net/browse/ED-19177
   */
-  if (_utils.browser.gecko && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.alternative-sticky-header-logic')) {
+  if (_utils.browser.gecko) {
     return (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n      .", " > tbody::before {\n        content: '';\n      }\n    "])), _types.TableCssClassName.TABLE_STICKY);
   }
 };

package/dist/es2019/nodeviews/TableRow.js

@@ -2,14 +2,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
-import { browser } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
 import { syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../pm-plugins/table-resizing/utils/dom';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
-import { STICKY_HEADER_TOGGLE_TOLERANCE_MS, stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
+import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
 import { getTop, getTree } from '../utils/dom';
 import { supportedHeaderRow } from '../utils/nodes';
 import TableNodeView from './TableNodeViewBase';
@@ -244,92 +242,34 @@ export default class TableRow extends TableNodeView {
     });
   }
   createIntersectionObserver() {
-    if (getBooleanFF('platform.editor.table.alternative-sticky-header-logic')) {
-      this.intersectionObserver = new IntersectionObserver((entries, _) => {
-        var _this$editorScrollabl2, _this$editorScrollabl3;
-        // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
-        // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
-        // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
-        const rootBounds = (_this$editorScrollabl2 = this.editorScrollableElement) === null || _this$editorScrollabl2 === void 0 ? void 0 : (_this$editorScrollabl3 = _this$editorScrollabl2.getBoundingClientRect) === null || _this$editorScrollabl3 === void 0 ? void 0 : _this$editorScrollabl3.call(_this$editorScrollabl2);
-        entries.forEach(entry => {
-          const {
-            target,
-            isIntersecting,
-            boundingClientRect
-          } = entry;
-          // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
-          const targetKey = target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP) ? 'top' : 'bottom';
-          // Cache the latest sentinel information
-          this.sentinelData[targetKey] = {
-            isIntersecting,
-            boundingClientRect,
-            rootBounds: rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds
-          };
-          // Keep the other sentinels rootBounds in sync with this latest one
-          this.sentinelData[targetKey === 'top' ? 'bottom' : targetKey].rootBounds = rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds;
-        });
-        this.refreshStickyState();
-      }, {
-        threshold: 0,
-        root: this.editorScrollableElement
-      });
-    } else {
-      this.intersectionObserver = new IntersectionObserver((entries, _) => {
-        const tree = getTree(this.dom);
-        if (!tree) {
-          return;
-        }
+    this.intersectionObserver = new IntersectionObserver((entries, _) => {
+      var _this$editorScrollabl2, _this$editorScrollabl3;
+      // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
+      // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
+      // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
+      const rootBounds = (_this$editorScrollabl2 = this.editorScrollableElement) === null || _this$editorScrollabl2 === void 0 ? void 0 : (_this$editorScrollabl3 = _this$editorScrollabl2.getBoundingClientRect) === null || _this$editorScrollabl3 === void 0 ? void 0 : _this$editorScrollabl3.call(_this$editorScrollabl2);
+      entries.forEach(entry => {
         const {
-          table
-        } = tree;
-        if (table.rows.length < 2) {
-          // ED-19307 - When there's only one row in a table the top & bottom sentinels become inverted. This creates some nasty visiblity
-          // toggling side-effects because the intersection observers gets confused.
-          return;
-        }
-        entries.forEach(entry => {
-          var _entry$rootBounds;
-          const target = entry.target;
-
-          // if the rootBounds has 0 height, e.g. confluence preview mode, we do nothing.
-          if (((_entry$rootBounds = entry.rootBounds) === null || _entry$rootBounds === void 0 ? void 0 : _entry$rootBounds.height) === 0) {
-            return;
-          }
-          if (target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP)) {
-            var _entry$rootBounds2;
-            const sentinelIsBelowScrollArea = (((_entry$rootBounds2 = entry.rootBounds) === null || _entry$rootBounds2 === void 0 ? void 0 : _entry$rootBounds2.bottom) || 0) < entry.boundingClientRect.bottom;
-            if (!entry.isIntersecting && !sentinelIsBelowScrollArea) {
-              var _entry$rootBounds3;
-              tree && this.makeHeaderRowSticky(tree, (_entry$rootBounds3 = entry.rootBounds) === null || _entry$rootBounds3 === void 0 ? void 0 : _entry$rootBounds3.top);
-              this.lastStickyTimestamp = Date.now();
-            } else {
-              table && this.makeRowHeaderNotSticky(table);
-            }
-          }
-          if (target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_BOTTOM)) {
-            var _entry$rootBounds4;
-            const sentinelIsAboveScrollArea = entry.boundingClientRect.top - this.dom.offsetHeight < (((_entry$rootBounds4 = entry.rootBounds) === null || _entry$rootBounds4 === void 0 ? void 0 : _entry$rootBounds4.top) || 0);
-            if (table && !entry.isIntersecting && sentinelIsAboveScrollArea) {
-              // Not a perfect solution, but need to this code specific for FireFox ED-19177
-              if (browser.gecko) {
-                if (this.lastStickyTimestamp && Date.now() - this.lastStickyTimestamp > STICKY_HEADER_TOGGLE_TOLERANCE_MS) {
-                  this.makeRowHeaderNotSticky(table);
-                }
-              } else {
-                this.makeRowHeaderNotSticky(table);
-              }
-            } else if (entry.isIntersecting && sentinelIsAboveScrollArea) {
-              var _entry$rootBounds5;
-              tree && this.makeHeaderRowSticky(tree, entry === null || entry === void 0 ? void 0 : (_entry$rootBounds5 = entry.rootBounds) === null || _entry$rootBounds5 === void 0 ? void 0 : _entry$rootBounds5.top);
-              this.lastStickyTimestamp = Date.now();
-            }
-          }
-          return;
-        });
-      }, {
-        root: this.editorScrollableElement
+          target,
+          isIntersecting,
+          boundingClientRect
+        } = entry;
+        // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
+        const targetKey = target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP) ? 'top' : 'bottom';
+        // Cache the latest sentinel information
+        this.sentinelData[targetKey] = {
+          isIntersecting,
+          boundingClientRect,
+          rootBounds: rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds
+        };
+        // Keep the other sentinels rootBounds in sync with this latest one
+        this.sentinelData[targetKey === 'top' ? 'bottom' : targetKey].rootBounds = rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds;
       });
-    }
+      this.refreshStickyState();
+    }, {
+      threshold: 0,
+      root: this.editorScrollableElement
+    });
   }
   refreshStickyState() {
     const tree = getTree(this.dom);

package/dist/es2019/ui/common-styles.js

@@ -165,7 +165,7 @@ const tableStickyHeaderFirefoxFixStyle = () => {
     This fixes a bug which occurs in firefox when the first row becomes sticky.
     see https://product-fabric.atlassian.net/browse/ED-19177
   */
-  if (browser.gecko && getBooleanFF('platform.editor.table.alternative-sticky-header-logic')) {
+  if (browser.gecko) {
     return css`
       .${ClassName.TABLE_STICKY} > tbody::before {
         content: '';

package/dist/esm/nodeviews/TableRow.js

@@ -10,14 +10,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
-import { browser } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
 import { syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../pm-plugins/table-resizing/utils/dom';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
-import { STICKY_HEADER_TOGGLE_TOLERANCE_MS, stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
+import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
 import { getTop, getTree } from '../utils/dom';
 import { supportedHeaderRow } from '../utils/nodes';
 import TableNodeView from './TableNodeViewBase';
@@ -273,88 +271,32 @@ var TableRow = /*#__PURE__*/function (_ref) {
     key: "createIntersectionObserver",
     value: function createIntersectionObserver() {
       var _this4 = this;
-      if (getBooleanFF('platform.editor.table.alternative-sticky-header-logic')) {
-        this.intersectionObserver = new IntersectionObserver(function (entries, _) {
-          var _this4$editorScrollab, _this4$editorScrollab2;
-          // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
-          // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
-          // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
-          var rootBounds = (_this4$editorScrollab = _this4.editorScrollableElement) === null || _this4$editorScrollab === void 0 || (_this4$editorScrollab2 = _this4$editorScrollab.getBoundingClientRect) === null || _this4$editorScrollab2 === void 0 ? void 0 : _this4$editorScrollab2.call(_this4$editorScrollab);
-          entries.forEach(function (entry) {
-            var target = entry.target,
-              isIntersecting = entry.isIntersecting,
-              boundingClientRect = entry.boundingClientRect;
-            // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
-            var targetKey = target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP) ? 'top' : 'bottom';
-            // Cache the latest sentinel information
-            _this4.sentinelData[targetKey] = {
-              isIntersecting: isIntersecting,
-              boundingClientRect: boundingClientRect,
-              rootBounds: rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds
-            };
-            // Keep the other sentinels rootBounds in sync with this latest one
-            _this4.sentinelData[targetKey === 'top' ? 'bottom' : targetKey].rootBounds = rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds;
-          });
-          _this4.refreshStickyState();
-        }, {
-          threshold: 0,
-          root: this.editorScrollableElement
-        });
-      } else {
-        this.intersectionObserver = new IntersectionObserver(function (entries, _) {
-          var tree = getTree(_this4.dom);
-          if (!tree) {
-            return;
-          }
-          var table = tree.table;
-          if (table.rows.length < 2) {
-            // ED-19307 - When there's only one row in a table the top & bottom sentinels become inverted. This creates some nasty visiblity
-            // toggling side-effects because the intersection observers gets confused.
-            return;
-          }
-          entries.forEach(function (entry) {
-            var _entry$rootBounds;
-            var target = entry.target;
-
-            // if the rootBounds has 0 height, e.g. confluence preview mode, we do nothing.
-            if (((_entry$rootBounds = entry.rootBounds) === null || _entry$rootBounds === void 0 ? void 0 : _entry$rootBounds.height) === 0) {
-              return;
-            }
-            if (target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP)) {
-              var _entry$rootBounds2;
-              var sentinelIsBelowScrollArea = (((_entry$rootBounds2 = entry.rootBounds) === null || _entry$rootBounds2 === void 0 ? void 0 : _entry$rootBounds2.bottom) || 0) < entry.boundingClientRect.bottom;
-              if (!entry.isIntersecting && !sentinelIsBelowScrollArea) {
-                var _entry$rootBounds3;
-                tree && _this4.makeHeaderRowSticky(tree, (_entry$rootBounds3 = entry.rootBounds) === null || _entry$rootBounds3 === void 0 ? void 0 : _entry$rootBounds3.top);
-                _this4.lastStickyTimestamp = Date.now();
-              } else {
-                table && _this4.makeRowHeaderNotSticky(table);
-              }
-            }
-            if (target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_BOTTOM)) {
-              var _entry$rootBounds4;
-              var sentinelIsAboveScrollArea = entry.boundingClientRect.top - _this4.dom.offsetHeight < (((_entry$rootBounds4 = entry.rootBounds) === null || _entry$rootBounds4 === void 0 ? void 0 : _entry$rootBounds4.top) || 0);
-              if (table && !entry.isIntersecting && sentinelIsAboveScrollArea) {
-                // Not a perfect solution, but need to this code specific for FireFox ED-19177
-                if (browser.gecko) {
-                  if (_this4.lastStickyTimestamp && Date.now() - _this4.lastStickyTimestamp > STICKY_HEADER_TOGGLE_TOLERANCE_MS) {
-                    _this4.makeRowHeaderNotSticky(table);
-                  }
-                } else {
-                  _this4.makeRowHeaderNotSticky(table);
-                }
-              } else if (entry.isIntersecting && sentinelIsAboveScrollArea) {
-                var _entry$rootBounds5;
-                tree && _this4.makeHeaderRowSticky(tree, entry === null || entry === void 0 || (_entry$rootBounds5 = entry.rootBounds) === null || _entry$rootBounds5 === void 0 ? void 0 : _entry$rootBounds5.top);
-                _this4.lastStickyTimestamp = Date.now();
-              }
-            }
-            return;
-          });
-        }, {
-          root: this.editorScrollableElement
+      this.intersectionObserver = new IntersectionObserver(function (entries, _) {
+        var _this4$editorScrollab, _this4$editorScrollab2;
+        // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
+        // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
+        // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
+        var rootBounds = (_this4$editorScrollab = _this4.editorScrollableElement) === null || _this4$editorScrollab === void 0 || (_this4$editorScrollab2 = _this4$editorScrollab.getBoundingClientRect) === null || _this4$editorScrollab2 === void 0 ? void 0 : _this4$editorScrollab2.call(_this4$editorScrollab);
+        entries.forEach(function (entry) {
+          var target = entry.target,
+            isIntersecting = entry.isIntersecting,
+            boundingClientRect = entry.boundingClientRect;
+          // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
+          var targetKey = target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP) ? 'top' : 'bottom';
+          // Cache the latest sentinel information
+          _this4.sentinelData[targetKey] = {
+            isIntersecting: isIntersecting,
+            boundingClientRect: boundingClientRect,
+            rootBounds: rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds
+          };
+          // Keep the other sentinels rootBounds in sync with this latest one
+          _this4.sentinelData[targetKey === 'top' ? 'bottom' : targetKey].rootBounds = rootBounds !== null && rootBounds !== void 0 ? rootBounds : entry.rootBounds;
         });
-      }
+        _this4.refreshStickyState();
+      }, {
+        threshold: 0,
+        root: this.editorScrollableElement
+      });
     }
   }, {
     key: "refreshStickyState",

package/dist/esm/ui/common-styles.js

@@ -51,7 +51,7 @@ var tableStickyHeaderFirefoxFixStyle = function tableStickyHeaderFirefoxFixStyle
     This fixes a bug which occurs in firefox when the first row becomes sticky.
     see https://product-fabric.atlassian.net/browse/ED-19177
   */
-  if (browser.gecko && getBooleanFF('platform.editor.table.alternative-sticky-header-logic')) {
+  if (browser.gecko) {
     return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n      .", " > tbody::before {\n        content: '';\n      }\n    "])), ClassName.TABLE_STICKY);
   }
 };

package/dist/types/nodeviews/TableRow.d.ts

@@ -14,7 +14,6 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
     private focused;
     private topPosEditorElement;
     private isSticky;
-    private lastStickyTimestamp;
     private intersectionObserver?;
     private resizeObserver?;
     private sentinels;

package/dist/types-ts4.5/nodeviews/TableRow.d.ts

@@ -14,7 +14,6 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
     private focused;
     private topPosEditorElement;
     private isSticky;
-    private lastStickyTimestamp;
     private intersectionObserver?;
     private resizeObserver?;
     private sentinels;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "7.3.6",
+  "version": "7.3.7",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/custom-steps": "^0.0.13",
-    "@atlaskit/editor-common": "^78.0.0",
+    "@atlaskit/editor-common": "^78.1.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-content-insertion": "^1.0.0",
@@ -117,9 +117,6 @@
     "platform.editor.table.shift-arrowup-fix": {
       "type": "boolean"
     },
-    "platform.editor.table.alternative-sticky-header-logic": {
-      "type": "boolean"
-    },
     "platform.editor.table.analytics-plugin-moved-event": {
       "type": "boolean"
     },

package/src/nodeviews/TableRow.ts

@@ -3,10 +3,8 @@ import throttle from 'lodash/throttle';
 
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
-import { browser } from '@atlaskit/editor-common/utils';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
@@ -18,7 +16,6 @@ import {
 import type { TablePluginState } from '../types';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
 import {
-  STICKY_HEADER_TOGGLE_TOLERANCE_MS,
   stickyHeaderBorderBottomWidth,
   stickyRowOffsetTop,
   tableControlsSpacing,
@@ -80,7 +77,6 @@ export default class TableRow
   private focused = false;
   private topPosEditorElement = 0;
   private isSticky: boolean;
-  private lastStickyTimestamp: number | undefined;
   private intersectionObserver?: IntersectionObserver;
   private resizeObserver?: ResizeObserver;
   private sentinels: {
@@ -349,108 +345,38 @@ export default class TableRow
   }
 
   private createIntersectionObserver() {
-    if (getBooleanFF('platform.editor.table.alternative-sticky-header-logic')) {
-      this.intersectionObserver = new IntersectionObserver(
-        (entries: IntersectionObserverEntry[], _: IntersectionObserver) => {
-          // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
-          // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
-          // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
-          const rootBounds = (
-            this.editorScrollableElement as Element
-          )?.getBoundingClientRect?.();
-
-          entries.forEach((entry) => {
-            const { target, isIntersecting, boundingClientRect } = entry;
-            // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
-            const targetKey = target.classList.contains(
-              ClassName.TABLE_STICKY_SENTINEL_TOP,
-            )
-              ? 'top'
-              : 'bottom';
-            // Cache the latest sentinel information
-            this.sentinelData[targetKey] = {
-              isIntersecting,
-              boundingClientRect,
-              rootBounds: rootBounds ?? entry.rootBounds,
-            };
-            // Keep the other sentinels rootBounds in sync with this latest one
-            this.sentinelData[
-              targetKey === 'top' ? 'bottom' : targetKey
-            ].rootBounds = rootBounds ?? entry.rootBounds;
-          });
-          this.refreshStickyState();
-        },
-        { threshold: 0, root: this.editorScrollableElement as Element },
-      );
-    } else {
-      this.intersectionObserver = new IntersectionObserver(
-        (entries: IntersectionObserverEntry[], _: IntersectionObserver) => {
-          const tree = getTree(this.dom);
-          if (!tree) {
-            return;
-          }
-          const { table } = tree;
-
-          if (table.rows.length < 2) {
-            // ED-19307 - When there's only one row in a table the top & bottom sentinels become inverted. This creates some nasty visiblity
-            // toggling side-effects because the intersection observers gets confused.
-            return;
-          }
-
-          entries.forEach((entry) => {
-            const target = entry.target as HTMLElement;
-
-            // if the rootBounds has 0 height, e.g. confluence preview mode, we do nothing.
-            if (entry.rootBounds?.height === 0) {
-              return;
-            }
-
-            if (
-              target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_TOP)
-            ) {
-              const sentinelIsBelowScrollArea =
-                (entry.rootBounds?.bottom || 0) <
-                entry.boundingClientRect.bottom;
-
-              if (!entry.isIntersecting && !sentinelIsBelowScrollArea) {
-                tree && this.makeHeaderRowSticky(tree, entry.rootBounds?.top);
-                this.lastStickyTimestamp = Date.now();
-              } else {
-                table && this.makeRowHeaderNotSticky(table);
-              }
-            }
-
-            if (
-              target.classList.contains(ClassName.TABLE_STICKY_SENTINEL_BOTTOM)
-            ) {
-              const sentinelIsAboveScrollArea =
-                entry.boundingClientRect.top - this.dom.offsetHeight <
-                (entry.rootBounds?.top || 0);
-
-              if (table && !entry.isIntersecting && sentinelIsAboveScrollArea) {
-                // Not a perfect solution, but need to this code specific for FireFox ED-19177
-                if (browser.gecko) {
-                  if (
-                    this.lastStickyTimestamp &&
-                    Date.now() - this.lastStickyTimestamp >
-                      STICKY_HEADER_TOGGLE_TOLERANCE_MS
-                  ) {
-                    this.makeRowHeaderNotSticky(table);
-                  }
-                } else {
-                  this.makeRowHeaderNotSticky(table);
-                }
-              } else if (entry.isIntersecting && sentinelIsAboveScrollArea) {
-                tree && this.makeHeaderRowSticky(tree, entry?.rootBounds?.top);
-                this.lastStickyTimestamp = Date.now();
-              }
-            }
-            return;
-          });
-        },
-        { root: this.editorScrollableElement as Element },
-      );
-    }
+    this.intersectionObserver = new IntersectionObserver(
+      (entries: IntersectionObserverEntry[], _: IntersectionObserver) => {
+        // IMPORTANT: please try and avoid using entry.rootBounds it's terribly inconsistent. For example; sometimes it may return
+        // 0 height. In safari it will multiply all values by the window scale factor, however chrome & firfox won't.
+        // This is why i just get the scroll view bounding rect here and use it, and fallback to the entry.rootBounds if needed.
+        const rootBounds = (
+          this.editorScrollableElement as Element
+        )?.getBoundingClientRect?.();
+
+        entries.forEach((entry) => {
+          const { target, isIntersecting, boundingClientRect } = entry;
+          // This observer only every looks at the top/bottom sentinels, we can assume if it's not one then it's the other.
+          const targetKey = target.classList.contains(
+            ClassName.TABLE_STICKY_SENTINEL_TOP,
+          )
+            ? 'top'
+            : 'bottom';
+          // Cache the latest sentinel information
+          this.sentinelData[targetKey] = {
+            isIntersecting,
+            boundingClientRect,
+            rootBounds: rootBounds ?? entry.rootBounds,
+          };
+          // Keep the other sentinels rootBounds in sync with this latest one
+          this.sentinelData[
+            targetKey === 'top' ? 'bottom' : targetKey
+          ].rootBounds = rootBounds ?? entry.rootBounds;
+        });
+        this.refreshStickyState();
+      },
+      { threshold: 0, root: this.editorScrollableElement as Element },
+    );
   }
 
   private refreshStickyState() {

package/src/ui/common-styles.ts

@@ -247,10 +247,7 @@ const tableStickyHeaderFirefoxFixStyle = () => {
     This fixes a bug which occurs in firefox when the first row becomes sticky.
     see https://product-fabric.atlassian.net/browse/ED-19177
   */
-  if (
-    browser.gecko &&
-    getBooleanFF('platform.editor.table.alternative-sticky-header-logic')
-  ) {
+  if (browser.gecko) {
     return css`
       .${ClassName.TABLE_STICKY} > tbody::before {
         content: '';