@atlaskit/renderer 109.17.1 → 109.17.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/renderer
 
+## 109.17.3
+
+### Patch Changes
+
+- [#89790](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89790) [`38cbee5b6ee4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/38cbee5b6ee4) - Adds errorboundary around bodiedExtension to try to get more error info
+
+## 109.17.2
+
+### Patch Changes
+
+- [#86368](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86368) [`8499e6f0fef4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8499e6f0fef4) - Remove custom-table-width feature flag
+- Updated dependencies
+
 ## 109.17.1
 
 ### Patch Changes

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

@@ -7,18 +7,31 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
+var _analyticsNext = require("@atlaskit/analytics-next");
 var _extension = require("./extension");
+var _ErrorBoundary = require("../../ui/Renderer/ErrorBoundary");
 var _ExtensionRenderer = _interopRequireDefault(require("../../ui/ExtensionRenderer"));
+var _enums = require("../../analytics/enums");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var BodiedExtension = function BodiedExtension(props) {
   var children = props.children,
     _props$layout = props.layout,
     layout = _props$layout === void 0 ? 'default' : _props$layout,
     _props$path = props.path,
-    path = _props$path === void 0 ? [] : _props$path;
+    path = _props$path === void 0 ? [] : _props$path,
+    extensionKey = props.extensionKey,
+    extensionType = props.extensionType;
+  var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var removeOverflow = _react.default.Children.toArray(children).map(function (child) {
     return /*#__PURE__*/_react.default.isValidElement(child) ? child.props.nodeType === 'table' : false;
   }).every(Boolean);
-  return /*#__PURE__*/_react.default.createElement(_ExtensionRenderer.default, (0, _extends2.default)({}, props, {
+  return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.ErrorBoundary, {
+    component: _enums.ACTION_SUBJECT.RENDERER,
+    componentId: _analytics.ACTION_SUBJECT_ID.EXTENSION_BODIED,
+    createAnalyticsEvent: createAnalyticsEvent,
+    additionalInfo: "".concat(extensionType, ": ").concat(extensionKey, " ")
+  }, /*#__PURE__*/_react.default.createElement(_ExtensionRenderer.default, (0, _extends2.default)({}, props, {
     type: "bodiedExtension"
   }), function (_ref) {
     var result = _ref.result;
@@ -38,6 +51,6 @@ var BodiedExtension = function BodiedExtension(props) {
     return (0, _extension.renderExtension)(children, layout, {
       isTopLevel: path.length < 1
     }, removeOverflow);
-  });
+  }));
 };
 var _default = exports.default = BodiedExtension;

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

@@ -15,16 +15,6 @@ var _table = require("../table");
 // User A creates a table with column widths → User B views it on a smaller screen
 // User A creates a table with column widths → User A views it with reduced viewport space (eg. Confluence sidebar is open)
 var MAX_SCALING_PERCENT = 0.3;
-var getTableLayoutWidth = function getTableLayoutWidth(layout) {
-  switch (layout) {
-    case 'full-width':
-      return _editorSharedStyles.akEditorFullWidthLayoutWidth;
-    case 'wide':
-      return _editorSharedStyles.akEditorWideLayoutWidth;
-    default:
-      return _editorSharedStyles.akEditorDefaultLayoutWidth;
-  }
-};
 var isTableResized = function isTableResized(columnWidths) {
   var filteredWidths = columnWidths.filter(function (width) {
     return width !== 0;
@@ -54,7 +44,6 @@ var calcScalePercent = exports.calcScalePercent = function calcScalePercent(_ref
 };
 var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   var columnWidths = props.columnWidths,
-    layout = props.layout,
     isNumberColumnEnabled = props.isNumberColumnEnabled,
     renderWidth = props.renderWidth,
     tableNode = props.tableNode,
@@ -64,15 +53,10 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   if (!columnWidths) {
     return [];
   }
-  var tableContainerWidth;
   var tableResized = isTableResized(columnWidths);
   var noOfColumns = columnWidths.length;
   var targetWidths;
-  if ((0, _table.isTableResizingEnabled)(rendererAppearance) && tableNode) {
-    tableContainerWidth = (0, _nodeWidth.getTableContainerWidth)(tableNode);
-  } else {
-    tableContainerWidth = getTableLayoutWidth(layout);
-  }
+  var tableContainerWidth = (0, _nodeWidth.getTableContainerWidth)(tableNode);
   if ((0, _table.isTableResizingEnabled)(rendererAppearance) && !isInsideOfBlockNode && !isinsideMultiBodiedExtension && !tableResized) {
     // for tables with no column widths defined, assume that the real table width
     // is defined by node.attrs.width

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

@@ -19,7 +19,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _types = require("@atlaskit/editor-common/types");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _style = require("../../ui/Renderer/style");
 var _tableCell = require("./tableCell");
@@ -33,7 +32,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var isTableResizingEnabled = exports.isTableResizingEnabled = function isTableResizingEnabled(appearance) {
-  return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') && (0, _appearance.isFullWidthOrFullPageAppearance)(appearance);
+  return (0, _appearance.isFullWidthOrFullPageAppearance)(appearance);
 };
 var orderChildren = function orderChildren(children, tableNode, smartCardStorage, tableOrderStatus) {
   if (!tableOrderStatus || tableOrderStatus.order === _types.SortOrder.NO_ORDER) {
@@ -299,7 +298,6 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
         isinsideMultiBodiedExtension = _this$props.isinsideMultiBodiedExtension;
       var stickyMode = this.state.stickyMode;
       var lineLength = _editorSharedStyles.akEditorDefaultLayoutWidth;
-      var tableWidth;
       var left;
       var updatedLayout;
 
@@ -307,8 +305,8 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
       // Please consider changes below carefully to not negatively impact SSR
       // `renderWidth` cannot be depended on during SSR
       var isRenderWidthValid = !!renderWidth && renderWidth > 0;
-      var calcDefaultLayoutWidthByAppearance = function calcDefaultLayoutWidthByAppearance(tableNode, rendererAppearance) {
-        if (rendererAppearance === 'full-width' && !tableNode.attrs.width) {
+      var calcDefaultLayoutWidthByAppearance = function calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode) {
+        if (rendererAppearance === 'full-width' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
           return isRenderWidthValid ? Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, renderWidth) : _editorSharedStyles.akEditorFullWidthLayoutWidth;
         } else {
           // custom width, or width mapped to breakpoint
@@ -316,12 +314,8 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
           return isRenderWidthValid ? Math.min(tableContainerWidth, renderWidth) : tableContainerWidth;
         }
       };
-      if (isTableResizingEnabled(rendererAppearance) && tableNode) {
-        tableWidth = calcDefaultLayoutWidthByAppearance(tableNode, rendererAppearance);
-      } else {
-        tableWidth = (0, _styles.calcTableWidth)(layout, renderWidth, false);
-      }
-      if (canUseLinelength(rendererAppearance) && tableWidth !== 'inherit' && tableWidth > lineLength) {
+      var tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
+      if (canUseLinelength(rendererAppearance) && tableWidth > lineLength) {
         left = lineLength / 2 - tableWidth / 2;
       }
       var children = _react.default.Children.toArray(this.props.children);
@@ -329,30 +323,15 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
       // Historically, tables in the full-width renderer had their layout set to 'default' which is deceiving.
       // This check caters for those tables and helps with SSR logic
       var isFullWidth = !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) && rendererAppearance === 'full-width' && layout !== 'full-width';
-      var hasCustomWidth = isTableResizingEnabled(rendererAppearance) && (tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.width);
       if (isFullWidth) {
         updatedLayout = 'full-width';
-      } else if (hasCustomWidth) {
+        // if table has width explicity set, ensure SSR is handled
+      } else if (tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) {
         updatedLayout = 'custom';
       } else {
         updatedLayout = layout;
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') && stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/_react.default.createElement(_sticky.StickyTable, {
-        isNumberColumnEnabled: isNumberColumnEnabled,
-        tableWidth: tableWidth,
-        layout: layout,
-        renderWidth: renderWidth,
-        handleRef: this.props.handleRef,
-        shadowClassNames: this.props.shadowClassNames,
-        top: this.stickyTop,
-        left: left,
-        mode: stickyMode,
-        innerRef: this.stickyWrapperRef,
-        wrapperWidth: this.state.wrapperWidth,
-        columnWidths: columnWidths,
-        rowHeight: this.state.headerRowHeight,
-        rendererAppearance: rendererAppearance
-      }, [children && children[0]]), /*#__PURE__*/_react.default.createElement("div", {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(this.props.shadowClassNames || ''),
         "data-layout": updatedLayout,
         ref: this.props.handleRef,
@@ -361,7 +340,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
           // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/design-system/ensure-design-token-usage/preview
           left: left
         }
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') && stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/_react.default.createElement(_sticky.StickyTable, {
+      }, stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/_react.default.createElement(_sticky.StickyTable, {
         isNumberColumnEnabled: isNumberColumnEnabled,
         tableWidth: tableWidth,
         layout: layout,

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

@@ -59,7 +59,9 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
   }, {
     key: "componentDidCatch",
     value: function componentDidCatch(error, errorInfo) {
-      var _this2 = this;
+      var _this$props$additiona,
+        _this2 = this;
+      var additionalInfo = (_this$props$additiona = this.props.additionalInfo) !== null && _this$props$additiona !== void 0 ? _this$props$additiona : '';
       this.fireAnalyticsEvent({
         action: _analytics.ACTION.CRASHED,
         actionSubject: this.props.component,
@@ -67,7 +69,7 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
         eventType: _analytics.EVENT_TYPE.OPERATIONAL,
         attributes: {
           platform: _events.PLATFORM.WEB,
-          errorMessage: error === null || error === void 0 ? void 0 : error.message,
+          errorMessage: "".concat(additionalInfo).concat(error === null || error === void 0 ? void 0 : error.message),
           componentStack: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack,
           errorRethrown: Boolean(this.props.rethrowError)
         }
@@ -86,7 +88,7 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
             eventType: _analytics.EVENT_TYPE.OPERATIONAL,
             attributes: {
               platform: _events.PLATFORM.WEB,
-              errorMessage: error === null || error === void 0 ? void 0 : error.message
+              errorMessage: "".concat(additionalInfo).concat(error === null || error === void 0 ? void 0 : error.message)
             }
           });
           this.setState(function () {

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

@@ -55,7 +55,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 = "109.17.1";
+var packageVersion = "109.17.3";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

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

@@ -1,15 +1,29 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { renderExtension } from './extension';
+import { ErrorBoundary } from '../../ui/Renderer/ErrorBoundary';
 import ExtensionRenderer from '../../ui/ExtensionRenderer';
+import { ACTION_SUBJECT } from '../../analytics/enums';
+import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 const BodiedExtension = props => {
   const {
     children,
     layout = 'default',
-    path = []
+    path = [],
+    extensionKey,
+    extensionType
   } = props;
+  const {
+    createAnalyticsEvent
+  } = useAnalyticsEvents();
   const removeOverflow = React.Children.toArray(children).map(child => /*#__PURE__*/React.isValidElement(child) ? child.props.nodeType === 'table' : false).every(Boolean);
-  return /*#__PURE__*/React.createElement(ExtensionRenderer, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(ErrorBoundary, {
+    component: ACTION_SUBJECT.RENDERER,
+    componentId: ACTION_SUBJECT_ID.EXTENSION_BODIED,
+    createAnalyticsEvent: createAnalyticsEvent,
+    additionalInfo: `${extensionType}: ${extensionKey} `
+  }, /*#__PURE__*/React.createElement(ExtensionRenderer, _extends({}, props, {
     type: "bodiedExtension"
   }), ({
     result
@@ -30,6 +44,6 @@ const BodiedExtension = props => {
     return renderExtension(children, layout, {
       isTopLevel: path.length < 1
     }, removeOverflow);
-  });
+  }));
 };
 export default BodiedExtension;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { akEditorTableNumberColumnWidth, akEditorWideLayoutWidth, akEditorFullWidthLayoutWidth, akEditorTableLegacyCellMinWidth, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
+import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { isTableResizingEnabled } from '../table';
 
@@ -9,16 +9,6 @@ import { isTableResizingEnabled } from '../table';
 // User A creates a table with column widths → User B views it on a smaller screen
 // User A creates a table with column widths → User A views it with reduced viewport space (eg. Confluence sidebar is open)
 const MAX_SCALING_PERCENT = 0.3;
-const getTableLayoutWidth = layout => {
-  switch (layout) {
-    case 'full-width':
-      return akEditorFullWidthLayoutWidth;
-    case 'wide':
-      return akEditorWideLayoutWidth;
-    default:
-      return akEditorDefaultLayoutWidth;
-  }
-};
 const isTableResized = columnWidths => {
   const filteredWidths = columnWidths.filter(width => width !== 0);
   return !!filteredWidths.length;
@@ -48,7 +38,6 @@ export const calcScalePercent = ({
 const renderScaleDownColgroup = props => {
   let {
     columnWidths,
-    layout,
     isNumberColumnEnabled,
     renderWidth,
     tableNode,
@@ -59,15 +48,10 @@ const renderScaleDownColgroup = props => {
   if (!columnWidths) {
     return [];
   }
-  let tableContainerWidth;
   const tableResized = isTableResized(columnWidths);
   const noOfColumns = columnWidths.length;
   let targetWidths;
-  if (isTableResizingEnabled(rendererAppearance) && tableNode) {
-    tableContainerWidth = getTableContainerWidth(tableNode);
-  } else {
-    tableContainerWidth = getTableLayoutWidth(layout);
-  }
+  const tableContainerWidth = getTableContainerWidth(tableNode);
   if (isTableResizingEnabled(rendererAppearance) && !isInsideOfBlockNode && !isinsideMultiBodiedExtension && !tableResized) {
     // for tables with no column widths defined, assume that the real table width
     // is defined by node.attrs.width

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

@@ -1,12 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { calcTableWidth, TableSharedCssClassName, tableMarginTop } from '@atlaskit/editor-common/styles';
+import { TableSharedCssClassName, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { WidthConsumer, overflowShadow } from '@atlaskit/editor-common/ui';
 import { createCompareNodes, convertProsemirrorTableNodeToArrayOfRows, hasMergedCell, compose } from '@atlaskit/editor-common/utils';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { FullPagePadding } from '../../ui/Renderer/style';
 import { TableHeader } from './tableCell';
@@ -14,7 +13,7 @@ import { withSmartCardStorage } from '../../ui/SmartCardStorage';
 import { StickyTable, tableStickyPadding, OverflowParent } from './table/sticky';
 import { Table } from './table/table';
 import { isFullWidthOrFullPageAppearance } from '../utils/appearance';
-export const isTableResizingEnabled = appearance => getBooleanFF('platform.editor.custom-table-width') && isFullWidthOrFullPageAppearance(appearance);
+export const isTableResizingEnabled = appearance => isFullWidthOrFullPageAppearance(appearance);
 const orderChildren = (children, tableNode, smartCardStorage, tableOrderStatus) => {
   if (!tableOrderStatus || tableOrderStatus.order === SortOrder.NO_ORDER) {
     return children;
@@ -246,7 +245,6 @@ export class TableContainer extends React.Component {
       stickyMode
     } = this.state;
     const lineLength = akEditorDefaultLayoutWidth;
-    let tableWidth;
     let left;
     let updatedLayout;
 
@@ -254,8 +252,8 @@ export class TableContainer extends React.Component {
     // Please consider changes below carefully to not negatively impact SSR
     // `renderWidth` cannot be depended on during SSR
     const isRenderWidthValid = !!renderWidth && renderWidth > 0;
-    const calcDefaultLayoutWidthByAppearance = (tableNode, rendererAppearance) => {
-      if (rendererAppearance === 'full-width' && !tableNode.attrs.width) {
+    const calcDefaultLayoutWidthByAppearance = (rendererAppearance, tableNode) => {
+      if (rendererAppearance === 'full-width' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
         return isRenderWidthValid ? Math.min(akEditorFullWidthLayoutWidth, renderWidth) : akEditorFullWidthLayoutWidth;
       } else {
         // custom width, or width mapped to breakpoint
@@ -263,12 +261,8 @@ export class TableContainer extends React.Component {
         return isRenderWidthValid ? Math.min(tableContainerWidth, renderWidth) : tableContainerWidth;
       }
     };
-    if (isTableResizingEnabled(rendererAppearance) && tableNode) {
-      tableWidth = calcDefaultLayoutWidthByAppearance(tableNode, rendererAppearance);
-    } else {
-      tableWidth = calcTableWidth(layout, renderWidth, false);
-    }
-    if (canUseLinelength(rendererAppearance) && tableWidth !== 'inherit' && tableWidth > lineLength) {
+    const tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
+    if (canUseLinelength(rendererAppearance) && tableWidth > lineLength) {
       left = lineLength / 2 - tableWidth / 2;
     }
     const children = React.Children.toArray(this.props.children);
@@ -276,30 +270,15 @@ export class TableContainer extends React.Component {
     // Historically, tables in the full-width renderer had their layout set to 'default' which is deceiving.
     // This check caters for those tables and helps with SSR logic
     const isFullWidth = !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) && rendererAppearance === 'full-width' && layout !== 'full-width';
-    const hasCustomWidth = isTableResizingEnabled(rendererAppearance) && (tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.width);
     if (isFullWidth) {
       updatedLayout = 'full-width';
-    } else if (hasCustomWidth) {
+      // if table has width explicity set, ensure SSR is handled
+    } else if (tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) {
       updatedLayout = 'custom';
     } else {
       updatedLayout = layout;
     }
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !getBooleanFF('platform.editor.custom-table-width') && stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/React.createElement(StickyTable, {
-      isNumberColumnEnabled: isNumberColumnEnabled,
-      tableWidth: tableWidth,
-      layout: layout,
-      renderWidth: renderWidth,
-      handleRef: this.props.handleRef,
-      shadowClassNames: this.props.shadowClassNames,
-      top: this.stickyTop,
-      left: left,
-      mode: stickyMode,
-      innerRef: this.stickyWrapperRef,
-      wrapperWidth: this.state.wrapperWidth,
-      columnWidths: columnWidths,
-      rowHeight: this.state.headerRowHeight,
-      rendererAppearance: rendererAppearance
-    }, [children && children[0]]), /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: `${TableSharedCssClassName.TABLE_CONTAINER} ${this.props.shadowClassNames || ''}`,
       "data-layout": updatedLayout,
       ref: this.props.handleRef,
@@ -308,7 +287,7 @@ export class TableContainer extends React.Component {
         // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/design-system/ensure-design-token-usage/preview
         left
       }
-    }, getBooleanFF('platform.editor.custom-table-width') && stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/React.createElement(StickyTable, {
+    }, stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/React.createElement(StickyTable, {
       isNumberColumnEnabled: isNumberColumnEnabled,
       tableWidth: tableWidth,
       layout: layout,

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

@@ -30,6 +30,8 @@ export class ErrorBoundary extends React.Component {
     return this.hasFallback() && this.state.errorCaptured;
   }
   componentDidCatch(error, errorInfo) {
+    var _this$props$additiona;
+    const additionalInfo = (_this$props$additiona = this.props.additionalInfo) !== null && _this$props$additiona !== void 0 ? _this$props$additiona : '';
     this.fireAnalyticsEvent({
       action: ACTION.CRASHED,
       actionSubject: this.props.component,
@@ -37,7 +39,7 @@ export class ErrorBoundary extends React.Component {
       eventType: EVENT_TYPE.OPERATIONAL,
       attributes: {
         platform: PLATFORM.WEB,
-        errorMessage: error === null || error === void 0 ? void 0 : error.message,
+        errorMessage: `${additionalInfo}${error === null || error === void 0 ? void 0 : error.message}`,
         componentStack: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack,
         errorRethrown: Boolean(this.props.rethrowError)
       }
@@ -56,7 +58,7 @@ export class ErrorBoundary extends React.Component {
           eventType: EVENT_TYPE.OPERATIONAL,
           attributes: {
             platform: PLATFORM.WEB,
-            errorMessage: error === null || error === void 0 ? void 0 : error.message
+            errorMessage: `${additionalInfo}${error === null || error === void 0 ? void 0 : error.message}`
           }
         });
         this.setState(() => ({

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

@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.17.1";
+const packageVersion = "109.17.3";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

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

@@ -1,17 +1,30 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { renderExtension } from './extension';
+import { ErrorBoundary } from '../../ui/Renderer/ErrorBoundary';
 import ExtensionRenderer from '../../ui/ExtensionRenderer';
+import { ACTION_SUBJECT } from '../../analytics/enums';
+import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 var BodiedExtension = function BodiedExtension(props) {
   var children = props.children,
     _props$layout = props.layout,
     layout = _props$layout === void 0 ? 'default' : _props$layout,
     _props$path = props.path,
-    path = _props$path === void 0 ? [] : _props$path;
+    path = _props$path === void 0 ? [] : _props$path,
+    extensionKey = props.extensionKey,
+    extensionType = props.extensionType;
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var removeOverflow = React.Children.toArray(children).map(function (child) {
     return /*#__PURE__*/React.isValidElement(child) ? child.props.nodeType === 'table' : false;
   }).every(Boolean);
-  return /*#__PURE__*/React.createElement(ExtensionRenderer, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(ErrorBoundary, {
+    component: ACTION_SUBJECT.RENDERER,
+    componentId: ACTION_SUBJECT_ID.EXTENSION_BODIED,
+    createAnalyticsEvent: createAnalyticsEvent,
+    additionalInfo: "".concat(extensionType, ": ").concat(extensionKey, " ")
+  }, /*#__PURE__*/React.createElement(ExtensionRenderer, _extends({}, props, {
     type: "bodiedExtension"
   }), function (_ref) {
     var result = _ref.result;
@@ -31,6 +44,6 @@ var BodiedExtension = function BodiedExtension(props) {
     return renderExtension(children, layout, {
       isTopLevel: path.length < 1
     }, removeOverflow);
-  });
+  }));
 };
 export default BodiedExtension;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { akEditorTableNumberColumnWidth, akEditorWideLayoutWidth, akEditorFullWidthLayoutWidth, akEditorTableLegacyCellMinWidth, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
+import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { isTableResizingEnabled } from '../table';
 
@@ -9,16 +9,6 @@ import { isTableResizingEnabled } from '../table';
 // User A creates a table with column widths → User B views it on a smaller screen
 // User A creates a table with column widths → User A views it with reduced viewport space (eg. Confluence sidebar is open)
 var MAX_SCALING_PERCENT = 0.3;
-var getTableLayoutWidth = function getTableLayoutWidth(layout) {
-  switch (layout) {
-    case 'full-width':
-      return akEditorFullWidthLayoutWidth;
-    case 'wide':
-      return akEditorWideLayoutWidth;
-    default:
-      return akEditorDefaultLayoutWidth;
-  }
-};
 var isTableResized = function isTableResized(columnWidths) {
   var filteredWidths = columnWidths.filter(function (width) {
     return width !== 0;
@@ -48,7 +38,6 @@ export var calcScalePercent = function calcScalePercent(_ref) {
 };
 var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   var columnWidths = props.columnWidths,
-    layout = props.layout,
     isNumberColumnEnabled = props.isNumberColumnEnabled,
     renderWidth = props.renderWidth,
     tableNode = props.tableNode,
@@ -58,15 +47,10 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
   if (!columnWidths) {
     return [];
   }
-  var tableContainerWidth;
   var tableResized = isTableResized(columnWidths);
   var noOfColumns = columnWidths.length;
   var targetWidths;
-  if (isTableResizingEnabled(rendererAppearance) && tableNode) {
-    tableContainerWidth = getTableContainerWidth(tableNode);
-  } else {
-    tableContainerWidth = getTableLayoutWidth(layout);
-  }
+  var tableContainerWidth = getTableContainerWidth(tableNode);
   if (isTableResizingEnabled(rendererAppearance) && !isInsideOfBlockNode && !isinsideMultiBodiedExtension && !tableResized) {
     // for tables with no column widths defined, assume that the real table width
     // is defined by node.attrs.width

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

@@ -12,12 +12,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import { calcTableWidth, TableSharedCssClassName, tableMarginTop } from '@atlaskit/editor-common/styles';
+import { TableSharedCssClassName, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { WidthConsumer, overflowShadow } from '@atlaskit/editor-common/ui';
 import { createCompareNodes, convertProsemirrorTableNodeToArrayOfRows, hasMergedCell, compose } from '@atlaskit/editor-common/utils';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { FullPagePadding } from '../../ui/Renderer/style';
 import { TableHeader } from './tableCell';
@@ -26,7 +25,7 @@ import { StickyTable, tableStickyPadding, OverflowParent } from './table/sticky'
 import { Table } from './table/table';
 import { isFullWidthOrFullPageAppearance } from '../utils/appearance';
 export var isTableResizingEnabled = function isTableResizingEnabled(appearance) {
-  return getBooleanFF('platform.editor.custom-table-width') && isFullWidthOrFullPageAppearance(appearance);
+  return isFullWidthOrFullPageAppearance(appearance);
 };
 var orderChildren = function orderChildren(children, tableNode, smartCardStorage, tableOrderStatus) {
   if (!tableOrderStatus || tableOrderStatus.order === SortOrder.NO_ORDER) {
@@ -292,7 +291,6 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
         isinsideMultiBodiedExtension = _this$props.isinsideMultiBodiedExtension;
       var stickyMode = this.state.stickyMode;
       var lineLength = akEditorDefaultLayoutWidth;
-      var tableWidth;
       var left;
       var updatedLayout;
 
@@ -300,8 +298,8 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
       // Please consider changes below carefully to not negatively impact SSR
       // `renderWidth` cannot be depended on during SSR
       var isRenderWidthValid = !!renderWidth && renderWidth > 0;
-      var calcDefaultLayoutWidthByAppearance = function calcDefaultLayoutWidthByAppearance(tableNode, rendererAppearance) {
-        if (rendererAppearance === 'full-width' && !tableNode.attrs.width) {
+      var calcDefaultLayoutWidthByAppearance = function calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode) {
+        if (rendererAppearance === 'full-width' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
           return isRenderWidthValid ? Math.min(akEditorFullWidthLayoutWidth, renderWidth) : akEditorFullWidthLayoutWidth;
         } else {
           // custom width, or width mapped to breakpoint
@@ -309,12 +307,8 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
           return isRenderWidthValid ? Math.min(tableContainerWidth, renderWidth) : tableContainerWidth;
         }
       };
-      if (isTableResizingEnabled(rendererAppearance) && tableNode) {
-        tableWidth = calcDefaultLayoutWidthByAppearance(tableNode, rendererAppearance);
-      } else {
-        tableWidth = calcTableWidth(layout, renderWidth, false);
-      }
-      if (canUseLinelength(rendererAppearance) && tableWidth !== 'inherit' && tableWidth > lineLength) {
+      var tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
+      if (canUseLinelength(rendererAppearance) && tableWidth > lineLength) {
         left = lineLength / 2 - tableWidth / 2;
       }
       var children = React.Children.toArray(this.props.children);
@@ -322,30 +316,15 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
       // Historically, tables in the full-width renderer had their layout set to 'default' which is deceiving.
       // This check caters for those tables and helps with SSR logic
       var isFullWidth = !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) && rendererAppearance === 'full-width' && layout !== 'full-width';
-      var hasCustomWidth = isTableResizingEnabled(rendererAppearance) && (tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.width);
       if (isFullWidth) {
         updatedLayout = 'full-width';
-      } else if (hasCustomWidth) {
+        // if table has width explicity set, ensure SSR is handled
+      } else if (tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) {
         updatedLayout = 'custom';
       } else {
         updatedLayout = layout;
       }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, !getBooleanFF('platform.editor.custom-table-width') && stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/React.createElement(StickyTable, {
-        isNumberColumnEnabled: isNumberColumnEnabled,
-        tableWidth: tableWidth,
-        layout: layout,
-        renderWidth: renderWidth,
-        handleRef: this.props.handleRef,
-        shadowClassNames: this.props.shadowClassNames,
-        top: this.stickyTop,
-        left: left,
-        mode: stickyMode,
-        innerRef: this.stickyWrapperRef,
-        wrapperWidth: this.state.wrapperWidth,
-        columnWidths: columnWidths,
-        rowHeight: this.state.headerRowHeight,
-        rendererAppearance: rendererAppearance
-      }, [children && children[0]]), /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: "".concat(TableSharedCssClassName.TABLE_CONTAINER, " ").concat(this.props.shadowClassNames || ''),
         "data-layout": updatedLayout,
         ref: this.props.handleRef,
@@ -354,7 +333,7 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
           // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/design-system/ensure-design-token-usage/preview
           left: left
         }
-      }, getBooleanFF('platform.editor.custom-table-width') && stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/React.createElement(StickyTable, {
+      }, stickyHeaders && tableCanBeSticky(tableNode, children) && /*#__PURE__*/React.createElement(StickyTable, {
         isNumberColumnEnabled: isNumberColumnEnabled,
         tableWidth: tableWidth,
         layout: layout,

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

@@ -52,7 +52,9 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidCatch",
     value: function componentDidCatch(error, errorInfo) {
-      var _this2 = this;
+      var _this$props$additiona,
+        _this2 = this;
+      var additionalInfo = (_this$props$additiona = this.props.additionalInfo) !== null && _this$props$additiona !== void 0 ? _this$props$additiona : '';
       this.fireAnalyticsEvent({
         action: ACTION.CRASHED,
         actionSubject: this.props.component,
@@ -60,7 +62,7 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
         eventType: EVENT_TYPE.OPERATIONAL,
         attributes: {
           platform: PLATFORM.WEB,
-          errorMessage: error === null || error === void 0 ? void 0 : error.message,
+          errorMessage: "".concat(additionalInfo).concat(error === null || error === void 0 ? void 0 : error.message),
           componentStack: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack,
           errorRethrown: Boolean(this.props.rethrowError)
         }
@@ -79,7 +81,7 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
             eventType: EVENT_TYPE.OPERATIONAL,
             attributes: {
               platform: PLATFORM.WEB,
-              errorMessage: error === null || error === void 0 ? void 0 : error.message
+              errorMessage: "".concat(additionalInfo).concat(error === null || error === void 0 ? void 0 : error.message)
             }
           });
           this.setState(function () {

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

@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.17.1";
+var packageVersion = "109.17.3";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

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

@@ -8,6 +8,7 @@ interface ErrorBoundaryProps {
     fallbackComponent?: React.ReactNode;
     createAnalyticsEvent?: CreateUIAnalyticsEvent;
     rethrowError?: boolean;
+    additionalInfo?: string;
 }
 interface ErrorBoundaryState {
     errorCaptured: boolean;

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

@@ -8,6 +8,7 @@ interface ErrorBoundaryProps {
     fallbackComponent?: React.ReactNode;
     createAnalyticsEvent?: CreateUIAnalyticsEvent;
     rethrowError?: boolean;
+    additionalInfo?: string;
 }
 interface ErrorBoundaryState {
     errorCaptured: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.17.1",
+  "version": "109.17.3",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.1.0",
-    "@atlaskit/link-datasource": "^1.26.0",
+    "@atlaskit/link-datasource": "^1.27.0",
     "@atlaskit/media-card": "^77.11.0",
     "@atlaskit/media-client": "^26.3.0",
     "@atlaskit/media-client-react": "^2.0.0",
@@ -47,7 +47,7 @@
     "@atlaskit/media-ui": "^25.7.0",
     "@atlaskit/media-viewer": "^48.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/smart-card": "^26.54.0",
+    "@atlaskit/smart-card": "^26.55.0",
     "@atlaskit/status": "^1.4.0",
     "@atlaskit/task-decision": "^17.9.0",
     "@atlaskit/theme": "^12.7.0",
@@ -119,9 +119,6 @@
     }
   },
   "platform-feature-flags": {
-    "platform.editor.custom-table-width": {
-      "type": "boolean"
-    },
     "platform.media-experience.media-viewer-v2_hgsii": {
       "type": "boolean",
       "referenceOnly": "true"