@atlaskit/editor-common 93.4.3 → 93.4.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 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.4.4";
 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.4.4";
 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/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.4.4";
 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.4.4";
 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/with-plugin-state/index.js

@@ -1,9 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import PropTypes from 'prop-types';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
 import { createDispatch } from '../event-dispatcher';
 import { startMeasure, stopMeasure } from '../performance-measures';
+import { EditorContext } from '../ui/EditorContext';
 import { analyticsEventKey } from '../utils';
 const DEFAULT_SAMPLING_RATE = 100;
 const DEFAULT_SLOW_THRESHOLD = 4;
@@ -50,6 +53,215 @@ const DEFAULT_SLOW_THRESHOLD = 4;
  *
  */
 class WithPluginState extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+  render() {
+    if (fg('platform_editor_react18_phase2')) {
+      return /*#__PURE__*/React.createElement(WithPluginStateNew, this.props);
+    }
+    return /*#__PURE__*/React.createElement(WithPluginStateOld, this.props);
+  }
+}
+function WithPluginStateNew(props) {
+  const context = React.useContext(EditorContext);
+  return /*#__PURE__*/React.createElement(WithPluginStateInner, _extends({}, props, {
+    editorActions: context === null || context === void 0 ? void 0 : context.editorActions
+  }));
+}
+export class WithPluginStateInner extends React.Component {
+  constructor(props) {
+    super(props);
+    _defineProperty(this, "listeners", {});
+    _defineProperty(this, "debounce", null);
+    _defineProperty(this, "notAppliedState", {});
+    _defineProperty(this, "isSubscribed", false);
+    _defineProperty(this, "callsCount", 0);
+    _defineProperty(this, "handlePluginStateChange", (propName, pluginName, performanceOptions, skipEqualityCheck) => pluginState => {
+      // skipEqualityCheck is being used for old plugins since they are mutating plugin state instead of creating a new one
+      if (this.state[propName] !== pluginState || skipEqualityCheck) {
+        this.updateState({
+          stateSubset: {
+            [propName]: pluginState
+          },
+          pluginName,
+          performanceOptions
+        });
+      }
+    });
+    /**
+     * Debounces setState calls in order to reduce number of re-renders caused by several plugin state changes.
+     */
+    _defineProperty(this, "updateState", ({
+      stateSubset,
+      pluginName,
+      performanceOptions
+    }) => {
+      this.notAppliedState = {
+        ...this.notAppliedState,
+        ...stateSubset
+      };
+      if (this.debounce) {
+        window.clearTimeout(this.debounce);
+      }
+      const debounce = this.props.debounce !== false ? fn => window.setTimeout(fn, 0) : fn => fn();
+      this.debounce = debounce(() => {
+        const measure = `🦉${pluginName}::WithPluginState`;
+        performanceOptions.trackingEnabled && startMeasure(measure);
+        this.setState(this.notAppliedState, () => {
+          performanceOptions.trackingEnabled && stopMeasure(measure, duration => {
+            // Each WithPluginState component will fire analytics event no more than once every `samplingLimit` times
+            if (++this.callsCount % performanceOptions.samplingRate === 0 && duration > performanceOptions.slowThreshold) {
+              this.dispatchAnalyticsEvent({
+                action: ACTION.WITH_PLUGIN_STATE_CALLED,
+                actionSubject: ACTION_SUBJECT.EDITOR,
+                eventType: EVENT_TYPE.OPERATIONAL,
+                attributes: {
+                  plugin: pluginName,
+                  duration
+                }
+              });
+            }
+          });
+        });
+        this.debounce = null;
+        this.notAppliedState = {};
+      });
+    });
+    _defineProperty(this, "dispatchAnalyticsEvent", payload => {
+      const eventDispatcher = this.getEventDispatcher();
+      if (eventDispatcher) {
+        const dispatch = createDispatch(eventDispatcher);
+        dispatch(analyticsEventKey, {
+          payload
+        });
+      }
+    });
+    this.state = this.getPluginsStates(this.props.plugins, this.getEditorView(props));
+  }
+  getEditorView(maybeProps) {
+    const props = maybeProps || this.props;
+    const editorActions = props.editorActions;
+    return props.editorView || (editorActions === null || editorActions === void 0 ? void 0 : editorActions._privateGetEditorView());
+  }
+  getEventDispatcher(maybeProps) {
+    var _props$editorActions;
+    const props = maybeProps || this.props;
+    return props.eventDispatcher || ((_props$editorActions = props.editorActions) === null || _props$editorActions === void 0 ? void 0 : _props$editorActions._privateGetEventDispatcher());
+  }
+  getPluginsStates(plugins, editorView) {
+    if (!editorView || !plugins) {
+      return {};
+    }
+    const keys = Object.keys(plugins);
+    return keys.reduce((acc, propName) => {
+      const pluginKey = plugins[propName];
+      if (!pluginKey) {
+        return acc;
+      }
+      acc[propName] = pluginKey.getState(editorView.state);
+      return acc;
+    }, {});
+  }
+  subscribe(props) {
+    var _uiTracking$samplingR, _uiTracking$slowThres;
+    const plugins = props.plugins;
+    const eventDispatcher = this.getEventDispatcher(props);
+    const 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
+    const fakePluginKey = {
+      key: 'analyticsPlugin$',
+      getState: state => {
+        return state['analyticsPlugin$'];
+      }
+    };
+    const analyticsPlugin = fakePluginKey.getState(editorView.state);
+    const uiTracking = analyticsPlugin && analyticsPlugin.performanceTracking ? analyticsPlugin.performanceTracking.uiTracking || {} : {};
+    const trackingEnabled = uiTracking.enabled === true;
+    const samplingRate = (_uiTracking$samplingR = uiTracking.samplingRate) !== null && _uiTracking$samplingR !== void 0 ? _uiTracking$samplingR : DEFAULT_SAMPLING_RATE;
+    const slowThreshold = (_uiTracking$slowThres = uiTracking.slowThreshold) !== null && _uiTracking$slowThres !== void 0 ? _uiTracking$slowThres : DEFAULT_SLOW_THRESHOLD;
+    this.isSubscribed = true;
+    const pluginsStates = this.getPluginsStates(plugins, editorView);
+    this.setState(pluginsStates);
+    Object.keys(plugins).forEach(propName => {
+      const pluginKey = plugins[propName];
+      if (!pluginKey) {
+        return;
+      }
+      const pluginName = pluginKey.key;
+      const pluginState = pluginsStates[propName];
+      const isPluginWithSubscribe = pluginState && pluginState.subscribe;
+      const handler = this.handlePluginStateChange(propName, pluginName, {
+        samplingRate,
+        slowThreshold,
+        trackingEnabled
+      }, isPluginWithSubscribe);
+      if (isPluginWithSubscribe) {
+        pluginState.subscribe(handler);
+      } else {
+        eventDispatcher.on(pluginKey.key, handler);
+      }
+      this.listeners[pluginKey.key] = {
+        handler,
+        pluginKey
+      };
+    });
+  }
+  unsubscribe() {
+    const eventDispatcher = this.getEventDispatcher();
+    const editorView = this.getEditorView();
+    if (!eventDispatcher || !editorView || !this.isSubscribed) {
+      return;
+    }
+    Object.keys(this.listeners).forEach(key => {
+      const pluginState = this.listeners[key].pluginKey.getState(editorView.state);
+      if (pluginState && pluginState.unsubscribe) {
+        pluginState.unsubscribe(this.listeners[key].handler);
+      } else {
+        eventDispatcher.off(key, this.listeners[key].handler);
+      }
+    });
+    this.listeners = [];
+  }
+  subscribeToContextUpdates() {
+    var _this$props$editorAct;
+    (_this$props$editorAct = this.props.editorActions) === null || _this$props$editorAct === void 0 ? void 0 : _this$props$editorAct._privateSubscribe(() => this.subscribe(this.props));
+  }
+  unsubscribeFromContextUpdates() {
+    var _this$props$editorAct2;
+    (_this$props$editorAct2 = this.props.editorActions) === null || _this$props$editorAct2 === void 0 ? void 0 : _this$props$editorAct2._privateUnsubscribe(() => this.subscribe(this.props));
+  }
+  componentDidMount() {
+    this.subscribe(this.props);
+    this.subscribeToContextUpdates();
+  }
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (!this.isSubscribed) {
+      this.subscribe(nextProps);
+    }
+  }
+  componentWillUnmount() {
+    if (this.debounce) {
+      window.clearTimeout(this.debounce);
+    }
+    this.unsubscribeFromContextUpdates();
+    this.unsubscribe();
+  }
+  render() {
+    const {
+      render
+    } = this.props;
+    return render(this.state);
+  }
+}
+_defineProperty(WithPluginStateInner, "displayName", 'WithPluginState');
+export class WithPluginStateOld extends React.Component {
   constructor(props, context) {
     super(props, context);
     _defineProperty(this, "listeners", {});
@@ -146,7 +358,7 @@ class WithPluginState extends React.Component {
     }, {});
   }
   subscribe(props) {
-    var _uiTracking$samplingR, _uiTracking$slowThres;
+    var _uiTracking$samplingR2, _uiTracking$slowThres2;
     const plugins = props.plugins;
     const eventDispatcher = this.getEventDispatcher(props);
     const editorView = this.getEditorView(props);
@@ -166,8 +378,8 @@ class WithPluginState extends React.Component {
     const analyticsPlugin = fakePluginKey.getState(editorView.state);
     const uiTracking = analyticsPlugin && analyticsPlugin.performanceTracking ? analyticsPlugin.performanceTracking.uiTracking || {} : {};
     const trackingEnabled = uiTracking.enabled === true;
-    const samplingRate = (_uiTracking$samplingR = uiTracking.samplingRate) !== null && _uiTracking$samplingR !== void 0 ? _uiTracking$samplingR : DEFAULT_SAMPLING_RATE;
-    const slowThreshold = (_uiTracking$slowThres = uiTracking.slowThreshold) !== null && _uiTracking$slowThres !== void 0 ? _uiTracking$slowThres : DEFAULT_SLOW_THRESHOLD;
+    const samplingRate = (_uiTracking$samplingR2 = uiTracking.samplingRate) !== null && _uiTracking$samplingR2 !== void 0 ? _uiTracking$samplingR2 : DEFAULT_SAMPLING_RATE;
+    const slowThreshold = (_uiTracking$slowThres2 = uiTracking.slowThreshold) !== null && _uiTracking$slowThres2 !== void 0 ? _uiTracking$slowThres2 : DEFAULT_SLOW_THRESHOLD;
     this.isSubscribed = true;
     const pluginsStates = this.getPluginsStates(plugins, editorView);
     this.setState(pluginsStates);
@@ -244,8 +456,8 @@ class WithPluginState extends React.Component {
     return render(this.state);
   }
 }
-_defineProperty(WithPluginState, "displayName", 'WithPluginState');
-_defineProperty(WithPluginState, "contextTypes", {
+_defineProperty(WithPluginStateOld, "displayName", 'WithPluginState');
+_defineProperty(WithPluginStateOld, "contextTypes", {
   editorActions: PropTypes.object,
   editorSharedConfig: PropTypes.object
 });

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "93.4.3";
+var packageVersion = "93.4.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "93.4.3";
+var packageVersion = "93.4.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

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

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

@@ -1,19 +1,22 @@
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import PropTypes from 'prop-types';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
 import { createDispatch } from '../event-dispatcher';
 import { startMeasure, stopMeasure } from '../performance-measures';
+import { EditorContext } from '../ui/EditorContext';
 import { analyticsEventKey } from '../utils';
 var DEFAULT_SAMPLING_RATE = 100;
 var DEFAULT_SLOW_THRESHOLD = 4;
@@ -61,10 +64,34 @@ var DEFAULT_SLOW_THRESHOLD = 4;
 var WithPluginState = /*#__PURE__*/function (_React$Component) {
   _inherits(WithPluginState, _React$Component);
   var _super = _createSuper(WithPluginState);
-  function WithPluginState(props, context) {
-    var _this;
+  function WithPluginState(props) {
     _classCallCheck(this, WithPluginState);
-    _this = _super.call(this, props, context);
+    return _super.call(this, props);
+  }
+  _createClass(WithPluginState, [{
+    key: "render",
+    value: function render() {
+      if (fg('platform_editor_react18_phase2')) {
+        return /*#__PURE__*/React.createElement(WithPluginStateNew, this.props);
+      }
+      return /*#__PURE__*/React.createElement(WithPluginStateOld, this.props);
+    }
+  }]);
+  return WithPluginState;
+}(React.Component);
+function WithPluginStateNew(props) {
+  var context = React.useContext(EditorContext);
+  return /*#__PURE__*/React.createElement(WithPluginStateInner, _extends({}, props, {
+    editorActions: context === null || context === void 0 ? void 0 : context.editorActions
+  }));
+}
+export var WithPluginStateInner = /*#__PURE__*/function (_React$Component2) {
+  _inherits(WithPluginStateInner, _React$Component2);
+  var _super2 = _createSuper(WithPluginStateInner);
+  function WithPluginStateInner(props) {
+    var _this;
+    _classCallCheck(this, WithPluginStateInner);
+    _this = _super2.call(this, props);
     _defineProperty(_assertThisInitialized(_this), "listeners", {});
     _defineProperty(_assertThisInitialized(_this), "debounce", null);
     _defineProperty(_assertThisInitialized(_this), "notAppliedState", {});
@@ -130,24 +157,22 @@ var WithPluginState = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    _defineProperty(_assertThisInitialized(_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;
   }
-  _createClass(WithPluginState, [{
+  _createClass(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",
@@ -238,6 +263,236 @@ var WithPluginState = /*#__PURE__*/function (_React$Component) {
       });
       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.Component);
+_defineProperty(WithPluginStateInner, "displayName", 'WithPluginState');
+export var WithPluginStateOld = /*#__PURE__*/function (_React$Component3) {
+  _inherits(WithPluginStateOld, _React$Component3);
+  var _super3 = _createSuper(WithPluginStateOld);
+  function WithPluginStateOld(props, context) {
+    var _this6;
+    _classCallCheck(this, WithPluginStateOld);
+    _this6 = _super3.call(this, props, context);
+    _defineProperty(_assertThisInitialized(_this6), "listeners", {});
+    _defineProperty(_assertThisInitialized(_this6), "debounce", null);
+    _defineProperty(_assertThisInitialized(_this6), "notAppliedState", {});
+    _defineProperty(_assertThisInitialized(_this6), "isSubscribed", false);
+    _defineProperty(_assertThisInitialized(_this6), "callsCount", 0);
+    _defineProperty(_assertThisInitialized(_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: _defineProperty({}, propName, pluginState),
+            pluginName: pluginName,
+            performanceOptions: performanceOptions
+          });
+        }
+      };
+    });
+    /**
+     * Debounces setState calls in order to reduce number of re-renders caused by several plugin state changes.
+     */
+    _defineProperty(_assertThisInitialized(_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 && startMeasure(measure);
+        _this6.setState(_this6.notAppliedState, function () {
+          performanceOptions.trackingEnabled && 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: ACTION.WITH_PLUGIN_STATE_CALLED,
+                actionSubject: ACTION_SUBJECT.EDITOR,
+                eventType: EVENT_TYPE.OPERATIONAL,
+                attributes: {
+                  plugin: pluginName,
+                  duration: duration
+                }
+              });
+            }
+          });
+        });
+        _this6.debounce = null;
+        _this6.notAppliedState = {};
+      });
+    });
+    _defineProperty(_assertThisInitialized(_this6), "dispatchAnalyticsEvent", function (payload) {
+      var eventDispatcher = _this6.getEventDispatcher();
+      if (eventDispatcher) {
+        var dispatch = createDispatch(eventDispatcher);
+        dispatch(analyticsEventKey, {
+          payload: payload
+        });
+      }
+    });
+    _defineProperty(_assertThisInitialized(_this6), "onContextUpdate", function () {
+      _this6.subscribe(_this6.props);
+    });
+    _this6.state = _this6.getPluginsStates(_this6.props.plugins, _this6.getEditorView(props, context));
+    return _this6;
+  }
+  _createClass(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) {
@@ -281,10 +536,10 @@ var WithPluginState = /*#__PURE__*/function (_React$Component) {
       return render(this.state);
     }
   }]);
