@atlaskit/editor-plugin-table 9.4.1 → 9.5.5

package/dist/es2019/nodeviews/TableRow.js

@@ -2,6 +2,8 @@ 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 { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { fg } 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';
@@ -218,21 +220,62 @@ export default class TableRow extends TableNodeView {
       // we expect tree to be defined after animation frame
       const tableContainer = (_getTree = getTree(this.dom)) === null || _getTree === void 0 ? void 0 : _getTree.wrapper.closest(`.${TableCssClassName.NODEVIEW_WRAPPER}`);
       if (tableContainer) {
+        const getSentinelTop = () =>
         // Ignored via go/ees005
         // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        this.sentinels.top = tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_TOP).item(0);
-        // Ignored via go/ees005
-        // eslint-disable-next-line @atlaskit/editor/no-as-casting
-        this.sentinels.bottom = tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM).item(0);
-        [this.sentinels.top, this.sentinels.bottom].forEach(el => {
-          // 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);
+        tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_TOP).item(0);
+        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.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM);
+          // Ignored via go/ees005
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          return fg('platform_editor_nested_tables_bottom_sentinel') ?
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          bottomSentinels.item(bottomSentinels.length - 1) :
+          // eslint-disable-next-line @atlaskit/editor/no-as-casting
+          tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM).item(0);
+        };
+        const sentinelsInDom = () => getSentinelTop() !== null && getSentinelBottom() !== null;
+        const observeStickySentinels = () => {
+          this.sentinels.top = getSentinelTop();
+          this.sentinels.bottom = getSentinelBottom();
+          [this.sentinels.top, this.sentinels.bottom].forEach(el => {
+            // 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_react18_stickyheaders_fix')) {
+          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
+              });
+            }
           }
-        });
+        } else {
+          observeStickySentinels();
+        }
       }
     });
   }
