@atlaskit/editor-common 83.1.0 → 83.3.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-common
 
+## 83.3.0
+
+### Minor Changes
+
+- [#115247](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/115247)
+  [`251d23ff9e6c8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/251d23ff9e6c8) -
+  upgrade adf-schema version to 38.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 83.2.0
+
+### Minor Changes
+
+- [#114794](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114794)
+  [`f859d1c0d08dc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f859d1c0d08dc) -
+  [ux] Adds in logic to conditionally show new label designs for macro interaction updates. Also
+  updates/adds new tests.
+
 ## 83.1.0
 
 ### Minor Changes

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

@@ -43,7 +43,8 @@ function ExtensionWithPluginState(props) {
     isNodeNested = props.isNodeNested,
     setIsNodeHovered = props.setIsNodeHovered;
   var _ref = macroInteractionDesignFeatureFlags || {},
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates;
   var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
   var isMobile = editorAppearance === 'mobile';
   var hasChildren = !!children;
@@ -111,6 +112,7 @@ function ExtensionWithPluginState(props) {
     isNodeNested: isNodeNested,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     customContainerStyles: customContainerStyles,
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: hasBody

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

@@ -31,7 +31,8 @@ var InlineExtension = function InlineExtension(props) {
     isNodeHovered = props.isNodeHovered,
     setIsNodeHovered = props.setIsNodeHovered;
   var _ref = macroInteractionDesignFeatureFlags || {},
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates;
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width']),
     widthState = _useSharedPluginState.widthState;
   var hasChildren = !!children;
@@ -53,6 +54,7 @@ var InlineExtension = function InlineExtension(props) {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     setIsNodeHovered: setIsNodeHovered
   }), (0, _react2.jsx)("div", {
     "data-testid": "inline-extension-wrapper"

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

@@ -5,38 +5,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExtensionLabel = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _reactIntlNext = require("react-intl-next");
+var _preferences = _interopRequireDefault(require("@atlaskit/icon/glyph/preferences"));
 var _colors = require("@atlaskit/theme/colors");
+var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 /** @jsx jsx */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
-var labelStyles = (0, _react2.css)({
+var containerStyles = (0, _react2.css)({
+  textAlign: 'left',
+  zIndex: 1,
+  position: 'relative',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied': {
+    marginTop: "var(--ds-space-300, 24px)"
+  }
+});
+var sharedLabelStyles = (0, _react2.css)({
   opacity: 0,
+  lineHeight: 1,
   display: 'inline-flex',
-  width: 'max-content',
   justifyContent: 'left',
   position: 'absolute',
-  // Unfortunately, these need to be these exact numbers - otherwise there will be a noticeable gap/overlap
+  width: 'max-content',
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
   top: '-19px',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.inline': {
-    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-    top: '-18px',
-    marginLeft: "var(--ds-space-150, 12px)"
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.show-label': {
     cursor: 'pointer',
-    background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(_colors.N40, ")"),
-    color: "var(--ds-text-subtle, ".concat(_colors.N500, ")"),
     opacity: 1
   },
-  borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
-  lineHeight: 1,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.nested': {
     // Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
@@ -44,26 +47,49 @@ var labelStyles = (0, _react2.css)({
     marginLeft: "var(--ds-space-150, 12px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-background': {
-    background: "var(--ds-surface, ".concat(_colors.N0, ")")
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-border': {
-    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(_colors.N30, ")"))
+  '&.inline': {
+    marginLeft: "var(--ds-space-150, 12px)",
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+    top: '-18px'
   }
 });
+var buttonLabelStyles = (0, _react2.css)({
+  alignItems: 'center',
+  borderRadius: "var(--ds-border-radius, 3px)",
+  paddingLeft: "var(--ds-space-050, 4px)",
+  paddingRight: "var(--ds-space-050, 4px)",
+  color: "var(--ds-text-subtle, ".concat(_colors.N800, ")"),
+  backgroundColor: "var(--ds-background-accent-gray-subtlest, ".concat(_colors.N30, ")")
+});
+var placeholderStyles = (0, _react2.css)({
+  height: "var(--ds-space-150, 12px)"
+});
 var textStyles = (0, _react2.css)({
   fontSize: '14px',
   fontWeight: 'normal',
   padding: "var(--ds-space-025, 2px)".concat(" ", "var(--ds-space-050, 4px)")
 });
-var containerStyles = (0, _react2.css)({
-  textAlign: 'left',
-  zIndex: 1,
-  position: 'relative',
+var originalLabelStyles = (0, _react2.css)({
+  borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied': {
-    marginTop: "var(--ds-space-300, 24px)"
+  '&.show-label': {
+    background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(_colors.N40, ")"),
+    color: "var(--ds-text-subtle, ".concat(_colors.N500, ")")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-background': {
+    background: "var(--ds-surface, ".concat(_colors.N0, ")")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-border': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(_colors.N30, ")"))
+  }
+});
+var i18n = (0, _reactIntlNext.defineMessages)({
+  configure: {
+    id: 'editor-common-extensibility.macro.button.configure',
+    defaultMessage: 'Configure',
+    description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
 var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
@@ -73,7 +99,10 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     customContainerStyles = _ref.customContainerStyles,
     isNodeNested = _ref.isNodeNested,
     setIsNodeHovered = _ref.setIsNodeHovered,
-    isBodiedMacro = _ref.isBodiedMacro;
+    isBodiedMacro = _ref.isBodiedMacro,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates;
+  var intl = (0, _reactIntlNext.useIntl)();
+  var tooltipText = "".concat(intl.formatMessage(i18n.configure), " ").concat(text);
   var containerClassNames = (0, _classnames.default)({
     bodied: isBodiedMacro
   });
@@ -81,20 +110,10 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     nested: isNodeNested,
     inline: extensionName === 'inlineExtension',
     bodied: isBodiedMacro,
-    'bodied-border': isBodiedMacro && !isNodeHovered,
-    'bodied-background': isBodiedMacro && !isNodeHovered,
+    'bodied-border': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
+    'bodied-background': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
     'show-label': isNodeHovered || isBodiedMacro
   });
-  var handleMouseEnter = (0, _react.useCallback)(function () {
-    // If current node is hovered and the label is hovered,
-    // consider the node as hovered so we can display the label for users to click on
-    if (isNodeHovered) {
-      setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(true);
-    }
-  }, [isNodeHovered, setIsNodeHovered]);
-  var handleMouseLeave = (0, _react.useCallback)(function () {
-    setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(false);
-  }, [setIsNodeHovered]);
   return (0, _react2.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     css: containerStyles
@@ -104,12 +123,35 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: customContainerStyles,
-    onMouseEnter: handleMouseEnter,
-    onMouseLeave: handleMouseLeave,
+    onMouseOver: function onMouseOver() {
+      setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(true);
+    },
+    onMouseLeave: function onMouseLeave() {
+      setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(false);
+    },
     "data-testid": "new-lozenge-container"
-  }, (0, _react2.jsx)("span", {
+  }, showMacroButtonUpdates ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_tooltip.default, {
+    content: tooltipText,
+    position: "top"
+  }, function (tooltipProps) {
+    return (0, _react2.jsx)("span", (0, _extends2.default)({
+      "data-testid": "new-lozenge-button"
+    }, tooltipProps, {
+      css: [sharedLabelStyles, buttonLabelStyles]
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+      ,
+      className: labelClassNames
+    }), text, " ", (0, _react2.jsx)(_preferences.default, {
+      label: ""
+    }));
+  }), (0, _react2.jsx)("div", {
+    "data-testid": "placeholder",
+    css: placeholderStyles
+  })) : (0, _react2.jsx)("span", {
     "data-testid": "new-lozenge",
-    css: labelStyles,
+    css: [sharedLabelStyles, originalLabelStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    ,
     className: labelClassNames
   }, (0, _react2.jsx)("span", {
     css: textStyles

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

@@ -23,6 +23,7 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
     params = _ref.params,
     renderImage = _ref.renderImage,
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates,
     customContainerStyles = _ref.customContainerStyles,
     isNodeHovered = _ref.isNodeHovered,
     isNodeNested = _ref.isNodeNested,
@@ -37,7 +38,8 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
       isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles,
       setIsNodeHovered: setIsNodeHovered,
-      isBodiedMacro: isBodiedMacro
+      isBodiedMacro: isBodiedMacro,
+      showMacroButtonUpdates: showMacroButtonUpdates
     });
   }
   var isBlockExtension = extensionName === 'extension';

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

@@ -47,6 +47,7 @@ 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,
+        showMacroButtonUpdates = _this$props.showMacroButtonUpdates,
         isNodeSelected = _this$props.isNodeSelected,
         isNodeHovered = _this$props.isNodeHovered,
         isNodeNested = _this$props.isNodeNested,
@@ -64,6 +65,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
         isNodeSelected: isNodeSelected,
         isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+        showMacroButtonUpdates: showMacroButtonUpdates,
         extensionName: name,
         lozengeData: lozengeData,
         params: params,

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

@@ -86,7 +86,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     isNodeNested = _ref.isNodeNested,
     setIsNodeHovered = _ref.setIsNodeHovered;
   var _ref2 = macroInteractionDesignFeatureFlags || {},
-    showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref2.showMacroButtonUpdates;
   var _node$attrs = node.attrs,
     parameters = _node$attrs.parameters,
     extensionKey = _node$attrs.extensionKey;
@@ -162,6 +163,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     isNodeSelected: isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: true,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     customContainerStyles: mbeWrapperStyles,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && 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 = "83.1.0";
+var packageVersion = "83.3.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

@@ -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 */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "83.1.0";
+var packageVersion = "83.3.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -31,7 +31,8 @@ function ExtensionWithPluginState(props) {
     setIsNodeHovered
   } = props;
   const {
-    showMacroInteractionDesignUpdates
+    showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates
   } = macroInteractionDesignFeatureFlags || {};
   const hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
   const isMobile = editorAppearance === 'mobile';
@@ -109,6 +110,7 @@ function ExtensionWithPluginState(props) {
     isNodeNested: isNodeNested,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     customContainerStyles: customContainerStyles,
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: hasBody

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

@@ -22,7 +22,8 @@ const InlineExtension = props => {
     setIsNodeHovered
   } = props;
   const {
-    showMacroInteractionDesignUpdates
+    showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates
   } = macroInteractionDesignFeatureFlags || {};
   const {
     widthState
@@ -46,6 +47,7 @@ const InlineExtension = props => {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     setIsNodeHovered: setIsNodeHovered
   }), jsx("div", {
     "data-testid": "inline-extension-wrapper"

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

@@ -1,33 +1,36 @@
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { useCallback } from 'react';
+import { Fragment } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
-import { N0, N30, N40, N500 } from '@atlaskit/theme/colors';
-const labelStyles = css({
+import { defineMessages, useIntl } from 'react-intl-next';
+import PreferencesIcon from '@atlaskit/icon/glyph/preferences';
+import { N0, N30, N40, N500, N800 } from '@atlaskit/theme/colors';
+import Tooltip from '@atlaskit/tooltip';
+const containerStyles = css({
+  textAlign: 'left',
+  zIndex: 1,
+  position: 'relative',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied': {
+    marginTop: "var(--ds-space-300, 24px)"
+  }
+});
+const sharedLabelStyles = css({
   opacity: 0,
+  lineHeight: 1,
   display: 'inline-flex',
-  width: 'max-content',
   justifyContent: 'left',
   position: 'absolute',
-  // Unfortunately, these need to be these exact numbers - otherwise there will be a noticeable gap/overlap
+  width: 'max-content',
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
   top: '-19px',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.inline': {
-    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-    top: '-18px',
-    marginLeft: "var(--ds-space-150, 12px)"
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.show-label': {
     cursor: 'pointer',
-    background: `var(--ds-background-accent-gray-subtle-pressed, ${N40})`,
-    color: `var(--ds-text-subtle, ${N500})`,
     opacity: 1
   },
-  borderRadius: `${"var(--ds-border-radius, 3px)"} ${"var(--ds-border-radius, 3px)"} 0 0`,
-  lineHeight: 1,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.nested': {
     // Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
@@ -35,26 +38,49 @@ const labelStyles = css({
     marginLeft: "var(--ds-space-150, 12px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-background': {
-    background: `var(--ds-surface, ${N0})`
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-border': {
-    boxShadow: `0 0 0 1px ${`var(--ds-border, ${N30})`}`
+  '&.inline': {
+    marginLeft: "var(--ds-space-150, 12px)",
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+    top: '-18px'
   }
 });
+const buttonLabelStyles = css({
+  alignItems: 'center',
+  borderRadius: "var(--ds-border-radius, 3px)",
+  paddingLeft: "var(--ds-space-050, 4px)",
+  paddingRight: "var(--ds-space-050, 4px)",
+  color: `var(--ds-text-subtle, ${N800})`,
+  backgroundColor: `var(--ds-background-accent-gray-subtlest, ${N30})`
+});
+const placeholderStyles = css({
+  height: "var(--ds-space-150, 12px)"
+});
 const textStyles = css({
   fontSize: '14px',
   fontWeight: 'normal',
   padding: `${"var(--ds-space-025, 2px)"} ${"var(--ds-space-050, 4px)"}`
 });
-const containerStyles = css({
-  textAlign: 'left',
-  zIndex: 1,
-  position: 'relative',
+const originalLabelStyles = css({
+  borderRadius: `${"var(--ds-border-radius, 3px)"} ${"var(--ds-border-radius, 3px)"} 0 0`,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied': {
-    marginTop: "var(--ds-space-300, 24px)"
+  '&.show-label': {
+    background: `var(--ds-background-accent-gray-subtle-pressed, ${N40})`,
+    color: `var(--ds-text-subtle, ${N500})`
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-background': {
+    background: `var(--ds-surface, ${N0})`
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-border': {
+    boxShadow: `0 0 0 1px ${`var(--ds-border, ${N30})`}`
+  }
+});
+const i18n = defineMessages({
+  configure: {
+    id: 'editor-common-extensibility.macro.button.configure',
+    defaultMessage: 'Configure',
+    description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
 export const ExtensionLabel = ({
@@ -64,8 +90,11 @@ export const ExtensionLabel = ({
   customContainerStyles,
   isNodeNested,
   setIsNodeHovered,
-  isBodiedMacro
+  isBodiedMacro,
+  showMacroButtonUpdates
 }) => {
+  const intl = useIntl();
+  const tooltipText = `${intl.formatMessage(i18n.configure)} ${text}`;
   const containerClassNames = classnames({
     bodied: isBodiedMacro
   });
@@ -73,20 +102,10 @@ export const ExtensionLabel = ({
     nested: isNodeNested,
     inline: extensionName === 'inlineExtension',
     bodied: isBodiedMacro,
-    'bodied-border': isBodiedMacro && !isNodeHovered,
-    'bodied-background': isBodiedMacro && !isNodeHovered,
+    'bodied-border': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
+    'bodied-background': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
     'show-label': isNodeHovered || isBodiedMacro
   });
-  const handleMouseEnter = useCallback(() => {
-    // If current node is hovered and the label is hovered,
-    // consider the node as hovered so we can display the label for users to click on
-    if (isNodeHovered) {
-      setIsNodeHovered === null || setIsNodeHovered === void 0 ? void 0 : setIsNodeHovered(true);
-    }
-  }, [isNodeHovered, setIsNodeHovered]);
-  const handleMouseLeave = useCallback(() => {
-    setIsNodeHovered === null || setIsNodeHovered === void 0 ? void 0 : setIsNodeHovered(false);
-  }, [setIsNodeHovered]);
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     css: containerStyles
@@ -96,12 +115,33 @@ export const ExtensionLabel = ({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: customContainerStyles,
-    onMouseEnter: handleMouseEnter,
-    onMouseLeave: handleMouseLeave,
+    onMouseOver: () => {
+      setIsNodeHovered === null || setIsNodeHovered === void 0 ? void 0 : setIsNodeHovered(true);
+    },
+    onMouseLeave: () => {
+      setIsNodeHovered === null || setIsNodeHovered === void 0 ? void 0 : setIsNodeHovered(false);
+    },
     "data-testid": "new-lozenge-container"
-  }, jsx("span", {
+  }, showMacroButtonUpdates ? jsx(Fragment, null, jsx(Tooltip, {
+    content: tooltipText,
+    position: "top"
+  }, tooltipProps => jsx("span", _extends({
+    "data-testid": "new-lozenge-button"
+  }, tooltipProps, {
+    css: [sharedLabelStyles, buttonLabelStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    ,
+    className: labelClassNames
+  }), text, " ", jsx(PreferencesIcon, {
+    label: ""
+  }))), jsx("div", {
+    "data-testid": "placeholder",
+    css: placeholderStyles
+  })) : jsx("span", {
     "data-testid": "new-lozenge",
-    css: labelStyles,
+    css: [sharedLabelStyles, originalLabelStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    ,
     className: labelClassNames
   }, jsx("span", {
     css: textStyles

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

@@ -16,6 +16,7 @@ export const LozengeComponent = ({
   params,
   renderImage,
   showMacroInteractionDesignUpdates,
+  showMacroButtonUpdates,
   customContainerStyles,
   isNodeHovered,
   isNodeNested,
@@ -31,7 +32,8 @@ export const LozengeComponent = ({
       isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles,
       setIsNodeHovered: setIsNodeHovered,
-      isBodiedMacro: isBodiedMacro
+      isBodiedMacro: isBodiedMacro,
+      showMacroButtonUpdates: showMacroButtonUpdates
     });
   }
   const isBlockExtension = extensionName === 'extension';

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

@@ -29,6 +29,7 @@ export default class ExtensionLozenge extends Component {
     _defineProperty(this, "renderFallback", lozengeData => {
       const {
         showMacroInteractionDesignUpdates,
+        showMacroButtonUpdates,
         isNodeSelected,
         isNodeHovered,
         isNodeNested,
@@ -50,6 +51,7 @@ export default class ExtensionLozenge extends Component {
         isNodeSelected: isNodeSelected,
         isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+        showMacroButtonUpdates: showMacroButtonUpdates,
         extensionName: name,
         lozengeData: lozengeData,
         params: params,

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

@@ -76,7 +76,8 @@ const MultiBodiedExtensionWithWidth = ({
   setIsNodeHovered
 }) => {
   const {
-    showMacroInteractionDesignUpdates
+    showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates
   } = macroInteractionDesignFeatureFlags || {};
   const {
     parameters,
@@ -152,6 +153,7 @@ const MultiBodiedExtensionWithWidth = ({
     isNodeSelected: isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: true,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     customContainerStyles: mbeWrapperStyles,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "83.1.0";
+const packageVersion = "83.3.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

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

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

@@ -35,7 +35,8 @@ function ExtensionWithPluginState(props) {
     isNodeNested = props.isNodeNested,
     setIsNodeHovered = props.setIsNodeHovered;
   var _ref = macroInteractionDesignFeatureFlags || {},
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates;
   var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
   var isMobile = editorAppearance === 'mobile';
   var hasChildren = !!children;
@@ -103,6 +104,7 @@ function ExtensionWithPluginState(props) {
     isNodeNested: isNodeNested,
     node: node,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     customContainerStyles: customContainerStyles,
     setIsNodeHovered: setIsNodeHovered,
     isBodiedMacro: hasBody

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

@@ -20,7 +20,8 @@ var InlineExtension = function InlineExtension(props) {
     isNodeHovered = props.isNodeHovered,
     setIsNodeHovered = props.setIsNodeHovered;
   var _ref = macroInteractionDesignFeatureFlags || {},
-    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates;
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width']),
     widthState = _useSharedPluginState.widthState;
   var hasChildren = !!children;
@@ -42,6 +43,7 @@ var InlineExtension = function InlineExtension(props) {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
     showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     setIsNodeHovered: setIsNodeHovered
   }), jsx("div", {
     "data-testid": "inline-extension-wrapper"

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

@@ -1,33 +1,36 @@
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { useCallback } from 'react';
+import { Fragment } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
-import { N0, N30, N40, N500 } from '@atlaskit/theme/colors';
-var labelStyles = css({
+import { defineMessages, useIntl } from 'react-intl-next';
+import PreferencesIcon from '@atlaskit/icon/glyph/preferences';
+import { N0, N30, N40, N500, N800 } from '@atlaskit/theme/colors';
+import Tooltip from '@atlaskit/tooltip';
+var containerStyles = css({
+  textAlign: 'left',
+  zIndex: 1,
+  position: 'relative',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied': {
+    marginTop: "var(--ds-space-300, 24px)"
+  }
+});
+var sharedLabelStyles = css({
   opacity: 0,
+  lineHeight: 1,
   display: 'inline-flex',
-  width: 'max-content',
   justifyContent: 'left',
   position: 'absolute',
-  // Unfortunately, these need to be these exact numbers - otherwise there will be a noticeable gap/overlap
+  width: 'max-content',
   // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
   top: '-19px',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.inline': {
-    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-    top: '-18px',
-    marginLeft: "var(--ds-space-150, 12px)"
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.show-label': {
     cursor: 'pointer',
-    background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(N40, ")"),
-    color: "var(--ds-text-subtle, ".concat(N500, ")"),
     opacity: 1
   },
-  borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
-  lineHeight: 1,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.nested': {
     // Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
@@ -35,26 +38,49 @@ var labelStyles = css({
     marginLeft: "var(--ds-space-150, 12px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-background': {
-    background: "var(--ds-surface, ".concat(N0, ")")
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-border': {
-    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(N30, ")"))
+  '&.inline': {
+    marginLeft: "var(--ds-space-150, 12px)",
+    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+    top: '-18px'
   }
 });
+var buttonLabelStyles = css({
+  alignItems: 'center',
+  borderRadius: "var(--ds-border-radius, 3px)",
+  paddingLeft: "var(--ds-space-050, 4px)",
+  paddingRight: "var(--ds-space-050, 4px)",
+  color: "var(--ds-text-subtle, ".concat(N800, ")"),
+  backgroundColor: "var(--ds-background-accent-gray-subtlest, ".concat(N30, ")")
+});
+var placeholderStyles = css({
+  height: "var(--ds-space-150, 12px)"
+});
 var textStyles = css({
   fontSize: '14px',
   fontWeight: 'normal',
   padding: "var(--ds-space-025, 2px)".concat(" ", "var(--ds-space-050, 4px)")
 });
-var containerStyles = css({
-  textAlign: 'left',
-  zIndex: 1,
-  position: 'relative',
+var originalLabelStyles = css({
+  borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied': {
-    marginTop: "var(--ds-space-300, 24px)"
+  '&.show-label': {
+    background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(N40, ")"),
+    color: "var(--ds-text-subtle, ".concat(N500, ")")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-background': {
+    background: "var(--ds-surface, ".concat(N0, ")")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-border': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(N30, ")"))
+  }
+});
+var i18n = defineMessages({
+  configure: {
+    id: 'editor-common-extensibility.macro.button.configure',
+    defaultMessage: 'Configure',
+    description: 'Text in tooltip that tells user they can configure the specific macro.'
   }
 });
 export var ExtensionLabel = function ExtensionLabel(_ref) {
@@ -64,7 +90,10 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
     customContainerStyles = _ref.customContainerStyles,
     isNodeNested = _ref.isNodeNested,
     setIsNodeHovered = _ref.setIsNodeHovered,
-    isBodiedMacro = _ref.isBodiedMacro;
+    isBodiedMacro = _ref.isBodiedMacro,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates;
+  var intl = useIntl();
+  var tooltipText = "".concat(intl.formatMessage(i18n.configure), " ").concat(text);
   var containerClassNames = classnames({
     bodied: isBodiedMacro
   });
@@ -72,20 +101,10 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
     nested: isNodeNested,
     inline: extensionName === 'inlineExtension',
     bodied: isBodiedMacro,
-    'bodied-border': isBodiedMacro && !isNodeHovered,
-    'bodied-background': isBodiedMacro && !isNodeHovered,
+    'bodied-border': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
+    'bodied-background': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
     'show-label': isNodeHovered || isBodiedMacro
   });
-  var handleMouseEnter = useCallback(function () {
-    // If current node is hovered and the label is hovered,
-    // consider the node as hovered so we can display the label for users to click on
-    if (isNodeHovered) {
-      setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(true);
-    }
-  }, [isNodeHovered, setIsNodeHovered]);
-  var handleMouseLeave = useCallback(function () {
-    setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(false);
-  }, [setIsNodeHovered]);
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     css: containerStyles
@@ -95,12 +114,35 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: customContainerStyles,
-    onMouseEnter: handleMouseEnter,
-    onMouseLeave: handleMouseLeave,
+    onMouseOver: function onMouseOver() {
+      setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(true);
+    },
+    onMouseLeave: function onMouseLeave() {
+      setIsNodeHovered === null || setIsNodeHovered === void 0 || setIsNodeHovered(false);
+    },
     "data-testid": "new-lozenge-container"
-  }, jsx("span", {
+  }, showMacroButtonUpdates ? jsx(Fragment, null, jsx(Tooltip, {
+    content: tooltipText,
+    position: "top"
+  }, function (tooltipProps) {
+    return jsx("span", _extends({
+      "data-testid": "new-lozenge-button"
+    }, tooltipProps, {
+      css: [sharedLabelStyles, buttonLabelStyles]
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+      ,
+      className: labelClassNames
+    }), text, " ", jsx(PreferencesIcon, {
+      label: ""
+    }));
+  }), jsx("div", {
+    "data-testid": "placeholder",
+    css: placeholderStyles
+  })) : jsx("span", {
     "data-testid": "new-lozenge",
-    css: labelStyles,
+    css: [sharedLabelStyles, originalLabelStyles]
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    ,
     className: labelClassNames
   }, jsx("span", {
     css: textStyles

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

@@ -19,6 +19,7 @@ export var LozengeComponent = function LozengeComponent(_ref) {
     params = _ref.params,
     renderImage = _ref.renderImage,
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref.showMacroButtonUpdates,
     customContainerStyles = _ref.customContainerStyles,
     isNodeHovered = _ref.isNodeHovered,
     isNodeNested = _ref.isNodeNested,
@@ -33,7 +34,8 @@ export var LozengeComponent = function LozengeComponent(_ref) {
       isNodeNested: isNodeNested,
       customContainerStyles: customContainerStyles,
       setIsNodeHovered: setIsNodeHovered,
-      isBodiedMacro: isBodiedMacro
+      isBodiedMacro: isBodiedMacro,
+      showMacroButtonUpdates: showMacroButtonUpdates
     });
   }
   var isBlockExtension = extensionName === 'extension';

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

@@ -42,6 +42,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "renderFallback", function (lozengeData) {
       var _this$props = _this.props,
         showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
+        showMacroButtonUpdates = _this$props.showMacroButtonUpdates,
         isNodeSelected = _this$props.isNodeSelected,
         isNodeHovered = _this$props.isNodeHovered,
         isNodeNested = _this$props.isNodeNested,
@@ -59,6 +60,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
         isNodeSelected: isNodeSelected,
         isNodeNested: isNodeNested,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
+        showMacroButtonUpdates: showMacroButtonUpdates,
         extensionName: name,
         lozengeData: lozengeData,
         params: params,

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

@@ -78,7 +78,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     isNodeNested = _ref.isNodeNested,
     setIsNodeHovered = _ref.setIsNodeHovered;
   var _ref2 = macroInteractionDesignFeatureFlags || {},
-    showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
+    showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates,
+    showMacroButtonUpdates = _ref2.showMacroButtonUpdates;
   var _node$attrs = node.attrs,
     parameters = _node$attrs.parameters,
     extensionKey = _node$attrs.extensionKey;
@@ -154,6 +155,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
     isNodeSelected: isNodeSelected,
     node: node,
     showMacroInteractionDesignUpdates: true,
+    showMacroButtonUpdates: showMacroButtonUpdates,
     customContainerStyles: mbeWrapperStyles,
     isNodeHovered: isNodeHovered,
     isNodeNested: isNodeNested,

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "83.1.0";
+var packageVersion = "83.3.0";
 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

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

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

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

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

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

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

@@ -6,6 +6,7 @@ import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 export interface Props {
     node: PmNode;
     showMacroInteractionDesignUpdates?: boolean;
+    showMacroButtonUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
     isNodeNested?: boolean;

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

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

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

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

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

@@ -6,6 +6,7 @@ import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 export interface Props {
     node: PmNode;
     showMacroInteractionDesignUpdates?: boolean;
+    showMacroButtonUpdates?: boolean;
     isNodeSelected?: boolean;
     isNodeHovered?: boolean;
     isNodeNested?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "83.1.0",
+	"version": "83.3.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -96,8 +96,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.4.0",
-		"@atlaskit/adf-schema": "^37.0.0",
-		"@atlaskit/adf-utils": "^19.3.0",
+		"@atlaskit/adf-schema": "^38.0.0",
+		"@atlaskit/adf-utils": "^19.4.0",
 		"@atlaskit/analytics-listeners": "^8.10.0",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
@@ -105,8 +105,8 @@
 		"@atlaskit/button": "^18.0.0",
 		"@atlaskit/code": "^15.3.0",
 		"@atlaskit/codemod-utils": "^4.2.0",
-		"@atlaskit/custom-steps": "^0.3.0",
-		"@atlaskit/editor-json-transformer": "^8.14.0",
+		"@atlaskit/custom-steps": "^0.4.0",
+		"@atlaskit/editor-json-transformer": "^8.15.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.12.0",
@@ -114,7 +114,7 @@
 		"@atlaskit/emoji": "^67.6.0",
 		"@atlaskit/icon": "^22.5.0",
 		"@atlaskit/icon-object": "^6.4.0",
-		"@atlaskit/link-datasource": "^2.4.0",
+		"@atlaskit/link-datasource": "^2.5.0",
 		"@atlaskit/link-picker": "^1.38.0",
 		"@atlaskit/media-card": "^77.12.0",
 		"@atlaskit/media-client": "^27.3.0",
@@ -130,7 +130,7 @@
 		"@atlaskit/primitives": "^9.0.0",
 		"@atlaskit/profilecard": "^19.15.0",
 		"@atlaskit/section-message": "^6.5.0",
-		"@atlaskit/smart-card": "^27.7.0",
+		"@atlaskit/smart-card": "^27.8.0",
 		"@atlaskit/smart-user-picker": "^6.9.0",
 		"@atlaskit/spinner": "^16.2.0",
 		"@atlaskit/task-decision": "^17.10.0",