@atlaskit/editor-core 187.47.9 → 187.48.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-core
 
+## 187.48.2
+
+### Patch Changes
+
+- [#40698](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40698) [`37b11d838e4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/37b11d838e4) - ED-20017 Decouple floating toolbar from editor-core
+- [#40700](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40700) [`07c8d720947`](https://bitbucket.org/atlassian/atlassian-frontend/commits/07c8d720947) - [ED-17196] Refactored editor internal abstraction
+- Updated dependencies
+
+## 187.48.0
+
+### Minor Changes
+
+- [`f8e7203eec6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f8e7203eec6) - ED-19618 Extract base plugin from editor-core
+
+### Patch Changes
+
+- [`4e0f5ccf818`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e0f5ccf818) - ADFEXP-526: fix loading-adf test
+- Updated dependencies
+
 ## 187.47.9
 
 ### Patch Changes

package/dist/cjs/{editor-next → composable-editor}/editor-internal.js

@@ -4,8 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EditorInternalWithoutHooks = EditorInternalWithoutHooks;
-exports.default = EditorInternal;
+exports.EditorInternal = EditorInternal;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -20,33 +19,14 @@ var _contextAdapter = require("../nodeviews/context-adapter");
 var _EditorContext = _interopRequireDefault(require("../ui/EditorContext"));
 var _context = require("../presets/context");
 var _RenderTracking = require("../utils/performance/components/RenderTracking");
-var _useMeasureEditorMountTime = _interopRequireDefault(require("./hooks/useMeasureEditorMountTime"));
-var _useProviderFactory = _interopRequireDefault(require("./hooks/useProviderFactory"));
 var _getBaseFontSize = require("./utils/getBaseFontSize");
 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; } /** @jsx jsx */
-/**
- * EditorInternal is used for the internal editor react component
- * with the lifecycle methods extracted into hooks.
- */
-function EditorInternal(props) {
-  var editorProps = props.props,
-    getExperienceStore = props.getExperienceStore,
-    editorActions = props.editorActions,
-    createAnalyticsEvent = props.createAnalyticsEvent;
-  (0, _useMeasureEditorMountTime.default)(editorProps, getExperienceStore, createAnalyticsEvent);
-  var providerFactory = (0, _useProviderFactory.default)(editorProps, editorActions, createAnalyticsEvent);
-  var updatedProps = _objectSpread(_objectSpread({}, props), {}, {
-    providerFactory: providerFactory
-  });
-  return (0, _react2.jsx)(EditorInternalWithoutHooks, updatedProps);
-}
-
 /**
  * EditorInternalComponent is used to capture the common component
  * from the `render` method of `Editor` and share it with `EditorNext`.
  */
-function EditorInternalWithoutHooks(_ref) {
+function EditorInternal(_ref) {
   var _props$performanceTra, _props$performanceTra2, _props$performanceTra3, _props$performanceTra4;
   var props = _ref.props,
     handleAnalyticsEvent = _ref.handleAnalyticsEvent,

package/dist/cjs/{editor-next/index.js → composable-editor/editor.js}

@@ -4,8 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Editor = Editor;
-exports.default = EditorNext;
+exports.ComposableEditor = ComposableEditor;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -14,7 +13,7 @@ var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-contex
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _ufo = require("@atlaskit/editor-common/ufo");
 var _utils = require("@atlaskit/editor-common/utils");
-var _plugins = require("../plugins");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _actions = _interopRequireDefault(require("../actions"));
 var _featureFlagsFromProps = require("../create-editor/feature-flags-from-props");
 var _versionWrapper = require("../version-wrapper");
@@ -22,11 +21,16 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _EditorContext = require("../ui/EditorContext");
 var _measureEnum = _interopRequireDefault(require("../utils/performance/measure-enum"));
-var _editorInternal = _interopRequireDefault(require("./editor-internal"));
+var _editorInternal = require("./editor-internal");
 var _sendDurationAnalytics = _interopRequireDefault(require("./utils/sendDurationAnalytics"));
 var _trackEditorActions = _interopRequireDefault(require("./utils/trackEditorActions"));
+var _useMeasureEditorMountTime = _interopRequireDefault(require("./hooks/useMeasureEditorMountTime"));
+var _useProviderFactory = _interopRequireDefault(require("./hooks/useProviderFactory"));
 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; } /** @jsx jsx */
+/**
+ * Editor wrapper that deals with the lifecycle logic of the editor
+ */
 function Editor(passedProps) {
   var _editorContext$editor;
   var defaultProps = {
@@ -75,7 +79,9 @@ function Editor(passedProps) {
     editorActions.current._privateUnregisterEditor();
     (_props$onDestroy = props.onDestroy) === null || _props$onDestroy === void 0 ? void 0 : _props$onDestroy.call(props);
   };
-  return (0, _react2.jsx)(_editorInternal.default, {
+  (0, _useMeasureEditorMountTime.default)(props, getExperienceStore, createAnalyticsEvent);
+  var providerFactory = (0, _useProviderFactory.default)(props, editorActions.current, createAnalyticsEvent);
+  return (0, _react2.jsx)(_editorInternal.EditorInternal, {
     props: props,
     handleAnalyticsEvent: handleAnalyticsEvent,
     createAnalyticsEvent: createAnalyticsEvent,
@@ -85,12 +91,12 @@ function Editor(passedProps) {
       return (_props$onSave = props.onSave) === null || _props$onSave === void 0 ? void 0 : _props$onSave.call(props, view);
     },
     editorActions: editorActions.current,
-    getExperienceStore: getExperienceStore,
     onEditorCreated: onEditorCreated,
-    onEditorDestroyed: onEditorDestroyed
+    onEditorDestroyed: onEditorDestroyed,
+    providerFactory: providerFactory
   });
 }
-function EditorNext(props) {
+function ComposableEditor(props) {
   var editorSessionId = (0, _react.useRef)((0, _v.default)());
   return (0, _react2.jsx)(_analyticsNamespacedContext.FabricEditorAnalyticsContext, {
     data: {
@@ -102,7 +108,7 @@ function EditorNext(props) {
     }
   }, (0, _react2.jsx)(Editor, props));
 }
-EditorNext.propTypes = {
+ComposableEditor.propTypes = {
   minHeight: function minHeight(_ref) {
     var appearance = _ref.appearance,
       _minHeight = _ref.minHeight;
@@ -113,7 +119,7 @@ EditorNext.propTypes = {
   },
   preset: function preset(_ref2) {
     var _preset = _ref2.preset;
-    if (!_preset.has(_plugins.basePlugin)) {
+    if (!_preset.has(_editorPluginBase.basePlugin)) {
       return new Error('Presets must contain the base plugin');
     }
     return null;

package/dist/cjs/composable-editor.js

@@ -1,13 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 Object.defineProperty(exports, "ComposableEditor", {
   enumerable: true,
   get: function get() {
-    return _editorNext.default;
+    return _editor.ComposableEditor;
   }
 });
-var _editorNext = _interopRequireDefault(require("./editor-next"));
+var _editor = require("./composable-editor/editor");

package/dist/cjs/editor.js

@@ -15,16 +15,16 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _editorDeprecationWarnings = _interopRequireDefault(require("./utils/editorDeprecationWarnings"));
-var _editorNext = _interopRequireDefault(require("./editor-next"));
+var _composableEditor = require("./composable-editor");
 var _useUniversalPreset = _interopRequireDefault(require("./labs/next/presets/useUniversalPreset"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
-var EditorNextWrapper = function EditorNextWrapper(_ref) {
+var ComposableEditorWrapper = function ComposableEditorWrapper(_ref) {
   var props = _ref.props;
   var preset = (0, _useUniversalPreset.default)({
     props: props
   });
-  return (0, _react2.jsx)(_editorNext.default, (0, _extends2.default)({
+  return (0, _react2.jsx)(_composableEditor.ComposableEditor, (0, _extends2.default)({
     preset: preset
   }, props));
 };
@@ -41,7 +41,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   (0, _createClass2.default)(Editor, [{
     key: "render",
     value: function render() {
-      return (0, _react2.jsx)(EditorNextWrapper, {
+      return (0, _react2.jsx)(ComposableEditorWrapper, {
         props: this.props
       });
     }

package/dist/cjs/index.js

@@ -278,7 +278,7 @@ Object.defineProperty(exports, "insertDate", {
 Object.defineProperty(exports, "insertExpand", {
   enumerable: true,
   get: function get() {
-    return _commands6.insertExpand;
+    return _commands5.insertExpand;
   }
 });
 Object.defineProperty(exports, "insertMediaSingleNode", {
@@ -350,19 +350,19 @@ Object.defineProperty(exports, "selectionPluginKey", {
 Object.defineProperty(exports, "setIsExpanded", {
   enumerable: true,
   get: function get() {
-    return _commands5.setIsExpanded;
+    return _commands4.setIsExpanded;
   }
 });
 Object.defineProperty(exports, "setKeyboardHeight", {
   enumerable: true,
   get: function get() {
-    return _commands4.setKeyboardHeight;
+    return _editorPluginBase.setKeyboardHeight;
   }
 });
 Object.defineProperty(exports, "setMobilePaddingTop", {
   enumerable: true,
   get: function get() {
-    return _commands5.setMobilePaddingTop;
+    return _commands4.setMobilePaddingTop;
   }
 });
 Object.defineProperty(exports, "setStatusPickerAt", {
@@ -462,8 +462,8 @@ var _actions2 = require("./plugins/status/actions");
 var _typeAhead = require("./plugins/type-ahead");
 var _history = require("./plugins/history");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _commands4 = require("./plugins/base/commands");
-var _commands5 = require("./plugins/mobile-dimensions/commands");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
+var _commands4 = require("./plugins/mobile-dimensions/commands");
 var _utils = require("./utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _createEditor = require("./create-editor");
@@ -471,7 +471,7 @@ var _actions3 = _interopRequireDefault(require("./actions"));
 var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _selection = require("@atlaskit/editor-common/selection");
 var _mobileSelection = require("./plugins/mobile-selection");
-var _commands6 = require("./plugins/expand/commands");
+var _commands5 = require("./plugins/expand/commands");
 var _WithPluginState = _interopRequireDefault(require("./ui/WithPluginState"));
 var _statusColorPalette = require("./ui/ColorPalette/Palettes/statusColorPalette");
 var _common = require("./ui/ColorPalette/Palettes/common");

package/dist/cjs/labs/next/presets/default.js

@@ -13,7 +13,7 @@ var _editorPluginHyperlink = require("@atlaskit/editor-plugin-hyperlink");
 var _editorPluginTextFormatting = require("@atlaskit/editor-plugin-text-formatting");
 var _editorPluginWidth = require("@atlaskit/editor-plugin-width");
 var _editorPluginUnsupportedContent = require("@atlaskit/editor-plugin-unsupported-content");
-var _base = require("../../../plugins/base");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _editorPluginFocus = require("@atlaskit/editor-plugin-focus");
 var _editorPluginEditorDisabled = require("@atlaskit/editor-plugin-editor-disabled");
 var _typeAhead = _interopRequireDefault(require("../../../plugins/type-ahead"));
@@ -63,7 +63,7 @@ function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add(_editorPluginComposition.compositionPlugin).add([_base.basePlugin, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
+  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add(_editorPluginComposition.compositionPlugin).add([_editorPluginBase.basePlugin, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/cjs/plugins/floating-toolbar/ui/Toolbar.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSameItem = exports.default = exports.areSameItems = void 0;
+exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -22,7 +22,6 @@ var _editorPalette = require("@atlaskit/editor-palette");
 var _components = require("@atlaskit/theme/components");
 var _constants = require("@atlaskit/theme/constants");
 var _colors = require("@atlaskit/theme/colors");
-var _utils = require("../utils");
 var _commands = require("../pm-plugins/toolbar-data/commands");
 var _ui = require("@atlaskit/editor-common/ui");
 var _Dropdown = _interopRequireDefault(require("./Dropdown"));
@@ -30,6 +29,7 @@ var _Select = _interopRequireDefault(require("./Select"));
 var _Separator = _interopRequireDefault(require("./Separator"));
 var _Input = _interopRequireDefault(require("./Input"));
 var _ExtensionsPlaceholder = require("./ExtensionsPlaceholder");
+var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _EmojiPickerButton = require("./EmojiPickerButton");
@@ -244,7 +244,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
   }
   // only rerender toolbar items if the node is different
   // otherwise it causes an issue where multiple popups stays open
-  return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !areSameItems(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
+  return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !(0, _floatingToolbar.areSameItems)(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
 });
 var toolbarContainer = function toolbarContainer(theme, scrollable, hasSelect, firstElementIsSelect) {
   return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background-color: ", ";\n  border-radius: ", "px;\n  box-shadow: ", ";\n  display: flex;\n  line-height: 1;\n  box-sizing: border-box;\n\n  & > div > div {\n    align-items: center;\n  }\n  ", "\n"])), (0, _components.themed)({
@@ -255,73 +255,6 @@ var toolbarContainer = function toolbarContainer(theme, scrollable, hasSelect, f
 var toolbarOverflow = function toolbarOverflow(scrollable, scrollDisabled, firstElementIsSelect) {
   return (0, _react2.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n"])), scrollable ? (0, _react2.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n        ", "\n        -webkit-overflow-scrolling: touch;\n        padding: ", " 0 50px;\n        > div {\n          > div:first-child {\n            ", "\n          }\n          > div:last-child {\n            margin-right: ", ";\n          }\n        }\n      "])), scrollDisabled ? (0, _react2.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n              overflow: hidden;\n            "]))) : (0, _react2.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n              overflow-x: auto;\n              overflow-y: hidden;\n            "]))), "var(--ds-space-050, 4px)", firstElementIsSelect ? (0, _react2.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n                  margin-left: ", ";\n                "])), "var(--ds-space-050, 4px)") : (0, _react2.css)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2.default)(["\n                  margin-left: ", ";\n                "])), "var(--ds-space-100, 8px)"), "var(--ds-space-100, 8px)") : (0, _react2.css)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteral2.default)(["\n        display: flex;\n      "]))));
 };
-function makeSameType(_a, _b) {
-  return true;
-}
-var compareItemWithKeys = function compareItemWithKeys(leftItem, rightItem) {
-  var excludedKeys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  return Object.keys(leftItem).filter(function (key) {
-    return excludedKeys.indexOf(key) === -1;
-  }).every(function (key) {
-    return leftItem[key] instanceof Object ? (0, _utils.shallowEqual)(leftItem[key], rightItem[key]) : leftItem[key] === rightItem[key];
-  });
-};
-var isSameItem = function isSameItem(leftItem, rightItem) {
-  if (leftItem.type !== rightItem.type) {
-    return false;
-  }
-  switch (leftItem.type) {
-    case 'button':
-      // Need to typecast `rightItem as typeof leftItem` otherwise we will
-      // have to put the `type !==` inside each case.
-      return compareItemWithKeys(leftItem, rightItem, ['type', 'onClick', 'onMouseEnter', 'onMouseLeave']);
-    case 'copy-button':
-      return compareItemWithKeys(leftItem, rightItem, ['type', 'items']);
-    case 'input':
-      return compareItemWithKeys(leftItem, rightItem, ['type', 'onSubmit', 'onBlur']);
-    case 'select':
-      if (makeSameType(leftItem, rightItem) && Array.isArray(leftItem.options) && Array.isArray(rightItem.options) && !(0, _utils.compareArrays)(leftItem.options, rightItem.options, function (left, right) {
-        return compareItemWithKeys(left, right);
-      })) {
-        return false;
-      }
-      return compareItemWithKeys(leftItem, rightItem, ['type', 'onChange', 'options']);
-    case 'dropdown':
-      if (makeSameType(leftItem, rightItem) && Array.isArray(leftItem.options) && Array.isArray(rightItem.options) &&
-      // @ts-expect-error TS2345: Argument of type 'DropdownOptionT<Function>[]' is not assignable to parameter of type 'any[][]'
-      !(0, _utils.compareArrays)(leftItem.options, rightItem.options, function (left, right) {
-        return (
-          // @ts-expect-error  TS2322: Type '"onClick"' is not assignable to type 'keyof any[]'
-          compareItemWithKeys(left, right, ['onClick'])
-        );
-      })) {
-        return false;
-      }
-      return compareItemWithKeys(leftItem, rightItem, ['type', 'options']);
-    case 'custom':
-      return false;
-    case 'separator':
-      return compareItemWithKeys(leftItem, rightItem);
-    case 'extensions-placeholder':
-      return compareItemWithKeys(leftItem, rightItem);
-  }
-};
-exports.isSameItem = isSameItem;
-var areSameItems = function areSameItems(leftArr, rightArr) {
-  if (leftArr === undefined && rightArr === undefined) {
-    return true;
-  }
-  if (leftArr === undefined || rightArr === undefined) {
-    return false;
-  }
-  if (leftArr.length !== rightArr.length) {
-    return false;
-  }
-  return leftArr.every(function (item, index) {
-    return isSameItem(rightArr[index], item);
-  });
-};
-exports.areSameItems = areSameItems;
 var Toolbar = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(Toolbar, _Component);
   var _super = _createSuper(Toolbar);

package/dist/cjs/plugins/floating-toolbar/utils.js

@@ -3,49 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.compareArrays = void 0;
 exports.findNode = findNode;
-exports.shallowEqual = void 0;
-var shallowEqual = function shallowEqual(objA, objB) {
-  if (objA === objB) {
-    return true;
-  }
-  if (objA == null || objB == null) {
-    return false;
-  }
-  var keysA = Object.keys(objA);
-  var keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) {
-    return false;
-  }
-  var bHasOwnProperty = Object.prototype.hasOwnProperty.bind(objB);
-  for (var idx = 0; idx < keysA.length; idx++) {
-    var key = keysA[idx];
-    if (!bHasOwnProperty(key)) {
-      return false;
-    }
-    if (objA[key] !== objB[key]) {
-      return false;
-    }
-  }
-  return true;
-};
-exports.shallowEqual = shallowEqual;
-var compareArrays = function compareArrays(left, right) {
-  var compareFn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : shallowEqual;
-  if (left.length !== right.length) {
-    return false;
-  }
-  for (var idx = 0; idx < left.length; idx++) {
-    if (!compareFn(left[idx], right[idx])) {
-      return false;
-    }
-  }
-  return true;
-};
-
 // find node in descendants by condition
-exports.compareArrays = compareArrays;
 function findNode(parent, predicate) {
   var matchedNode;
   parent.descendants(function (node) {

package/dist/cjs/plugins/index.js

@@ -29,12 +29,6 @@ Object.defineProperty(exports, "avatarGroupPlugin", {
     return _avatarGroup.default;
   }
 });
-Object.defineProperty(exports, "basePlugin", {
-  enumerable: true,
-  get: function get() {
-    return _base.basePlugin;
-  }
-});
 Object.defineProperty(exports, "beforePrimaryToolbarPlugin", {
   enumerable: true,
   get: function get() {
@@ -317,7 +311,6 @@ Object.defineProperty(exports, "viewUpdateSubscriptionPlugin", {
     return _viewUpdateSubscription.default;
   }
 });
-var _base = require("./base");
 var _betterTypeHistory = _interopRequireDefault(require("./better-type-history"));
 var _clearMarksOnChangeToEmptyDocument = _interopRequireDefault(require("./clear-marks-on-change-to-empty-document"));
 var _codeBlock = _interopRequireDefault(require("./code-block"));

package/dist/cjs/plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates.js

@@ -4,10 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.subscribeToToolbarAndPickerUpdates = void 0;
-var _pluginKey = require("../../date/pm-plugins/plugin-key");
-var _floatingToolbar = require("../../floating-toolbar");
-var _pluginKey2 = require("../../status/plugin-key");
-var _Toolbar = require("../../floating-toolbar/ui/Toolbar");
+var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _utils = require("../../type-ahead/utils");
 var _ = require("..");
 var areToolbarsSame = function areToolbarsSame(left, right) {
@@ -27,7 +24,7 @@ var areToolbarsSame = function areToolbarsSame(left, right) {
   }
   var leftItems = Array.isArray(leftConfig.items) ? leftConfig.items : leftConfig.items(left.node);
   var rightItems = Array.isArray(rightConfig.items) ? rightConfig.items : rightConfig.items(right.node);
-  return (0, _Toolbar.areSameItems)(leftItems, rightItems);
+  return (0, _floatingToolbar.areSameItems)(leftItems, rightItems);
 };
 var subscribeToToolbarAndPickerUpdates = function subscribeToToolbarAndPickerUpdates(editorView, cb) {
   var lastUpdatedState = null;
@@ -39,16 +36,36 @@ var subscribeToToolbarAndPickerUpdates = function subscribeToToolbarAndPickerUpd
     if ((0, _utils.isTypeAheadOpen)(newEditorState)) {
       return;
     }
-    var dateState = _pluginKey.pluginKey.getState(newEditorState);
-    var statusState = _pluginKey2.pluginKey.getState(newEditorState);
-    var _ref2 = _floatingToolbar.pluginKey.getState(newEditorState),
+
+    // Creating fake plugin keys for these plugins for the mean time until all these plugins are extracted.
+    var datePluginKey = {
+      key: 'datePlugin$',
+      getState: function getState(state) {
+        return state['datePlugin$'];
+      }
+    };
+    var statusPluginKey = {
+      key: 'statusPlugin$',
+      getState: function getState(state) {
+        return state['statusPlugin$'];
+      }
+    };
+    var floatingToolbarPluginKey = {
+      key: 'floatingToolbarPluginKey$',
+      getState: function getState(state) {
+        return state['floatingToolbarPluginKey$'];
+      }
+    };
+    var dateState = datePluginKey.getState(newEditorState);
+    var statusState = statusPluginKey.getState(newEditorState);
+    var _ref2 = floatingToolbarPluginKey.getState(newEditorState),
       getConfigWithNodeInfo = _ref2.getConfigWithNodeInfo;
     var toolbarConfig = getConfigWithNodeInfo(newEditorState);
     var shouldCallback = false;
     if (lastUpdatedState) {
-      var oldDateState = _pluginKey.pluginKey.getState(lastUpdatedState);
-      var oldStatusState = _pluginKey2.pluginKey.getState(lastUpdatedState);
-      var _ref3 = _floatingToolbar.pluginKey.getState(lastUpdatedState),
+      var oldDateState = datePluginKey.getState(lastUpdatedState);
+      var oldStatusState = statusPluginKey.getState(lastUpdatedState);
+      var _ref3 = floatingToolbarPluginKey.getState(lastUpdatedState),
         getOldConfigWithNodeInfo = _ref3.getConfigWithNodeInfo;
       var oldToolbarConfig = getOldConfigWithNodeInfo(lastUpdatedState);
       var isToolbarEqual = areToolbarsSame(toolbarConfig, oldToolbarConfig);

package/dist/cjs/test-utils.js

@@ -39,7 +39,7 @@ var _preset = require("@atlaskit/editor-common/preset");
 var _createSchema = require("./create-editor/create-schema");
 var _sortByOrder = require("./create-editor/sort-by-order");
 var _pluginKey = require("./plugins/analytics/plugin-key");
-var _base = require("./plugins/base");
+var _editorPluginBase = require("@atlaskit/editor-plugin-base");
 var _api = require("./plugins/type-ahead/api");
 var _eventDispatcher = require("./event-dispatcher");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -104,7 +104,7 @@ var createPMSchemaAndPlugins = function createPMSchemaAndPlugins() {
   var inputPreset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new _preset.EditorPresetBuilder();
   return function (pluginFactoryParams) {
     var editorPlugins = [];
-    var preset = inputPreset.has(_base.basePlugin) ? inputPreset : inputPreset.add(_base.basePlugin);
+    var preset = inputPreset.has(_editorPluginBase.basePlugin) ? inputPreset : inputPreset.add(_editorPluginBase.basePlugin);
     editorPlugins = preset.build({
       pluginInjectionAPI: pluginFactoryParams.pluginInjectionAPI
     });

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

@@ -15,7 +15,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _ui = require("@atlaskit/editor-common/ui");
 var _react = _interopRequireDefault(require("react"));
 var _editor = _interopRequireDefault(require("../../editor"));
-var _editorNext = _interopRequireDefault(require("../../editor-next"));
+var _composableEditor = require("../../composable-editor");
 var _EditorWithActions = _interopRequireDefault(require("../../labs/EditorWithActions"));
 var _ChromeCollapsed = _interopRequireDefault(require("../ChromeCollapsed"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -52,10 +52,10 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
       var child = _react.default.Children.only(this.props.children);
-      if (child.type !== _editor.default && child.type !== _EditorWithActions.default && child.type !== _editorNext.default) {
+      if (child.type !== _editor.default && child.type !== _EditorWithActions.default && child.type !== _composableEditor.ComposableEditor) {
         throw new Error('Expected child to be of type `Editor`');
       }
-      this.functionalEditor = child.type === _editorNext.default;
+      this.functionalEditor = child.type === _composableEditor.ComposableEditor;
       if (!this.props.isExpanded) {
         return /*#__PURE__*/_react.default.createElement(_ui.IntlProviderIfMissingWrapper, null, /*#__PURE__*/_react.default.createElement(_ChromeCollapsed.default, {
           onFocus: this.props.onFocus,

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.47.9";
+var version = "187.48.2";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/{editor-next → composable-editor}/editor-internal.js

@@ -12,34 +12,12 @@ import { ContextAdapter } from '../nodeviews/context-adapter';
 import EditorContext from '../ui/EditorContext';
 import { useSetPresetContext } from '../presets/context';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
-import useMeasureEditorMountTime from './hooks/useMeasureEditorMountTime';
-import useProviderFactory from './hooks/useProviderFactory';
 import { getBaseFontSize } from './utils/getBaseFontSize';
-/**
- * EditorInternal is used for the internal editor react component
- * with the lifecycle methods extracted into hooks.
- */
-export default function EditorInternal(props) {
-  const {
-    props: editorProps,
-    getExperienceStore,
-    editorActions,
-    createAnalyticsEvent
-  } = props;
-  useMeasureEditorMountTime(editorProps, getExperienceStore, createAnalyticsEvent);
-  const providerFactory = useProviderFactory(editorProps, editorActions, createAnalyticsEvent);
-  const updatedProps = {
-    ...props,
-    providerFactory
-  };
-  return jsx(EditorInternalWithoutHooks, updatedProps);
-}
-
 /**
  * EditorInternalComponent is used to capture the common component
  * from the `render` method of `Editor` and share it with `EditorNext`.
  */
-export function EditorInternalWithoutHooks({
+export function EditorInternal({
   props,
   handleAnalyticsEvent,
   createAnalyticsEvent,