@atlaskit/editor-common 93.4.3 → 93.5.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @atlaskit/editor-common
 
+## 93.5.0
+
+### Minor Changes
+
+- [#151611](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151611)
+  [`ee71cb75c933c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ee71cb75c933c) -
+  ED-25294 add new attribute as engagement platform message trigger
+
+### Patch Changes
+
+- [#152399](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152399)
+  [`fbd7217f0cb51`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fbd7217f0cb51) -
+  [ux] ED-25092: Added iconFallback prop to FloatingToolbarDropdown
+- [#151611](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151611)
+  [`c866e61e26ae2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c866e61e26ae2) -
+  [ux] [ED-25306] When opening the media picker from the editor main toolbar do not use the
+  ToolbarArrowKeyNavigationProvider
+- [#152510](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152510)
+  [`dcf9edde7ac7b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dcf9edde7ac7b) -
+  bump adf-schema to 42.0.1
+- Updated dependencies
+
+## 93.4.4
+
+### Patch Changes
+
+- [#151676](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151676)
+  [`ed6d01983b0da`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ed6d01983b0da) -
+  ED-25183: Remediate WithEditorActions, WithPluginState & LegacyEditorContext context type
+
 ## 93.4.3
 
 ### Patch Changes

package/UNSAFE_do_not_use_editor_context/package.json

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

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 && {}.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 = "93.4.3";
+var packageVersion = "93.5.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

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "93.4.3";
+var packageVersion = "93.5.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/ui/EditorContext/index.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EditorContext = void 0;
+var _react = _interopRequireDefault(require("react"));
+var EditorContext = exports.EditorContext = /*#__PURE__*/_react.default.createContext({});

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

@@ -12,6 +12,8 @@ var _withAnalyticsContext = _interopRequireDefault(require("@atlaskit/analytics-
 var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
+var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/chevron-down"));
+var _primitives = require("@atlaskit/primitives");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _analytics = require("../../analytics");
 var _uiColor = require("../../ui-color");
@@ -30,8 +32,11 @@ var _types = require("../ArrowKeyNavigationProvider/types");
 var colorPickerButtonWrapper = (0, _react2.css)({
   position: 'relative'
 });
-var colorPickerExpandContainer = (0, _react2.css)({
-  margin: "0px ".concat("var(--ds-space-negative-050, -4px)")
+var colorPickerExpandContainer = (0, _primitives.xcss)({
+  marginTop: 'space.0',
+  marginBottom: 'space.0',
+  marginLeft: 'space.negative.050',
+  marginRight: 'space.negative.050'
 });
 
 // Control the size of color picker buttons and preview
@@ -228,10 +233,13 @@ var ColorPickerButton = function ColorPickerButton(props) {
     // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
     ,
     css: buttonStyle,
-    iconAfter: (0, _react2.jsx)("span", {
-      css: colorPickerExpandContainer
-    }, (0, _react2.jsx)(_chevronDown.default, {
-      label: ""
+    iconAfter: (0, _react2.jsx)(_primitives.Box, {
+      xcss: colorPickerExpandContainer
+    }, (0, _react2.jsx)(_chevronDown2.default, {
+      color: "currentColor",
+      spacing: "spacious",
+      LEGACY_fallbackIcon: _chevronDown.default,
+      label: "color-picker-chevron-down"
     })),
     "data-selected-color": props.currentColor
   })), renderPopup());

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

@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _elementBrowser = require("../../element-browser");
 var _messages = require("../../messages");
+var _mediaInsert = require("../../messages/media-insert");
 var _ui = require("../../ui");
 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 && {}.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; }
@@ -16,7 +17,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * @jsxRuntime classic
  * @jsx jsx
  */
-/* eslint-disable no-console */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
@@ -144,6 +144,11 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
       if (!filteredFocusableElements || (filteredFocusableElements === null || filteredFocusableElements === void 0 ? void 0 : filteredFocusableElements.length) === 0) {
         return;
       }
+
+      // If the target element is the media picker then navigation is handled by the media picker
+      if (targetElement instanceof HTMLElement && targetElement.closest("[aria-label=\"".concat(intl.formatMessage(_mediaInsert.mediaInsertMessages.mediaPickerPopupAriaLabel), "\"]"))) {
+        return;
+      }
       if (targetElement instanceof HTMLElement && !((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
         selectedItemIndex.current = -1;
       } else {
@@ -196,7 +201,7 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
         editorViewDom === null || editorViewDom === void 0 || editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
       }
     };
-  }, [selectedItemIndex, wrapperRef, editorView, disableArrowKeyNavigation, handleEscape, childComponentSelector, incrementIndex, decrementIndex, isShortcutToFocusToolbar, editorAppearance, useStickyToolbar]);
+  }, [selectedItemIndex, wrapperRef, editorView, disableArrowKeyNavigation, handleEscape, childComponentSelector, incrementIndex, decrementIndex, isShortcutToFocusToolbar, editorAppearance, useStickyToolbar, intl]);
   return (0, _react2.jsx)("div", {
     css: editorAppearance === 'comment' && centeredToolbarContainer
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/cjs/with-plugin-state/index.js

@@ -4,19 +4,22 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WithPluginState = void 0;
+exports.WithPluginStateOld = exports.WithPluginStateInner = exports.WithPluginState = void 0;
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _eventDispatcher = require("../event-dispatcher");
 var _performanceMeasures = require("../performance-measures");
+var _EditorContext = require("../ui/EditorContext");
 var _utils = require("../utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -68,10 +71,34 @@ var DEFAULT_SLOW_THRESHOLD = 4;
 var WithPluginState = exports.WithPluginState = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(WithPluginState, _React$Component);
   var _super = _createSuper(WithPluginState);
-  function WithPluginState(props, context) {
-    var _this;
+  function WithPluginState(props) {
     (0, _classCallCheck2.default)(this, WithPluginState);
-    _this = _super.call(this, props, context);
+    return _super.call(this, props);
+  }
+  (0, _createClass2.default)(WithPluginState, [{
+    key: "render",
+    value: function render() {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2')) {
+        return /*#__PURE__*/_react.default.createElement(WithPluginStateNew, this.props);
+      }
+      return /*#__PURE__*/_react.default.createElement(WithPluginStateOld, this.props);
+    }
+  }]);
+  return WithPluginState;
+}(_react.default.Component);
+function WithPluginStateNew(props) {
+  var context = _react.default.useContext(_EditorContext.EditorContext);
+  return /*#__PURE__*/_react.default.createElement(WithPluginStateInner, (0, _extends2.default)({}, props, {
+    editorActions: context === null || context === void 0 ? void 0 : context.editorActions
+  }));
+}
+var WithPluginStateInner = exports.WithPluginStateInner = /*#__PURE__*/function (_React$Component2) {
+  (0, _inherits2.default)(WithPluginStateInner, _React$Component2);
+  var _super2 = _createSuper(WithPluginStateInner);
+  function WithPluginStateInner(props) {
+    var _this;
+    (0, _classCallCheck2.default)(this, WithPluginStateInner);
+    _this = _super2.call(this, props);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "listeners", {});
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "debounce", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "notAppliedState", {});
@@ -137,24 +164,22 @@ var WithPluginState = exports.WithPluginState = /*#__PURE__*/function (_React$Co
         });
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onContextUpdate", function () {
-      _this.subscribe(_this.props);
-    });
-    _this.state = _this.getPluginsStates(_this.props.plugins, _this.getEditorView(props, context));
+    _this.state = _this.getPluginsStates(_this.props.plugins, _this.getEditorView(props));
     return _this;
   }
-  (0, _createClass2.default)(WithPluginState, [{
+  (0, _createClass2.default)(WithPluginStateInner, [{
     key: "getEditorView",
-    value: function getEditorView(maybeProps, maybeContext) {
+    value: function getEditorView(maybeProps) {
       var props = maybeProps || this.props;
-      var context = maybeContext || this.context;
-      return props.editorView || context && context.editorActions && context.editorActions._privateGetEditorView() || context && context.editorSharedConfig && context.editorSharedConfig.editorView;
+      var editorActions = props.editorActions;
+      return props.editorView || (editorActions === null || editorActions === void 0 ? void 0 : editorActions._privateGetEditorView());
     }
   }, {
     key: "getEventDispatcher",
     value: function getEventDispatcher(maybeProps) {
+      var _props$editorActions;
       var props = maybeProps || this.props;
-      return props.eventDispatcher || this.context && this.context.editorActions && this.context.editorActions._privateGetEventDispatcher() || this.context && this.context.editorSharedConfig && this.context.editorSharedConfig.eventDispatcher;
+      return props.eventDispatcher || ((_props$editorActions = props.editorActions) === null || _props$editorActions === void 0 ? void 0 : _props$editorActions._privateGetEventDispatcher());
     }
   }, {
     key: "getPluginsStates",
@@ -245,6 +270,236 @@ var WithPluginState = exports.WithPluginState = /*#__PURE__*/function (_React$Co
       });
       this.listeners = [];
     }
+  }, {
+    key: "subscribeToContextUpdates",
+    value: function subscribeToContextUpdates() {
+      var _this$props$editorAct,
+        _this4 = this;
+      (_this$props$editorAct = this.props.editorActions) === null || _this$props$editorAct === void 0 || _this$props$editorAct._privateSubscribe(function () {
+        return _this4.subscribe(_this4.props);
+      });
+    }
+  }, {
+    key: "unsubscribeFromContextUpdates",
+    value: function unsubscribeFromContextUpdates() {
+      var _this$props$editorAct2,
+        _this5 = this;
+      (_this$props$editorAct2 = this.props.editorActions) === null || _this$props$editorAct2 === void 0 || _this$props$editorAct2._privateUnsubscribe(function () {
+        return _this5.subscribe(_this5.props);
+      });
+    }
+  }, {
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.subscribe(this.props);
+      this.subscribeToContextUpdates();
+    }
+  }, {
+    key: "UNSAFE_componentWillReceiveProps",
+    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+      if (!this.isSubscribed) {
+        this.subscribe(nextProps);
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.debounce) {
+        window.clearTimeout(this.debounce);
+      }
+      this.unsubscribeFromContextUpdates();
+      this.unsubscribe();
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var render = this.props.render;
+      return render(this.state);
+    }
+  }]);
+  return WithPluginStateInner;
+}(_react.default.Component);
+(0, _defineProperty2.default)(WithPluginStateInner, "displayName", 'WithPluginState');
+var WithPluginStateOld = exports.WithPluginStateOld = /*#__PURE__*/function (_React$Component3) {
+  (0, _inherits2.default)(WithPluginStateOld, _React$Component3);
+  var _super3 = _createSuper(WithPluginStateOld);
+  function WithPluginStateOld(props, context) {
+    var _this6;
+    (0, _classCallCheck2.default)(this, WithPluginStateOld);
+    _this6 = _super3.call(this, props, context);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "listeners", {});
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "debounce", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "notAppliedState", {});
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "isSubscribed", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "callsCount", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "handlePluginStateChange", function (propName, pluginName, performanceOptions, skipEqualityCheck) {
+      return function (pluginState) {
+        // skipEqualityCheck is being used for old plugins since they are mutating plugin state instead of creating a new one
+        if (_this6.state[propName] !== pluginState || skipEqualityCheck) {
+          _this6.updateState({
+            stateSubset: (0, _defineProperty2.default)({}, propName, pluginState),
+            pluginName: pluginName,
+            performanceOptions: performanceOptions
+          });
+        }
+      };
+    });
+    /**
+     * Debounces setState calls in order to reduce number of re-renders caused by several plugin state changes.
+     */
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "updateState", function (_ref2) {
+      var stateSubset = _ref2.stateSubset,
+        pluginName = _ref2.pluginName,
+        performanceOptions = _ref2.performanceOptions;
+      _this6.notAppliedState = _objectSpread(_objectSpread({}, _this6.notAppliedState), stateSubset);
+      if (_this6.debounce) {
+        window.clearTimeout(_this6.debounce);
+      }
+      var debounce = _this6.props.debounce !== false ? function (fn) {
+        return window.setTimeout(fn, 0);
+      } : function (fn) {
+        return fn();
+      };
+      _this6.debounce = debounce(function () {
+        var measure = "\uD83E\uDD89".concat(pluginName, "::WithPluginState");
+        performanceOptions.trackingEnabled && (0, _performanceMeasures.startMeasure)(measure);
+        _this6.setState(_this6.notAppliedState, function () {
+          performanceOptions.trackingEnabled && (0, _performanceMeasures.stopMeasure)(measure, function (duration) {
+            // Each WithPluginState component will fire analytics event no more than once every `samplingLimit` times
+            if (++_this6.callsCount % performanceOptions.samplingRate === 0 && duration > performanceOptions.slowThreshold) {
+              _this6.dispatchAnalyticsEvent({
+                action: _analytics.ACTION.WITH_PLUGIN_STATE_CALLED,
+                actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
+                eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+                attributes: {
+                  plugin: pluginName,
+                  duration: duration
+                }
+              });
+            }
+          });
+        });
+        _this6.debounce = null;
+        _this6.notAppliedState = {};
+      });
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "dispatchAnalyticsEvent", function (payload) {
+      var eventDispatcher = _this6.getEventDispatcher();
+      if (eventDispatcher) {
+        var dispatch = (0, _eventDispatcher.createDispatch)(eventDispatcher);
+        dispatch(_utils.analyticsEventKey, {
+          payload: payload
+        });
+      }
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this6), "onContextUpdate", function () {
+      _this6.subscribe(_this6.props);
+    });
+    _this6.state = _this6.getPluginsStates(_this6.props.plugins, _this6.getEditorView(props, context));
+    return _this6;
+  }
+  (0, _createClass2.default)(WithPluginStateOld, [{
+    key: "getEditorView",
+    value: function getEditorView(maybeProps, maybeContext) {
+      var props = maybeProps || this.props;
+      var context = maybeContext || this.context;
+      return props.editorView || context && context.editorActions && context.editorActions._privateGetEditorView() || context && context.editorSharedConfig && context.editorSharedConfig.editorView;
+    }
+  }, {
+    key: "getEventDispatcher",
+    value: function getEventDispatcher(maybeProps) {
+      var props = maybeProps || this.props;
+      return props.eventDispatcher || this.context && this.context.editorActions && this.context.editorActions._privateGetEventDispatcher() || this.context && this.context.editorSharedConfig && this.context.editorSharedConfig.eventDispatcher;
+    }
+  }, {
+    key: "getPluginsStates",
+    value: function getPluginsStates(plugins, editorView) {
+      if (!editorView || !plugins) {
+        return {};
+      }
+      var keys = Object.keys(plugins);
+      return keys.reduce(function (acc, propName) {
+        var pluginKey = plugins[propName];
+        if (!pluginKey) {
+          return acc;
+        }
+        acc[propName] = pluginKey.getState(editorView.state);
+        return acc;
+      }, {});
+    }
+  }, {
+    key: "subscribe",
+    value: function subscribe(props) {
+      var _uiTracking$samplingR2,
+        _uiTracking$slowThres2,
+        _this7 = this;
+      var plugins = props.plugins;
+      var eventDispatcher = this.getEventDispatcher(props);
+      var editorView = this.getEditorView(props);
+      if (!eventDispatcher || !editorView || this.isSubscribed) {
+        return;
+      }
+
+      // TODO: ED-15663
+      // Please, do not copy or use this kind of code below
+      // @ts-ignore
+      var fakePluginKey = {
+        key: 'analyticsPlugin$',
+        getState: function getState(state) {
+          return state['analyticsPlugin$'];
+        }
+      };
+      var analyticsPlugin = fakePluginKey.getState(editorView.state);
+      var uiTracking = analyticsPlugin && analyticsPlugin.performanceTracking ? analyticsPlugin.performanceTracking.uiTracking || {} : {};
+      var trackingEnabled = uiTracking.enabled === true;
+      var samplingRate = (_uiTracking$samplingR2 = uiTracking.samplingRate) !== null && _uiTracking$samplingR2 !== void 0 ? _uiTracking$samplingR2 : DEFAULT_SAMPLING_RATE;
+      var slowThreshold = (_uiTracking$slowThres2 = uiTracking.slowThreshold) !== null && _uiTracking$slowThres2 !== void 0 ? _uiTracking$slowThres2 : DEFAULT_SLOW_THRESHOLD;
+      this.isSubscribed = true;
+      var pluginsStates = this.getPluginsStates(plugins, editorView);
+      this.setState(pluginsStates);
+      Object.keys(plugins).forEach(function (propName) {
+        var pluginKey = plugins[propName];
+        if (!pluginKey) {
+          return;
+        }
+        var pluginName = pluginKey.key;
+        var pluginState = pluginsStates[propName];
+        var isPluginWithSubscribe = pluginState && pluginState.subscribe;
+        var handler = _this7.handlePluginStateChange(propName, pluginName, {
+          samplingRate: samplingRate,
+          slowThreshold: slowThreshold,
+          trackingEnabled: trackingEnabled
+        }, isPluginWithSubscribe);
+        if (isPluginWithSubscribe) {
+          pluginState.subscribe(handler);
+        } else {
+          eventDispatcher.on(pluginKey.key, handler);
+        }
+        _this7.listeners[pluginKey.key] = {
+          handler: handler,
+          pluginKey: pluginKey
+        };
+      });
+    }
+  }, {
+    key: "unsubscribe",
+    value: function unsubscribe() {
+      var _this8 = this;
+      var eventDispatcher = this.getEventDispatcher();
+      var editorView = this.getEditorView();
+      if (!eventDispatcher || !editorView || !this.isSubscribed) {
+        return;
+      }
+      Object.keys(this.listeners).forEach(function (key) {
+        var pluginState = _this8.listeners[key].pluginKey.getState(editorView.state);
+        if (pluginState && pluginState.unsubscribe) {
+          pluginState.unsubscribe(_this8.listeners[key].handler);
+        } else {
+          eventDispatcher.off(key, _this8.listeners[key].handler);
+        }
+      });
+      this.listeners = [];
+    }
   }, {
     key: "subscribeToContextUpdates",
     value: function subscribeToContextUpdates(context) {
@@ -288,10 +543,10 @@ var WithPluginState = exports.WithPluginState = /*#__PURE__*/function (_React$Co
       return render(this.state);
     }
   }]);
-  return WithPluginState;
+  return WithPluginStateOld;
 }(_react.default.Component);
-(0, _defineProperty2.default)(WithPluginState, "displayName", 'WithPluginState');
-(0, _defineProperty2.default)(WithPluginState, "contextTypes", {
+(0, _defineProperty2.default)(WithPluginStateOld, "displayName", 'WithPluginState');
+(0, _defineProperty2.default)(WithPluginStateOld, "contextTypes", {
   editorActions: _propTypes.default.object,
   editorSharedConfig: _propTypes.default.object
 });

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 = "93.4.3";
+const packageVersion = "93.5.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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "93.4.3";
+const packageVersion = "93.5.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/ui/EditorContext/index.js

@@ -0,0 +1,2 @@
+import React from 'react';
+export const EditorContext = /*#__PURE__*/React.createContext({});

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

@@ -9,7 +9,9 @@ import { css, jsx } from '@emotion/react';
 import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext';
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Button from '@atlaskit/button/standard-button';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import LegacyExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
+import { Box, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, editorAnalyticsChannel, EVENT_TYPE } from '../../analytics';
 import { ColorPalette, DEFAULT_BORDER_COLOR, getSelectedRowAndColumnFromPalette } from '../../ui-color';
@@ -22,8 +24,11 @@ import { ArrowKeyNavigationType } from '../ArrowKeyNavigationProvider/types';
 const colorPickerButtonWrapper = css({
   position: 'relative'
 });
-const colorPickerExpandContainer = css({
-  margin: `0px ${"var(--ds-space-negative-050, -4px)"}`
+const colorPickerExpandContainer = xcss({
+  marginTop: 'space.0',
+  marginBottom: 'space.0',
+  marginLeft: 'space.negative.050',
+  marginRight: 'space.negative.050'
 });
 
 // Control the size of color picker buttons and preview
@@ -208,10 +213,13 @@ const ColorPickerButton = props => {
     // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
     ,
     css: buttonStyle,
-    iconAfter: jsx("span", {
-      css: colorPickerExpandContainer
-    }, jsx(ExpandIcon, {
-      label: ""
+    iconAfter: jsx(Box, {
+      xcss: colorPickerExpandContainer
+    }, jsx(ChevronDownIcon, {
+      color: "currentColor",
+      spacing: "spacious",
+      LEGACY_fallbackIcon: LegacyExpandIcon,
+      label: "color-picker-chevron-down"
     })),
     "data-selected-color": props.currentColor
   })), renderPopup());

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

@@ -2,14 +2,14 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-/* eslint-disable no-console */
 
 import React, { useCallback, useLayoutEffect, useRef } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { ELEMENT_BROWSER_ID } from '../../element-browser';
-import { fullPageMessages as messages } from '../../messages';
+import { fullPageMessages } from '../../messages';
+import { mediaInsertMessages } from '../../messages/media-insert';
 import { EDIT_AREA_ID } from '../../ui';
 /*
  **  The context is used to handle the keydown events of submenus.
@@ -137,6 +137,11 @@ export const ToolbarArrowKeyNavigationProvider = ({
       if (!filteredFocusableElements || (filteredFocusableElements === null || filteredFocusableElements === void 0 ? void 0 : filteredFocusableElements.length) === 0) {
         return;
       }
+
+      // If the target element is the media picker then navigation is handled by the media picker
+      if (targetElement instanceof HTMLElement && targetElement.closest(`[aria-label="${intl.formatMessage(mediaInsertMessages.mediaPickerPopupAriaLabel)}"]`)) {
+        return;
+      }
       if (targetElement instanceof HTMLElement && !((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
         selectedItemIndex.current = -1;
       } else {
@@ -189,7 +194,7 @@ export const ToolbarArrowKeyNavigationProvider = ({
         editorViewDom === null || editorViewDom === void 0 ? void 0 : editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
       }
     };
-  }, [selectedItemIndex, wrapperRef, editorView, disableArrowKeyNavigation, handleEscape, childComponentSelector, incrementIndex, decrementIndex, isShortcutToFocusToolbar, editorAppearance, useStickyToolbar]);
+  }, [selectedItemIndex, wrapperRef, editorView, disableArrowKeyNavigation, handleEscape, childComponentSelector, incrementIndex, decrementIndex, isShortcutToFocusToolbar, editorAppearance, useStickyToolbar, intl]);
   return jsx("div", {
     css: editorAppearance === 'comment' && centeredToolbarContainer
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -197,7 +202,7 @@ export const ToolbarArrowKeyNavigationProvider = ({
     className: "custom-key-handler-wrapper",
     ref: wrapperRef,
     role: "toolbar",
-    "aria-label": intl.formatMessage(messages.toolbarLabel),
+    "aria-label": intl.formatMessage(fullPageMessages.toolbarLabel),
     "aria-controls": EDIT_AREA_ID
   }, jsx(KeyDownHandlerContext.Provider, {
     value: submenuKeydownHandleContext