@atlaskit/renderer 112.4.0 → 112.5.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/renderer
 
+## 112.5.0
+
+### Minor Changes
+
+- [#162298](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/162298)
+  [`f5893b7270927`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f5893b7270927) -
+  ED-25498 Integrate transformNestedTablesIncomingDocument with Editor and Renderer to transform
+  nested table extensions
+
+### Patch Changes
+
+- Updated dependencies
+
+## 112.4.1
+
+### Patch Changes
+
+- [#161210](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/161210)
+  [`ffa275ccb1a59`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ffa275ccb1a59) -
+  adjust temporary sticky table config options to accept an id rather than the HTMLElement
+- Updated dependencies
+
 ## 112.4.0
 
 ### Minor Changes

package/dist/cjs/react/nodes/table/sticky.js

@@ -173,7 +173,7 @@ var StickyTable = exports.StickyTable = function StickyTable(_ref) {
 /**
  * Traverse DOM Tree upwards looking for table parents with "overflow: scroll".
  */
-function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
+function findHorizontalOverflowScrollParent(table, defaultScrollRootId) {
   var parent = table;
   if (!parent) {
     return null;
@@ -184,9 +184,9 @@ function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
     if (style.overflow === 'scroll' || style.overflowY === 'scroll') {
       return parent;
     }
-    if (!!defaultScrollRootEl && defaultScrollRootEl === parent) {
-      // If a defaultScrollRootEl was specified and we reached it without finding a closer scroll parent,
-      // use the defaultScrollRootEl.
+    if (!!defaultScrollRootId && parent.id === defaultScrollRootId) {
+      // If a defaultScrollRootId was specified and we reached the element with this id without finding a closer
+      // scroll parent, use this element as the scroll parent
       return parent;
     }
   }
@@ -203,6 +203,14 @@ var OverflowParent = exports.OverflowParent = /*#__PURE__*/function () {
     get: function get() {
       return this.ref instanceof HTMLElement;
     }
+  }, {
+    key: "id",
+    get: function get() {
+      if (this.ref instanceof HTMLElement) {
+        return this.ref.id;
+      }
+      return '';
+    }
   }, {
     key: "top",
     get: function get() {
@@ -231,8 +239,8 @@ var OverflowParent = exports.OverflowParent = /*#__PURE__*/function () {
     }
   }], [{
     key: "fromElement",
-    value: function fromElement(el, defaultScrollRootEl) {
-      return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootEl) || window);
+    value: function fromElement(el, defaultScrollRootId) {
+      return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootId) || window);
     }
   }]);
   return OverflowParent;

package/dist/cjs/react/nodes/table.js

@@ -254,7 +254,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
       }
       if (this.props.stickyHeaders) {
         var _this$props$stickyHea;
-        this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRoot_DO_NOT_USE);
+        this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
         this.overflowParent.addEventListener('scroll', this.onScroll);
       }
       if (this.wrapperRef.current && isStickyScrollbarEnabled(this.props.rendererAppearance)) {
@@ -267,7 +267,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
       // toggling sticky headers visiblity
       if (this.props.stickyHeaders && !this.overflowParent) {
         var _this$props$stickyHea2;
-        this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRoot_DO_NOT_USE);
+        this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
       } else if (!this.props.stickyHeaders && this.overflowParent) {
         this.overflowParent.removeEventListener('scroll', this.onScroll);
         this.overflowParent = null;
@@ -291,6 +291,15 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
       }
       return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + _styles.tableMarginTop - _sticky.tableStickyPadding;
     }
