@atlaskit/editor-common 78.25.0 → 78.26.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-common
 
+## 78.26.1
+
+### Patch Changes
+
+- [#89487](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89487) [`4aa7d85aa286`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4aa7d85aa286) - [ux] Fix extension label and opacity
+
+## 78.26.0
+
+### Minor Changes
+
+- [#88763](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88763) [`9fcd30347b0c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9fcd30347b0c) - [ux] Removed annotation styling for media in editor and renderer
+
 ## 78.25.0
 
 ### Minor Changes

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

@@ -106,6 +106,7 @@ function ExtensionWithPluginState(props) {
   return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
+    isNodeNested: isNodeNested,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     customContainerStyles: customContainerStyles

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

@@ -21,8 +21,7 @@ var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault
     border: "1px solid transparent" // adding this so macro doesn't jump when hover border is shown
   },
   '&.with-hover-border': {
-    border: "1px solid ".concat("var(--ds-border-bold, ".concat(_colors.N100, ")")),
-    opacity: '86%'
+    border: "1px solid ".concat("var(--ds-border-input, ".concat(_colors.N500, ")"))
   },
   '&.with-margin-styles': {
     margin: "0 ".concat("var(--ds-space-negative-150, -12px)"),

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

@@ -30,7 +30,12 @@ var labelStyles = (0, _react.css)({
     opacity: 1
   },
   borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
-  lineHeight: 1
+  lineHeight: 1,
+  '&.nested': {
+    // 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)"
+  }
 });
 var textStyles = (0, _react.css)({
   fontSize: '14px',
@@ -41,10 +46,12 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
   var text = _ref.text,
     extensionName = _ref.extensionName,
     isNodeHovered = _ref.isNodeHovered,
-    customContainerStyles = _ref.customContainerStyles;
+    customContainerStyles = _ref.customContainerStyles,
+    isNodeNested = _ref.isNodeNested;
   var classNames = (0, _classnames.default)('extension-title', 'extension-label', {
     'inline-extension': extensionName === 'inlineExtension',
-    hovered: isNodeHovered
+    hovered: isNodeHovered,
+    nested: isNodeNested
   });
   return (0, _react.jsx)("div", {
     style: customContainerStyles

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

@@ -24,13 +24,15 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
     renderImage = _ref.renderImage,
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
     customContainerStyles = _ref.customContainerStyles,
-    isNodeHovered = _ref.isNodeHovered;
+    isNodeHovered = _ref.isNodeHovered,
+    isNodeNested = _ref.isNodeNested;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return (0, _react.jsx)(_ExtensionLabel.ExtensionLabel, {
       text: capitalizedTitle,
       extensionName: extensionName,
       isNodeHovered: isNodeHovered,
+      isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles
     });
   }

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

@@ -48,6 +48,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
         isNodeSelected = _this$props.isNodeSelected,
         isNodeHovered = _this$props.isNodeHovered,
+        isNodeNested = _this$props.isNodeNested,
         customContainerStyles = _this$props.customContainerStyles;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
@@ -58,6 +59,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
       return (0, _react2.jsx)(_LozengeComponent.LozengeComponent, {
         isNodeHovered: isNodeHovered,
         isNodeSelected: isNodeSelected,
+        isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         extensionName: name,
         lozengeData: lozengeData,

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

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

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

@@ -30,8 +30,7 @@ var mbeExtensionWrapperCSSStyles = exports.mbeExtensionWrapperCSSStyles = (0, _r
     border: "1px solid ".concat("var(--ds-border-inverse, ".concat(_colors.N0, ")")) // adding this so macro doesn't jump when hover border is shown
   },
   '&.with-hover-border': {
-    border: "1px solid ".concat("var(--ds-border-bold, ".concat(_colors.N100, ")")),
-    opacity: '86%'
+    border: "1px solid ".concat("var(--ds-border-input, ".concat(_colors.N500, ")"))
   }
 });
 var overlayStyles = exports.overlayStyles = (0, _react.css)({

package/dist/cjs/media/index.js

@@ -21,12 +21,6 @@ Object.defineProperty(exports, "commentMessages", {
     return _comments.commentMessages;
   }
 });
-Object.defineProperty(exports, "commentStatusStyleMap", {
-  enumerable: true,
-  get: function get() {
-    return _styles.commentStatusStyleMap;
-  }
-});
 Object.defineProperty(exports, "dropPlaceholderMessages", {
   enumerable: true,
   get: function get() {
@@ -78,5 +72,4 @@ var _caption = require("./messages/caption");
 var _dropPlaceholder = require("./messages/dropPlaceholder");
 var _altText = require("./messages/altText");
 var _mediaResizeAnnouncerMess = require("./messages/mediaResizeAnnouncerMess");
-var _comments = require("./messages/comments");
-var _styles = require("./styles");
+var _comments = require("./messages/comments");

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

package/dist/cjs/styles/index.js

@@ -255,12 +255,6 @@ Object.defineProperty(exports, "listsSharedStyles", {
     return _lists.listsSharedStyles;
   }
 });
-Object.defineProperty(exports, "mediaAnnotationStyles", {
-  enumerable: true,
-  get: function get() {
-    return _annotation.mediaAnnotationStyles;
-  }
-});
 Object.defineProperty(exports, "mediaSingleSharedStyle", {
   enumerable: true,
   get: function get() {

package/dist/cjs/styles/shared/annotation.js

@@ -4,12 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mediaAnnotationStyles = exports.blockAnnotationPrefix = exports.annotationSharedStyles = exports.annotationPrefix = exports.BlockAnnotationSharedClassNames = exports.AnnotationSharedClassNames = exports.AnnotationSharedCSSByState = void 0;
+exports.blockAnnotationPrefix = exports.annotationSharedStyles = exports.annotationPrefix = exports.BlockAnnotationSharedClassNames = exports.AnnotationSharedClassNames = exports.AnnotationSharedCSSByState = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
-var _styles = require("../../media/styles");
 var _templateObject;
 var annotationPrefix = exports.annotationPrefix = 'ak-editor-annotation';
 var AnnotationSharedClassNames = exports.AnnotationSharedClassNames = {
@@ -23,7 +22,6 @@ var BlockAnnotationSharedClassNames = exports.BlockAnnotationSharedClassNames =
   blur: "".concat(blockAnnotationPrefix, "-blur"),
   draft: "".concat(blockAnnotationPrefix, "-draft")
 };
-var mediaNodeDomRef = 'mediaView-content-wrap';
 var Y75a = 'rgba(255, 240, 179, 0.5)';
 var Y200a = 'rgba(255, 196, 0, 0.82)';
 var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
@@ -73,9 +71,5 @@ var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function A
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
 var annotationSharedStyles = exports.annotationSharedStyles = function annotationSharedStyles() {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    .", " {\n      ", ";\n    }\n\n    .", " {\n      ", ";\n      cursor: initial;\n    }\n\n    .", " {\n      ", ";\n    }\n\n    // Styling for comments on media node\n    .", "[class*=ak-editor-block-annotation-] {\n      border-radius: 3px;\n    }\n\n    .", ".", " {\n      box-shadow: ", ";\n    }\n\n    .", ".", " {\n      box-shadow: ", ";\n    }\n\n    .", ".", " {\n      box-shadow: ", ";\n    }\n  }\n"])), AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur, mediaNodeDomRef, mediaNodeDomRef, BlockAnnotationSharedClassNames.draft, (0, _styles.commentStatusStyleMap)('draft'), mediaNodeDomRef, BlockAnnotationSharedClassNames.focus, (0, _styles.commentStatusStyleMap)('focus'), mediaNodeDomRef, BlockAnnotationSharedClassNames.blur, (0, _styles.commentStatusStyleMap)('blur'));
-};
-var mediaAnnotationStyles = exports.mediaAnnotationStyles = (0, _react.css)({
-  boxShadow: "3px 3px ".concat("var(--ds-background-accent-yellow-subtler, ".concat(Y75a, ")")),
-  borderRadius: '3px'
-});
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    .", " {\n      ", ";\n    }\n\n    .", " {\n      ", ";\n      cursor: initial;\n    }\n\n    .", " {\n      ", ";\n    }\n  }\n"])), AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur);
+};

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

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 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.25.0";
+var packageVersion = "78.26.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -102,6 +102,7 @@ function ExtensionWithPluginState(props) {
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
+    isNodeNested: isNodeNested,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     customContainerStyles: customContainerStyles

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

@@ -1,5 +1,5 @@
 import { css } from '@emotion/react';
-import { N100, N30 } from '@atlaskit/theme/colors';
+import { N30, N500 } from '@atlaskit/theme/colors';
 import { wrapperDefault } from '../styles';
 export const widerLayoutClassName = 'wider-layout';
 export const wrapperStyle = css(wrapperDefault, {
@@ -15,8 +15,7 @@ export const wrapperStyle = css(wrapperDefault, {
     border: `1px solid transparent` // adding this so macro doesn't jump when hover border is shown
   },
   '&.with-hover-border': {
-    border: `1px solid ${`var(--ds-border-bold, ${N100})`}`,
-    opacity: '86%'
+    border: `1px solid ${`var(--ds-border-input, ${N500})`}`
   },
   '&.with-margin-styles': {
     margin: `0 ${"var(--ds-space-negative-150, -12px)"}`,

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

@@ -23,7 +23,12 @@ const labelStyles = css({
     opacity: 1
   },
   borderRadius: `${"var(--ds-border-radius, 3px)"} ${"var(--ds-border-radius, 3px)"} 0 0`,
-  lineHeight: 1
+  lineHeight: 1,
+  '&.nested': {
+    // 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)"
+  }
 });
 const textStyles = css({
   fontSize: '14px',
@@ -34,11 +39,13 @@ export const ExtensionLabel = ({
   text,
   extensionName,
   isNodeHovered,
-  customContainerStyles
+  customContainerStyles,
+  isNodeNested
 }) => {
   const classNames = classnames('extension-title', 'extension-label', {
     'inline-extension': extensionName === 'inlineExtension',
-    hovered: isNodeHovered
+    hovered: isNodeHovered,
+    nested: isNodeNested
   });
   return jsx("div", {
     style: customContainerStyles

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

@@ -16,7 +16,8 @@ export const LozengeComponent = ({
   renderImage,
   showMacroInteractionDesignUpdates,
   customContainerStyles,
-  isNodeHovered
+  isNodeHovered,
+  isNodeNested
 }) => {
   const capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
@@ -24,6 +25,7 @@ export const LozengeComponent = ({
       text: capitalizedTitle,
       extensionName: extensionName,
       isNodeHovered: isNodeHovered,
+      isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles
     });
   }

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

@@ -29,6 +29,7 @@ export default class ExtensionLozenge extends Component {
         showMacroInteractionDesignUpdates,
         isNodeSelected,
         isNodeHovered,
+        isNodeNested,
         customContainerStyles
       } = this.props;
       const {
@@ -43,6 +44,7 @@ export default class ExtensionLozenge extends Component {
       return jsx(LozengeComponent, {
         isNodeHovered: isNodeHovered,
         isNodeSelected: isNodeSelected,
+        isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         extensionName: name,
         lozengeData: lozengeData,

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

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

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

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

package/dist/es2019/media/index.js

@@ -7,5 +7,4 @@ export { captionMessages } from './messages/caption';
 export { dropPlaceholderMessages } from './messages/dropPlaceholder';
 export { altTextMessages } from './messages/altText';
 export { mediaResizeAnnouncerMessMessages } from './messages/mediaResizeAnnouncerMess';
-export { commentMessages } from './messages/comments';
-export { commentStatusStyleMap } from './styles';
+export { commentMessages } from './messages/comments';

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

package/dist/es2019/styles/index.js

@@ -1,6 +1,6 @@
 export { textColorStyles } from './shared/text-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl } from './shared/table';
-export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, mediaAnnotationStyles } from './shared/annotation';
+export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
 export { mediaSingleSharedStyle, richMediaClassName } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';

package/dist/es2019/styles/shared/annotation.js

@@ -1,7 +1,6 @@
 import { css } from '@emotion/react';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { N60A, Y300, Y75 } from '@atlaskit/theme/colors';
-import { commentStatusStyleMap } from '../../media/styles';
 export const annotationPrefix = 'ak-editor-annotation';
 export const AnnotationSharedClassNames = {
   focus: `${annotationPrefix}-focus`,
@@ -14,7 +13,6 @@ export const BlockAnnotationSharedClassNames = {
   blur: `${blockAnnotationPrefix}-blur`,
   draft: `${blockAnnotationPrefix}-draft`
 };
-const mediaNodeDomRef = 'mediaView-content-wrap';
 const Y75a = 'rgba(255, 240, 179, 0.5)';
 const Y200a = 'rgba(255, 196, 0, 0.82)';
 export const AnnotationSharedCSSByState = () => getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? {
@@ -75,26 +73,5 @@ export const annotationSharedStyles = () => css`
     .${AnnotationSharedClassNames.blur} {
       ${AnnotationSharedCSSByState().blur};
     }
-
-    // Styling for comments on media node
-    .${mediaNodeDomRef}[class*=ak-editor-block-annotation-] {
-      border-radius: 3px;
-    }
-
-    .${mediaNodeDomRef}.${BlockAnnotationSharedClassNames.draft} {
-      box-shadow: ${commentStatusStyleMap('draft')};
-    }
-
-    .${mediaNodeDomRef}.${BlockAnnotationSharedClassNames.focus} {
-      box-shadow: ${commentStatusStyleMap('focus')};
-    }
-
-    .${mediaNodeDomRef}.${BlockAnnotationSharedClassNames.blur} {
-      box-shadow: ${commentStatusStyleMap('blur')};
-    }
   }
-`;
-export const mediaAnnotationStyles = css({
-  boxShadow: `3px 3px ${`var(--ds-background-accent-yellow-subtler, ${Y75a})`}`,
-  borderRadius: '3px'
-});
+`;

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

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

@@ -97,6 +97,7 @@ function ExtensionWithPluginState(props) {
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
+    isNodeNested: isNodeNested,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
     customContainerStyles: customContainerStyles

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

@@ -1,5 +1,5 @@
 import { css } from '@emotion/react';
-import { N100, N30 } from '@atlaskit/theme/colors';
+import { N30, N500 } from '@atlaskit/theme/colors';
 import { wrapperDefault } from '../styles';
 export var widerLayoutClassName = 'wider-layout';
 export var wrapperStyle = css(wrapperDefault, {
@@ -15,8 +15,7 @@ export var wrapperStyle = css(wrapperDefault, {
     border: "1px solid transparent" // adding this so macro doesn't jump when hover border is shown
   },
   '&.with-hover-border': {
-    border: "1px solid ".concat("var(--ds-border-bold, ".concat(N100, ")")),
-    opacity: '86%'
+    border: "1px solid ".concat("var(--ds-border-input, ".concat(N500, ")"))
   },
   '&.with-margin-styles': {
     margin: "0 ".concat("var(--ds-space-negative-150, -12px)"),

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

@@ -23,7 +23,12 @@ var labelStyles = css({
     opacity: 1
   },
   borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
-  lineHeight: 1
+  lineHeight: 1,
+  '&.nested': {
+    // 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)"
+  }
 });
 var textStyles = css({
   fontSize: '14px',
@@ -34,10 +39,12 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
   var text = _ref.text,
     extensionName = _ref.extensionName,
     isNodeHovered = _ref.isNodeHovered,
-    customContainerStyles = _ref.customContainerStyles;
+    customContainerStyles = _ref.customContainerStyles,
+    isNodeNested = _ref.isNodeNested;
   var classNames = classnames('extension-title', 'extension-label', {
     'inline-extension': extensionName === 'inlineExtension',
-    hovered: isNodeHovered
+    hovered: isNodeHovered,
+    nested: isNodeNested
   });
   return jsx("div", {
     style: customContainerStyles

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

@@ -19,13 +19,15 @@ export var LozengeComponent = function LozengeComponent(_ref) {
     renderImage = _ref.renderImage,
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
     customContainerStyles = _ref.customContainerStyles,
-    isNodeHovered = _ref.isNodeHovered;
+    isNodeHovered = _ref.isNodeHovered,
+    isNodeNested = _ref.isNodeNested;
   var capitalizedTitle = capitalizeFirstLetter(title);
   if (showMacroInteractionDesignUpdates) {
     return jsx(ExtensionLabel, {
       text: capitalizedTitle,
       extensionName: extensionName,
       isNodeHovered: isNodeHovered,
+      isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles
     });
   }

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

@@ -42,6 +42,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
         isNodeSelected = _this$props.isNodeSelected,
         isNodeHovered = _this$props.isNodeHovered,
+        isNodeNested = _this$props.isNodeNested,
         customContainerStyles = _this$props.customContainerStyles;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
@@ -52,6 +53,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
       return jsx(LozengeComponent, {
         isNodeHovered: isNodeHovered,
         isNodeSelected: isNodeSelected,
+        isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
         extensionName: name,
         lozengeData: lozengeData,

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

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

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

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

package/dist/esm/media/index.js

@@ -7,5 +7,4 @@ export { captionMessages } from './messages/caption';
 export { dropPlaceholderMessages } from './messages/dropPlaceholder';
 export { altTextMessages } from './messages/altText';
 export { mediaResizeAnnouncerMessMessages } from './messages/mediaResizeAnnouncerMess';
-export { commentMessages } from './messages/comments';
-export { commentStatusStyleMap } from './styles';
+export { commentMessages } from './messages/comments';

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

package/dist/esm/styles/index.js

@@ -1,6 +1,6 @@
 export { textColorStyles } from './shared/text-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl } from './shared/table';
-export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, mediaAnnotationStyles } from './shared/annotation';
+export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
 export { mediaSingleSharedStyle, richMediaClassName } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';

package/dist/esm/styles/shared/annotation.js

@@ -3,7 +3,6 @@ var _templateObject;
 import { css } from '@emotion/react';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { N60A, Y300, Y75 } from '@atlaskit/theme/colors';
-import { commentStatusStyleMap } from '../../media/styles';
 export var annotationPrefix = 'ak-editor-annotation';
 export var AnnotationSharedClassNames = {
   focus: "".concat(annotationPrefix, "-focus"),
@@ -16,7 +15,6 @@ export var BlockAnnotationSharedClassNames = {
   blur: "".concat(blockAnnotationPrefix, "-blur"),
   draft: "".concat(blockAnnotationPrefix, "-draft")
 };
-var mediaNodeDomRef = 'mediaView-content-wrap';
 var Y75a = 'rgba(255, 240, 179, 0.5)';
 var Y200a = 'rgba(255, 196, 0, 0.82)';
 export var AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
@@ -66,9 +64,5 @@ export var AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
 export var annotationSharedStyles = function annotationSharedStyles() {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .", " {\n      ", ";\n    }\n\n    .", " {\n      ", ";\n      cursor: initial;\n    }\n\n    .", " {\n      ", ";\n    }\n\n    // Styling for comments on media node\n    .", "[class*=ak-editor-block-annotation-] {\n      border-radius: 3px;\n    }\n\n    .", ".", " {\n      box-shadow: ", ";\n    }\n\n    .", ".", " {\n      box-shadow: ", ";\n    }\n\n    .", ".", " {\n      box-shadow: ", ";\n    }\n  }\n"])), AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur, mediaNodeDomRef, mediaNodeDomRef, BlockAnnotationSharedClassNames.draft, commentStatusStyleMap('draft'), mediaNodeDomRef, BlockAnnotationSharedClassNames.focus, commentStatusStyleMap('focus'), mediaNodeDomRef, BlockAnnotationSharedClassNames.blur, commentStatusStyleMap('blur'));
-};
-export var mediaAnnotationStyles = css({
-  boxShadow: "3px 3px ".concat("var(--ds-background-accent-yellow-subtler, ".concat(Y75a, ")")),
-  borderRadius: '3px'
-});
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .", " {\n      ", ";\n    }\n\n    .", " {\n      ", ";\n      cursor: initial;\n    }\n\n    .", " {\n      ", ";\n    }\n  }\n"])), AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur);
+};

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

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

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

@@ -5,7 +5,8 @@ type ExtensionLabelProps = {
     text: string;
     extensionName: string;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
 };
-export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, }: ExtensionLabelProps) => jsx.JSX.Element;
+export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, }: ExtensionLabelProps) => jsx.JSX.Element;
 export {};

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

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

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

@@ -8,6 +8,7 @@ export interface Props {
     showMacroInteractionDesignUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
 }
 export interface LozengeData {

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

@@ -8,4 +8,3 @@ export { dropPlaceholderMessages } from './messages/dropPlaceholder';
 export { altTextMessages } from './messages/altText';
 export { mediaResizeAnnouncerMessMessages } from './messages/mediaResizeAnnouncerMess';
 export { commentMessages } from './messages/comments';
-export { commentStatusStyleMap } from './styles';

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

@@ -1,6 +1,6 @@
 export { textColorStyles } from './shared/text-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl, } from './shared/table';
-export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, mediaAnnotationStyles, } from './shared/annotation';
+export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
 export { mediaSingleSharedStyle, richMediaClassName, } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';

package/dist/types/styles/shared/annotation.d.ts

@@ -15,4 +15,3 @@ export declare const AnnotationSharedCSSByState: () => {
     blur: import("@emotion/react").SerializedStyles;
 };
 export declare const annotationSharedStyles: () => import("@emotion/react").SerializedStyles;
-export declare const mediaAnnotationStyles: import("@emotion/react").SerializedStyles;

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

@@ -5,7 +5,8 @@ type ExtensionLabelProps = {
     text: string;
     extensionName: string;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
 };
-export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, }: ExtensionLabelProps) => jsx.JSX.Element;
+export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, }: ExtensionLabelProps) => jsx.JSX.Element;
 export {};

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

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

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

@@ -8,6 +8,7 @@ export interface Props {
     showMacroInteractionDesignUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
+    isNodeNested?: boolean;
     customContainerStyles?: CSSProperties;
 }
 export interface LozengeData {

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

@@ -8,4 +8,3 @@ export { dropPlaceholderMessages } from './messages/dropPlaceholder';
 export { altTextMessages } from './messages/altText';
 export { mediaResizeAnnouncerMessMessages } from './messages/mediaResizeAnnouncerMess';
 export { commentMessages } from './messages/comments';
-export { commentStatusStyleMap } from './styles';

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

@@ -1,6 +1,6 @@
 export { textColorStyles } from './shared/text-color';
 export { tableSharedStyle, tableMarginTop, tableMarginBottom, tableMarginSides, tableCellMinWidth, tableNewColumnMinWidth, tableCellBorderWidth, calcTableWidth, TableSharedCssClassName, tableResizeHandleWidth, tableCellPadding, tableMarginTopWithControl, } from './shared/table';
-export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, mediaAnnotationStyles, } from './shared/annotation';
+export { AnnotationSharedClassNames, BlockAnnotationSharedClassNames, AnnotationSharedCSSByState, annotationSharedStyles, } from './shared/annotation';
 export { columnLayoutSharedStyle } from './shared/column-layout';
 export { mediaSingleSharedStyle, richMediaClassName, } from './shared/media-single';
 export { blockquoteSharedStyles } from './shared/blockquote';

package/dist/types-ts4.5/styles/shared/annotation.d.ts

@@ -15,4 +15,3 @@ export declare const AnnotationSharedCSSByState: () => {
     blur: import("@emotion/react").SerializedStyles;
 };
 export declare const annotationSharedStyles: () => import("@emotion/react").SerializedStyles;
-export declare const mediaAnnotationStyles: import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.25.0",
+  "version": "78.26.1",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -121,7 +121,7 @@
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/media-file-preview": "^0.5.0",
     "@atlaskit/media-picker": "^66.4.0",
-    "@atlaskit/media-ui": "^25.6.0",
+    "@atlaskit/media-ui": "^25.7.0",
     "@atlaskit/media-viewer": "48.4.4",
     "@atlaskit/mention": "^23.0.0",
     "@atlaskit/menu": "^2.1.0",

package/dist/cjs/media/styles.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.commentStatusStyleMap = void 0;
-var _colors = require("@atlaskit/theme/colors");
-var boxShadowColorByStatus = {
-  draft: "var(--ds-background-accent-yellow-subtle, ".concat(_colors.Y300, ")"),
-  focus: "var(--ds-background-accent-yellow-subtle, ".concat(_colors.Y300, ")"),
-  blur: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y200, ")")
-};
-var commentStatusStyleMap = exports.commentStatusStyleMap = function commentStatusStyleMap(status) {
-  return "3px 3px 0px 0px ".concat(boxShadowColorByStatus[status]);
-};

package/dist/es2019/media/styles.js

@@ -1,7 +0,0 @@
-import { Y200, Y300 } from '@atlaskit/theme/colors';
-const boxShadowColorByStatus = {
-  draft: `var(--ds-background-accent-yellow-subtle, ${Y300})`,
-  focus: `var(--ds-background-accent-yellow-subtle, ${Y300})`,
-  blur: `var(--ds-background-accent-yellow-subtler, ${Y200})`
-};
-export const commentStatusStyleMap = status => `3px 3px 0px 0px ${boxShadowColorByStatus[status]}`;

package/dist/esm/media/styles.js

@@ -1,9 +0,0 @@
-import { Y200, Y300 } from '@atlaskit/theme/colors';
-var boxShadowColorByStatus = {
-  draft: "var(--ds-background-accent-yellow-subtle, ".concat(Y300, ")"),
-  focus: "var(--ds-background-accent-yellow-subtle, ".concat(Y300, ")"),
-  blur: "var(--ds-background-accent-yellow-subtler, ".concat(Y200, ")")
-};
-export var commentStatusStyleMap = function commentStatusStyleMap(status) {
-  return "3px 3px 0px 0px ".concat(boxShadowColorByStatus[status]);
-};

package/dist/types/media/styles.d.ts

@@ -1,2 +0,0 @@
-export type CommentStatus = 'draft' | 'focus' | 'blur';
-export declare const commentStatusStyleMap: (status: CommentStatus) => string;

package/dist/types-ts4.5/media/styles.d.ts

@@ -1,2 +0,0 @@
-export type CommentStatus = 'draft' | 'focus' | 'blur';
-export declare const commentStatusStyleMap: (status: CommentStatus) => string;