@@ -311,7 +354,7 @@ export default class TableRow extends TableNodeView {
     const {
       table
     } = tree;
-    const shouldStick = this.isHeaderSticky();
+    const shouldStick = this.shouldSticky();
     if (this.isSticky !== shouldStick) {
       if (shouldStick) {
         var _this$sentinelData$to;
@@ -323,6 +366,28 @@ export default class TableRow extends TableNodeView {
       }
     }
   }
+  shouldSticky() {
+    if (
+    // is Safari
+    navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && fg('platform_editor_advanced_layouts_post_fix_patch_4')) {
+      const pos = this.getPos();
+      if (typeof pos === 'number') {
+        const $tableRowPos = this.view.state.doc.resolve(pos);
+
+        // layout -> layout column -> table -> table row
+        if ($tableRowPos.depth >= 3) {
+          var _findParentNodeCloses;
+          const isInsideLayout = (_findParentNodeCloses = findParentNodeClosestToPos($tableRowPos, node => {
+            return node.type.name === 'layoutColumn';
+          })) === null || _findParentNodeCloses === void 0 ? void 0 : _findParentNodeCloses.node;
+          if (isInsideLayout) {
+            return false;
+          }
+        }
+      }
+    }
+    return this.isHeaderSticky();
+  }
   isHeaderSticky() {
     var _sentinelTop$rootBoun;
     /*

package/dist/es2019/nodeviews/TableStickyScrollbar.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { TableCssClassName as ClassName } from '../types';
 export class TableStickyScrollbar {
@@ -50,7 +51,7 @@ export class TableStickyScrollbar {
     this.createIntersectionObserver();
   }
   createIntersectionObserver() {
-    var _this$wrapper, _this$wrapper$parentE2, _this$wrapper$parentE3, _this$wrapper2, _this$wrapper2$parent, _this$wrapper2$parent2;
+    var _this$wrapper, _this$wrapper$parentE2, _this$wrapper2, _this$wrapper2$parent, _this$wrapper2$parent2, _this$wrapper3, _this$wrapper3$parent, _this$wrapper3$parent2;
     this.editorScrollableElement =
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -82,13 +83,15 @@ export class TableStickyScrollbar {
       root: this.editorScrollableElement
     });
 
-    // Ignored via go/ees005
-    // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    this.sentinels.bottom = (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 ? void 0 : (_this$wrapper$parentE2 = _this$wrapper.parentElement) === null || _this$wrapper$parentE2 === void 0 ? void 0 : (_this$wrapper$parentE3 = _this$wrapper$parentE2.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM)) === null || _this$wrapper$parentE3 === void 0 ? void 0 : _this$wrapper$parentE3.item(0);
+    // 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 = (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 ? void 0 : (_this$wrapper$parentE2 = _this$wrapper.parentElement) === null || _this$wrapper$parentE2 === void 0 ? void 0 : _this$wrapper$parentE2.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM);
+    this.sentinels.bottom = fg('platform_editor_nested_tables_bottom_sentinel') ? // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    bottomSentinels === null || bottomSentinels === void 0 ? void 0 : bottomSentinels.item(bottomSentinels.length - 1) : // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 ? void 0 : (_this$wrapper2$parent = _this$wrapper2.parentElement) === null || _this$wrapper2$parent === void 0 ? void 0 : (_this$wrapper2$parent2 = _this$wrapper2$parent.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM)) === null || _this$wrapper2$parent2 === void 0 ? void 0 : _this$wrapper2$parent2.item(0);
 
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    this.sentinels.top = (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 ? void 0 : (_this$wrapper2$parent = _this$wrapper2.parentElement) === null || _this$wrapper2$parent === void 0 ? void 0 : (_this$wrapper2$parent2 = _this$wrapper2$parent.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_TOP)) === null || _this$wrapper2$parent2 === void 0 ? void 0 : _this$wrapper2$parent2.item(0);
+    this.sentinels.top = (_this$wrapper3 = this.wrapper) === null || _this$wrapper3 === void 0 ? void 0 : (_this$wrapper3$parent = _this$wrapper3.parentElement) === null || _this$wrapper3$parent === void 0 ? void 0 : (_this$wrapper3$parent2 = _this$wrapper3$parent.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_TOP)) === null || _this$wrapper3$parent2 === void 0 ? void 0 : _this$wrapper3$parent2.item(0);
     [this.sentinels.bottom, this.sentinels.top].forEach(el =>
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -1,11 +1,13 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // TODO: Clean up ED-23976
 import { createTableView } from './table';
 import TableCell from './TableCell';
 import TableRow from './TableRow';
 export const lazyTableView = options => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return (node, view, getPos) => {
       return createTableView(node, view, getPos, options.portalProviderAPI, options.eventDispatcher, options.getEditorContainerWidth, options.getEditorFeatureFlags, options.dispatchAnalyticsEvent, options.pluginInjectionApi, options.isCommentEditor, options.isChromelessEditor);
     };
@@ -38,7 +40,8 @@ export const lazyTableView = options => {
   });
 };
 export const lazyTableCellView = options => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return (node, view, getPos) => {
       var _options$pluginInject, _options$pluginInject2;
       return new TableCell(node, view, getPos, options.eventDispatcher, (_options$pluginInject = options.pluginInjectionApi) === null || _options$pluginInject === void 0 ? void 0 : (_options$pluginInject2 = _options$pluginInject.analytics) === null || _options$pluginInject2 === void 0 ? void 0 : _options$pluginInject2.actions);
@@ -67,7 +70,8 @@ export const lazyTableCellView = options => {
   });
 };
 export const lazyTableHeaderView = options => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return (node, view, getPos) => {
       var _options$pluginInject3, _options$pluginInject4;
       return new TableCell(node, view, getPos, options.eventDispatcher, (_options$pluginInject3 = options.pluginInjectionApi) === null || _options$pluginInject3 === void 0 ? void 0 : (_options$pluginInject4 = _options$pluginInject3.analytics) === null || _options$pluginInject4 === void 0 ? void 0 : _options$pluginInject4.actions);
@@ -96,7 +100,8 @@ export const lazyTableHeaderView = options => {
   });
 };
 export const lazyTableRowView = options => {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return (node, view, getPos) => {
       return new TableRow(node, view, getPos, options.eventDispatcher);
     };

package/dist/es2019/pm-plugins/utils/paste.js

@@ -170,14 +170,19 @@ const isNodeSingleCellTable = (node, schema) => {
 const isFragmentSingleCellTable = (fragment, schema) => {
   return fragment.childCount === 1 && fragment.firstChild !== null && isNodeSingleCellTable(fragment.firstChild, schema);
 };
-const containsTextBlockChildren = (fragment, schema) => {
-  let containsTextBlock = false;
+const containsNonTableBlockChildren = (fragment, schema) => {
+  let containsNonTableBlock = false;
+  const {
+    table,
+    tableCell,
+    tableHeader
+  } = schema.nodes;
   fragment.forEach(node => {
-    if (node.isTextblock) {
-      containsTextBlock = true;
+    if (node.isBlock && ![table, tableCell, tableHeader].includes(node.type)) {
+      containsNonTableBlock = true;
     }
   });
-  return containsTextBlock;
+  return containsNonTableBlock;
 };
 export const transformSliceToRemoveOpenTable = (slice, schema) => {
   var _slice$content$firstC8;
@@ -187,7 +192,7 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
     // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
 
     // slice starts and ends inside a nested table at the same depth
-    if (slice.openStart >= 7 && slice.openEnd >= 7 && slice.openStart === slice.openEnd) {
+    if (slice.openStart >= 7 && slice.openEnd >= 7) {
       let cleaned = slice;
       let descendedDepth = 0;
       const tableDepthDecrement = 2;
@@ -200,9 +205,9 @@ export const transformSliceToRemoveOpenTable = (slice, schema) => {
             descendedDepth += tableDepthDecrement;
           } else if (node.type === schema.nodes.table) {
             return false;
-          } else if (containsTextBlockChildren(node.content, schema)) {
+          } else if (containsNonTableBlockChildren(node.content, schema)) {
             descendedDepth += tableDepthDecrement;
-            // create a new slice with the content of the textblock children and the depth of the nested tables subtracted
+            // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
             cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
             return false;
           }

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

@@ -10,6 +10,7 @@ import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles
 import { SORTABLE_COLUMN_ICON_CLASSNAME } from '@atlaskit/editor-common/table';
 import { akEditorSelectedNodeClassName, akEditorSmallZIndex, akEditorStickyHeaderZIndex, akEditorTableCellOnStickyHeaderZIndex, akEditorTableNumberColumnWidth, akEditorTableToolbarSize, akEditorUnitZIndex, getSelectionStyles, MAX_BROWSER_SCROLLBAR_HEIGHT, relativeFontSizeToBase16, SelectionStyle } from '@atlaskit/editor-shared-styles';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N40A, R500 } from '@atlaskit/theme/colors';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { SORTING_ICON_CLASS_NAME } from '../pm-plugins/view-mode-sort/consts';
@@ -124,34 +125,65 @@ const breakoutWidthStyling = () => {
 	`;
 };
 const viewModeSortStyles = () => {
-  return css`
-		th {
-			.${SORTING_ICON_CLASS_NAME} {
-				+ p {
-					margin-top: 0 !important;
-				}
-			}
+  return fg('platform_editor_nested_tables_view_mode_sort') ? css`
+				// new styles
+				th {
+					.${SORTING_ICON_CLASS_NAME} {
+						+ p {
+							margin-top: 0 !important;
+						}
+					}
 
-			&:has(.is-active) {
-				.${SORTABLE_COLUMN_ICON_CLASSNAME} {
-					opacity: 1;
-				}
-			}
+					&:has(.is-active) {
+						.${SORTABLE_COLUMN_ICON_CLASSNAME} {
+							opacity: 1;
+						}
+					}
+
+					.${SORTABLE_COLUMN_ICON_CLASSNAME} {
+						opacity: 0;
+						&:focus {
+							opacity: 1;
+						}
+					}
 
-			.${SORTABLE_COLUMN_ICON_CLASSNAME} {
-				opacity: 0;
-				&:focus {
-					opacity: 1;
+					&:hover:not(:has(.${ClassName.TABLE_CONTAINER}:hover)) {
+						> .${SORTING_ICON_CLASS_NAME} {
+							.${SORTABLE_COLUMN_ICON_CLASSNAME} {
+								opacity: 1;
+							}
+						}
+					}
 				}
-			}
+			` : css`
+				// old styles
+				th {
+					.${SORTING_ICON_CLASS_NAME} {
+						+ p {
+							margin-top: 0 !important;
+						}
+					}
 
-			&:hover {
-				.${SORTABLE_COLUMN_ICON_CLASSNAME} {
-					opacity: 1;
+					&:has(.is-active) {
+						.${SORTABLE_COLUMN_ICON_CLASSNAME} {
+							opacity: 1;
+						}
+					}
+
+					.${SORTABLE_COLUMN_ICON_CLASSNAME} {
+						opacity: 0;
+						&:focus {
+							opacity: 1;
+						}
+					}
+
+					&:hover {
+						.${SORTABLE_COLUMN_ICON_CLASSNAME} {
+							opacity: 1;
+						}
+					}
 				}
-			}
-		}
-	`;
+			`;
 };
 const tableBorderStyles = () => {
   return `border-color: ${tableBorderDeleteColor}`;

package/dist/esm/nodeviews/TableRow.js

@@ -9,6 +9,8 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { fg } 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';
@@ -241,21 +243,67 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         // we expect tree to be defined after animation frame
         var tableContainer = (_getTree = getTree(_this2.dom)) === null || _getTree === void 0 ? void 0 : _getTree.wrapper.closest(".".concat(TableCssClassName.NODEVIEW_WRAPPER));
         if (tableContainer) {
-          // Ignored via go/ees005
-          // eslint-disable-next-line @atlaskit/editor/no-as-casting
-          _this2.sentinels.top = tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_TOP).item(0);
-          // Ignored via go/ees005
-          // eslint-disable-next-line @atlaskit/editor/no-as-casting
-          _this2.sentinels.bottom = tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM).item(0);
-          [_this2.sentinels.top, _this2.sentinels.bottom].forEach(function (el) {
-            // skip if already observed for another row on this table
-            if (el && !el.dataset.isObserved) {
-              el.dataset.isObserved = 'true';
+          var getSentinelTop = function getSentinelTop() {
+            return (
               // Ignored via go/ees005
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              _this2.intersectionObserver.observe(el);
+              // eslint-disable-next-line @atlaskit/editor/no-as-casting
+              tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_TOP).item(0)
+            );
+          };
+          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.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM);
+            // Ignored via go/ees005
+            // eslint-disable-next-line @atlaskit/editor/no-as-casting
+            return fg('platform_editor_nested_tables_bottom_sentinel') ?
+            // eslint-disable-next-line @atlaskit/editor/no-as-casting
+            bottomSentinels.item(bottomSentinels.length - 1) :
+            // eslint-disable-next-line @atlaskit/editor/no-as-casting
+            tableContainer.getElementsByClassName(ClassName.TABLE_STICKY_SENTINEL_BOTTOM).item(0);
+          };
+          var sentinelsInDom = function sentinelsInDom() {
+            return getSentinelTop() !== null && getSentinelBottom() !== null;
+          };
+          var observeStickySentinels = function observeStickySentinels() {
+            _this2.sentinels.top = getSentinelTop();
+            _this2.sentinels.bottom = getSentinelBottom();
+            [_this2.sentinels.top, _this2.sentinels.bottom].forEach(function (el) {
+              // 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_react18_stickyheaders_fix')) {
+            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
+                });
+              }
             }
-          });
+          } else {
+            observeStickySentinels();
+          }
         }
       });
     }
@@ -336,7 +384,7 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         return;
       }
       var table = tree.table;
-      var shouldStick = this.isHeaderSticky();
+      var shouldStick = this.shouldSticky();
       if (this.isSticky !== shouldStick) {
         if (shouldStick) {
           var _this$sentinelData$to;
@@ -348,6 +396,30 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         }
       }
     }
+  }, {
+    key: "shouldSticky",
+    value: function shouldSticky() {
+      if (
+      // is Safari
+      navigator.userAgent.includes('AppleWebKit') && !navigator.userAgent.includes('Chrome') && fg('platform_editor_advanced_layouts_post_fix_patch_4')) {
+        var pos = this.getPos();
+        if (typeof pos === 'number') {
+          var $tableRowPos = this.view.state.doc.resolve(pos);
+
+          // layout -> layout column -> table -> table row
+          if ($tableRowPos.depth >= 3) {
+            var _findParentNodeCloses;
+            var isInsideLayout = (_findParentNodeCloses = findParentNodeClosestToPos($tableRowPos, function (node) {
+              return node.type.name === 'layoutColumn';
+            })) === null || _findParentNodeCloses === void 0 ? void 0 : _findParentNodeCloses.node;
+            if (isInsideLayout) {
+              return false;
+            }
+          }
+        }
+      }
+      return this.isHeaderSticky();
+    }
   }, {
     key: "isHeaderSticky",
     value: function isHeaderSticky() {

package/dist/esm/nodeviews/TableStickyScrollbar.js

@@ -2,6 +2,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { TableCssClassName as ClassName } from '../types';
 export var TableStickyScrollbar = /*#__PURE__*/function () {
@@ -64,7 +65,8 @@ export var TableStickyScrollbar = /*#__PURE__*/function () {
     value: function createIntersectionObserver() {
       var _this2 = this,
         _this$wrapper,
-        _this$wrapper2;
+        _this$wrapper2,
+        _this$wrapper3;
       this.editorScrollableElement =
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
@@ -96,13 +98,15 @@ export var TableStickyScrollbar = /*#__PURE__*/function () {
         root: this.editorScrollableElement
       });
 
-      // Ignored via go/ees005
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      this.sentinels.bottom = (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 || (_this$wrapper = _this$wrapper.parentElement) === null || _this$wrapper === void 0 || (_this$wrapper = _this$wrapper.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM)) === null || _this$wrapper === void 0 ? void 0 : _this$wrapper.item(0);
+      // 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 = (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 || (_this$wrapper = _this$wrapper.parentElement) === null || _this$wrapper === void 0 ? void 0 : _this$wrapper.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM);
+      this.sentinels.bottom = fg('platform_editor_nested_tables_bottom_sentinel') ? // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      bottomSentinels === null || bottomSentinels === void 0 ? void 0 : bottomSentinels.item(bottomSentinels.length - 1) : // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.parentElement) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM)) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.item(0);
 
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      this.sentinels.top = (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.parentElement) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_TOP)) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.item(0);
+      this.sentinels.top = (_this$wrapper3 = this.wrapper) === null || _this$wrapper3 === void 0 || (_this$wrapper3 = _this$wrapper3.parentElement) === null || _this$wrapper3 === void 0 || (_this$wrapper3 = _this$wrapper3.getElementsByClassName(ClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_TOP)) === null || _this$wrapper3 === void 0 ? void 0 : _this$wrapper3.item(0);
       [this.sentinels.bottom, this.sentinels.top].forEach(function (el) {
         return (
           // Ignored via go/ees005

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

@@ -1,11 +1,13 @@
 import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // TODO: Clean up ED-23976
 import { createTableView } from './table';
 import TableCell from './TableCell';
 import TableRow from './TableRow';
 export var lazyTableView = function lazyTableView(options) {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return function (node, view, getPos) {
       return createTableView(node, view, getPos, options.portalProviderAPI, options.eventDispatcher, options.getEditorContainerWidth, options.getEditorFeatureFlags, options.dispatchAnalyticsEvent, options.pluginInjectionApi, options.isCommentEditor, options.isChromelessEditor);
     };
@@ -38,7 +40,8 @@ export var lazyTableView = function lazyTableView(options) {
   });
 };
 export var lazyTableCellView = function lazyTableCellView(options) {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return function (node, view, getPos) {
       var _options$pluginInject;
       return new TableCell(node, view, getPos, options.eventDispatcher, (_options$pluginInject = options.pluginInjectionApi) === null || _options$pluginInject === void 0 || (_options$pluginInject = _options$pluginInject.analytics) === null || _options$pluginInject === void 0 ? void 0 : _options$pluginInject.actions);
@@ -67,7 +70,8 @@ export var lazyTableCellView = function lazyTableCellView(options) {
   });
 };
 export var lazyTableHeaderView = function lazyTableHeaderView(options) {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return function (node, view, getPos) {
       var _options$pluginInject2;
       return new TableCell(node, view, getPos, options.eventDispatcher, (_options$pluginInject2 = options.pluginInjectionApi) === null || _options$pluginInject2 === void 0 || (_options$pluginInject2 = _options$pluginInject2.analytics) === null || _options$pluginInject2 === void 0 ? void 0 : _options$pluginInject2.actions);
@@ -96,7 +100,8 @@ export var lazyTableHeaderView = function lazyTableHeaderView(options) {
   });
 };
 export var lazyTableRowView = function lazyTableRowView(options) {
-  if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
+  // LNV tables are broken in concurrent mode - temporarily disable to unblock concurrent mode
+  if (editorExperiment('platform_editor_exp_lazy_node_views', false) || fg('platform_editor_disable_table_lnv')) {
     return function (node, view, getPos) {
       return new TableRow(node, view, getPos, options.eventDispatcher);
     };

package/dist/esm/pm-plugins/utils/paste.js

@@ -172,14 +172,18 @@ var isNodeSingleCellTable = function isNodeSingleCellTable(node, schema) {
 var isFragmentSingleCellTable = function isFragmentSingleCellTable(fragment, schema) {
   return fragment.childCount === 1 && fragment.firstChild !== null && isNodeSingleCellTable(fragment.firstChild, schema);
 };
-var containsTextBlockChildren = function containsTextBlockChildren(fragment, schema) {
-  var containsTextBlock = false;
+var containsNonTableBlockChildren = function containsNonTableBlockChildren(fragment, schema) {
+  var containsNonTableBlock = false;
+  var _schema$nodes4 = schema.nodes,
+    table = _schema$nodes4.table,
+    tableCell = _schema$nodes4.tableCell,
+    tableHeader = _schema$nodes4.tableHeader;
   fragment.forEach(function (node) {
-    if (node.isTextblock) {
-      containsTextBlock = true;
+    if (node.isBlock && ![table, tableCell, tableHeader].includes(node.type)) {
+      containsNonTableBlock = true;
     }
   });
-  return containsTextBlock;
+  return containsNonTableBlock;
 };
 export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpenTable(slice, schema) {
   var _slice$content$firstC4;
@@ -189,7 +193,7 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
     // We are using `safeInsert` to paste nested tables, so we do not want to preserve this wrapping
 
     // slice starts and ends inside a nested table at the same depth
-    if (slice.openStart >= 7 && slice.openEnd >= 7 && slice.openStart === slice.openEnd) {
+    if (slice.openStart >= 7 && slice.openEnd >= 7) {
       var cleaned = slice;
       var descendedDepth = 0;
       var tableDepthDecrement = 2;
@@ -202,9 +206,9 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
             descendedDepth += tableDepthDecrement;
           } else if (node.type === schema.nodes.table) {
             return false;
-          } else if (containsTextBlockChildren(node.content, schema)) {
+          } else if (containsNonTableBlockChildren(node.content, schema)) {
             descendedDepth += tableDepthDecrement;
-            // create a new slice with the content of the textblock children and the depth of the nested tables subtracted
+            // create a new slice with the content of non-table block children and the depth of the nested tables subtracted
             cleaned = new Slice(node.content, slice.openStart - descendedDepth - tableDepthDecrement, slice.openEnd - descendedDepth - tableDepthDecrement);
             return false;
           }
@@ -254,9 +258,9 @@ export var transformSliceToRemoveOpenTable = function transformSliceToRemoveOpen
   return slice;
 };
 export var transformSliceToCorrectEmptyTableCells = function transformSliceToCorrectEmptyTableCells(slice, schema) {
-  var _schema$nodes4 = schema.nodes,
-    tableCell = _schema$nodes4.tableCell,
-    tableHeader = _schema$nodes4.tableHeader;
+  var _schema$nodes5 = schema.nodes,
+    tableCell = _schema$nodes5.tableCell,
+    tableHeader = _schema$nodes5.tableHeader;
   return mapSlice(slice, function (node) {
     if (node && (node.type === tableCell || node.type === tableHeader) && !node.content.childCount) {
       return node.type.createAndFill(node.attrs) || node;