@atlaskit/editor-common 83.0.4 → 83.2.0

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

package/dist/es2019/ui-menu/ArrowKeyNavigationProvider/ColorPaletteArrowKeyNavigationProvider/index.js

@@ -1,4 +1,5 @@
 import React, { useLayoutEffect, useRef, useState } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 /**
  * This component is a wrapper for color picker which listens to keydown events of children
  * and handles arrow key navigation
@@ -12,12 +13,14 @@ export const ColorPaletteArrowKeyNavigationProvider = ({
   handleClose,
   closeOnTab,
   editorRef,
-  ignoreEscapeKey
+  ignoreEscapeKey,
+  popupsMountPoint
 }) => {
   const wrapperRef = useRef(null);
   const currentSelectedColumnIndex = useRef(selectedColumnIndex === -1 ? 0 : selectedColumnIndex);
   const currentSelectedRowIndex = useRef(selectedRowIndex === -1 ? 0 : selectedRowIndex);
-  const [listenerTargetElement] = useState(editorRef.current);
+  const element = getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && popupsMountPoint ? popupsMountPoint : editorRef.current;
+  const [listenerTargetElement] = useState(element);
   const incrementRowIndex = (rowElements, columnElements) => {
     if (currentSelectedRowIndex.current === rowElements.length - 1) {
       currentSelectedRowIndex.current = 0;

package/dist/es2019/ui-menu/ArrowKeyNavigationProvider/MenuArrowKeyNavigationProvider/index.js

@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const hasEnabledItems = list => list.some(item => item.getAttribute('aria-disabled') !== 'true');
 
 /**
@@ -12,11 +13,13 @@ export const MenuArrowKeyNavigationProvider = ({
   keyDownHandlerContext,
   closeOnTab,
   onSelection,
-  editorRef
+  editorRef,
+  popupsMountPoint
 }) => {
   const wrapperRef = useRef(null);
   const [currentSelectedItemIndex, setCurrentSelectedItemIndex] = useState(-1);
-  const [listenerTargetElement] = useState(editorRef.current);
+  const element = getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && popupsMountPoint ? [popupsMountPoint, editorRef.current] : [editorRef.current];
+  const [listenerTargetElement] = useState(element);
   const incrementIndex = useCallback(list => {
     const currentIndex = currentSelectedItemIndex;
     let nextIndex = (currentIndex + 1) % list.length;
@@ -134,9 +137,13 @@ export const MenuArrowKeyNavigationProvider = ({
           return;
       }
     };
-    listenerTargetElement && listenerTargetElement.addEventListener('keydown', handleKeyDown);
+    listenerTargetElement && listenerTargetElement.forEach(function (elem) {
+      elem && elem.addEventListener('keydown', handleKeyDown);
+    });
     return () => {
-      listenerTargetElement && listenerTargetElement.removeEventListener('keydown', handleKeyDown);
+      listenerTargetElement && listenerTargetElement.forEach(function (elem) {
+        elem && elem.removeEventListener('keydown', handleKeyDown);
+      });
     };
   }, [currentSelectedItemIndex, wrapperRef, handleClose, disableArrowKeyNavigation, keyDownHandlerContext, closeOnTab, onSelection, incrementIndex, decrementIndex, listenerTargetElement]);
   return /*#__PURE__*/React.createElement("div", {

package/dist/es2019/ui-menu/ArrowKeyNavigationProvider/index.js

@@ -12,6 +12,7 @@ export const ArrowKeyNavigationProvider = props => {
   } = props;
   if (type === ArrowKeyNavigationType.COLOR) {
     return /*#__PURE__*/React.createElement(ReactEditorViewContext.Consumer, null, ({
+      popupsMountPoint,
       editorView,
       editorRef
     }) => editorRef && /*#__PURE__*/React.createElement(ColorPaletteArrowKeyNavigationProvider, _extends({
@@ -19,13 +20,16 @@ export const ArrowKeyNavigationProvider = props => {
       selectedColumnIndex: props.selectedColumnIndex,
       isOpenedByKeyboard: props.isOpenedByKeyboard,
       isPopupPositioned: props.isPopupPositioned,
-      editorRef: editorRef
+      editorRef: editorRef,
+      popupsMountPoint: popupsMountPoint
     }, restProps), children));
   }
   return /*#__PURE__*/React.createElement(ReactEditorViewContext.Consumer, null, ({
+    popupsMountPoint,
     editorView,
     editorRef
   }) => editorRef && /*#__PURE__*/React.createElement(MenuArrowKeyNavigationProvider, _extends({
-    editorRef: editorRef
+    editorRef: editorRef,
+    popupsMountPoint: popupsMountPoint
   }, restProps), children));
 };

package/dist/es2019/ui-menu/DropdownMenu/index.js

@@ -241,14 +241,22 @@ export default class DropdownMenuWrapper extends PureComponent {
     }, children), isOpen ? this.renderDropdownMenu() : null);
   }
   componentDidUpdate(previousProps) {
-    const isOpenToggled = this.props.isOpen !== previousProps.isOpen;
-    if (this.props.isOpen && isOpenToggled) {
+    const {
+      mountTo,
+      isOpen
+    } = this.props;
+    const isOpenToggled = isOpen !== previousProps.isOpen;
+    if (isOpen && isOpenToggled) {
       if (typeof this.props.shouldFocusFirstItem === 'function' && this.props.shouldFocusFirstItem()) {
         var _this$state$target2;
         const keyboardEvent = new KeyboardEvent('keydown', {
           key: 'ArrowDown',
           bubbles: true
         });
+        if (mountTo && getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty')) {
+          mountTo.dispatchEvent(keyboardEvent);
+          return;
+        }
         (_this$state$target2 = this.state.target) === null || _this$state$target2 === void 0 ? void 0 : _this$state$target2.dispatchEvent(keyboardEvent);
       }
     }

package/dist/es2019/ui-react/with-react-editor-view-outer-listeners.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { PureComponent, useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import ReactEditorViewContext from './ReactEditorViewContext';
 
 // This needs exporting to be used alongisde `withReactEditorViewOuterListeners`
@@ -50,7 +51,7 @@ class WithOutsideClick extends PureComponent {
     if (this.props.handleEscapeKeydown) {
       var _this$props$editorRef;
       // Attached event to the menu so that 'ESC' events from the opened menu also will be handled.
-      (((_this$props$editorRef = this.props.editorRef) === null || _this$props$editorRef === void 0 ? void 0 : _this$props$editorRef.current) || this.props.targetRef || document).addEventListener('keydown', this.handleKeydown, false);
+      (getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && this.props.popupsMountPoint ? this.props.popupsMountPoint : undefined || ((_this$props$editorRef = this.props.editorRef) === null || _this$props$editorRef === void 0 ? void 0 : _this$props$editorRef.current) || this.props.targetRef || document).addEventListener('keydown', this.handleKeydown, false);
     }
   }
   componentWillUnmount() {
@@ -59,7 +60,7 @@ class WithOutsideClick extends PureComponent {
     }
     if (this.props.handleEscapeKeydown) {
       var _this$props$editorRef2;
-      (((_this$props$editorRef2 = this.props.editorRef) === null || _this$props$editorRef2 === void 0 ? void 0 : _this$props$editorRef2.current) || this.props.targetRef || document).removeEventListener('keydown', this.handleKeydown, false);
+      (getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && this.props.popupsMountPoint ? this.props.popupsMountPoint : undefined || ((_this$props$editorRef2 = this.props.editorRef) === null || _this$props$editorRef2 === void 0 ? void 0 : _this$props$editorRef2.current) || this.props.targetRef || document).removeEventListener('keydown', this.handleKeydown, false);
     }
   }
   render() {
@@ -86,11 +87,13 @@ export default function withReactEditorViewOuterListeners(Component) {
     }, [isActiveProp]);
     return /*#__PURE__*/React.createElement(ReactEditorViewContext.Consumer, null, ({
       editorView,
+      popupsMountPoint,
       editorRef
     }) => /*#__PURE__*/React.createElement(WithOutsideClick, {
       editorView: editorView,
       editorRef: editorRef,
       targetRef: props.targetRef,
+      popupsMountPoint: popupsMountPoint,
       isActiveComponent: isActiveComponent,
       handleClickOutside: handleClickOutside,
       handleEnterKeydown: handleEnterKeydown,

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