@atlaskit/editor-common 96.6.0 → 96.7.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-common
 
+## 96.7.0
+
+### Minor Changes
+
+- [#181279](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181279)
+  [`2b71646184e76`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2b71646184e76) -
+  [ux] Sends in new parameter from Confluence to editor to hide default border around 1P bodied
+  extensions in live pages if the parameter is true
+
+## 96.6.1
+
+### Patch Changes
+
+- [#181016](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181016)
+  [`fb9a503ee55c3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb9a503ee55c3) -
+  Add new `getColumnWidths` function which will loop through each table row, looking for the max
+  number of table cells to use to render the table correctly when table resizing is enabled.
+
 ## 96.6.0
 
 ### Minor Changes

package/dist/cjs/extensibility/Extension/Extension/extension-utils.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isEmptyBodiedMacro = void 0;
+var isEmptyBodiedMacro = exports.isEmptyBodiedMacro = function isEmptyBodiedMacro(node) {
+  var _node$content, _firstGrandChildNode$;
+  if (node.type.name !== 'bodiedExtension') {
+    return false;
+  }
+  var firstChildNode = node === null || node === void 0 || (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
+  var firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
+
+  // If firstChildNode?.childCount > 1 means there is content along with the placeholder.
+  var isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 || (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
+  var isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
+  return isEmptyWithPlacholder || isEmptyWithNoContent;
+};

package/dist/cjs/extensibility/Extension/Extension/index.js

@@ -18,6 +18,7 @@ var _ui = require("../../../ui");
 var _utils = require("../../../utils");
 var _Lozenge = _interopRequireDefault(require("../Lozenge"));
 var _styles = require("../styles");
+var _extensionUtils = require("./extension-utils");
 var _styles2 = require("./styles");
 var _excluded = ["type"];
 /**
@@ -47,6 +48,7 @@ function ExtensionWithPluginState(props) {
     isNodeNested = props.isNodeNested,
     setIsNodeHovered = props.setIsNodeHovered,
     showLivePagesBodiedMacrosRendererView = props.showLivePagesBodiedMacrosRendererView,
+    showUpdatedLivePages1PBodiedExtensionUI = props.showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView = props.showBodiedExtensionRendererView,
     setShowBodiedExtensionRendererView = props.setShowBodiedExtensionRendererView;
   var _ref = macroInteractionDesignFeatureFlags || {},
@@ -68,9 +70,12 @@ function ExtensionWithPluginState(props) {
   isTopLevelNode &&
   // Extension breakout state should not be respected when the editor appearance is full-width mode
   editorAppearance !== 'full-width';
+
+  // We don't want to show border for non-empty 1p bodied extensions in live pages
+  var show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? (0, _extensionUtils.isEmptyBodiedMacro)(node) : true;
   var classNames = (0, _classnames2.default)('extension-container', 'block', shadowClassNames, (0, _defineProperty2.default)({
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
-    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView,
+    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
@@ -126,6 +131,7 @@ function ExtensionWithPluginState(props) {
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: hasBody,
     showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+    showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView: showBodiedExtensionRendererView,
     setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
   }), (0, _react2.jsx)("div", {

package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -124,10 +124,11 @@ var i18n = (0, _reactIntlNext.defineMessages)({
     description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
-var getShouldShowBodiedMacroLabel = exports.getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView) {
-  if (!isBodiedMacro) {
+var getShouldShowBodiedMacroLabel = exports.getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) {
+  // Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
+  if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
     return isNodeHovered;
-  } // Bodied macros show the label by default
+  }
   if (!showLivePagesBodiedMacrosRendererView) {
     return true;
   } // Keep showing labels as usual for default experience for bodied macros
@@ -143,10 +144,11 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     isBodiedMacro = _ref.isBodiedMacro,
     showMacroButtonUpdates = _ref.showMacroButtonUpdates,
     showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
+    showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView;
   var isInlineExtension = extensionName === 'inlineExtension';
   var showDefaultBodiedStyles = isBodiedMacro && !isNodeHovered;
-  var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView);
+  var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
   var containerClassNames = (0, _classnames.default)({
     bodied: isBodiedMacro
   });

package/dist/cjs/extensibility/Extension/Lozenge/LozengeComponent.js

@@ -35,6 +35,7 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
     setIsNodeHovered = _ref.setIsNodeHovered,
     isBodiedMacro = _ref.isBodiedMacro,
     showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
+    showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
     setShowBodiedExtensionRendererView = _ref.setShowBodiedExtensionRendererView;
   var capitalizedTitle = capitalizeFirstLetter(title);
@@ -49,6 +50,7 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
       isBodiedMacro: isBodiedMacro,
       showMacroButtonUpdates: showMacroButtonUpdates,
       showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
       showBodiedExtensionRendererView: showBodiedExtensionRendererView
     }), showLivePagesBodiedMacrosRendererView && isBodiedMacro && (0, _react2.jsx)(_EditToggle.EditToggle, {
       isNodeHovered: isNodeHovered,

package/dist/cjs/extensibility/Extension/Lozenge/index.js

@@ -55,6 +55,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         setIsNodeHovered = _this$props.setIsNodeHovered,
         isBodiedMacro = _this$props.isBodiedMacro,
         showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView = _this$props.setShowBodiedExtensionRendererView;
       var _this$props$node$attr = _this.props.node.attrs,
@@ -78,6 +79,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         setIsNodeHovered: setIsNodeHovered,
         isBodiedMacro: isBodiedMacro,
         showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
       });

package/dist/cjs/extensibility/Extension.js

@@ -38,6 +38,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
         eventDispatcher = _this$props.eventDispatcher,
         macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
         rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
       return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.ExtensionComponent, {
         editorView: editorView,
@@ -52,6 +53,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
         eventDispatcher: eventDispatcher,
         macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         rendererExtensionHandlers: rendererExtensionHandlers
       });
     });

package/dist/cjs/extensibility/ExtensionComponent.js

@@ -24,6 +24,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _extensions = require("../extensions");
 var _utils = require("../utils");
 var _Extension = _interopRequireDefault(require("./Extension/Extension"));
+var _extensionUtils = require("./Extension/Extension/extension-utils");
 var _InlineExtension = _interopRequireDefault(require("./Extension/InlineExtension"));
 var _MultiBodiedExtension = _interopRequireDefault(require("./MultiBodiedExtension"));
 var _excluded = ["extensionProvider", "showLivePagesBodiedMacrosRendererView", "node"];
@@ -35,19 +36,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 
 /* temporary type until FG cleaned up */
 
-var isEmptyBodiedMacro = function isEmptyBodiedMacro(node) {
-  var _node$content, _firstGrandChildNode$;
-  if (node.type.name !== 'bodiedExtension') {
-    return false;
-  }
-  var firstChildNode = node === null || node === void 0 || (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
-  var firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
-
-  // If firstChildNode?.childCount > 1 means there is content along with the placeholder.
-  var isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 || (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
-  var isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
-  return isEmptyWithPlacholder || isEmptyWithNoContent;
-};
 var getBodiedExtensionContent = function getBodiedExtensionContent(node) {
   var bodiedExtensionContent = [];
   node.content.forEach(function (childNode) {
@@ -206,7 +194,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
         node = _this$props2.node,
         showLivePagesBodiedMacrosRendererView = _this$props2.showLivePagesBodiedMacrosRendererView;
       // We only care about this empty state on first page load or insertion to determine the view
-      if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !isEmptyBodiedMacro(node)) {
+      if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)) {
         this.setState({
           showBodiedExtensionRendererView: true
         });
@@ -252,7 +240,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
         getPos = _this$props3.getPos,
         eventDispatcher = _this$props3.eventDispatcher,
         macroInteractionDesignFeatureFlags = _this$props3.macroInteractionDesignFeatureFlags,
-        showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView;
+        showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI;
       var selection = editorView.state.selection;
       var selectedNode = selection instanceof _state.NodeSelection && selection.node;
       var position = typeof getPos === 'function' && getPos();
@@ -295,6 +284,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
             isNodeNested: isNodeNested,
             setIsNodeHovered: this.setIsNodeHovered,
             showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
+            showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
             showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
             setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
           }, extensionHandlerResult);
@@ -339,7 +329,7 @@ var ExtensionComponentNew = exports.ExtensionComponentNew = function ExtensionCo
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     extensionProvider = _useState2[0],
     setExtensionProvider = _useState2[1];
-  var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !isEmptyBodiedMacro(node)),
+  var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     showBodiedExtensionRendererView = _useState4[0],
     setShowBodiedExtensionRendererView = _useState4[1];
@@ -515,6 +505,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
         macroInteractionDesignFeatureFlags = _this$props4.macroInteractionDesignFeatureFlags,
         extensionProvider = _this$props4.extensionProvider,
         showLivePagesBodiedMacrosRendererView = _this$props4.showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI = _this$props4.showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView = _this$props4.showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView;
       var selection = editorView.state.selection;
@@ -559,6 +550,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
             isNodeNested: isNodeNested,
             setIsNodeHovered: this.setIsNodeHovered,
             showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
+            showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
             showBodiedExtensionRendererView: showBodiedExtensionRendererView,
             setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
           }, extensionHandlerResult);

package/dist/cjs/extensibility/extensionNodeView.js

@@ -75,12 +75,13 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
         pluginInjectionApi: props.pluginInjectionApi,
         macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI: props.showUpdatedLivePages1PBodiedExtensionUI,
         rendererExtensionHandlers: props.rendererExtensionHandlers
       }));
     }
   }]);
 }(_reactNodeView.default);
-function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
+function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers) {
   return function (node, view, getPos) {
     return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory: providerFactory,
@@ -89,6 +90,7 @@ function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory,
       pluginInjectionApi: pluginInjectionApi,
       macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
       showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
       rendererExtensionHandlers: rendererExtensionHandlers
     }).init();
   };

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 = "96.6.0";
+var packageVersion = "96.7.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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 = "96.6.0";
+var packageVersion = "96.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/index.js

@@ -432,6 +432,12 @@ Object.defineProperty(exports, "getChildrenInfo", {
     return _referentiality.getChildrenInfo;
   }
 });
+Object.defineProperty(exports, "getColumnWidths", {
+  enumerable: true,
+  get: function get() {
+    return _table.getColumnWidths;
+  }
+});
 Object.defineProperty(exports, "getDatasourceType", {
   enumerable: true,
   get: function get() {

package/dist/cjs/utils/table.js

@@ -6,11 +6,44 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.calcTableColumnWidths = calcTableColumnWidths;
 exports.convertProsemirrorTableNodeToArrayOfRows = convertProsemirrorTableNodeToArrayOfRows;
+exports.getColumnWidths = getColumnWidths;
 exports.hasMergedCell = hasMergedCell;
 exports.isPositionNearTableRow = isPositionNearTableRow;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+/**
+ * Looks at every table row to find the correct number of columns for table, which
+ * accounts for tables with uneven rows.
+ *
+ * Returns an array of column widths if defined otherwise 0, positions respect table order.
+ */
+function getColumnWidths(node) {
+  var tableColumnWidths = [];
+  node.forEach(function (row) {
+    var currentTableWidth = [];
+    row.forEach(function (cell) {
+      var _ref = cell.attrs,
+        colspan = _ref.colspan,
+        colwidth = _ref.colwidth;
+      // column has been resized, colWidth will be an array, can safely take values even if cell is merged
+      if (Array.isArray(colwidth)) {
+        currentTableWidth.push.apply(currentTableWidth, (0, _toConsumableArray2.default)(colwidth));
+        // table has merged cells but no colWidth, so columns haven't been resized, default to 0
+      } else if (colspan !== undefined && colspan > 1) {
+        currentTableWidth.push.apply(currentTableWidth, (0, _toConsumableArray2.default)(Array(colspan).fill(0)));
+        // no merged cells, no column resized, default to 0
+      } else {
+        currentTableWidth.push(0);
+      }
+    });
+    if (currentTableWidth.length > tableColumnWidths.length) {
+      tableColumnWidths = currentTableWidth;
+    }
+  });
+  return tableColumnWidths;
+}
 function calcTableColumnWidths(node) {
+  // TODO: replaced with getColumnWidths, which correctly scans entire table for column widths
   if ((0, _platformFeatureFlags.fg)('platform_editor_table_row_span_fix')) {
     var _firstRow = node.firstChild;
     var _tableColumnWidths = [];

package/dist/es2019/extensibility/Extension/Extension/extension-utils.js

@@ -0,0 +1,13 @@
+export const isEmptyBodiedMacro = node => {
+  var _node$content, _firstGrandChildNode$;
+  if (node.type.name !== 'bodiedExtension') {
+    return false;
+  }
+  const firstChildNode = node === null || node === void 0 ? void 0 : (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
+  const firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
+
+  // If firstChildNode?.childCount > 1 means there is content along with the placeholder.
+  const isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 ? void 0 : (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
+  const isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
+  return isEmptyWithPlacholder || isEmptyWithNoContent;
+};

package/dist/es2019/extensibility/Extension/Extension/index.js

@@ -15,6 +15,7 @@ import { overflowShadow } from '../../../ui';
 import { calculateBreakoutStyles } from '../../../utils';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
+import { isEmptyBodiedMacro } from './extension-utils';
 import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
 function ExtensionWithPluginState(props) {
   const {
@@ -34,6 +35,7 @@ function ExtensionWithPluginState(props) {
     isNodeNested,
     setIsNodeHovered,
     showLivePagesBodiedMacrosRendererView,
+    showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView,
     setShowBodiedExtensionRendererView
   } = props;
@@ -59,9 +61,12 @@ function ExtensionWithPluginState(props) {
   isTopLevelNode &&
   // Extension breakout state should not be respected when the editor appearance is full-width mode
   editorAppearance !== 'full-width';
+
+  // We don't want to show border for non-empty 1p bodied extensions in live pages
+  const show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? isEmptyBodiedMacro(node) : true;
   const classNames = classnames('extension-container', 'block', shadowClassNames, {
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
-    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView,
+    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
@@ -124,6 +129,7 @@ function ExtensionWithPluginState(props) {
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: hasBody,
     showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+    showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
     showBodiedExtensionRendererView: showBodiedExtensionRendererView,
     setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
   }), jsx("div", {

package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -115,10 +115,11 @@ const i18n = defineMessages({
     description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
-export const getShouldShowBodiedMacroLabel = (isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView) => {
-  if (!isBodiedMacro) {
+export const getShouldShowBodiedMacroLabel = (isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) => {
+  // Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
+  if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
     return isNodeHovered;
-  } // Bodied macros show the label by default
+  }
   if (!showLivePagesBodiedMacrosRendererView) {
     return true;
   } // Keep showing labels as usual for default experience for bodied macros
@@ -134,11 +135,12 @@ export const ExtensionLabel = ({
   isBodiedMacro,
   showMacroButtonUpdates,
   showLivePagesBodiedMacrosRendererView,
+  showUpdatedLivePages1PBodiedExtensionUI,
   showBodiedExtensionRendererView
 }) => {
   const isInlineExtension = extensionName === 'inlineExtension';
   const showDefaultBodiedStyles = isBodiedMacro && !isNodeHovered;
-  const shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView);
+  const shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
   const containerClassNames = classnames({
     bodied: isBodiedMacro
   });

package/dist/es2019/extensibility/Extension/Lozenge/LozengeComponent.js

@@ -27,6 +27,7 @@ export const LozengeComponent = ({
   setIsNodeHovered,
   isBodiedMacro,
   showLivePagesBodiedMacrosRendererView,
+  showUpdatedLivePages1PBodiedExtensionUI,
   showBodiedExtensionRendererView,
   setShowBodiedExtensionRendererView
 }) => {
@@ -42,6 +43,7 @@ export const LozengeComponent = ({
       isBodiedMacro: isBodiedMacro,
       showMacroButtonUpdates: showMacroButtonUpdates,
       showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
       showBodiedExtensionRendererView: showBodiedExtensionRendererView
     }), showLivePagesBodiedMacrosRendererView && isBodiedMacro && jsx(EditToggle, {
       isNodeHovered: isNodeHovered,

package/dist/es2019/extensibility/Extension/Lozenge/index.js

@@ -40,6 +40,7 @@ export default class ExtensionLozenge extends Component {
         setIsNodeHovered,
         isBodiedMacro,
         showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView
       } = this.props;
@@ -67,6 +68,7 @@ export default class ExtensionLozenge extends Component {
         setIsNodeHovered: setIsNodeHovered,
         isBodiedMacro: isBodiedMacro,
         showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         showBodiedExtensionRendererView: showBodiedExtensionRendererView,
         setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
       });

package/dist/es2019/extensibility/Extension.js

@@ -20,6 +20,7 @@ export class Extension extends Component {
         eventDispatcher,
         macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI,
         rendererExtensionHandlers
       } = this.props;
       return /*#__PURE__*/React.createElement(ExtensionComponent, {
@@ -35,6 +36,7 @@ export class Extension extends Component {
         eventDispatcher: eventDispatcher,
         macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
         showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
+        showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
         rendererExtensionHandlers: rendererExtensionHandlers
       });
     });

package/dist/es2019/extensibility/ExtensionComponent.js

@@ -8,6 +8,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
 import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
 import Extension from './Extension/Extension';
+import { isEmptyBodiedMacro } from './Extension/Extension/extension-utils';
 import InlineExtension from './Extension/InlineExtension';
 import MultiBodiedExtension from './MultiBodiedExtension';
 
@@ -15,19 +16,6 @@ import MultiBodiedExtension from './MultiBodiedExtension';
 
 /* temporary type until FG cleaned up */
 
-const isEmptyBodiedMacro = node => {
-  var _node$content, _firstGrandChildNode$;
-  if (node.type.name !== 'bodiedExtension') {
-    return false;
-  }
-  const firstChildNode = node === null || node === void 0 ? void 0 : (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
-  const firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
-
-  // If firstChildNode?.childCount > 1 means there is content along with the placeholder.
-  const isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 ? void 0 : (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
-  const isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
-  return isEmptyWithPlacholder || isEmptyWithNoContent;
-};
 const getBodiedExtensionContent = node => {
   const bodiedExtensionContent = [];
   node.content.forEach(childNode => {
@@ -208,7 +196,8 @@ export class ExtensionComponentOld extends Component {
       getPos,
       eventDispatcher,
       macroInteractionDesignFeatureFlags,
-      showLivePagesBodiedMacrosRendererView
+      showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI
     } = this.props;
     const {
       selection
@@ -254,6 +243,7 @@ export class ExtensionComponentOld extends Component {
           isNodeNested: isNodeNested,
           setIsNodeHovered: this.setIsNodeHovered,
           showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
+          showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
           showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
           setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
         }, extensionHandlerResult);
@@ -444,6 +434,7 @@ class ExtensionComponentInner extends Component {
       macroInteractionDesignFeatureFlags,
       extensionProvider,
       showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI,
       showBodiedExtensionRendererView,
       setShowBodiedExtensionRendererView
     } = this.props;
@@ -491,6 +482,7 @@ class ExtensionComponentInner extends Component {
           isNodeNested: isNodeNested,
           setIsNodeHovered: this.setIsNodeHovered,
           showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
+          showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
           showBodiedExtensionRendererView: showBodiedExtensionRendererView,
           setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
         }, extensionHandlerResult);

package/dist/es2019/extensibility/extensionNodeView.js

@@ -49,11 +49,12 @@ export class ExtensionNode extends ReactNodeView {
       pluginInjectionApi: props.pluginInjectionApi,
       macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
       showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI: props.showUpdatedLivePages1PBodiedExtensionUI,
       rendererExtensionHandlers: props.rendererExtensionHandlers
     }));
   }
 }
-export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
+export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers) {
   return (node, view, getPos) => {
     return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory,
@@ -62,6 +63,7 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
       pluginInjectionApi,
       macroInteractionDesignFeatureFlags,
       showLivePagesBodiedMacrosRendererView,
+      showUpdatedLivePages1PBodiedExtensionUI,
       rendererExtensionHandlers
     }).init();
   };

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 = "96.6.0";
+const packageVersion = "96.7.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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 = "96.6.0";
+const packageVersion = "96.7.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/index.js

@@ -122,7 +122,7 @@ export { isPerformanceAPIAvailable, isPerformanceObserverAvailable } from './per
  */
 export { getResponseEndTime } from './performance/navigation';
 export { getExtensionRenderer } from './extension-handler';
-export { hasMergedCell, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow } from './table';
+export { hasMergedCell, getColumnWidths, calcTableColumnWidths, convertProsemirrorTableNodeToArrayOfRows, isPositionNearTableRow } from './table';
 export { createCompareNodes } from './compareNodes';
 export { compose } from './compose';
 export { isTextInput } from './is-text-input';