+  }, {
+    key: "shouldAddOverflowParentOffsetTop_DO_NOT_USE",
+    get: function get() {
+      // IF the StickyHeaderConfig specifies that the default scroll root offsetTop should be added
+      // AND the StickyHeaderConfig specifies a default scroll root id
+      // AND the OverflowParent is the corresponding element
+      // THEN we should add the OverflowParent offset top (RETURN TRUE)
+      return this.props.stickyHeaders && !!this.props.stickyHeaders.shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE && !!this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE && this.overflowParent && this.overflowParent.id === this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE;
+    }
   }, {
     key: "stickyTop",
     get: function get() {
@@ -299,10 +308,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
           return this.pinTop;
         case 'stick':
           var offsetTop = this.props.stickyHeaders && this.props.stickyHeaders.offsetTop;
-          if (typeof offsetTop === 'number') {
-            var _this$props$stickyHea3, _this$props$stickyHea4;
-            var defaultScrollRootOffsetTop = (_this$props$stickyHea3 = (_this$props$stickyHea4 = this.props.stickyHeaders) === null || _this$props$stickyHea4 === void 0 ? void 0 : _this$props$stickyHea4.defaultScrollRootTop_DO_NOT_USE) !== null && _this$props$stickyHea3 !== void 0 ? _this$props$stickyHea3 : 0;
-            return offsetTop + defaultScrollRootOffsetTop;
+          if (typeof offsetTop === 'number' && this.shouldAddOverflowParentOffsetTop_DO_NOT_USE) {
+            var overflowParentOffsetTop = this.overflowParent ? this.overflowParent.top : 0;
+            return offsetTop + overflowParentOffsetTop;
           } else {
             return offsetTop;
           }

package/dist/cjs/render-document.js

@@ -15,6 +15,7 @@ var _events = require("./analytics/events");
 var _unsupportedContent = require("./analytics/unsupported-content");
 var _transforms = require("@atlaskit/adf-utils/transforms");
 var _countNodes = require("./ui/Renderer/count-nodes");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var SUPPORTS_HIRES_TIMER_API = !!(typeof window !== 'undefined' && window.performance && performance.now);
 var withStopwatch = function withStopwatch(cb) {
   var startTime = SUPPORTS_HIRES_TIMER_API ? performance.now() : Date.now();
@@ -63,6 +64,32 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
       result.version = 1;
     }
   }
+  if ((0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
+    // Convert nested-table extensions into nested tables
+    try {
+      var _transformNestedTable = (0, _transforms.transformNestedTablesIncomingDocument)(result),
+        _transformedAdf = _transformNestedTable.transformedAdf,
+        _isTransformed = _transformNestedTable.isTransformed;
+      if (_isTransformed) {
+        dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
+          action: _analytics.ACTION.NESTED_TABLE_TRANSFORMED,
+          actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
+          eventType: _analytics.EVENT_TYPE.OPERATIONAL
+        });
+        result = _transformedAdf;
+      }
+    } catch (e) {
+      dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
+        action: _analytics.ACTION.INVALID_PROSEMIRROR_DOCUMENT,
+        actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
+        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        attributes: {
+          platform: _events.PLATFORM.WEB,
+          errorStack: 'Failed to transform one or more nested tables in the document'
+        }
+      });
+    }
+  }
   return result;
 };
 var memoValidation = (0, _memoizeOne.default)(_validation, function (newArgs, lastArgs) {

package/dist/cjs/ui/Renderer/index.js

@@ -65,7 +65,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "112.4.0";
+var packageVersion = "112.5.0";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/es2019/react/nodes/table/sticky.js

@@ -174,7 +174,7 @@ export const StickyTable = ({
 /**
  * Traverse DOM Tree upwards looking for table parents with "overflow: scroll".
  */
-function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
+function findHorizontalOverflowScrollParent(table, defaultScrollRootId) {
   let parent = table;
   if (!parent) {
     return null;
@@ -185,9 +185,9 @@ function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
     if (style.overflow === 'scroll' || style.overflowY === 'scroll') {
       return parent;
     }
-    if (!!defaultScrollRootEl && defaultScrollRootEl === parent) {
-      // If a defaultScrollRootEl was specified and we reached it without finding a closer scroll parent,
-      // use the defaultScrollRootEl.
+    if (!!defaultScrollRootId && parent.id === defaultScrollRootId) {
+      // If a defaultScrollRootId was specified and we reached the element with this id without finding a closer
+      // scroll parent, use this element as the scroll parent
       return parent;
     }
   }
@@ -198,12 +198,18 @@ export class OverflowParent {
     this.ref = ref;
     this.ref = ref;
   }
-  static fromElement(el, defaultScrollRootEl) {
-    return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootEl) || window);
+  static fromElement(el, defaultScrollRootId) {
+    return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootId) || window);
   }
   get isElement() {
     return this.ref instanceof HTMLElement;
   }
+  get id() {
+    if (this.ref instanceof HTMLElement) {
+      return this.ref.id;
+    }
+    return '';
+  }
   get top() {
     if (this.ref instanceof HTMLElement) {
       return this.ref.getBoundingClientRect().top;

package/dist/es2019/react/nodes/table.js

@@ -205,7 +205,7 @@ export class TableContainer extends React.Component {
     }
     if (this.props.stickyHeaders) {
       var _this$props$stickyHea;
-      this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRoot_DO_NOT_USE);
+      this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
       this.overflowParent.addEventListener('scroll', this.onScroll);
     }
     if (this.wrapperRef.current && isStickyScrollbarEnabled(this.props.rendererAppearance)) {
@@ -216,7 +216,7 @@ export class TableContainer extends React.Component {
     // toggling sticky headers visiblity
     if (this.props.stickyHeaders && !this.overflowParent) {
       var _this$props$stickyHea2;
-      this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRoot_DO_NOT_USE);
+      this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
     } else if (!this.props.stickyHeaders && this.overflowParent) {
       this.overflowParent.removeEventListener('scroll', this.onScroll);
       this.overflowParent = null;
@@ -238,16 +238,22 @@ export class TableContainer extends React.Component {
     }
     return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + tableMarginTop - tableStickyPadding;
   }
+  get shouldAddOverflowParentOffsetTop_DO_NOT_USE() {
+    // IF the StickyHeaderConfig specifies that the default scroll root offsetTop should be added
+    // AND the StickyHeaderConfig specifies a default scroll root id
+    // AND the OverflowParent is the corresponding element
+    // THEN we should add the OverflowParent offset top (RETURN TRUE)
+    return this.props.stickyHeaders && !!this.props.stickyHeaders.shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE && !!this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE && this.overflowParent && this.overflowParent.id === this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE;
+  }
   get stickyTop() {
     switch (this.state.stickyMode) {
       case 'pin-bottom':
         return this.pinTop;
       case 'stick':
         const offsetTop = this.props.stickyHeaders && this.props.stickyHeaders.offsetTop;
-        if (typeof offsetTop === 'number') {
-          var _this$props$stickyHea3, _this$props$stickyHea4;
-          const defaultScrollRootOffsetTop = (_this$props$stickyHea3 = (_this$props$stickyHea4 = this.props.stickyHeaders) === null || _this$props$stickyHea4 === void 0 ? void 0 : _this$props$stickyHea4.defaultScrollRootTop_DO_NOT_USE) !== null && _this$props$stickyHea3 !== void 0 ? _this$props$stickyHea3 : 0;
-          return offsetTop + defaultScrollRootOffsetTop;
+        if (typeof offsetTop === 'number' && this.shouldAddOverflowParentOffsetTop_DO_NOT_USE) {
+          const overflowParentOffsetTop = this.overflowParent ? this.overflowParent.top : 0;
+          return offsetTop + overflowParentOffsetTop;
         } else {
           return offsetTop;
         }

package/dist/es2019/render-document.js

@@ -5,8 +5,9 @@ import { validateADFEntity, findAndTrackUnsupportedContentNodes } from '@atlaski
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { PLATFORM } from './analytics/events';
 import { trackUnsupportedContentLevels } from './analytics/unsupported-content';
-import { transformMediaLinkMarks } from '@atlaskit/adf-utils/transforms';
+import { transformMediaLinkMarks, transformNestedTablesIncomingDocument } from '@atlaskit/adf-utils/transforms';
 import { countNodes } from './ui/Renderer/count-nodes';
+import { fg } from '@atlaskit/platform-feature-flags';
 const SUPPORTS_HIRES_TIMER_API = !!(typeof window !== 'undefined' && window.performance && performance.now);
 const withStopwatch = cb => {
   const startTime = SUPPORTS_HIRES_TIMER_API ? performance.now() : Date.now();
@@ -56,6 +57,33 @@ const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnaly
       result.version = 1;
     }
   }
+  if (fg('platform_editor_use_nested_table_pm_nodes')) {
+    // Convert nested-table extensions into nested tables
+    try {
+      const {
+        transformedAdf,
+        isTransformed
+      } = transformNestedTablesIncomingDocument(result);
+      if (isTransformed) {
+        dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
+          action: ACTION.NESTED_TABLE_TRANSFORMED,
+          actionSubject: ACTION_SUBJECT.RENDERER,
+          eventType: EVENT_TYPE.OPERATIONAL
+        });
+        result = transformedAdf;
+      }
+    } catch (e) {
+      dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
+        action: ACTION.INVALID_PROSEMIRROR_DOCUMENT,
+        actionSubject: ACTION_SUBJECT.RENDERER,
+        eventType: EVENT_TYPE.OPERATIONAL,
+        attributes: {
+          platform: PLATFORM.WEB,
+          errorStack: 'Failed to transform one or more nested tables in the document'
+        }
+      });
+    }
+  }
   return result;
 };
 const memoValidation = memoizeOne(_validation, (newArgs, lastArgs) => {

package/dist/es2019/ui/Renderer/index.js

@@ -45,7 +45,7 @@ import { countNodes } from './count-nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "112.4.0";
+const packageVersion = "112.5.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/esm/react/nodes/table/sticky.js

@@ -164,7 +164,7 @@ export var StickyTable = function StickyTable(_ref) {
 /**
  * Traverse DOM Tree upwards looking for table parents with "overflow: scroll".
  */
-function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
+function findHorizontalOverflowScrollParent(table, defaultScrollRootId) {
   var parent = table;
   if (!parent) {
     return null;
@@ -175,9 +175,9 @@ function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
     if (style.overflow === 'scroll' || style.overflowY === 'scroll') {
       return parent;
     }
-    if (!!defaultScrollRootEl && defaultScrollRootEl === parent) {
-      // If a defaultScrollRootEl was specified and we reached it without finding a closer scroll parent,
-      // use the defaultScrollRootEl.
+    if (!!defaultScrollRootId && parent.id === defaultScrollRootId) {
+      // If a defaultScrollRootId was specified and we reached the element with this id without finding a closer
+      // scroll parent, use this element as the scroll parent
       return parent;
     }
   }
@@ -194,6 +194,14 @@ export var OverflowParent = /*#__PURE__*/function () {
     get: function get() {
       return this.ref instanceof HTMLElement;
     }
+  }, {
+    key: "id",
+    get: function get() {
+      if (this.ref instanceof HTMLElement) {
+        return this.ref.id;
+      }
+      return '';
+    }
   }, {
     key: "top",
     get: function get() {
@@ -222,8 +230,8 @@ export var OverflowParent = /*#__PURE__*/function () {
     }
   }], [{
     key: "fromElement",
-    value: function fromElement(el, defaultScrollRootEl) {
-      return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootEl) || window);
+    value: function fromElement(el, defaultScrollRootId) {
+      return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootId) || window);
     }
   }]);
   return OverflowParent;

package/dist/esm/react/nodes/table.js

@@ -247,7 +247,7 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
       }
       if (this.props.stickyHeaders) {
         var _this$props$stickyHea;
-        this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRoot_DO_NOT_USE);
+        this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
         this.overflowParent.addEventListener('scroll', this.onScroll);
       }
       if (this.wrapperRef.current && isStickyScrollbarEnabled(this.props.rendererAppearance)) {
@@ -260,7 +260,7 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
       // toggling sticky headers visiblity
       if (this.props.stickyHeaders && !this.overflowParent) {
         var _this$props$stickyHea2;
-        this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRoot_DO_NOT_USE);
+        this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
       } else if (!this.props.stickyHeaders && this.overflowParent) {
         this.overflowParent.removeEventListener('scroll', this.onScroll);
         this.overflowParent = null;
@@ -284,6 +284,15 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
       }
       return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + tableMarginTop - tableStickyPadding;
     }
