@atlaskit/editor-common 78.9.1 → 78.10.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/editor-common
 
+## 78.10.0
+
+### Minor Changes
+
+- [#77821](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77821) [`41dfb88ade75`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/41dfb88ade75) - [ux] Adds lozenge design update to inline macros if macroInteractionDesignUpdate flag is true
+
+### Patch Changes
+
+- [#78224](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78224) [`6b4c9dd4ad34`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b4c9dd4ad34) - ED-22219: adf-schema updated to 35.5.2
+- Updated dependencies
+
+## 78.9.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 78.9.3
+
+### Patch Changes
+
+- [#77819](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77819) [`ac7c9369d377`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ac7c9369d377) - [ux] Updates lozenges to match designs more closely in the macro visual design update project
+
+## 78.9.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 78.9.1
 
 ### Patch Changes

package/constants/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@atlaskit/editor-common/constants",
+  "main": "../dist/cjs/link/constants.js",
+  "module": "../dist/esm/link/constants.js",
+  "module:es2019": "../dist/es2019/link/constants.js",
+  "sideEffects": false,
+  "types": "../dist/types/link/constants.d.ts",
+  "typesVersions": {
+    ">=4.5 <4.9": {
+      "*": [
+        "../dist/types-ts4.5/link/constants.d.ts"
+      ]
+    }
+  }
+}

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

@@ -84,7 +84,8 @@ function ExtensionWithPluginState(props) {
   return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
     isNodeSelected: isNodeSelected,
     node: node,
-    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    customContainerStyles: customContainerStyles
   }), (0, _react2.jsx)("div", {
     ref: handleRef,
     "data-layout": node.attrs.layout,

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

@@ -37,7 +37,11 @@ var InlineExtension = exports.default = /*#__PURE__*/function (_Component) {
         isNodeSelected = _this$props.isNodeSelected;
       var hasChildren = !!children;
       var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-      return (0, _react2.jsx)("div", {
+      return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
+        node: node,
+        isNodeSelected: isNodeSelected,
+        showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+      }), (0, _react2.jsx)("div", {
         css: _styles2.wrapperStyle,
         className: "extension-container inline ".concat(className)
       }, (0, _react2.jsx)("div", {
@@ -47,7 +51,7 @@ var InlineExtension = exports.default = /*#__PURE__*/function (_Component) {
         node: node,
         isNodeSelected: isNodeSelected,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-      }));
+      })));
     }
   }]);
   return InlineExtension;

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

@@ -46,7 +46,8 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderFallback", function (lozengeData) {
       var _this$props = _this.props,
         showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
-        isNodeSelected = _this$props.isNodeSelected;
+        isNodeSelected = _this$props.isNodeSelected,
+        customContainerStyles = _this$props.customContainerStyles;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
         extensionKey = _this$props$node$attr.extensionKey;
@@ -61,7 +62,8 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         lozengeData: lozengeData,
         params: params,
         title: title,
-        renderImage: _this.renderImage
+        renderImage: _this.renderImage,
+        customContainerStyles: customContainerStyles
       });
     });
     return _this;

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

