@atlaskit/editor-common 106.0.2 → 106.1.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-common
 
+## 106.1.1
+
+### Patch Changes
+
+- [#158451](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/158451)
+  [`b1235f9180ac5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b1235f9180ac5) -
+  EDITOR-586 - Implement Select Annotation APIs for Renderer and integrate with CCFE
+
+## 106.1.0
+
+### Minor Changes
+
+- [#157313](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/157313)
+  [`8f3a2416f23fe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8f3a2416f23fe) -
+  [ux] Added a reserved height to the extension NodeWrapper in the editor. An array of
+  ExtensionViewportSize is sent from Confluence editor through the plugins into the nodeviews and
+  used there. Depending on the array values, a minimum height is set.
+- [#162505](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/162505)
+  [`2fb5a885dc719`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2fb5a885dc719) -
+  clean up platform_editor_table_row_span_fix_all and platform_editor_table_row_span_fix fgs
+
 ## 106.0.2
 
 ### Patch Changes

package/dist/cjs/extensibility/ExtensionNodeWrapper.js

@@ -8,10 +8,12 @@ exports.ExtensionNodeWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _whitespace = require("../whitespace");
 /**
  * @jsxRuntime classic
  * @jsx jsx
+ * @jsxFrag React.Fragment
  */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -26,6 +28,35 @@ var styles = (0, _react2.css)({
     position: 'relative'
   }
 });
+var viewportSizes = ['small', 'medium', 'default', 'large', 'xlarge'];
+var macroHeights = {
+  small: '112px',
+  medium: '262px',
+  default: '262px',
+  large: '524px',
+  xlarge: '1048px'
+};
+var getViewportHeight = function getViewportHeight(extensionId, extensionViewportSizes) {
+  var _extensionViewportSiz;
+  var viewportSize = Array.isArray(extensionViewportSizes) && extensionId ? (_extensionViewportSiz = extensionViewportSizes.find(function (ext) {
+    return ext.extensionId === extensionId;
+  })) === null || _extensionViewportSiz === void 0 ? void 0 : _extensionViewportSiz.viewportSize : undefined;
+  if (!viewportSize) {
+    return undefined;
+  }
+
+  // If it's a predefined size, use the macroHeights mapping
+  if (viewportSizes.includes(viewportSize)) {
+    return macroHeights[viewportSize];
+  }
+
+  // This is added to somewhat prepare to support connect macros which don't have a predefined size
+  // If it's a custom pixel value, use it directly
+  if (viewportSize.endsWith('px')) {
+    return viewportSize;
+  }
+  return undefined;
+};
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
  * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
@@ -37,18 +68,28 @@ var styles = (0, _react2.css)({
 var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
     nodeType = _ref.nodeType,
-    macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags;
+    macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags,
+    extensionId = _ref.extensionId,
+    extensionViewportSizes = _ref.extensionViewportSizes;
   var _ref2 = macroInteractionDesignFeatureFlags || {},
     showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
   var wrapperClassNames = (0, _classnames.default)({
     'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
     relative: showMacroInteractionDesignUpdates
   });
-  return (
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    (0, _react2.jsx)("span", {
-      className: wrapperClassNames,
-      css: styles
-    }, children, nodeType === 'inlineExtension' && _whitespace.ZERO_WIDTH_SPACE)
-  );
+  var viewportHeight = getViewportHeight(extensionId, extensionViewportSizes);
+  var content =
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+  (0, _react2.jsx)("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && _whitespace.ZERO_WIDTH_SPACE);
+  if (viewportHeight && (0, _platformFeatureFlags.fg)('confluence_preload_forge_viewport_heights_editor')) {
+    return (0, _react2.jsx)("div", {
+      style: {
+        minHeight: viewportHeight
+      }
+    }, content);
+  }
+  return content;
 };

package/dist/cjs/extensibility/extensionNodeView.js

@@ -52,10 +52,12 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
   }, {
     key: "render",
     value: function render(props, forwardRef) {
-      var _props$extensionNodeV;
+      var _this$node$attrs$para, _props$extensionNodeV, _props$extensionNodeV2;
       return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {
         nodeType: this.node.type.name,
-        macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
+        macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
+        extensionId: (_this$node$attrs$para = this.node.attrs.parameters) === null || _this$node$attrs$para === void 0 ? void 0 : _this$node$attrs$para.extensionId,
+        extensionViewportSizes: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.extensionViewportSizes
       }, /*#__PURE__*/_react.default.createElement(_Extension.Extension, {
         editorView: this.view,
         node: this.node,
@@ -71,7 +73,7 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
         providerFactory: props.providerFactory,
         handleContentDOMRef: forwardRef,
         extensionHandlers: props.extensionHandlers,
-        editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
+        editorAppearance: (_props$extensionNodeV2 = props.extensionNodeViewOptions) === null || _props$extensionNodeV2 === void 0 ? void 0 : _props$extensionNodeV2.appearance,
         pluginInjectionApi: props.pluginInjectionApi,
         macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "106.0.2";
+var packageVersion = "106.1.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/resizer/useBreakoutGuidelines.js

@@ -118,7 +118,9 @@ function useBreakoutGuidelines(getEditorWidth, isResizing) {
       setCurrentLayout('center');
     } else if (wide && Math.abs(newWidth - wide) < SNAP_GAP / 2) {
       setCurrentLayout('wide');
-    } else if (fullWidth && (Math.abs(newWidth - fullWidth + _editorSharedStyles.akEditorGutterPadding) < SNAP_GAP / 2 || newWidth >= fullWidth)) {
+    } else if (fullWidth && (
+    // we only allow snap from one side, so we don't use Math.abs here
+    fullWidth + _editorSharedStyles.akEditorGutterPadding - newWidth < SNAP_GAP / 2 || newWidth >= fullWidth)) {
       setCurrentLayout('full-width');
     } else {
       setCurrentLayout(null);

package/dist/cjs/types/extensibility.js

@@ -0,0 +1 @@
+"use strict";

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

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "106.0.2";
+var packageVersion = "106.1.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/cjs/utils/table.js

@@ -10,7 +10,6 @@ exports.getColumnWidths = getColumnWidths;
 exports.hasMergedCell = hasMergedCell;
 exports.isPositionNearTableRow = isPositionNearTableRow;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * Returns an array of column widths (0 if column width is undefined) of a given table node by scanning the **entire table**.
  *
@@ -64,42 +63,22 @@ function getColumnWidths(node) {
  * @returns Array<number>
  */
 function calcTableColumnWidths(node) {
-  // Ignored via go/ees007
-  // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
-  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
-  if ((0, _platformFeatureFlags.fg)('platform_editor_table_row_span_fix') || (0, _platformFeatureFlags.fg)('platform_editor_table_row_span_fix_all')) {
-    var _firstRow = node.firstChild;
-    var _tableColumnWidths = [];
-    if (_firstRow) {
-      _firstRow.forEach(function (cell) {
-        var _cell$attrs = cell.attrs,
-          colspan = _cell$attrs.colspan,
-          colwidth = _cell$attrs.colwidth;
-        // column has been resized, colWidth will be an array, can safely take values even if cell is merged
-        if (Array.isArray(colwidth)) {
-          _tableColumnWidths.push.apply(_tableColumnWidths, (0, _toConsumableArray2.default)(colwidth));
-          // table has merged cells but no colWidth, so columns haven't been resized, default to 0
-        } else if (colspan > 1) {
-          _tableColumnWidths.push.apply(_tableColumnWidths, (0, _toConsumableArray2.default)(Array(colspan).fill(0)));
-          // no merged cells, no column resized, default to 0
-        } else {
-          _tableColumnWidths.push(0);
-        }
-      });
-    }
-    return _tableColumnWidths;
-  }
-  var tableColumnWidths = [];
   var firstRow = node.firstChild;
+  var tableColumnWidths = [];
   if (firstRow) {
-    // Sanity validation, but it should always have a first row
-    // Iterate for the cells in the first row
-    firstRow.forEach(function (colNode) {
-      var colwidth = colNode.attrs.colwidth || [0];
-
-      // If we have colwidth, we added it
-      if (colwidth) {
-        tableColumnWidths = [].concat((0, _toConsumableArray2.default)(tableColumnWidths), (0, _toConsumableArray2.default)(colwidth));
+    firstRow.forEach(function (cell) {
+      var _cell$attrs = cell.attrs,
+        colspan = _cell$attrs.colspan,
+        colwidth = _cell$attrs.colwidth;
+      // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+      if (Array.isArray(colwidth)) {
+        tableColumnWidths.push.apply(tableColumnWidths, (0, _toConsumableArray2.default)(colwidth));
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan > 1) {
+        tableColumnWidths.push.apply(tableColumnWidths, (0, _toConsumableArray2.default)(Array(colspan).fill(0)));
+        // no merged cells, no column resized, default to 0
+      } else {
+        tableColumnWidths.push(0);
       }
     });
   }

package/dist/es2019/extensibility/ExtensionNodeWrapper.js

@@ -1,12 +1,14 @@
 /**
  * @jsxRuntime classic
  * @jsx jsx
+ * @jsxFrag React.Fragment
  */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ZERO_WIDTH_SPACE } from '../whitespace';
 const styles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -18,6 +20,33 @@ const styles = css({
     position: 'relative'
   }
 });
+const viewportSizes = ['small', 'medium', 'default', 'large', 'xlarge'];
+const macroHeights = {
+  small: '112px',
+  medium: '262px',
+  default: '262px',
+  large: '524px',
+  xlarge: '1048px'
+};
+const getViewportHeight = (extensionId, extensionViewportSizes) => {
+  var _extensionViewportSiz;
+  const viewportSize = Array.isArray(extensionViewportSizes) && extensionId ? (_extensionViewportSiz = extensionViewportSizes.find(ext => ext.extensionId === extensionId)) === null || _extensionViewportSiz === void 0 ? void 0 : _extensionViewportSiz.viewportSize : undefined;
+  if (!viewportSize) {
+    return undefined;
+  }
+
+  // If it's a predefined size, use the macroHeights mapping
+  if (viewportSizes.includes(viewportSize)) {
+    return macroHeights[viewportSize];
+  }
+
+  // This is added to somewhat prepare to support connect macros which don't have a predefined size
+  // If it's a custom pixel value, use it directly
+  if (viewportSize.endsWith('px')) {
+    return viewportSize;
+  }
+  return undefined;
+};
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
  * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
@@ -29,7 +58,9 @@ const styles = css({
 export const ExtensionNodeWrapper = ({
   children,
   nodeType,
-  macroInteractionDesignFeatureFlags
+  macroInteractionDesignFeatureFlags,
+  extensionId,
+  extensionViewportSizes
 }) => {
   const {
     showMacroInteractionDesignUpdates
@@ -38,11 +69,19 @@ export const ExtensionNodeWrapper = ({
     'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
     relative: showMacroInteractionDesignUpdates
   });
-  return (
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    jsx("span", {
-      className: wrapperClassNames,
-      css: styles
-    }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE)
-  );
+  const viewportHeight = getViewportHeight(extensionId, extensionViewportSizes);
+  const content =
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+  jsx("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+  if (viewportHeight && fg('confluence_preload_forge_viewport_heights_editor')) {
+    return jsx("div", {
+      style: {
+        minHeight: viewportHeight
+      }
+    }, content);
+  }
+  return content;
 };

package/dist/es2019/extensibility/extensionNodeView.js

@@ -26,10 +26,12 @@ export class ExtensionNode extends ReactNodeView {
     };
   }
   render(props, forwardRef) {
-    var _props$extensionNodeV;
+    var _this$node$attrs$para, _props$extensionNodeV, _props$extensionNodeV2;
     return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
       nodeType: this.node.type.name,
-      macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
+      macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
+      extensionId: (_this$node$attrs$para = this.node.attrs.parameters) === null || _this$node$attrs$para === void 0 ? void 0 : _this$node$attrs$para.extensionId,
+      extensionViewportSizes: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.extensionViewportSizes
     }, /*#__PURE__*/React.createElement(Extension, {
       editorView: this.view,
       node: this.node,
@@ -45,7 +47,7 @@ export class ExtensionNode extends ReactNodeView {
       providerFactory: props.providerFactory,
       handleContentDOMRef: forwardRef,
       extensionHandlers: props.extensionHandlers,
-      editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
+      editorAppearance: (_props$extensionNodeV2 = props.extensionNodeViewOptions) === null || _props$extensionNodeV2 === void 0 ? void 0 : _props$extensionNodeV2.appearance,
       pluginInjectionApi: props.pluginInjectionApi,
       macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
       showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "106.0.2";
+const packageVersion = "106.1.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/resizer/useBreakoutGuidelines.js

@@ -101,7 +101,9 @@ export function useBreakoutGuidelines(getEditorWidth, isResizing, dynamicFullWid
       setCurrentLayout('center');
     } else if (wide && Math.abs(newWidth - wide) < SNAP_GAP / 2) {
       setCurrentLayout('wide');
-    } else if (fullWidth && (Math.abs(newWidth - fullWidth + akEditorGutterPadding) < SNAP_GAP / 2 || newWidth >= fullWidth)) {
+    } else if (fullWidth && (
+    // we only allow snap from one side, so we don't use Math.abs here
+    fullWidth + akEditorGutterPadding - newWidth < SNAP_GAP / 2 || newWidth >= fullWidth)) {
       setCurrentLayout('full-width');
     } else {
       setCurrentLayout(null);

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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "106.0.2";
+const packageVersion = "106.1.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/utils/table.js

@@ -1,5 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-
 /**
  * Returns an array of column widths (0 if column width is undefined) of a given table node by scanning the **entire table**.
  *
@@ -54,43 +52,23 @@ export function getColumnWidths(node) {
  * @returns Array<number>
  */
 export function calcTableColumnWidths(node) {
-  // Ignored via go/ees007
-  // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
-  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
-  if (fg('platform_editor_table_row_span_fix') || fg('platform_editor_table_row_span_fix_all')) {
-    const firstRow = node.firstChild;
-    const tableColumnWidths = [];
-    if (firstRow) {
-      firstRow.forEach(cell => {
-        const {
-          colspan,
-          colwidth
-        } = cell.attrs;
-        // column has been resized, colWidth will be an array, can safely take values even if cell is merged
-        if (Array.isArray(colwidth)) {
-          tableColumnWidths.push(...colwidth);
-          // table has merged cells but no colWidth, so columns haven't been resized, default to 0
-        } else if (colspan > 1) {
-          tableColumnWidths.push(...Array(colspan).fill(0));
-          // no merged cells, no column resized, default to 0
-        } else {
-          tableColumnWidths.push(0);
-        }
-      });
-    }
-    return tableColumnWidths;
-  }
-  let tableColumnWidths = [];
   const firstRow = node.firstChild;
+  const tableColumnWidths = [];
   if (firstRow) {
-    // Sanity validation, but it should always have a first row
-    // Iterate for the cells in the first row
-    firstRow.forEach(colNode => {
-      const colwidth = colNode.attrs.colwidth || [0];
-
-      // If we have colwidth, we added it
-      if (colwidth) {
-        tableColumnWidths = [...tableColumnWidths, ...colwidth];
+    firstRow.forEach(cell => {
+      const {
+        colspan,
+        colwidth
+      } = cell.attrs;
+      // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+      if (Array.isArray(colwidth)) {
+        tableColumnWidths.push(...colwidth);
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan > 1) {
+        tableColumnWidths.push(...Array(colspan).fill(0));
+        // no merged cells, no column resized, default to 0
+      } else {
+        tableColumnWidths.push(0);
       }
     });
   }

package/dist/esm/extensibility/ExtensionNodeWrapper.js

@@ -1,12 +1,14 @@
 /**
  * @jsxRuntime classic
  * @jsx jsx
+ * @jsxFrag React.Fragment
  */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ZERO_WIDTH_SPACE } from '../whitespace';
 var styles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
@@ -18,6 +20,35 @@ var styles = css({
     position: 'relative'
   }
 });
+var viewportSizes = ['small', 'medium', 'default', 'large', 'xlarge'];
+var macroHeights = {
+  small: '112px',
+  medium: '262px',
+  default: '262px',
+  large: '524px',
+  xlarge: '1048px'
+};
+var getViewportHeight = function getViewportHeight(extensionId, extensionViewportSizes) {
+  var _extensionViewportSiz;
+  var viewportSize = Array.isArray(extensionViewportSizes) && extensionId ? (_extensionViewportSiz = extensionViewportSizes.find(function (ext) {
+    return ext.extensionId === extensionId;
+  })) === null || _extensionViewportSiz === void 0 ? void 0 : _extensionViewportSiz.viewportSize : undefined;
+  if (!viewportSize) {
+    return undefined;
+  }
+
+  // If it's a predefined size, use the macroHeights mapping
+  if (viewportSizes.includes(viewportSize)) {
+    return macroHeights[viewportSize];
+  }
+
+  // This is added to somewhat prepare to support connect macros which don't have a predefined size
+  // If it's a custom pixel value, use it directly
+  if (viewportSize.endsWith('px')) {
+    return viewportSize;
+  }
+  return undefined;
+};
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
  * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
@@ -29,18 +60,28 @@ var styles = css({
 export var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
     nodeType = _ref.nodeType,
-    macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags;
+    macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags,
+    extensionId = _ref.extensionId,
+    extensionViewportSizes = _ref.extensionViewportSizes;
   var _ref2 = macroInteractionDesignFeatureFlags || {},
     showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
   var wrapperClassNames = classnames({
     'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
     relative: showMacroInteractionDesignUpdates
   });
-  return (
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    jsx("span", {
-      className: wrapperClassNames,
-      css: styles
-    }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE)
-  );
+  var viewportHeight = getViewportHeight(extensionId, extensionViewportSizes);
+  var content =
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+  jsx("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+  if (viewportHeight && fg('confluence_preload_forge_viewport_heights_editor')) {
+    return jsx("div", {
+      style: {
+        minHeight: viewportHeight
+      }
+    }, content);
+  }
+  return content;
 };

package/dist/esm/extensibility/extensionNodeView.js

@@ -44,10 +44,12 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(props, forwardRef) {
-      var _props$extensionNodeV;
+      var _this$node$attrs$para, _props$extensionNodeV, _props$extensionNodeV2;
       return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
         nodeType: this.node.type.name,
-        macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
+        macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
+        extensionId: (_this$node$attrs$para = this.node.attrs.parameters) === null || _this$node$attrs$para === void 0 ? void 0 : _this$node$attrs$para.extensionId,
+        extensionViewportSizes: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.extensionViewportSizes
       }, /*#__PURE__*/React.createElement(Extension, {
         editorView: this.view,
         node: this.node,
@@ -63,7 +65,7 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
         providerFactory: props.providerFactory,
         handleContentDOMRef: forwardRef,
         extensionHandlers: props.extensionHandlers,
-        editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
+        editorAppearance: (_props$extensionNodeV2 = props.extensionNodeViewOptions) === null || _props$extensionNodeV2 === void 0 ? void 0 : _props$extensionNodeV2.appearance,
         pluginInjectionApi: props.pluginInjectionApi,
         macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "106.0.2";
+var packageVersion = "106.1.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/resizer/useBreakoutGuidelines.js

@@ -110,7 +110,9 @@ export function useBreakoutGuidelines(getEditorWidth, isResizing) {
       setCurrentLayout('center');
     } else if (wide && Math.abs(newWidth - wide) < SNAP_GAP / 2) {
       setCurrentLayout('wide');
-    } else if (fullWidth && (Math.abs(newWidth - fullWidth + akEditorGutterPadding) < SNAP_GAP / 2 || newWidth >= fullWidth)) {
+    } else if (fullWidth && (
+    // we only allow snap from one side, so we don't use Math.abs here
+    fullWidth + akEditorGutterPadding - newWidth < SNAP_GAP / 2 || newWidth >= fullWidth)) {
       setCurrentLayout('full-width');
     } else {
       setCurrentLayout(null);

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

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "106.0.2";
+var packageVersion = "106.1.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/utils/table.js

@@ -1,6 +1,4 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { fg } from '@atlaskit/platform-feature-flags';
-
 /**
  * Returns an array of column widths (0 if column width is undefined) of a given table node by scanning the **entire table**.
  *
@@ -54,42 +52,22 @@ export function getColumnWidths(node) {
  * @returns Array<number>
  */
 export function calcTableColumnWidths(node) {
-  // Ignored via go/ees007
-  // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
-  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
-  if (fg('platform_editor_table_row_span_fix') || fg('platform_editor_table_row_span_fix_all')) {
-    var _firstRow = node.firstChild;
-    var _tableColumnWidths = [];
-    if (_firstRow) {
-      _firstRow.forEach(function (cell) {
-        var _cell$attrs = cell.attrs,
-          colspan = _cell$attrs.colspan,
-          colwidth = _cell$attrs.colwidth;
-        // column has been resized, colWidth will be an array, can safely take values even if cell is merged
-        if (Array.isArray(colwidth)) {
-          _tableColumnWidths.push.apply(_tableColumnWidths, _toConsumableArray(colwidth));
-          // table has merged cells but no colWidth, so columns haven't been resized, default to 0
-        } else if (colspan > 1) {
-          _tableColumnWidths.push.apply(_tableColumnWidths, _toConsumableArray(Array(colspan).fill(0)));
-          // no merged cells, no column resized, default to 0
-        } else {
-          _tableColumnWidths.push(0);
-        }
-      });
-    }
-    return _tableColumnWidths;
-  }
-  var tableColumnWidths = [];
   var firstRow = node.firstChild;
+  var tableColumnWidths = [];
   if (firstRow) {
-    // Sanity validation, but it should always have a first row
-    // Iterate for the cells in the first row
-    firstRow.forEach(function (colNode) {
-      var colwidth = colNode.attrs.colwidth || [0];
-
-      // If we have colwidth, we added it
-      if (colwidth) {
-        tableColumnWidths = [].concat(_toConsumableArray(tableColumnWidths), _toConsumableArray(colwidth));
+    firstRow.forEach(function (cell) {
+      var _cell$attrs = cell.attrs,
+        colspan = _cell$attrs.colspan,
+        colwidth = _cell$attrs.colwidth;
+      // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+      if (Array.isArray(colwidth)) {
+        tableColumnWidths.push.apply(tableColumnWidths, _toConsumableArray(colwidth));
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan > 1) {
+        tableColumnWidths.push.apply(tableColumnWidths, _toConsumableArray(Array(colspan).fill(0)));
+        // no merged cells, no column resized, default to 0
+      } else {
+        tableColumnWidths.push(0);
       }
     });
   }

package/dist/types/annotation/index.d.ts

@@ -4,7 +4,7 @@
 import { EventEmitter } from 'events';
 import type { AnnotationId } from '@atlaskit/adf-schema';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
-import type { AddNodeMarkStep, AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import type { AddNodeMarkStep, AddMarkStep, RemoveNodeMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 export type UpdateEvent = 'create' | 'delete' | 'resolve' | 'unresolve' | 'setselectedannotation' | 'sethoveredannotation' | 'removehoveredannotation' | 'closeinlinecomment';
 export type VisibilityEvent = 'setvisibility';
 type AnnotationCallback = (params: string) => void;
@@ -27,6 +27,10 @@ export type ActionResult = {
     inlineNodeTypes?: string[];
     targetNodeType?: string;
 } & AnnotationByMatches;
+export type ClearAnnotationActionResult = {
+    step: RemoveMarkStep | RemoveNodeMarkStep;
+    doc: JSONDocNode;
+};
 export type AnnotationDraftStartedData = {
     targetElement: HTMLElement | undefined;
     /**
@@ -84,10 +88,10 @@ export type GetDraftResult = {
 } & AnnotationDraftStartedData);
 export type ClearAnnotationResult = {
     success: false;
-    reason: ManagerFailureReasons | 'id-not-valid';
+    reason: ManagerFailureReasons | 'id-not-valid' | 'clear-failed';
 } | {
     success: true;
-    actionResult: ActionResult | undefined;
+    actionResult: ClearAnnotationActionResult | undefined;
 };
 export type SelectAnnotationResult = {
     success: false;

package/dist/types/extensibility/ExtensionNodeWrapper.d.ts

@@ -1,14 +1,18 @@
 /**
  * @jsxRuntime classic
  * @jsx jsx
+ * @jsxFrag React.Fragment
  */
 import React from 'react';
 import { jsx } from '@emotion/react';
+import type { ExtensionViewportSize } from '../types';
 import type { MacroInteractionDesignFeatureFlags } from './types';
 type Props = {
     children: React.ReactNode;
     nodeType: string;
     macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
+    extensionId?: string;
+    extensionViewportSizes?: ExtensionViewportSize[];
 };
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
@@ -18,5 +22,5 @@ type Props = {
  * @param param0
  * @returns
  */
-export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, }: Props) => jsx.JSX.Element;
+export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, extensionId, extensionViewportSizes, }: Props) => jsx.JSX.Element;
 export {};

package/dist/types/extensibility/extensionNodeView.d.ts

@@ -8,10 +8,11 @@ import type { PortalProviderAPI } from '../portal';
 import type { ProviderFactory } from '../provider-factory';
 import type { ForwardRef, getPosHandler } from '../react-node-view';
 import ReactNodeView from '../react-node-view';
-import type { EditorAppearance } from '../types';
+import type { EditorAppearance, ExtensionViewportSize } from '../types';
 import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
 interface ExtensionNodeViewOptions {
     appearance?: EditorAppearance;
+    extensionViewportSizes?: ExtensionViewportSize[];
 }
 export declare class ExtensionNode extends ReactNodeView {
     ignoreMutation(mutation: MutationRecord | {

package/dist/types/types/annotation/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { AnnotationId, AnnotationTypes } from '@atlaskit/adf-schema';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
-import type { AddNodeMarkStep, AddMarkStep, Step } from '@atlaskit/editor-prosemirror/transform';
+import type { AddNodeMarkStep, AddMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import type { AnnotationManager } from '../../annotation';
 import type { AnnotationState, AnnotationUpdateEmitter } from './emitter';
 export type AnnotationByMatches = {
@@ -12,7 +12,7 @@ export type AnnotationByMatches = {
     isAnnotationAllowed?: boolean;
 };
 type ActionResult = {
-    step: Step;
+    step: RemoveMarkStep | RemoveNodeMarkStep;
     doc: JSONDocNode;
 } | false;
 export type AnnotationActionResult = ({

package/dist/types/types/extensibility.d.ts

@@ -0,0 +1,4 @@
+export interface ExtensionViewportSize {
+    extensionId?: string;
+    viewportSize?: string;
+}

package/dist/types/types/index.d.ts

@@ -58,3 +58,4 @@ import type { EditorPresetBuilder, ExtractPresetAPI } from '../preset';
  */
 export type ExtractPublicEditorAPI<T extends EditorPresetBuilder<any, any>> = ExtractPresetAPI<T>;
 export type { UserPreferencesProvider, UserPreferences } from './user-preferences';
+export type { ExtensionViewportSize } from './extensibility';

package/dist/types-ts4.5/annotation/index.d.ts

@@ -4,7 +4,7 @@
 import { EventEmitter } from 'events';
 import type { AnnotationId } from '@atlaskit/adf-schema';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
-import type { AddNodeMarkStep, AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import type { AddNodeMarkStep, AddMarkStep, RemoveNodeMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
 export type UpdateEvent = 'create' | 'delete' | 'resolve' | 'unresolve' | 'setselectedannotation' | 'sethoveredannotation' | 'removehoveredannotation' | 'closeinlinecomment';
 export type VisibilityEvent = 'setvisibility';
 type AnnotationCallback = (params: string) => void;
@@ -27,6 +27,10 @@ export type ActionResult = {
     inlineNodeTypes?: string[];
     targetNodeType?: string;
 } & AnnotationByMatches;
+export type ClearAnnotationActionResult = {
+    step: RemoveMarkStep | RemoveNodeMarkStep;
+    doc: JSONDocNode;
+};
 export type AnnotationDraftStartedData = {
     targetElement: HTMLElement | undefined;
     /**
@@ -84,10 +88,10 @@ export type GetDraftResult = {
 } & AnnotationDraftStartedData);
 export type ClearAnnotationResult = {
     success: false;
-    reason: ManagerFailureReasons | 'id-not-valid';
+    reason: ManagerFailureReasons | 'id-not-valid' | 'clear-failed';
 } | {
     success: true;
-    actionResult: ActionResult | undefined;
+    actionResult: ClearAnnotationActionResult | undefined;
 };
 export type SelectAnnotationResult = {
     success: false;

package/dist/types-ts4.5/extensibility/ExtensionNodeWrapper.d.ts

@@ -1,14 +1,18 @@
 /**
  * @jsxRuntime classic
  * @jsx jsx
+ * @jsxFrag React.Fragment
  */
 import React from 'react';
 import { jsx } from '@emotion/react';
+import type { ExtensionViewportSize } from '../types';
 import type { MacroInteractionDesignFeatureFlags } from './types';
 type Props = {
     children: React.ReactNode;
     nodeType: string;
     macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
+    extensionId?: string;
+    extensionViewportSizes?: ExtensionViewportSize[];
 };
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
@@ -18,5 +22,5 @@ type Props = {
  * @param param0
  * @returns
  */
-export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, }: Props) => jsx.JSX.Element;
+export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, extensionId, extensionViewportSizes, }: Props) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/extensibility/extensionNodeView.d.ts

@@ -8,10 +8,11 @@ import type { PortalProviderAPI } from '../portal';
 import type { ProviderFactory } from '../provider-factory';
 import type { ForwardRef, getPosHandler } from '../react-node-view';
 import ReactNodeView from '../react-node-view';
-import type { EditorAppearance } from '../types';
+import type { EditorAppearance, ExtensionViewportSize } from '../types';
 import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
 interface ExtensionNodeViewOptions {
     appearance?: EditorAppearance;
+    extensionViewportSizes?: ExtensionViewportSize[];
 }
 export declare class ExtensionNode extends ReactNodeView {
     ignoreMutation(mutation: MutationRecord | {

package/dist/types-ts4.5/types/annotation/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { AnnotationId, AnnotationTypes } from '@atlaskit/adf-schema';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
-import type { AddNodeMarkStep, AddMarkStep, Step } from '@atlaskit/editor-prosemirror/transform';
+import type { AddNodeMarkStep, AddMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import type { AnnotationManager } from '../../annotation';
 import type { AnnotationState, AnnotationUpdateEmitter } from './emitter';
 export type AnnotationByMatches = {
@@ -12,7 +12,7 @@ export type AnnotationByMatches = {
     isAnnotationAllowed?: boolean;
 };
 type ActionResult = {
-    step: Step;
+    step: RemoveMarkStep | RemoveNodeMarkStep;
     doc: JSONDocNode;
 } | false;
 export type AnnotationActionResult = ({

package/dist/types-ts4.5/types/extensibility.d.ts

@@ -0,0 +1,4 @@
+export interface ExtensionViewportSize {
+    extensionId?: string;
+    viewportSize?: string;
+}

package/dist/types-ts4.5/types/index.d.ts

@@ -58,3 +58,4 @@ import type { EditorPresetBuilder, ExtractPresetAPI } from '../preset';
  */
 export type ExtractPublicEditorAPI<T extends EditorPresetBuilder<any, any>> = ExtractPresetAPI<T>;
 export type { UserPreferencesProvider, UserPreferences } from './user-preferences';
+export type { ExtensionViewportSize } from './extensibility';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "106.0.2",
+	"version": "106.1.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -286,12 +286,6 @@
 		"platform_editor_breakoutresizer_remove_assertion": {
 			"type": "boolean"
 		},
-		"platform_editor_table_row_span_fix": {
-			"type": "boolean"
-		},
-		"platform_editor_table_row_span_fix_all": {
-			"type": "boolean"
-		},
 		"platform-component-visual-refresh": {
 			"type": "boolean"
 		},
@@ -396,6 +390,9 @@
 		},
 		"dst-a11y__replace-anchor-with-link__editor": {
 			"type": "boolean"
+		},
+		"confluence_preload_forge_viewport_heights_editor": {
+			"type": "boolean"
 		}
 	}
 }