@atlaskit/editor-common 83.0.4 → 83.2.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-common
 
+## 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
+
+- [#114806](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114806)
+  [`d3310bbf372ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d3310bbf372ec) -
+  [ux] The keyboard navigation for the main toolbar
+- [#114811](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114811)
+  [`ad0d2f10ef71b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ad0d2f10ef71b) -
+  CONFONBO-3268: Changes for the experiment Teammate Presence: expose 2 new collab events to add
+  statuses (viewing/editing) to Confluence
+
 ## 83.0.4
 
 ### Patch 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.0.4";
+var packageVersion = "83.2.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.0.4";
+var packageVersion = "83.2.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ColorPaletteArrowKeyNavigationProvider = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 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; }
 /**
@@ -23,11 +24,13 @@ var ColorPaletteArrowKeyNavigationProvider = exports.ColorPaletteArrowKeyNavigat
     handleClose = _ref.handleClose,
     closeOnTab = _ref.closeOnTab,
     editorRef = _ref.editorRef,
-    ignoreEscapeKey = _ref.ignoreEscapeKey;
+    ignoreEscapeKey = _ref.ignoreEscapeKey,
+    popupsMountPoint = _ref.popupsMountPoint;
   var wrapperRef = (0, _react.useRef)(null);
   var currentSelectedColumnIndex = (0, _react.useRef)(selectedColumnIndex === -1 ? 0 : selectedColumnIndex);
   var currentSelectedRowIndex = (0, _react.useRef)(selectedRowIndex === -1 ? 0 : selectedRowIndex);
-  var _useState = (0, _react.useState)(editorRef.current),
+  var element = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-main-toolbar-navigation_osrty') && popupsMountPoint ? popupsMountPoint : editorRef.current;
+  var _useState = (0, _react.useState)(element),
     _useState2 = (0, _slicedToArray2.default)(_useState, 1),
     listenerTargetElement = _useState2[0];
   var incrementRowIndex = function incrementRowIndex(rowElements, columnElements) {

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.MenuArrowKeyNavigationProvider = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 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 hasEnabledItems = function hasEnabledItems(list) {
@@ -27,13 +28,15 @@ var MenuArrowKeyNavigationProvider = exports.MenuArrowKeyNavigationProvider = fu
     keyDownHandlerContext = _ref.keyDownHandlerContext,
     closeOnTab = _ref.closeOnTab,
     onSelection = _ref.onSelection,
-    editorRef = _ref.editorRef;
+    editorRef = _ref.editorRef,
+    popupsMountPoint = _ref.popupsMountPoint;
   var wrapperRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(-1),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     currentSelectedItemIndex = _useState2[0],
     setCurrentSelectedItemIndex = _useState2[1];
-  var _useState3 = (0, _react.useState)(editorRef.current),
+  var element = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-main-toolbar-navigation_osrty') && popupsMountPoint ? [popupsMountPoint, editorRef.current] : [editorRef.current];
+  var _useState3 = (0, _react.useState)(element),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 1),
     listenerTargetElement = _useState4[0];
   var incrementIndex = (0, _react.useCallback)(function (list) {
@@ -153,9 +156,13 @@ var MenuArrowKeyNavigationProvider = exports.MenuArrowKeyNavigationProvider = fu
           return;
       }
     };
-    listenerTargetElement && listenerTargetElement.addEventListener('keydown', handleKeyDown);
+    listenerTargetElement && listenerTargetElement.forEach(function (elem) {
+      elem && elem.addEventListener('keydown', handleKeyDown);
+    });
     return function () {
-      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.default.createElement("div", {

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

@@ -19,22 +19,26 @@ var ArrowKeyNavigationProvider = exports.ArrowKeyNavigationProvider = function A
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   if (type === _types.ArrowKeyNavigationType.COLOR) {
     return /*#__PURE__*/_react.default.createElement(_uiReact.ReactEditorViewContext.Consumer, null, function (_ref) {
-      var editorView = _ref.editorView,
+      var popupsMountPoint = _ref.popupsMountPoint,
+        editorView = _ref.editorView,
         editorRef = _ref.editorRef;
       return editorRef && /*#__PURE__*/_react.default.createElement(_ColorPaletteArrowKeyNavigationProvider.ColorPaletteArrowKeyNavigationProvider, (0, _extends2.default)({
         selectedRowIndex: props.selectedRowIndex,
         selectedColumnIndex: props.selectedColumnIndex,
         isOpenedByKeyboard: props.isOpenedByKeyboard,
         isPopupPositioned: props.isPopupPositioned,
-        editorRef: editorRef
+        editorRef: editorRef,
+        popupsMountPoint: popupsMountPoint
       }, restProps), children);
     });
   }
   return /*#__PURE__*/_react.default.createElement(_uiReact.ReactEditorViewContext.Consumer, null, function (_ref2) {
-    var editorView = _ref2.editorView,
+    var popupsMountPoint = _ref2.popupsMountPoint,
+      editorView = _ref2.editorView,
       editorRef = _ref2.editorRef;
     return editorRef && /*#__PURE__*/_react.default.createElement(_MenuArrowKeyNavigationProvider.MenuArrowKeyNavigationProvider, (0, _extends2.default)({
-      editorRef: editorRef
+      editorRef: editorRef,
+      popupsMountPoint: popupsMountPoint
     }, restProps), children);
   });
 };

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