@@ -23,14 +23,16 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
     params = _ref.params,
     renderImage = _ref.renderImage,
     isNodeSelected = _ref.isNodeSelected,
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    customContainerStyles = _ref.customContainerStyles;
   var capitalizedTitle = capitalizeFirstLetter(title);
   // TODO: only show on lozenge on hover: https://product-fabric.atlassian.net/browse/PGXT-4945
   if (showMacroInteractionDesignUpdates) {
     return (0, _react.jsx)("div", {
       className: "extension-title",
       css: _styles.lozengeWrapper,
-      "data-testid": "new-lozenge"
+      "data-testid": "new-lozenge",
+      style: customContainerStyles
     }, (0, _react.jsx)(_tag.SimpleTag, {
       text: capitalizedTitle,
       color: isNodeSelected ? 'blueLight' : 'greyLight'

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

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -18,14 +17,67 @@ Object.defineProperty(exports, "padding", {
   }
 });
 exports.wrapperDefault = exports.styledImage = exports.placeholderFallbackParams = exports.placeholderFallback = void 0;
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
 var _styles = require("../../styles");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
-var wrapperDefault = exports.wrapperDefault = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: ", ";\n  position: relative;\n  vertical-align: middle;\n\n  .ProseMirror-selectednode > span > & > .extension-overlay {\n    box-shadow: inset 0px 0px 0px 2px ", ";\n    opacity: 1;\n  }\n\n  &.with-overlay {\n    .extension-overlay {\n      background: ", ";\n      color: transparent;\n    }\n\n    &:hover .extension-overlay {\n      opacity: 1;\n    }\n  }\n"])), "var(--ds-background-neutral, ".concat(_colors.N20, ")"), "var(--ds-border-radius, 3px)", "var(--ds-border-selected, ".concat(_colors.B200, ")"), "var(--ds-background-neutral-hovered, ".concat(_colors.N20A, ")"));
-var overlay = exports.overlay = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  border-radius: ", ";\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  opacity: 0;\n  pointer-events: none;\n  transition: opacity 0.3s;\n"])), "var(--ds-border-radius, 3px)");
-var placeholderFallback = exports.placeholderFallback = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n\n  & > img {\n    margin: 0 ", ";\n  }\n\n  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n  /* stylelint-disable-next-line */\n  label: placeholder-fallback;\n"])), "var(--ds-space-050, 4px)");
-var placeholderFallbackParams = exports.placeholderFallbackParams = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-block;\n  max-width: 200px;\n  margin-left: 5px;\n  color: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), "var(--ds-text-subtlest, ".concat(_colors.N70, ")"));
-var styledImage = exports.styledImage = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  max-height: 16px;\n  max-width: 16px;\n  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n  /* stylelint-disable-next-line */\n  label: lozenge-image;\n"])));
-var lozengeWrapper = exports.lozengeWrapper = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  justify-content: left;\n  width: 100%;\n  margin-left: ", ";\n"])), "var(--ds-space-050, 4px)");
+var wrapperDefault = exports.wrapperDefault = (0, _react.css)({
+  background: "var(--ds-background-neutral, ".concat(_colors.N20, ")"),
+  borderRadius: "var(--ds-border-radius, 3px)",
+  position: 'relative',
+  verticalAlign: 'middle',
+  '.ProseMirror-selectednode > span > & > .extension-overlay': {
+    boxShadow: "inset 0px 0px 0px 2px ".concat("var(--ds-border-selected, ".concat(_colors.B200, ")")),
+    opacity: 1
+  },
+  '&.with-overlay': {
+    '.extension-overlay': {
+      background: "var(--ds-background-neutral-hovered, ".concat(_colors.N20A, ")"),
+      color: 'transparent'
+    },
+    '&:hover .extension-overlay': {
+      opacity: 1
+    }
+  }
+});
+var overlay = exports.overlay = (0, _react.css)({
+  borderRadius: "var(--ds-border-radius, 3px)",
+  position: 'absolute',
+  width: '100%',
+  height: '100%',
+  opacity: 0,
+  pointerEvents: 'none',
+  transition: 'opacity 0.3s'
+});
+var placeholderFallback = exports.placeholderFallback = (0, _react.css)({
+  display: 'inline-flex',
+  alignItems: 'center',
+  '& > img': {
+    margin: "0 ".concat("var(--ds-space-050, 4px)")
+  },
+  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */
+  /* stylelint-disable-next-line */
+  label: 'placeholder-fallback'
+});
+var placeholderFallbackParams = exports.placeholderFallbackParams = (0, _react.css)({
+  display: 'inline-block',
+  maxWidth: '200px',
+  marginLeft: '5px',
+  color: "var(--ds-text-subtlest, ".concat(_colors.N70, ")"),
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap',
+  overflow: 'hidden'
+});
+var styledImage = exports.styledImage = (0, _react.css)({
+  maxHeight: '16px',
+  maxWidth: '16px',
+  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */
+  /* stylelint-disable-next-line */
+  label: 'lozenge-image'
+});
+var lozengeWrapper = exports.lozengeWrapper = (0, _react.css)({
+  display: 'flex',
+  justifyContent: 'left',
+  width: '100%',
+  marginLeft: "var(--ds-space-050, 4px)",
+  marginBottom: "var(--ds-space-negative-050, -4px)"
+});

package/dist/cjs/extensibility/ExtensionNodeWrapper.js

@@ -6,9 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ExtensionNodeWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../utils");
+/** @jsx jsx */
+
+var styles = (0, _react2.css)({
+  '&.inline-extension': {
+    display: 'inline-block'
+  }
+});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -16,6 +26,13 @@ var _utils = require("../utils");
  */
 var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
-    nodeType = _ref.nodeType;
-  return /*#__PURE__*/_react.default.createElement("span", null, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE);
+    nodeType = _ref.nodeType,
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+  var wrapperClassNames = (0, _classnames.default)({
+    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
+  });
+  return (0, _react2.jsx)("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE);
 };

package/dist/cjs/extensibility/extensionNodeView.js

@@ -55,7 +55,8 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
       return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {
-        nodeType: this.node.type.name
+        nodeType: this.node.type.name,
+        showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
       }, /*#__PURE__*/_react.default.createElement(_Extension.Extension, {
         editorView: this.view,
         node: this.node,

package/dist/cjs/link/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stagingLinkPreferencesUrl = exports.productionLinkPreferencesUrl = void 0;
+var stagingLinkPreferencesUrl = exports.stagingLinkPreferencesUrl = 'https://id.stg.internal.atlassian.com/manage-profile/link-preferences';
+var productionLinkPreferencesUrl = exports.productionLinkPreferencesUrl = 'https://id.atlassian.com/manage-profile/link-preferences';

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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.9.1";
+var packageVersion = "78.10.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

@@ -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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.9.1";
+var packageVersion = "78.10.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -80,7 +80,8 @@ function ExtensionWithPluginState(props) {
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     node: node,
-    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    customContainerStyles: customContainerStyles
   }), jsx("div", {
     ref: handleRef,
     "data-layout": node.attrs.layout,

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

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { jsx } from '@emotion/react';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
@@ -14,7 +14,11 @@ export default class InlineExtension extends Component {
     } = this.props;
     const hasChildren = !!children;
     const className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-    return jsx("div", {
+    return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
+      node: node,
+      isNodeSelected: isNodeSelected,
+      showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+    }), jsx("div", {
       css: wrapperStyle,
       className: `extension-container inline ${className}`
     }, jsx("div", {
@@ -24,6 +28,6 @@ export default class InlineExtension extends Component {
       node: node,
       isNodeSelected: isNodeSelected,
       showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-    }));
+    })));
   }
 }

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