+  }, {
+    key: "shouldAddOverflowParentOffsetTop_DO_NOT_USE",
+    get: function get() {
+      // IF the StickyHeaderConfig specifies that the default scroll root offsetTop should be added
+      // AND the StickyHeaderConfig specifies a default scroll root id
+      // AND the OverflowParent is the corresponding element
+      // THEN we should add the OverflowParent offset top (RETURN TRUE)
+      return this.props.stickyHeaders && !!this.props.stickyHeaders.shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE && !!this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE && this.overflowParent && this.overflowParent.id === this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE;
+    }
   }, {
     key: "stickyTop",
     get: function get() {
@@ -292,10 +301,9 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
           return this.pinTop;
         case 'stick':
           var offsetTop = this.props.stickyHeaders && this.props.stickyHeaders.offsetTop;
-          if (typeof offsetTop === 'number') {
-            var _this$props$stickyHea3, _this$props$stickyHea4;
-            var defaultScrollRootOffsetTop = (_this$props$stickyHea3 = (_this$props$stickyHea4 = this.props.stickyHeaders) === null || _this$props$stickyHea4 === void 0 ? void 0 : _this$props$stickyHea4.defaultScrollRootTop_DO_NOT_USE) !== null && _this$props$stickyHea3 !== void 0 ? _this$props$stickyHea3 : 0;
-            return offsetTop + defaultScrollRootOffsetTop;
+          if (typeof offsetTop === 'number' && this.shouldAddOverflowParentOffsetTop_DO_NOT_USE) {
+            var overflowParentOffsetTop = this.overflowParent ? this.overflowParent.top : 0;
+            return offsetTop + overflowParentOffsetTop;
           } else {
             return offsetTop;
           }

package/dist/esm/render-document.js

@@ -6,8 +6,9 @@ import { validateADFEntity, findAndTrackUnsupportedContentNodes } from '@atlaski
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { PLATFORM } from './analytics/events';
 import { trackUnsupportedContentLevels } from './analytics/unsupported-content';
-import { transformMediaLinkMarks } from '@atlaskit/adf-utils/transforms';
+import { transformMediaLinkMarks, transformNestedTablesIncomingDocument } from '@atlaskit/adf-utils/transforms';
 import { countNodes } from './ui/Renderer/count-nodes';
+import { fg } from '@atlaskit/platform-feature-flags';
 var SUPPORTS_HIRES_TIMER_API = !!(typeof window !== 'undefined' && window.performance && performance.now);
 var withStopwatch = function withStopwatch(cb) {
   var startTime = SUPPORTS_HIRES_TIMER_API ? performance.now() : Date.now();
@@ -56,6 +57,32 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
       result.version = 1;
     }
   }
+  if (fg('platform_editor_use_nested_table_pm_nodes')) {
+    // Convert nested-table extensions into nested tables
+    try {
+      var _transformNestedTable = transformNestedTablesIncomingDocument(result),
+        _transformedAdf = _transformNestedTable.transformedAdf,
+        _isTransformed = _transformNestedTable.isTransformed;
+      if (_isTransformed) {
+        dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
+          action: ACTION.NESTED_TABLE_TRANSFORMED,
+          actionSubject: ACTION_SUBJECT.RENDERER,
+          eventType: EVENT_TYPE.OPERATIONAL
+        });
+        result = _transformedAdf;
+      }
+    } catch (e) {
+      dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
+        action: ACTION.INVALID_PROSEMIRROR_DOCUMENT,
+        actionSubject: ACTION_SUBJECT.RENDERER,
+        eventType: EVENT_TYPE.OPERATIONAL,
+        attributes: {
+          platform: PLATFORM.WEB,
+          errorStack: 'Failed to transform one or more nested tables in the document'
+        }
+      });
+    }
+  }
   return result;
 };
 var memoValidation = memoizeOne(_validation, function (newArgs, lastArgs) {

package/dist/esm/ui/Renderer/index.js

@@ -55,7 +55,7 @@ import { countNodes } from './count-nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "112.4.0";
+var packageVersion = "112.5.0";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/types/analytics/events.d.ts

@@ -114,6 +114,7 @@ type RendererTTIAEP = AEP<ACTION.RENDERER_TTI, ACTION_SUBJECT.RENDERER, undefine
     ttiFromInvocation: number;
     canceled: boolean;
 }, EVENT_TYPE.OPERATIONAL>;
-export type AnalyticsEventPayload<T = void> = RendererStartAEP | RendererRenderedAEP | ComponentCrashErrorAEP | RendererUnsupportedContentLevelsTrackingSucceeded | RendererUnsupportedContentLevelsTrackingErrored | RendererSelectAllCaughtAEP | RendererSelectAllEscapedAEP | CodeBlockCopyAEP | CodeBlockWrapAEP | HeadingAnchorLinkButtonAEP | AnchorLinkAEP | TableSortColumnNotAllowedAEP | TableSortColumnAEP | VisitLinkAEP | VisitMediaLinkAEP | ExpandAEP | UnsupportedContentPayload | UnsupportedContentTooltipPayload | AnnotationAEP | AnnotationDeleteAEP | MediaLnkTransformedAEP | InvalidProsemirrorDocumentErrorAEP | RendererTTIAEP;
+type NestedTableTransformedAEP = OperationalAEP<ACTION.NESTED_TABLE_TRANSFORMED, ACTION_SUBJECT.RENDERER, undefined, undefined>;
+export type AnalyticsEventPayload<T = void> = RendererStartAEP | RendererRenderedAEP | ComponentCrashErrorAEP | RendererUnsupportedContentLevelsTrackingSucceeded | RendererUnsupportedContentLevelsTrackingErrored | RendererSelectAllCaughtAEP | RendererSelectAllEscapedAEP | CodeBlockCopyAEP | CodeBlockWrapAEP | HeadingAnchorLinkButtonAEP | AnchorLinkAEP | TableSortColumnNotAllowedAEP | TableSortColumnAEP | VisitLinkAEP | VisitMediaLinkAEP | ExpandAEP | UnsupportedContentPayload | UnsupportedContentTooltipPayload | AnnotationAEP | AnnotationDeleteAEP | MediaLnkTransformedAEP | InvalidProsemirrorDocumentErrorAEP | RendererTTIAEP | NestedTableTransformedAEP;
 export type FireAnalyticsCallback = <T = void>(payload: AnalyticsEventPayload<T>) => void | undefined;
 export {};

package/dist/types/react/nodes/table/sticky.d.ts

@@ -31,8 +31,9 @@ export declare const StickyTable: ({ top, left, mode, shadowClassNames, innerRef
 export declare class OverflowParent {
     private ref;
     private constructor();
-    static fromElement(el: HTMLElement | null, defaultScrollRootEl?: HTMLElement): OverflowParent;
+    static fromElement(el: HTMLElement | null, defaultScrollRootId?: string): OverflowParent;
     get isElement(): boolean;
+    get id(): string;
     get top(): number;
     addEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;
     removeEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;

package/dist/types/react/nodes/table.d.ts

@@ -48,6 +48,7 @@ export declare class TableContainer extends React.Component<TableProps & Overflo
     onScroll: () => void;
     onWrapperScrolled: () => void;
     get pinTop(): number | undefined;
+    get shouldAddOverflowParentOffsetTop_DO_NOT_USE(): boolean | null | undefined;
     get stickyTop(): number | undefined;
     render(): JSX.Element;
     private grabFirstRowRef;

package/dist/types/ui/Renderer/types.d.ts

@@ -7,17 +7,17 @@ export type RendererAppearance = 'comment' | 'full-page' | 'full-width' | undefi
  *
  * They will be cleaned up ASAP after Confluence refactors its page layout to add an explicit scroll container (DISCO-3121)
  *
- * `defaultScrollRoot_DO_NOT_USE` - defaults to undefined - can be used to specify the default OverflowParent if the table
- *      doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined, the
- *      default OverflowParent will be the window
- * `defaultScrollRootTop_DO_NOT_USE` - defaults to 0 - can be used to specify any offset that should be applied to the
- *      sticky table header offset but does not need to be included when determining if the header should be sticky.
- *      This is required bcause the llogic that determines if the header should be sticky takes the OverflowParent.offsetTop
+ * `defaultScrollRootId_DO_NOT_USE` - defaults to undefined - can be used to specify the id of default OverflowParent if
+ *      the table doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined,
+ *      the default OverflowParent will be the window
+ * `shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE` - defaults to false - can be used to specify that if the OverflowParent
+ *      is the default one specificed, then the sticky table header offset should include the OverflowParent offset.
+ *      This is required because the logic that determines if the header should be sticky always takes the OverflowParent.offsetTop
  *      into account. But the calculation to get the actual header offset does not.
  */
 type StickyHeaderConfig_DO_NOT_USE = {
-    defaultScrollRoot_DO_NOT_USE?: HTMLElement;
-    defaultScrollRootTop_DO_NOT_USE?: number;
+    defaultScrollRootId_DO_NOT_USE?: string;
+    shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE?: boolean;
 };
 export type StickyHeaderConfig = {
     offsetTop?: number;

package/dist/types-ts4.5/analytics/events.d.ts

@@ -114,6 +114,7 @@ type RendererTTIAEP = AEP<ACTION.RENDERER_TTI, ACTION_SUBJECT.RENDERER, undefine
     ttiFromInvocation: number;
     canceled: boolean;
 }, EVENT_TYPE.OPERATIONAL>;
-export type AnalyticsEventPayload<T = void> = RendererStartAEP | RendererRenderedAEP | ComponentCrashErrorAEP | RendererUnsupportedContentLevelsTrackingSucceeded | RendererUnsupportedContentLevelsTrackingErrored | RendererSelectAllCaughtAEP | RendererSelectAllEscapedAEP | CodeBlockCopyAEP | CodeBlockWrapAEP | HeadingAnchorLinkButtonAEP | AnchorLinkAEP | TableSortColumnNotAllowedAEP | TableSortColumnAEP | VisitLinkAEP | VisitMediaLinkAEP | ExpandAEP | UnsupportedContentPayload | UnsupportedContentTooltipPayload | AnnotationAEP | AnnotationDeleteAEP | MediaLnkTransformedAEP | InvalidProsemirrorDocumentErrorAEP | RendererTTIAEP;
+type NestedTableTransformedAEP = OperationalAEP<ACTION.NESTED_TABLE_TRANSFORMED, ACTION_SUBJECT.RENDERER, undefined, undefined>;
+export type AnalyticsEventPayload<T = void> = RendererStartAEP | RendererRenderedAEP | ComponentCrashErrorAEP | RendererUnsupportedContentLevelsTrackingSucceeded | RendererUnsupportedContentLevelsTrackingErrored | RendererSelectAllCaughtAEP | RendererSelectAllEscapedAEP | CodeBlockCopyAEP | CodeBlockWrapAEP | HeadingAnchorLinkButtonAEP | AnchorLinkAEP | TableSortColumnNotAllowedAEP | TableSortColumnAEP | VisitLinkAEP | VisitMediaLinkAEP | ExpandAEP | UnsupportedContentPayload | UnsupportedContentTooltipPayload | AnnotationAEP | AnnotationDeleteAEP | MediaLnkTransformedAEP | InvalidProsemirrorDocumentErrorAEP | RendererTTIAEP | NestedTableTransformedAEP;
 export type FireAnalyticsCallback = <T = void>(payload: AnalyticsEventPayload<T>) => void | undefined;
 export {};

package/dist/types-ts4.5/react/nodes/table/sticky.d.ts

@@ -31,8 +31,9 @@ export declare const StickyTable: ({ top, left, mode, shadowClassNames, innerRef
 export declare class OverflowParent {
     private ref;
     private constructor();
-    static fromElement(el: HTMLElement | null, defaultScrollRootEl?: HTMLElement): OverflowParent;
+    static fromElement(el: HTMLElement | null, defaultScrollRootId?: string): OverflowParent;
     get isElement(): boolean;
+    get id(): string;
     get top(): number;
     addEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;
     removeEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;

package/dist/types-ts4.5/react/nodes/table.d.ts

@@ -48,6 +48,7 @@ export declare class TableContainer extends React.Component<TableProps & Overflo
     onScroll: () => void;
     onWrapperScrolled: () => void;
     get pinTop(): number | undefined;
+    get shouldAddOverflowParentOffsetTop_DO_NOT_USE(): boolean | null | undefined;
     get stickyTop(): number | undefined;
     render(): JSX.Element;
     private grabFirstRowRef;

package/dist/types-ts4.5/ui/Renderer/types.d.ts

@@ -7,17 +7,17 @@ export type RendererAppearance = 'comment' | 'full-page' | 'full-width' | undefi
  *
  * They will be cleaned up ASAP after Confluence refactors its page layout to add an explicit scroll container (DISCO-3121)
  *
- * `defaultScrollRoot_DO_NOT_USE` - defaults to undefined - can be used to specify the default OverflowParent if the table
- *      doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined, the
- *      default OverflowParent will be the window
- * `defaultScrollRootTop_DO_NOT_USE` - defaults to 0 - can be used to specify any offset that should be applied to the
- *      sticky table header offset but does not need to be included when determining if the header should be sticky.
- *      This is required bcause the llogic that determines if the header should be sticky takes the OverflowParent.offsetTop
+ * `defaultScrollRootId_DO_NOT_USE` - defaults to undefined - can be used to specify the id of default OverflowParent if
+ *      the table doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined,
+ *      the default OverflowParent will be the window
+ * `shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE` - defaults to false - can be used to specify that if the OverflowParent
+ *      is the default one specificed, then the sticky table header offset should include the OverflowParent offset.
+ *      This is required because the logic that determines if the header should be sticky always takes the OverflowParent.offsetTop
  *      into account. But the calculation to get the actual header offset does not.
  */
 type StickyHeaderConfig_DO_NOT_USE = {
-    defaultScrollRoot_DO_NOT_USE?: HTMLElement;
-    defaultScrollRootTop_DO_NOT_USE?: number;
+    defaultScrollRootId_DO_NOT_USE?: string;
+    shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE?: boolean;
 };
 export type StickyHeaderConfig = {
     offsetTop?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "112.4.0",
+	"version": "112.5.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -23,14 +23,14 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^44.2.0",
-		"@atlaskit/adf-utils": "^19.10.0",
+		"@atlaskit/adf-utils": "^19.12.0",
 		"@atlaskit/analytics-listeners": "^8.11.0",
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^94.13.0",
-		"@atlaskit/editor-json-transformer": "^8.20.0",
+		"@atlaskit/editor-common": "^94.17.0",
+		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
@@ -38,13 +38,13 @@
 		"@atlaskit/feature-gate-js-client": "^4.22.0",
 		"@atlaskit/icon": "^22.24.0",
 		"@atlaskit/link-datasource": "^3.8.0",
-		"@atlaskit/media-card": "^78.11.0",
-		"@atlaskit/media-client": "^28.0.0",
+		"@atlaskit/media-card": "^78.12.0",
+		"@atlaskit/media-client": "^28.2.0",
 		"@atlaskit/media-client-react": "^2.3.0",
 		"@atlaskit/media-common": "^11.7.0",
-		"@atlaskit/media-filmstrip": "^47.4.0",
-		"@atlaskit/media-ui": "^26.0.0",
-		"@atlaskit/media-viewer": "^49.2.0",
+		"@atlaskit/media-filmstrip": "^47.5.0",
+		"@atlaskit/media-ui": "^26.1.0",
+		"@atlaskit/media-viewer": "^49.3.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/smart-card": "^30.2.0",
 		"@atlaskit/status": "^1.5.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.12.0",
 		"@atlaskit/tokens": "^2.2.0",
-		"@atlaskit/tooltip": "^18.8.0",
+		"@atlaskit/tooltip": "^18.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -77,7 +77,7 @@
 		"@atlaskit/linking-common": "^6.0.0",
 		"@atlaskit/media-core": "^34.3.0",
 		"@atlaskit/media-integration-test-helpers": "^3.1.0",
-		"@atlaskit/media-test-helpers": "^34.5.0",
+		"@atlaskit/media-test-helpers": "^34.6.0",
 		"@atlaskit/mention": "^23.3.0",
 		"@atlaskit/navigation-next": "^9.0.0",
 		"@atlaskit/util-data-test": "^17.12.0",
@@ -126,7 +126,7 @@
 		"annotations_align_editor_and_renderer_styles": {
 			"type": "boolean"
 		},
-		"platform_editor_react18_phase2": {
+		"platform_editor_react18_phase2_v2": {
 			"type": "boolean"
 		},
 		"platform-fix-table-ssr-resizing": {
@@ -149,6 +149,9 @@
 		},
 		"platform_editor_advanced_layouts_breakout_resizing": {
 			"type": "boolean"
+		},
+		"platform_editor_use_nested_table_pm_nodes": {
+			"type": "boolean"
 		}
 	},
 	"af:exports": {