@@ -244,14 +244,21 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(previousProps) {
-      var isOpenToggled = this.props.isOpen !== previousProps.isOpen;
-      if (this.props.isOpen && isOpenToggled) {
+      var _this$props3 = this.props,
+        mountTo = _this$props3.mountTo,
+        isOpen = _this$props3.isOpen;
+      var isOpenToggled = isOpen !== previousProps.isOpen;
+      if (isOpen && isOpenToggled) {
         if (typeof this.props.shouldFocusFirstItem === 'function' && this.props.shouldFocusFirstItem()) {
           var _this$state$target2;
           var keyboardEvent = new KeyboardEvent('keydown', {
             key: 'ArrowDown',
             bubbles: true
           });
+          if (mountTo && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-main-toolbar-navigation_osrty')) {
+            mountTo.dispatchEvent(keyboardEvent);
+            return;
+          }
           (_this$state$target2 = this.state.target) === null || _this$state$target2 === void 0 || _this$state$target2.dispatchEvent(keyboardEvent);
         }
       }

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

@@ -17,6 +17,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ReactEditorViewContext = _interopRequireDefault(require("./ReactEditorViewContext"));
 var _excluded = ["handleClickOutside", "handleEnterKeydown", "handleEscapeKeydown", "closeOnTab"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -79,7 +80,7 @@ var WithOutsideClick = /*#__PURE__*/function (_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);
+        ((0, _platformFeatureFlags.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);
       }
     }
   }, {
@@ -90,7 +91,7 @@ var WithOutsideClick = /*#__PURE__*/function (_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);
+        ((0, _platformFeatureFlags.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);
       }
     }
   }, {
@@ -123,11 +124,13 @@ function withReactEditorViewOuterListeners(Component) {
     }, [isActiveProp]);
     return /*#__PURE__*/_react.default.createElement(_ReactEditorViewContext.default.Consumer, null, function (_ref2) {
       var editorView = _ref2.editorView,
+        popupsMountPoint = _ref2.popupsMountPoint,
         editorRef = _ref2.editorRef;
       return /*#__PURE__*/_react.default.createElement(WithOutsideClick, {
         editorView: editorView,
         editorRef: editorRef,
         targetRef: props.targetRef,
+        popupsMountPoint: popupsMountPoint,
         isActiveComponent: isActiveComponent,
         handleClickOutside: handleClickOutside,
         handleEnterKeydown: handleEnterKeydown,

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"