-  return WithPluginState;
+  return WithPluginStateOld;
 }(React.Component);
-_defineProperty(WithPluginState, "displayName", 'WithPluginState');
-_defineProperty(WithPluginState, "contextTypes", {
+_defineProperty(WithPluginStateOld, "displayName", 'WithPluginState');
+_defineProperty(WithPluginStateOld, "contextTypes", {
   editorActions: PropTypes.object,
   editorSharedConfig: PropTypes.object
 });

package/dist/types/ui/EditorContext/index.d.ts

@@ -0,0 +1,2 @@
+import React from "react";
+export declare const EditorContext: React.Context<{}>;

package/dist/types/with-plugin-state/index.d.ts

@@ -73,7 +73,41 @@ export interface Props<P extends NamedPluginKeys> {
  * ```
  *
  */
-declare class WithPluginState<P extends NamedPluginKeys> extends React.Component<Props<P>, State> {
+declare class WithPluginState<P extends NamedPluginKeys> extends React.Component<WithPluginStateInnerProps<P>, State> {
+    constructor(props: WithPluginStateInnerProps<P>);
+    render(): JSX.Element;
+}
+type WithPluginStateInnerProps<P extends NamedPluginKeys> = Props<P> & {
+    editorActions?: EditorActionsPrivateAccess;
+};
+export declare class WithPluginStateInner<P extends NamedPluginKeys> extends React.Component<WithPluginStateInnerProps<P>, State> {
+    static displayName: string;
+    private listeners;
+    private debounce;
+    private notAppliedState;
+    private isSubscribed;
+    private callsCount;
+    state: NamedPluginStates<P>;
+    constructor(props: Props<P>);
+    private getEditorView;
+    private getEventDispatcher;
+    private handlePluginStateChange;
+    /**
+     * Debounces setState calls in order to reduce number of re-renders caused by several plugin state changes.
+     */
+    private updateState;
+    private dispatchAnalyticsEvent;
+    private getPluginsStates;
+    private subscribe;
+    private unsubscribe;
+    private subscribeToContextUpdates;
+    private unsubscribeFromContextUpdates;
+    componentDidMount(): void;
+    UNSAFE_componentWillReceiveProps(nextProps: Props<P>): void;
+    componentWillUnmount(): void;
+    render(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
+}
+export declare class WithPluginStateOld<P extends NamedPluginKeys> extends React.Component<Props<P>, State> {
     static displayName: string;
     private listeners;
     private debounce;

package/dist/types-ts4.5/ui/EditorContext/index.d.ts

@@ -0,0 +1,2 @@
+import React from "react";
+export declare const EditorContext: React.Context<{}>;

package/dist/types-ts4.5/with-plugin-state/index.d.ts

@@ -73,7 +73,41 @@ export interface Props<P extends NamedPluginKeys> {
  * ```
  *
  */
-declare class WithPluginState<P extends NamedPluginKeys> extends React.Component<Props<P>, State> {
+declare class WithPluginState<P extends NamedPluginKeys> extends React.Component<WithPluginStateInnerProps<P>, State> {
+    constructor(props: WithPluginStateInnerProps<P>);
+    render(): JSX.Element;
+}
+type WithPluginStateInnerProps<P extends NamedPluginKeys> = Props<P> & {
+    editorActions?: EditorActionsPrivateAccess;
+};
+export declare class WithPluginStateInner<P extends NamedPluginKeys> extends React.Component<WithPluginStateInnerProps<P>, State> {
+    static displayName: string;
+    private listeners;
+    private debounce;
+    private notAppliedState;
+    private isSubscribed;
+    private callsCount;
+    state: NamedPluginStates<P>;
+    constructor(props: Props<P>);
+    private getEditorView;
+    private getEventDispatcher;
+    private handlePluginStateChange;
+    /**
+     * Debounces setState calls in order to reduce number of re-renders caused by several plugin state changes.
+     */
+    private updateState;
+    private dispatchAnalyticsEvent;
+    private getPluginsStates;
+    private subscribe;
+    private unsubscribe;
+    private subscribeToContextUpdates;
+    private unsubscribeFromContextUpdates;
+    componentDidMount(): void;
+    UNSAFE_componentWillReceiveProps(nextProps: Props<P>): void;
+    componentWillUnmount(): void;
+    render(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
+}
+export declare class WithPluginStateOld<P extends NamedPluginKeys> extends React.Component<Props<P>, State> {
     static displayName: string;
     private listeners;
     private debounce;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "93.4.3",
+	"version": "93.4.4",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -105,7 +105,8 @@
 		"./intl-error-boundary": "./src/ui/IntlErrorBoundary/index.tsx",
 		"./code-block": "./src/code-block/index.ts",
 		"./table": "./src/table/index.ts",
-		"./lazy-node-view": "./src/lazy-node-view/index.ts"
+		"./lazy-node-view": "./src/lazy-node-view/index.ts",
+		"./UNSAFE_do_not_use_editor_context": "./src/ui/EditorContext/index.ts"
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.4.0",