@atlaskit/editor-common 78.31.1 → 78.31.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-common
 
+## 78.31.2
+
+### Patch Changes
+
+- [#93268](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/93268) [`1b6c2eb2c1be`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1b6c2eb2c1be) - [ux] Always show borders and labels for bodied extensions in new macro UX designs
+- [#93629](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/93629) [`63b7e6ebb83e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/63b7e6ebb83e) - Null check in width provider to protect against bug that causes crash due to body not being initialised.
+
 ## 78.31.1
 
 ### Patch Changes

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

@@ -63,6 +63,7 @@ function ExtensionWithPluginState(props) {
   var classNames = (0, _classnames2.default)('extension-container', 'block', shadowClassNames, (0, _defineProperty2.default)({
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
     'with-border': showMacroInteractionDesignUpdates,
+    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
@@ -110,7 +111,8 @@ function ExtensionWithPluginState(props) {
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     customContainerStyles: customContainerStyles,
-    setIsNodeHovered: setIsNodeHovered
+    setIsNodeHovered: setIsNodeHovered,
+    isBodiedMacro: hasBody
   }), (0, _react2.jsx)("div", {
     ref: handleRef,
     "data-layout": node.attrs.layout,

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

@@ -20,6 +20,9 @@ var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault
   '&.with-border': {
     border: "1px solid transparent" // adding this so macro doesn't jump when hover border is shown
   },
+  '&.with-bodied-border': {
+    border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N30, ")"))
+  },
   '&.with-hover-border': {
     border: "1px solid ".concat("var(--ds-border-input, ".concat(_colors.N500, ")"))
   },

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

@@ -20,12 +20,12 @@ var labelStyles = (0, _react2.css)({
   // Unfortunately, these need to be these exact numbers - otherwise there will be a gap/noticeable overlap
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
   top: '-18px',
-  '&.inline-extension': {
+  '&.inline': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
     top: '-17px',
     marginLeft: "var(--ds-space-150, 12px)"
   },
-  '&.hovered': {
+  '&.show-label': {
     cursor: 'pointer',
     background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(_colors.N300, ")"),
     color: "var(--ds-text-subtle, ".concat(_colors.N500, ")"),
@@ -37,6 +37,13 @@ var labelStyles = (0, _react2.css)({
     // Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
     // in the nested component
     marginLeft: "var(--ds-space-150, 12px)"
+  },
+  '&.bodied-background': {
+    background: "var(--ds-surface, ".concat(_colors.N0, ")")
+  },
+  '&.bodied-border': {
+    border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N30, ")")),
+    borderBottom: 'none'
   }
 });
 var textStyles = (0, _react2.css)({
@@ -50,11 +57,15 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     isNodeHovered = _ref.isNodeHovered,
     customContainerStyles = _ref.customContainerStyles,
     isNodeNested = _ref.isNodeNested,
-    setIsNodeHovered = _ref.setIsNodeHovered;
+    setIsNodeHovered = _ref.setIsNodeHovered,
+    isBodiedMacro = _ref.isBodiedMacro;
   var classNames = (0, _classnames.default)('extension-title', 'extension-label', {
-    'inline-extension': extensionName === 'inlineExtension',
-    hovered: isNodeHovered,
-    nested: isNodeNested
+    nested: isNodeNested,
+    inline: extensionName === 'inlineExtension',
+    bodied: isBodiedMacro,
+    'bodied-border': isBodiedMacro,
+    'bodied-background': isBodiedMacro && !isNodeHovered,
+    'show-label': isNodeHovered || isBodiedMacro
   });
   var handleMouseEnter = (0, _react.useCallback)(function () {
     // If current node is hovered and the label is hovered,

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

@@ -26,7 +26,8 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
     customContainerStyles = _ref.customContainerStyles,
     isNodeHovered = _ref.isNodeHovered,
     isNodeNested = _ref.isNodeNested,
-    setIsNodeHovered = _ref.setIsNodeHovered;
+    setIsNodeHovered = _ref.setIsNodeHovered,
+    isBodiedMacro = _ref.isBodiedMacro;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return (0, _react.jsx)(_ExtensionLabel.ExtensionLabel, {
@@ -35,7 +36,8 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
       isNodeHovered: isNodeHovered,
       isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles,
-      setIsNodeHovered: setIsNodeHovered
+      setIsNodeHovered: setIsNodeHovered,
+      isBodiedMacro: isBodiedMacro
     });
   }
   var isBlockExtension = extensionName === 'extension';

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

@@ -50,7 +50,8 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         isNodeHovered = _this$props.isNodeHovered,
         isNodeNested = _this$props.isNodeNested,
         customContainerStyles = _this$props.customContainerStyles,
-        setIsNodeHovered = _this$props.setIsNodeHovered;
+        setIsNodeHovered = _this$props.setIsNodeHovered,
+        isBodiedMacro = _this$props.isBodiedMacro;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
         extensionKey = _this$props$node$attr.extensionKey;
@@ -68,7 +69,8 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         title: title,
         renderImage: _this.renderImage,
         customContainerStyles: customContainerStyles,
-        setIsNodeHovered: setIsNodeHovered
+        setIsNodeHovered: setIsNodeHovered,
+        isBodiedMacro: isBodiedMacro
       });
     });
     return _this;

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

@@ -150,7 +150,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     customContainerStyles: mbeWrapperStyles,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,
-    setIsNodeHovered: setIsNodeHovered
+    setIsNodeHovered: setIsNodeHovered,
+    isBodiedMacro: true
   }), (0, _react2.jsx)("div", {
     className: wrapperClassNames,
     css: _styles.mbeExtensionWrapperCSSStyles,

package/dist/cjs/extensibility/MultiBodiedExtension/styles.js

@@ -27,7 +27,7 @@ var mbeExtensionWrapperCSSStyles = exports.mbeExtensionWrapperCSSStyles = (0, _r
     paddingTop: "var(--ds-space-100, 8px)".concat(" !important")
   },
   '&.with-border': {
-    border: "1px solid ".concat("var(--ds-border-inverse, ".concat(_colors.N0, ")")) // adding this so macro doesn't jump when hover border is shown
+    border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N30, ")"))
   },
   '&.with-hover-border': {
     border: "1px solid ".concat("var(--ds-border-input, ".concat(_colors.N500, ")"))

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,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 && Object.prototype.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 = "78.31.1";
+var packageVersion = "78.31.2";
 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

@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
 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; })(); } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.31.1";
+var packageVersion = "78.31.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -44,11 +44,12 @@ var WidthContext = exports.WidthContext = /*#__PURE__*/_react.default.createCont
 var Provider = WidthContext.Provider,
   Consumer = exports.WidthConsumer = WidthContext.Consumer;
 var WidthProvider = exports.WidthProvider = function WidthProvider(_ref) {
+  var _document$body$offset, _document$body;
   var className = _ref.className,
     shouldCheckExistingValue = _ref.shouldCheckExistingValue,
     children = _ref.children;
   var existingContextValue = _react.default.useContext(WidthContext);
-  var _React$useState = _react.default.useState(typeof document !== 'undefined' ? document.body.offsetWidth : 0),
+  var _React$useState = _react.default.useState(typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     width = _React$useState2[0],
     setWidth = _React$useState2[1];

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

@@ -52,6 +52,7 @@ function ExtensionWithPluginState(props) {
   const classNames = classnames('extension-container', 'block', shadowClassNames, {
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
     'with-border': showMacroInteractionDesignUpdates,
+    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
@@ -106,7 +107,8 @@ function ExtensionWithPluginState(props) {
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     customContainerStyles: customContainerStyles,
-    setIsNodeHovered: setIsNodeHovered
+    setIsNodeHovered: setIsNodeHovered,
+    isBodiedMacro: hasBody
   }), jsx("div", {
     ref: handleRef,
     "data-layout": node.attrs.layout,

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

@@ -14,6 +14,9 @@ export const wrapperStyle = css(wrapperDefault, {
   '&.with-border': {
     border: `1px solid transparent` // adding this so macro doesn't jump when hover border is shown
   },
+  '&.with-bodied-border': {
+    border: `1px solid ${`var(--ds-border, ${N30})`}`
+  },
   '&.with-hover-border': {
     border: `1px solid ${`var(--ds-border-input, ${N500})`}`
   },

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

@@ -2,7 +2,7 @@
 import { useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
-import { N300, N500 } from '@atlaskit/theme/colors';
+import { N0, N30, N300, N500 } from '@atlaskit/theme/colors';
 const labelStyles = css({
   opacity: 0,
   display: 'inline-flex',
@@ -12,12 +12,12 @@ const labelStyles = css({
   // Unfortunately, these need to be these exact numbers - otherwise there will be a gap/noticeable overlap
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
   top: '-18px',
-  '&.inline-extension': {
+  '&.inline': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
     top: '-17px',
     marginLeft: "var(--ds-space-150, 12px)"
   },
-  '&.hovered': {
+  '&.show-label': {
     cursor: 'pointer',
     background: `var(--ds-background-accent-gray-subtle-pressed, ${N300})`,
     color: `var(--ds-text-subtle, ${N500})`,
@@ -29,6 +29,13 @@ const labelStyles = css({
     // Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
     // in the nested component
     marginLeft: "var(--ds-space-150, 12px)"
+  },
+  '&.bodied-background': {
+    background: `var(--ds-surface, ${N0})`
+  },
+  '&.bodied-border': {
+    border: `1px solid ${`var(--ds-border, ${N30})`}`,
+    borderBottom: 'none'
   }
 });
 const textStyles = css({
@@ -42,12 +49,16 @@ export const ExtensionLabel = ({
   isNodeHovered,
   customContainerStyles,
   isNodeNested,
-  setIsNodeHovered
+  setIsNodeHovered,
+  isBodiedMacro
 }) => {
   const classNames = classnames('extension-title', 'extension-label', {
-    'inline-extension': extensionName === 'inlineExtension',
-    hovered: isNodeHovered,
-    nested: isNodeNested
+    nested: isNodeNested,
+    inline: extensionName === 'inlineExtension',
+    bodied: isBodiedMacro,
+    'bodied-border': isBodiedMacro,
+    'bodied-background': isBodiedMacro && !isNodeHovered,
+    'show-label': isNodeHovered || isBodiedMacro
   });
   const handleMouseEnter = useCallback(() => {
     // If current node is hovered and the label is hovered,

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

@@ -18,7 +18,8 @@ export const LozengeComponent = ({
   customContainerStyles,
   isNodeHovered,
   isNodeNested,
-  setIsNodeHovered
+  setIsNodeHovered,
+  isBodiedMacro
 }) => {
   const capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
@@ -28,7 +29,8 @@ export const LozengeComponent = ({
       isNodeHovered: isNodeHovered,
       isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles,
-      setIsNodeHovered: setIsNodeHovered
+      setIsNodeHovered: setIsNodeHovered,
+      isBodiedMacro: isBodiedMacro
     });
   }
   const isBlockExtension = extensionName === 'extension';

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

@@ -31,7 +31,8 @@ export default class ExtensionLozenge extends Component {
         isNodeHovered,
         isNodeNested,
         customContainerStyles,
-        setIsNodeHovered
+        setIsNodeHovered,
+        isBodiedMacro
       } = this.props;
       const {
         parameters,
@@ -53,7 +54,8 @@ export default class ExtensionLozenge extends Component {
         title: title,
         renderImage: this.renderImage,
         customContainerStyles: customContainerStyles,
-        setIsNodeHovered: setIsNodeHovered
+        setIsNodeHovered: setIsNodeHovered,
+        isBodiedMacro: isBodiedMacro
       });
     });
   }

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

@@ -138,7 +138,8 @@ const MultiBodiedExtensionWithWidth = ({
     customContainerStyles: mbeWrapperStyles,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,
-    setIsNodeHovered: setIsNodeHovered
+    setIsNodeHovered: setIsNodeHovered,
+    isBodiedMacro: true
   }), jsx("div", {
     className: wrapperClassNames,
     css: mbeExtensionWrapperCSSStyles,

package/dist/es2019/extensibility/MultiBodiedExtension/styles.js

@@ -1,5 +1,5 @@
 import { css } from '@emotion/react';
-import { N0, N500 } from '@atlaskit/theme/colors';
+import { N30, N500 } from '@atlaskit/theme/colors';
 import { wrapperDefault } from '../Extension/styles';
 
 // Wrapper the extension title and extensionContainer
@@ -22,7 +22,7 @@ export const mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
     paddingTop: `${"var(--ds-space-100, 8px)"} !important`
   },
   '&.with-border': {
-    border: `1px solid ${`var(--ds-border-inverse, ${N0})`}` // adding this so macro doesn't jump when hover border is shown
+    border: `1px solid ${`var(--ds-border, ${N30})`}`
   },
   '&.with-hover-border': {
     border: `1px solid ${`var(--ds-border-input, ${N500})`}`

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 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 = "78.31.1";
+const packageVersion = "78.31.2";
 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

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.31.1";
+const packageVersion = "78.31.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -34,8 +34,9 @@ export const WidthProvider = ({
   shouldCheckExistingValue,
   children
 }) => {
+  var _document$body$offset, _document$body;
   const existingContextValue = React.useContext(WidthContext);
-  const [width, setWidth] = React.useState(typeof document !== 'undefined' ? document.body.offsetWidth : 0);
+  const [width, setWidth] = React.useState(typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0);
   const providerValue = React.useMemo(() => createWidthContext(width), [width]);
   const updateWidth = rafSchedule(nextWidth => {
     // Ignore changes that are less than SCROLLBAR_WIDTH, otherwise it can cause infinite re-scaling

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

@@ -54,6 +54,7 @@ function ExtensionWithPluginState(props) {
   var classNames = classnames('extension-container', 'block', shadowClassNames, _defineProperty({
     'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
     'with-border': showMacroInteractionDesignUpdates,
+    'with-bodied-border': showMacroInteractionDesignUpdates && hasBody,
     'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested,
     'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
     'with-danger-overlay': showMacroInteractionDesignUpdates,
@@ -101,7 +102,8 @@ function ExtensionWithPluginState(props) {
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     customContainerStyles: customContainerStyles,
-    setIsNodeHovered: setIsNodeHovered
+    setIsNodeHovered: setIsNodeHovered,
+    isBodiedMacro: hasBody
   }), jsx("div", {
     ref: handleRef,
     "data-layout": node.attrs.layout,

package/dist/esm/extensibility/Extension/Extension/styles.js

@@ -14,6 +14,9 @@ export var wrapperStyle = css(wrapperDefault, {
   '&.with-border': {
     border: "1px solid transparent" // adding this so macro doesn't jump when hover border is shown
   },
+  '&.with-bodied-border': {
+    border: "1px solid ".concat("var(--ds-border, ".concat(N30, ")"))
+  },
   '&.with-hover-border': {
     border: "1px solid ".concat("var(--ds-border-input, ".concat(N500, ")"))
   },

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

@@ -2,7 +2,7 @@
 import { useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
-import { N300, N500 } from '@atlaskit/theme/colors';
+import { N0, N30, N300, N500 } from '@atlaskit/theme/colors';
 var labelStyles = css({
   opacity: 0,
   display: 'inline-flex',
@@ -12,12 +12,12 @@ var labelStyles = css({
   // Unfortunately, these need to be these exact numbers - otherwise there will be a gap/noticeable overlap
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
   top: '-18px',
-  '&.inline-extension': {
+  '&.inline': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
     top: '-17px',
     marginLeft: "var(--ds-space-150, 12px)"
   },
-  '&.hovered': {
+  '&.show-label': {
     cursor: 'pointer',
     background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(N300, ")"),
     color: "var(--ds-text-subtle, ".concat(N500, ")"),
@@ -29,6 +29,13 @@ var labelStyles = css({
     // Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
     // in the nested component
     marginLeft: "var(--ds-space-150, 12px)"
+  },
+  '&.bodied-background': {
+    background: "var(--ds-surface, ".concat(N0, ")")
+  },
+  '&.bodied-border': {
+    border: "1px solid ".concat("var(--ds-border, ".concat(N30, ")")),
+    borderBottom: 'none'
   }
 });
 var textStyles = css({
@@ -42,11 +49,15 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
     isNodeHovered = _ref.isNodeHovered,
     customContainerStyles = _ref.customContainerStyles,
     isNodeNested = _ref.isNodeNested,
-    setIsNodeHovered = _ref.setIsNodeHovered;
+    setIsNodeHovered = _ref.setIsNodeHovered,
+    isBodiedMacro = _ref.isBodiedMacro;
   var classNames = classnames('extension-title', 'extension-label', {
-    'inline-extension': extensionName === 'inlineExtension',
-    hovered: isNodeHovered,
-    nested: isNodeNested
+    nested: isNodeNested,
+    inline: extensionName === 'inlineExtension',
+    bodied: isBodiedMacro,
+    'bodied-border': isBodiedMacro,
+    'bodied-background': isBodiedMacro && !isNodeHovered,
+    'show-label': isNodeHovered || isBodiedMacro
   });
   var handleMouseEnter = useCallback(function () {
     // If current node is hovered and the label is hovered,

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

@@ -21,7 +21,8 @@ export var LozengeComponent = function LozengeComponent(_ref) {
     customContainerStyles = _ref.customContainerStyles,
     isNodeHovered = _ref.isNodeHovered,
     isNodeNested = _ref.isNodeNested,
-    setIsNodeHovered = _ref.setIsNodeHovered;
+    setIsNodeHovered = _ref.setIsNodeHovered,
+    isBodiedMacro = _ref.isBodiedMacro;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return jsx(ExtensionLabel, {
@@ -30,7 +31,8 @@ export var LozengeComponent = function LozengeComponent(_ref) {
       isNodeHovered: isNodeHovered,
       isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles,
-      setIsNodeHovered: setIsNodeHovered
+      setIsNodeHovered: setIsNodeHovered,
+      isBodiedMacro: isBodiedMacro
     });
   }
   var isBlockExtension = extensionName === 'extension';

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

@@ -44,7 +44,8 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         isNodeHovered = _this$props.isNodeHovered,
         isNodeNested = _this$props.isNodeNested,
         customContainerStyles = _this$props.customContainerStyles,
-        setIsNodeHovered = _this$props.setIsNodeHovered;
+        setIsNodeHovered = _this$props.setIsNodeHovered,
+        isBodiedMacro = _this$props.isBodiedMacro;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
         extensionKey = _this$props$node$attr.extensionKey;
@@ -62,7 +63,8 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         title: title,
         renderImage: _this.renderImage,
         customContainerStyles: customContainerStyles,
-        setIsNodeHovered: setIsNodeHovered
+        setIsNodeHovered: setIsNodeHovered,
+        isBodiedMacro: isBodiedMacro
       });
     });
     return _this;

package/dist/esm/extensibility/MultiBodiedExtension/index.js

@@ -141,7 +141,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     customContainerStyles: mbeWrapperStyles,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,
-    setIsNodeHovered: setIsNodeHovered
+    setIsNodeHovered: setIsNodeHovered,
+    isBodiedMacro: true
   }), jsx("div", {
     className: wrapperClassNames,
     css: mbeExtensionWrapperCSSStyles,

package/dist/esm/extensibility/MultiBodiedExtension/styles.js

@@ -1,5 +1,5 @@
 import { css } from '@emotion/react';
-import { N0, N500 } from '@atlaskit/theme/colors';
+import { N30, N500 } from '@atlaskit/theme/colors';
 import { wrapperDefault } from '../Extension/styles';
 
 // Wrapper the extension title and extensionContainer
@@ -22,7 +22,7 @@ export var mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
     paddingTop: "var(--ds-space-100, 8px)".concat(" !important")
   },
   '&.with-border': {
-    border: "1px solid ".concat("var(--ds-border-inverse, ".concat(N0, ")")) // adding this so macro doesn't jump when hover border is shown
+    border: "1px solid ".concat("var(--ds-border, ".concat(N30, ")"))
   },
   '&.with-hover-border': {
     border: "1px solid ".concat("var(--ds-border-input, ".concat(N500, ")"))

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 = "78.31.1";
+var packageVersion = "78.31.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -15,7 +15,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.31.1";
+var packageVersion = "78.31.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -31,11 +31,12 @@ export var WidthContext = /*#__PURE__*/React.createContext(createWidthContext())
 var Provider = WidthContext.Provider,
   Consumer = WidthContext.Consumer;
 export var WidthProvider = function WidthProvider(_ref) {
+  var _document$body$offset, _document$body;
   var className = _ref.className,
     shouldCheckExistingValue = _ref.shouldCheckExistingValue,
     children = _ref.children;
   var existingContextValue = React.useContext(WidthContext);
-  var _React$useState = React.useState(typeof document !== 'undefined' ? document.body.offsetWidth : 0),
+  var _React$useState = React.useState(typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     width = _React$useState2[0],
     setWidth = _React$useState2[1];

package/dist/types/extensibility/Extension/Lozenge/ExtensionLabel.d.ts

@@ -7,6 +7,7 @@ type ExtensionLabelProps = {
     isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
     setIsNodeHovered?: (isHovered: boolean) => void;
+    isBodiedMacro?: boolean;
 };
-export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, }: ExtensionLabelProps) => jsx.JSX.Element;
+export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, }: ExtensionLabelProps) => jsx.JSX.Element;
 export {};

package/dist/types/extensibility/Extension/Lozenge/LozengeComponent.d.ts

@@ -15,6 +15,7 @@ type LozengeComponentProps = {
     isNodeHovered?: boolean;
     isNodeNested?: boolean;
     setIsNodeHovered?: (isHovered: boolean) => void;
+    isBodiedMacro?: boolean;
 };
-export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, }: LozengeComponentProps) => jsx.JSX.Element;
+export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, }: LozengeComponentProps) => jsx.JSX.Element;
 export {};

package/dist/types/extensibility/Extension/Lozenge/index.d.ts

@@ -11,6 +11,7 @@ export interface Props {
     isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
     setIsNodeHovered?: (isHovered: boolean) => void;
+    isBodiedMacro?: boolean;
 }
 export interface LozengeData {
     url: string;

package/dist/types-ts4.5/extensibility/Extension/Lozenge/ExtensionLabel.d.ts

@@ -7,6 +7,7 @@ type ExtensionLabelProps = {
     isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
     setIsNodeHovered?: (isHovered: boolean) => void;
+    isBodiedMacro?: boolean;
 };
-export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, }: ExtensionLabelProps) => jsx.JSX.Element;
+export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, }: ExtensionLabelProps) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/extensibility/Extension/Lozenge/LozengeComponent.d.ts

@@ -15,6 +15,7 @@ type LozengeComponentProps = {
     isNodeHovered?: boolean;
     isNodeNested?: boolean;
     setIsNodeHovered?: (isHovered: boolean) => void;
+    isBodiedMacro?: boolean;
 };
-export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, }: LozengeComponentProps) => jsx.JSX.Element;
+export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, }: LozengeComponentProps) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/extensibility/Extension/Lozenge/index.d.ts

@@ -11,6 +11,7 @@ export interface Props {
     isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
     setIsNodeHovered?: (isHovered: boolean) => void;
+    isBodiedMacro?: boolean;
 }
 export interface LozengeData {
     url: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.31.1",
+  "version": "78.31.2",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"