@atlaskit/editor-common 84.5.1 → 85.1.0

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

@@ -105,7 +105,7 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleCloseAndFocus", function (event) {
       var _this$state$target;
       (_this$state$target = _this.state.target) === null || _this$state$target === void 0 || (_this$state$target = _this$state$target.querySelector('button')) === null || _this$state$target === void 0 || _this$state$target.focus();
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
         _this.handleClose(event);
       } else {
         _this.handleClose();
@@ -114,7 +114,7 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleClose", function (event) {
       var onOpenChange = _this.props.onOpenChange;
       if (onOpenChange) {
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+        if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
           onOpenChange({
             isOpen: false,
             event: event
@@ -149,7 +149,8 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
         onItemActivated = _this$props.onItemActivated,
         arrowKeyNavigationProviderOptions = _this$props.arrowKeyNavigationProviderOptions,
         section = _this$props.section,
-        isAllowEnterDefaultBehavior = _this$props.isAllowEnterDefaultBehavior;
+        allowEnterDefaultBehavior = _this$props.allowEnterDefaultBehavior,
+        handleEscapeKeydown = _this$props.handleEscapeKeydown;
       // Note that this onSelection function can't be refactored to useMemo for
       // performance gains as it is being used as a dependency in a useEffect in
       // MenuArrowKeyNavigationProvider in order to check for re-renders to adjust
@@ -190,10 +191,10 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
         shouldFitContainer: true,
         isTriggerNotTabbable: true,
         handleClickOutside: this.handleClose,
-        handleEscapeKeydown: this.handleCloseAndFocus,
+        handleEscapeKeydown: (0, _platformFeatureFlags.fg)('platform-editor-a11y-image-border-options-dropdown') ? handleEscapeKeydown || this.handleCloseAndFocus : this.handleCloseAndFocus,
         handleEnterKeydown: function handleEnterKeydown(e) {
-          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
-            if (!isAllowEnterDefaultBehavior) {
+          if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') || (0, _platformFeatureFlags.fg)('platform-editor-a11y-image-border-options-dropdown')) {
+            if (!allowEnterDefaultBehavior) {
               e.preventDefault();
             }
           } else {
@@ -255,7 +256,7 @@ var DropdownMenuWrapper = exports.default = /*#__PURE__*/function (_PureComponen
             key: 'ArrowDown',
             bubbles: true
           });
-          if (mountTo && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-main-toolbar-navigation_osrty')) {
+          if (mountTo && (0, _platformFeatureFlags.fg)('platform.editor.a11y-main-toolbar-navigation_osrty')) {
             mountTo.dispatchEvent(keyboardEvent);
             return;
           }
@@ -306,17 +307,38 @@ function DropdownMenuItem(_ref) {
   var _handleSubmenuActive = function _handleSubmenuActive(event) {
     setSubmenuActive(Boolean(event.target instanceof HTMLElement && event.target.closest(".".concat(_styles.DropdownMenuSharedCssClassName.SUBMENU))));
   };
+  var ariaLabel;
+  if ((0, _platformFeatureFlags.fg)('platform-editor-a11y-image-border-options-dropdown')) {
+    ariaLabel = item['aria-label'] === '' ? undefined : item['aria-label'] || String(item.content);
+  } else {
+    ariaLabel = item['aria-label'] || String(item.content);
+  }
+  var testId;
+  if ((0, _platformFeatureFlags.fg)('platform-editor-a11y-image-border-options-dropdown')) {
+    testId = item['data-testid'] || "dropdown-item__".concat(item.content);
+  } else {
+    testId = "dropdown-item__".concat(String(item.content));
+  }
+
+  // From time to time we don't want to have any tabIndex on item wrapper
+  // especially when we pass any interactive element as a item.content
+  var tabIndex;
+  if ((0, _platformFeatureFlags.fg)('platform-editor-a11y-image-border-options-dropdown')) {
+    tabIndex = item.wrapperTabIndex === null ? undefined : item.wrapperTabIndex || -1;
+  } else {
+    tabIndex = -1;
+  }
   var dropListItem = (0, _react2.jsx)("div", {
     css: function css() {
       return buttonStyles(item.isActive, submenuActive);
     },
-    tabIndex: -1,
+    tabIndex: tabIndex,
     "aria-disabled": item.isDisabled ? 'true' : 'false',
     onMouseDown: _handleSubmenuActive
   }, (0, _react2.jsx)(_menu.CustomItem, {
     item: item,
     key: (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : String(item.content),
-    testId: "dropdown-item__".concat(String(item.content)),
+    testId: testId,
     role: shouldUseDefaultRole ? 'button' : 'menuitem',
     iconBefore: item.elemBefore,
     iconAfter: item.elemAfter,
@@ -326,7 +348,7 @@ function DropdownMenuItem(_ref) {
         item: item
       });
     },
-    "aria-label": item['aria-label'] || String(item.content),
+    "aria-label": ariaLabel,
     "aria-pressed": shouldUseDefaultRole ? item.isActive : undefined,
     "aria-keyshortcuts": item['aria-keyshortcuts'],
     onMouseDown: function onMouseDown(e) {
@@ -343,7 +365,7 @@ function DropdownMenuItem(_ref) {
         item: item
       });
     },
-    "aria-expanded": (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') ? item['aria-expanded'] : undefined
+    "aria-expanded": (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') ? item['aria-expanded'] : undefined
   }, item.content));
   if (item.tooltipDescription) {
     var _item$key3;

package/dist/es2019/analytics/types/enums.js

@@ -235,6 +235,7 @@ export let ACTION_SUBJECT = /*#__PURE__*/function (ACTION_SUBJECT) {
   ACTION_SUBJECT["DRAG"] = "drag";
   ACTION_SUBJECT["ELEMENT"] = "element";
   ACTION_SUBJECT["CONTEXT_MENU"] = "contextMenu";
+  ACTION_SUBJECT["INLINE_DIALOG"] = "inlineDialog";
   return ACTION_SUBJECT;
 }({});
 export let ACTION_SUBJECT_ID = /*#__PURE__*/function (ACTION_SUBJECT_ID) {
@@ -349,6 +350,7 @@ export let ACTION_SUBJECT_ID = /*#__PURE__*/function (ACTION_SUBJECT_ID) {
   ACTION_SUBJECT_ID["SAVE"] = "save";
   ACTION_SUBJECT_ID["SECTION"] = "section";
   ACTION_SUBJECT_ID["SMART_LINK"] = "smartLink";
+  ACTION_SUBJECT_ID["SMART_LINK_TOOLBAR"] = "smartLinkToolbar";
   ACTION_SUBJECT_ID["STATUS"] = "status";
   ACTION_SUBJECT_ID["SYMBOL"] = "symbol";
   ACTION_SUBJECT_ID["TABLE"] = "table";

package/dist/es2019/extensibility/extensionNodeView.js

@@ -53,13 +53,12 @@ export class ExtensionNode extends ReactNodeView {
 }
 export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags) {
   return (node, view, getPos) => {
-    const hasIntlContext = true;
     return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory,
       extensionHandlers,
       extensionNodeViewOptions,
       pluginInjectionApi,
       macroInteractionDesignFeatureFlags
-    }, undefined, undefined, undefined, hasIntlContext).init();
+    }).init();
   };
 }

package/dist/es2019/keymaps/index.js

@@ -98,6 +98,7 @@ export const toggleHighlightPalette = makeKeyMapWithCommon('Toggle Highlight Pal
 export const focusToContextMenuTrigger = makeKeyMapWithCommon('Focus table context menu trigger', 'Shift-F10');
 export const dragToMoveUp = makeKeyMapWithCommon('Move node up in the document', 'Ctrl-Alt-Shift-ArrowUp');
 export const dragToMoveDown = makeKeyMapWithCommon('Move node down in the document', 'Ctrl-Alt-Shift-ArrowDown');
+export const showElementDragHandle = makeKeyMapWithCommon('Show drag handle for editor element', 'Ctrl-Alt-Shift-a');
 const arrowKeysMap = {
   // for reference: https://wincent.com/wiki/Unicode_representations_of_modifier_keys
   ARROWLEFT: '\u2190',

package/dist/es2019/keymaps/keymap.js

@@ -1,6 +1,5 @@
 import { base, keyName } from 'w3c-keyname';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { SafePlugin } from '../safe-plugin';
 
 /**
@@ -14,52 +13,35 @@ export function keymap(bindings) {
   return new SafePlugin({
     props: {
       handleKeyDown(view, event) {
-        if (getBooleanFF('platform.editor.text-alignment-keyboard-shortcuts')) {
-          const name = keyName(event);
-          let keyboardEvent = event;
+        const name = keyName(event);
+        let keyboardEvent = event;
 
-          // We will try to bypass the keycode only if any of mod keys are pressed,
-          // to allow users to use non-latin and Dead characters.
-          const isModKeyPressed = event.ctrlKey || event.metaKey;
+        // We will try to bypass the keycode only if any of mod keys are pressed,
+        // to allow users to use non-latin and Dead characters.
+        const isModKeyPressed = event.ctrlKey || event.metaKey;
 
-          // Check the unicode of the character to assert that it's not an ASCII character.
-          // These are characters outside latin's range.
-          const isNonLatinKey = name.length === 1 && /[^\u0000-\u007f]/.test(name);
+        // Check the unicode of the character to assert that it's not an ASCII character.
+        // These are characters outside latin's range.
+        const isNonLatinKey = name.length === 1 && /[^\u0000-\u007f]/.test(name);
 
-          // The `Dead` key is a key that combines with a following key to produce a combined character.
-          // It will have `even.key === 'Dead'` in some browsers but the `keyCode` will be the same as in a qwerty-keyboard.
-          // See https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key and https://en.wikipedia.org/wiki/Dead_key
-          const isDeadKey = name === 'Dead';
-          if (isModKeyPressed && (isNonLatinKey || isDeadKey)) {
-            keyboardEvent = new KeyboardEvent(event.type, {
-              // FIXME: The event.keyCode is deprecated (see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode),
-              //        and could be removed in any time, but the w3c-keyname library doesn't provide a way to get
-              //        a key by event.code.
-              key: base[event.keyCode],
-              code: event.code,
-              ctrlKey: event.ctrlKey,
-              altKey: event.altKey,
-              metaKey: event.metaKey,
-              shiftKey: event.shiftKey
-            });
-          }
-          return keydownHandler(bindings)(view, keyboardEvent);
-        } else {
-          const name = keyName(event);
-          let keyboardEvent = event;
-          if (event.ctrlKey && name.length === 1 &&
-          // Check the unicode of the character to
-          // assert that its not an ASCII character.
-          // These are characters outside Latin's range.
-          /[^\u0000-\u007f]/.test(name)) {
-            keyboardEvent = new KeyboardEvent('keydown', {
-              key: base[event.keyCode],
-              code: event.code,
-              ctrlKey: true
-            });
-          }
-          return keydownHandler(bindings)(view, keyboardEvent);
+        // The `Dead` key is a key that combines with a following key to produce a combined character.
+        // It will have `even.key === 'Dead'` in some browsers but the `keyCode` will be the same as in a qwerty-keyboard.
+        // See https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key and https://en.wikipedia.org/wiki/Dead_key
+        const isDeadKey = name === 'Dead';
+        if (isModKeyPressed && (isNonLatinKey || isDeadKey)) {
+          keyboardEvent = new KeyboardEvent(event.type, {
+            // FIXME: The event.keyCode is deprecated (see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode),
+            //        and could be removed in any time, but the w3c-keyname library doesn't provide a way to get
+            //        a key by event.code.
+            key: base[event.keyCode],
+            code: event.code,
+            ctrlKey: event.ctrlKey,
+            altKey: event.altKey,
+            metaKey: event.metaKey,
+            shiftKey: event.shiftKey
+          });
         }
+        return keydownHandler(bindings)(view, keyboardEvent);
       }
     }
   });

package/dist/es2019/link/ConfigureLinkOverlay/Dropdown.js

@@ -5,28 +5,46 @@ import { useCallback } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
+import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
 import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
 import PreferencesIcon from '@atlaskit/icon/glyph/preferences';
 import ShortcutIcon from '@atlaskit/icon/glyph/shortcut';
 import { cardMessages as messages } from '../../messages';
 import { StyledButton } from './StyledButton';
+import { useLinkOverlayAnalyticsEvents } from './useLinkOverlayAnalyticsEvents';
+const SMALL_LINK_TOOLBAR_ANALYTICS_SOURCE = 'smallLinkToolbar';
 const Dropdown = ({
-  testId,
-  onDropdownChange
+  onDropdownChange,
+  testId
 }) => {
   const {
     formatMessage
   } = useIntl();
   const configureLinkLabel = formatMessage(messages.inlineConfigureLink);
   const goToLinkLabel = formatMessage(messages.inlineGoToLink);
+  const {
+    fireActionClickEvent,
+    fireLinkClickEvent,
+    fireToolbarViewEvent
+  } = useLinkOverlayAnalyticsEvents();
   const onOpenChange = useCallback(({
     isOpen
   }) => {
     onDropdownChange === null || onDropdownChange === void 0 ? void 0 : onDropdownChange(isOpen);
-  }, [onDropdownChange]);
+    if (isOpen) {
+      fireToolbarViewEvent();
+    }
+  }, [fireToolbarViewEvent, onDropdownChange]);
+  const onGoToLinkClick = useCallback(() => {
+    fireActionClickEvent('goToLink');
+  }, [fireActionClickEvent]);
+  const onConfigureClick = useCallback(() => {
+    fireActionClickEvent('configureLink');
+  }, [fireActionClickEvent]);
   return jsx(DropdownMenu, {
     trigger: ({
+      onClick,
       triggerRef,
       ...props
     }) => jsx(StyledButton, _extends({
@@ -35,7 +53,11 @@ const Dropdown = ({
       iconBefore: jsx(ChevronDownIcon, {
         label: configureLinkLabel,
         size: 'small'
-      })
+      }),
+      onClick: e => {
+        onClick === null || onClick === void 0 ? void 0 : onClick(e);
+        fireLinkClickEvent();
+      }
     })),
     testId: `${testId}-dropdown`,
     onOpenChange: onOpenChange
@@ -43,12 +65,16 @@ const Dropdown = ({
     elemBefore: jsx(ShortcutIcon, {
       label: goToLinkLabel,
       size: 'medium'
-    })
+    }),
+    onClick: onGoToLinkClick
   }, goToLinkLabel), jsx(DropdownItem, {
     elemBefore: jsx(PreferencesIcon, {
       label: configureLinkLabel,
       size: 'medium'
-    })
+    }),
+    onClick: onConfigureClick
   }, configureLinkLabel)));
 };
-export default Dropdown;
+export default withAnalyticsContext({
+  source: SMALL_LINK_TOOLBAR_ANALYTICS_SOURCE
+})(Dropdown);

package/dist/es2019/link/ConfigureLinkOverlay/index.js

@@ -4,6 +4,7 @@ import { useCallback, useLayoutEffect, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
+import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import PreferencesIcon from '@atlaskit/icon/glyph/preferences';
 import { N0 } from '@atlaskit/theme/colors';
@@ -12,6 +13,7 @@ import Tooltip from '@atlaskit/tooltip';
 import { cardMessages } from '../../messages';
 import Dropdown from './Dropdown';
 import { StyledButton } from './StyledButton';
+import { useLinkOverlayAnalyticsEvents } from './useLinkOverlayAnalyticsEvents';
 const buttonWrapperStyles = css({
   position: 'absolute',
   zIndex: layers.card(),
@@ -22,7 +24,7 @@ const buttonWrapperStyles = css({
   borderRadius: "var(--ds-border-radius, 3px)"
 });
 const showDropdownThresholdPx = 50;
-export const OverlayButton = ({
+export const OverlayButton = withAnalyticsContext()(({
   editorView,
   testId = 'link-configure-overlay-button',
   targetElementPos = 0,
@@ -34,6 +36,10 @@ export const OverlayButton = ({
   } = useIntl();
   const configureLinkLabel = formatMessage(cardMessages.inlineConfigureLink);
   const [showDropdown, setShowDropdown] = useState(false);
+  const {
+    fireLinkClickEvent,
+    fireActionClickEvent
+  } = useLinkOverlayAnalyticsEvents();
   useLayoutEffect(() => {
     var _domNode;
     let domNode = editorView.nodeDOM(targetElementPos);
@@ -52,7 +58,7 @@ export const OverlayButton = ({
   const docNode = editorView.state.doc.nodeAt(targetElementPos);
   const nodeEnd = targetElementPos + ((_docNode$nodeSize = docNode === null || docNode === void 0 ? void 0 : docNode.nodeSize) !== null && _docNode$nodeSize !== void 0 ? _docNode$nodeSize : 0);
   const isText = docNode === null || docNode === void 0 ? void 0 : docNode.isText;
-  const handleClick = useCallback(() => {
+  const handleConfigureClick = useCallback(() => {
     const tr = editorView.state.tr;
     if (isText) {
       tr.setSelection(TextSelection.create(tr.doc, targetElementPos, Math.min(nodeEnd, tr.doc.nodeSize)));
@@ -60,7 +66,12 @@ export const OverlayButton = ({
       tr.setSelection(NodeSelection.create(tr.doc, targetElementPos));
     }
     editorView.dispatch(tr);
-  }, [isText, editorView, nodeEnd, targetElementPos]);
+  }, [editorView, isText, targetElementPos, nodeEnd]);
+  const handleConfigureClickWithAnalytics = useCallback(() => {
+    fireLinkClickEvent();
+    fireActionClickEvent('configureLink');
+    handleConfigureClick();
+  }, [fireActionClickEvent, fireLinkClickEvent, handleConfigureClick]);
   const {
     from,
     to
@@ -80,11 +91,11 @@ export const OverlayButton = ({
     hideTooltipOnClick: true,
     testId: `${testId}-tooltip`
   }, jsx(StyledButton, {
-    onClick: handleClick,
+    onClick: handleConfigureClickWithAnalytics,
     iconBefore: jsx(PreferencesIcon, {
       label: configureLinkLabel,
       size: "small",
       testId: `${testId}-configure-icon`
     })
   })));
-};
+});

package/dist/es2019/link/ConfigureLinkOverlay/useLinkOverlayAnalyticsEvents.js

@@ -0,0 +1,39 @@
+import { useMemo } from 'react';
+import { FabricChannel } from '@atlaskit/analytics-listeners';
+import { useAnalyticsEvents } from '@atlaskit/analytics-next';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../analytics';
+export const useLinkOverlayAnalyticsEvents = () => {
+  const {
+    createAnalyticsEvent
+  } = useAnalyticsEvents();
+  return useMemo(() => ({
+    fireActionClickEvent: linkAction => {
+      createAnalyticsEvent({
+        action: ACTION.CLICKED,
+        actionSubject: ACTION_SUBJECT.BUTTON,
+        eventType: EVENT_TYPE.UI,
+        attributes: {
+          action: linkAction
+        }
+      }).fire(FabricChannel.media);
+    },
+    fireLinkClickEvent: () => {
+      createAnalyticsEvent({
+        action: ACTION.CLICKED,
+        actionSubject: ACTION_SUBJECT.LINK,
+        eventType: EVENT_TYPE.UI
+      }).fire(FabricChannel.media);
+    },
+    fireToolbarViewEvent: () => {
+      createAnalyticsEvent({
+        action: ACTION.VIEWED,
+        actionSubject: ACTION_SUBJECT.INLINE_DIALOG,
+        actionSubjectId: ACTION_SUBJECT_ID.SMART_LINK_TOOLBAR,
+        eventType: EVENT_TYPE.SCREEN,
+        attributes: {
+          linkType: 'smallLink'
+        }
+      }).fire(FabricChannel.media);
+    }
+  }), [createAnalyticsEvent]);
+};

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

package/dist/es2019/react-node-view/getInlineNodeViewProducer.js

@@ -58,9 +58,7 @@ function createNodeView({
       nodeViewParams,
       Component,
       extraComponentProps
-    }), domRef, key, false,
-    // node views should be rendered with intl context
-    true);
+    }), domRef, key);
   }
   const {
     samplingRate,
@@ -117,7 +115,7 @@ function createNodeView({
       // When prosemirror destroys the node view, we need to clean up
       // what we have previously rendered using the editor portal
       // provider api.
-      pmPluginFactoryParams.portalProviderAPI.remove(key, domRef);
+      pmPluginFactoryParams.portalProviderAPI.remove(key);
       // @ts-expect-error Expect an error as domRef is expected to be
       // of HTMLSpanElement type however once the node view has
       // been destroyed no other consumers should still be using it.

package/dist/es2019/react-node-view/index.js

@@ -9,7 +9,7 @@ import { analyticsEventKey } from '../utils/analytics';
 import { generateUniqueNodeKey } from './generateUniqueNodeKey';
 export { getInlineNodeViewProducer, inlineNodeViewClassname } from './getInlineNodeViewProducer';
 export default class ReactNodeView {
-  constructor(_node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasAnalyticsContext = false, viewShouldUpdate, hasIntlContext = false) {
+  constructor(_node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, viewShouldUpdate) {
     _defineProperty(this, "decorations", []);
     _defineProperty(this, "handleRef", node => this._handleRef(node));
     _defineProperty(this, "dispatchAnalyticsEvent", payload => {
@@ -26,10 +26,8 @@ export default class ReactNodeView {
     this.portalProviderAPI = portalProviderAPI;
     this.reactComponentProps = reactComponentProps || {};
     this.reactComponent = reactComponent;
-    this.hasAnalyticsContext = hasAnalyticsContext;
     this._viewShouldUpdate = viewShouldUpdate;
     this.eventDispatcher = eventDispatcher;
-    this.hasIntlContext = hasIntlContext;
     this.key = generateUniqueNodeKey();
   }
 
@@ -92,7 +90,7 @@ export default class ReactNodeView {
         dispatchAnalyticsEvent: this.dispatchAnalyticsEvent
       }, component());
     };
-    this.portalProviderAPI.render(componentWithErrorBoundary, this.domRef, this.key, this.hasAnalyticsContext, this.hasIntlContext);
+    this.portalProviderAPI.render(componentWithErrorBoundary, this.domRef, this.key);
   }
   createDomRef() {
     if (!this.node.isInline) {
@@ -165,11 +163,11 @@ export default class ReactNodeView {
     if (!this.domRef) {
       return;
     }
-    this.portalProviderAPI.remove(this.key, this.domRef);
+    this.portalProviderAPI.remove(this.key);
     this.domRef = undefined;
     this.contentDOM = undefined;
   }
-  static fromComponent(component, portalProviderAPI, eventDispatcher, props, viewShouldUpdate, hasIntlContext = false) {
-    return (node, view, getPos) => new ReactNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, props, component, false, viewShouldUpdate, hasIntlContext).init();
+  static fromComponent(component, portalProviderAPI, eventDispatcher, props, viewShouldUpdate) {
+    return (node, view, getPos) => new ReactNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, props, component, viewShouldUpdate).init();
   }
 }

package/dist/es2019/selection-based-node-view/SelectionBasedNodeView.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import ReactNodeView from '../react-node-view';
+
 /**
  * A ReactNodeView that handles React components sensitive
  * to selection changes.
@@ -25,8 +26,8 @@ import ReactNodeView from '../react-node-view';
  */
 
 export class SelectionBasedNodeView extends ReactNodeView {
-  constructor(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext = false, viewShouldUpdate, hasIntlContext = false) {
-    super(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext, viewShouldUpdate, hasIntlContext);
+  constructor(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, viewShouldUpdate) {
+    super(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, viewShouldUpdate);
     _defineProperty(this, "isSelectedNode", false);
     _defineProperty(this, "isNodeInsideSelection", (from, to, pos, posEnd) => {
       ({

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

package/dist/es2019/ui-color/ColorPalette/Color/index.js

@@ -39,6 +39,18 @@ const Color = props => {
     e.preventDefault();
     onClick(value, label);
   };
+  const onKeyDown = e => {
+    const {
+      onKeyDown,
+      value,
+      label
+    } = props;
+    if (!onKeyDown) {
+      return undefined;
+    }
+    e.preventDefault();
+    onKeyDown(value, label, e);
+  };
   return jsx(Tooltip, {
     content: label
   }, jsx("span", {
@@ -52,6 +64,7 @@ const Color = props => {
     role: "radio",
     "aria-checked": isSelected,
     onClick: onClick,
+    onKeyDown: onKeyDown,
     onMouseDown: onMouseDown,
     tabIndex: tabIndex
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/es2019/ui-color/ColorPalette/index.js

@@ -39,6 +39,7 @@ const ColorPalette = props => {
   const {
     cols = DEFAULT_COLOR_PICKER_COLUMNS,
     onClick,
+    onKeyDown,
     selectedColor,
     className,
     intl: {
@@ -87,6 +88,7 @@ const ColorPalette = props => {
       borderColor: border,
       label: message ? formatMessage(message) : label,
       onClick: onClick,
+      onKeyDown: onKeyDown,
       isSelected: value === selectedColor,
       checkMarkColor: getCheckMarkColor(value, useIconToken),
       hexToPaletteColor: hexToPaletteColor,

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 const hasEnabledItems = list => list.some(item => item.getAttribute('aria-disabled') !== 'true');
 
 /**
@@ -14,11 +14,12 @@ export const MenuArrowKeyNavigationProvider = ({
   closeOnTab,
   onSelection,
   editorRef,
-  popupsMountPoint
+  popupsMountPoint,
+  disableCloseOnArrowClick
 }) => {
   const wrapperRef = useRef(null);
   const [currentSelectedItemIndex, setCurrentSelectedItemIndex] = useState(-1);
-  const element = getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && popupsMountPoint ? [popupsMountPoint, editorRef.current] : [editorRef.current];
+  const element = popupsMountPoint && fg('platform.editor.a11y-main-toolbar-navigation_osrty') ? [popupsMountPoint, editorRef.current] : [editorRef.current];
   const [listenerTargetElement] = useState(element);
   const incrementIndex = useCallback(list => {
     const currentIndex = currentSelectedItemIndex;
@@ -111,7 +112,13 @@ export const MenuArrowKeyNavigationProvider = ({
           if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
             return;
           }
-          handleClose(event);
+          if (fg('platform-editor-a11y-image-border-options-dropdown')) {
+            if (!disableCloseOnArrowClick) {
+              handleClose(event);
+            }
+          } else {
+            handleClose(event);
+          }
           if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
             keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowLeft();
           }
@@ -120,7 +127,13 @@ export const MenuArrowKeyNavigationProvider = ({
           if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
             return;
           }
-          handleClose(event);
+          if (fg('platform-editor-a11y-image-border-options-dropdown')) {
+            if (!disableCloseOnArrowClick) {
+              handleClose(event);
+            }
+          } else {
+            handleClose(event);
+          }
           if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
             keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowRight();
           }
@@ -145,7 +158,7 @@ export const MenuArrowKeyNavigationProvider = ({
         elem && elem.removeEventListener('keydown', handleKeyDown);
       });
     };
-  }, [currentSelectedItemIndex, wrapperRef, handleClose, disableArrowKeyNavigation, keyDownHandlerContext, closeOnTab, onSelection, incrementIndex, decrementIndex, listenerTargetElement]);
+  }, [currentSelectedItemIndex, wrapperRef, handleClose, disableArrowKeyNavigation, keyDownHandlerContext, closeOnTab, onSelection, incrementIndex, decrementIndex, listenerTargetElement, disableCloseOnArrowClick]);
   return /*#__PURE__*/React.createElement("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: "menu-key-handler-wrapper custom-key-handler-wrapper",