@@ -27,7 +27,8 @@ export default class ExtensionLozenge extends Component {
     _defineProperty(this, "renderFallback", lozengeData => {
       const {
         showMacroInteractionDesignUpdates,
-        isNodeSelected
+        isNodeSelected,
+        customContainerStyles
       } = this.props;
       const {
         parameters,
@@ -46,7 +47,8 @@ export default class ExtensionLozenge extends Component {
         lozengeData: lozengeData,
         params: params,
         title: title,
-        renderImage: this.renderImage
+        renderImage: this.renderImage,
+        customContainerStyles: customContainerStyles
       });
     });
   }

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

@@ -1,4 +1,5 @@
 /** @jsx jsx */
+
 import { jsx } from '@emotion/react';
 import EditorFileIcon from '@atlaskit/icon/glyph/editor/file';
 import { SimpleTag as Tag } from '@atlaskit/tag';
@@ -14,7 +15,8 @@ export const LozengeComponent = ({
   params,
   renderImage,
   isNodeSelected,
-  showMacroInteractionDesignUpdates
+  showMacroInteractionDesignUpdates,
+  customContainerStyles
 }) => {
   const capitalizedTitle = capitalizeFirstLetter(title);
   // TODO: only show on lozenge on hover: https://product-fabric.atlassian.net/browse/PGXT-4945
@@ -22,7 +24,8 @@ export const LozengeComponent = ({
     return jsx("div", {
       className: "extension-title",
       css: lozengeWrapper,
-      "data-testid": "new-lozenge"
+      "data-testid": "new-lozenge",
+      style: customContainerStyles
     }, jsx(Tag, {
       text: capitalizedTitle,
       color: isNodeSelected ? 'blueLight' : 'greyLight'

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

@@ -2,68 +2,64 @@ import { css } from '@emotion/react';
 import { B200, N20, N20A, N70 } from '@atlaskit/theme/colors';
 import { BODIED_EXT_PADDING, EXTENSION_PADDING } from '../../styles';
 export { EXTENSION_PADDING as padding, BODIED_EXT_PADDING };
-export const wrapperDefault = css`
-  background: ${`var(--ds-background-neutral, ${N20})`};
-  border-radius: ${"var(--ds-border-radius, 3px)"};
-  position: relative;
-  vertical-align: middle;
-
-  .ProseMirror-selectednode > span > & > .extension-overlay {
-    box-shadow: inset 0px 0px 0px 2px ${`var(--ds-border-selected, ${B200})`};
-    opacity: 1;
-  }
-
-  &.with-overlay {
-    .extension-overlay {
-      background: ${`var(--ds-background-neutral-hovered, ${N20A})`};
-      color: transparent;
-    }
-
-    &:hover .extension-overlay {
-      opacity: 1;
+export const wrapperDefault = css({
+  background: `var(--ds-background-neutral, ${N20})`,
+  borderRadius: "var(--ds-border-radius, 3px)",
+  position: 'relative',
+  verticalAlign: 'middle',
+  '.ProseMirror-selectednode > span > & > .extension-overlay': {
+    boxShadow: `inset 0px 0px 0px 2px ${`var(--ds-border-selected, ${B200})`}`,
+    opacity: 1
+  },
+  '&.with-overlay': {
+    '.extension-overlay': {
+      background: `var(--ds-background-neutral-hovered, ${N20A})`,
+      color: 'transparent'
+    },
+    '&:hover .extension-overlay': {
+      opacity: 1
     }
   }
-`;
-export const overlay = css`
-  border-radius: ${"var(--ds-border-radius, 3px)"};
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-  pointer-events: none;
-  transition: opacity 0.3s;
-`;
-export const placeholderFallback = css`
-  display: inline-flex;
-  align-items: center;
-
-  & > img {
-    margin: 0 ${"var(--ds-space-050, 4px)"};
-  }
-
+});
+export const overlay = css({
+  borderRadius: "var(--ds-border-radius, 3px)",
+  position: 'absolute',
+  width: '100%',
+  height: '100%',
+  opacity: 0,
+  pointerEvents: 'none',
+  transition: 'opacity 0.3s'
+});
+export const placeholderFallback = css({
+  display: 'inline-flex',
+  alignItems: 'center',
+  '& > img': {
+    margin: `0 ${"var(--ds-space-050, 4px)"}`
+  },
   /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */
   /* stylelint-disable-next-line */
-  label: placeholder-fallback;
-`;
-export const placeholderFallbackParams = css`
-  display: inline-block;
-  max-width: 200px;
-  margin-left: 5px;
-  color: ${`var(--ds-text-subtlest, ${N70})`};
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-`;
-export const styledImage = css`
-  max-height: 16px;
-  max-width: 16px;
+  label: 'placeholder-fallback'
+});
+export const placeholderFallbackParams = css({
+  display: 'inline-block',
+  maxWidth: '200px',
+  marginLeft: '5px',
+  color: `var(--ds-text-subtlest, ${N70})`,
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap',
+  overflow: 'hidden'
+});
+export const styledImage = css({
+  maxHeight: '16px',
+  maxWidth: '16px',
   /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */
   /* stylelint-disable-next-line */
-  label: lozenge-image;
-`;
-export const lozengeWrapper = css`
-  display: flex;
-  justify-content: left;
-  width: 100%;
-  margin-left: ${"var(--ds-space-050, 4px)"};
-`;
+  label: 'lozenge-image'
+});
+export const lozengeWrapper = css({
+  display: 'flex',
+  justifyContent: 'left',
+  width: '100%',
+  marginLeft: "var(--ds-space-050, 4px)",
+  marginBottom: "var(--ds-space-negative-050, -4px)"
+});

package/dist/es2019/extensibility/ExtensionNodeWrapper.js

@@ -1,7 +1,16 @@
+/** @jsx jsx */
 import React from 'react';
+import { css, jsx } from '@emotion/react';
+import classnames from 'classnames';
 import { ZERO_WIDTH_SPACE } from '../utils';
+const styles = css({
+  '&.inline-extension': {
+    display: 'inline-block'
+  }
+});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -9,5 +18,14 @@ import { ZERO_WIDTH_SPACE } from '../utils';
  */
 export const ExtensionNodeWrapper = ({
   children,
-  nodeType
-}) => /*#__PURE__*/React.createElement("span", null, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+  nodeType,
+  showMacroInteractionDesignUpdates
+}) => {
+  const wrapperClassNames = classnames({
+    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
+  });
+  return jsx("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+};

package/dist/es2019/extensibility/extensionNodeView.js

@@ -28,7 +28,8 @@ export class ExtensionNode extends ReactNodeView {
   render(props, forwardRef) {
     var _props$extensionNodeV;
     return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
-      nodeType: this.node.type.name
+      nodeType: this.node.type.name,
+      showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
     }, /*#__PURE__*/React.createElement(Extension, {
       editorView: this.view,
       node: this.node,

package/dist/es2019/link/constants.js

@@ -0,0 +1,2 @@
+export const stagingLinkPreferencesUrl = 'https://id.stg.internal.atlassian.com/manage-profile/link-preferences';
+export const productionLinkPreferencesUrl = 'https://id.atlassian.com/manage-profile/link-preferences';

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.9.1";
+const packageVersion = "78.10.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

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

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

@@ -75,7 +75,8 @@ function ExtensionWithPluginState(props) {
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     node: node,
-    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+    showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    customContainerStyles: customContainerStyles
   }), jsx("div", {
     ref: handleRef,
     "data-layout": node.attrs.layout,

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

@@ -6,7 +6,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /** @jsx jsx */
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { jsx } from '@emotion/react';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
@@ -28,7 +28,11 @@ var InlineExtension = /*#__PURE__*/function (_Component) {
         isNodeSelected = _this$props.isNodeSelected;
       var hasChildren = !!children;
       var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-      return jsx("div", {
+      return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
+        node: node,
+        isNodeSelected: isNodeSelected,
+        showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+      }), jsx("div", {
         css: wrapperStyle,
         className: "extension-container inline ".concat(className)
       }, jsx("div", {
@@ -38,7 +42,7 @@ var InlineExtension = /*#__PURE__*/function (_Component) {
         node: node,
         isNodeSelected: isNodeSelected,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-      }));
+      })));
     }
   }]);
   return InlineExtension;

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

@@ -40,7 +40,8 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "renderFallback", function (lozengeData) {
       var _this$props = _this.props,
         showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
-        isNodeSelected = _this$props.isNodeSelected;
+        isNodeSelected = _this$props.isNodeSelected,
+        customContainerStyles = _this$props.customContainerStyles;
       var _this$props$node$attr = _this.props.node.attrs,
         parameters = _this$props$node$attr.parameters,
         extensionKey = _this$props$node$attr.extensionKey;
@@ -55,7 +56,8 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         lozengeData: lozengeData,
         params: params,
         title: title,
-        renderImage: _this.renderImage
+        renderImage: _this.renderImage,
+        customContainerStyles: customContainerStyles
       });
     });
     return _this;