@atlaskit/editor-core 187.47.9 → 187.48.2

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

@@ -6,7 +6,7 @@ import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-con
 import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { getAnalyticsAppearance, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
-import { basePlugin } from '../plugins';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import EditorActions from '../actions';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import { name, version } from '../version-wrapper';
@@ -14,10 +14,16 @@ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { useConstructor } from '@atlaskit/editor-common/hooks';
 import { useEditorContext } from '../ui/EditorContext';
 import measurements from '../utils/performance/measure-enum';
-import EditorInternal from './editor-internal';
+import { EditorInternal } from './editor-internal';
 import sendDurationAnalytics from './utils/sendDurationAnalytics';
 import trackEditorActions from './utils/trackEditorActions';
-export function Editor(passedProps) {
+import useMeasureEditorMountTime from './hooks/useMeasureEditorMountTime';
+import useProviderFactory from './hooks/useProviderFactory';
+
+/**
+ * Editor wrapper that deals with the lifecycle logic of the editor
+ */
+function Editor(passedProps) {
   var _editorContext$editor;
   const defaultProps = {
     appearance: 'comment',
@@ -61,6 +67,8 @@ export function Editor(passedProps) {
     editorActions.current._privateUnregisterEditor();
     (_props$onDestroy = props.onDestroy) === null || _props$onDestroy === void 0 ? void 0 : _props$onDestroy.call(props);
   };
+  useMeasureEditorMountTime(props, getExperienceStore, createAnalyticsEvent);
+  const providerFactory = useProviderFactory(props, editorActions.current, createAnalyticsEvent);
   return jsx(EditorInternal, {
     props: props,
     handleAnalyticsEvent: handleAnalyticsEvent,
@@ -71,12 +79,12 @@ export 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
   });
 }
-export default function EditorNext(props) {
+export function ComposableEditor(props) {
   const editorSessionId = useRef(uuid());
   return jsx(FabricEditorAnalyticsContext, {
     data: {
@@ -88,7 +96,7 @@ export default function EditorNext(props) {
     }
   }, jsx(Editor, props));
 }
-EditorNext.propTypes = {
+ComposableEditor.propTypes = {
   minHeight: ({
     appearance,
     minHeight

package/dist/es2019/composable-editor.js

@@ -1 +1 @@
-export { default as ComposableEditor } from './editor-next';
+export { ComposableEditor } from './composable-editor/editor';

package/dist/es2019/editor.js

@@ -4,15 +4,15 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { jsx } from '@emotion/react';
 import editorDeprecationWarnings from './utils/editorDeprecationWarnings';
-import EditorNext from './editor-next';
+import { ComposableEditor } from './composable-editor';
 import useUniversalPreset from './labs/next/presets/useUniversalPreset';
-const EditorNextWrapper = ({
+const ComposableEditorWrapper = ({
   props
 }) => {
   const preset = useUniversalPreset({
     props
   });
-  return jsx(EditorNext, _extends({
+  return jsx(ComposableEditor, _extends({
     preset: preset
   }, props));
 };
@@ -22,7 +22,7 @@ export default class Editor extends React.Component {
     editorDeprecationWarnings(props);
   }
   render() {
-    return jsx(EditorNextWrapper, {
+    return jsx(ComposableEditorWrapper, {
       props: this.props
     });
   }

package/dist/es2019/index.js

@@ -41,7 +41,7 @@ export { commitStatusPicker, setStatusPickerAt, updateStatus, updateStatusWithAn
 export { typeAheadPluginKey } from './plugins/type-ahead';
 export { historyPluginKey } from './plugins/history';
 export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-export { setKeyboardHeight } from './plugins/base/commands';
+export { setKeyboardHeight } from '@atlaskit/editor-plugin-base';
 export { setMobilePaddingTop, setIsExpanded } from './plugins/mobile-dimensions/commands';
 
 // Used in editor-test-helpers and mobile bridge

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

@@ -7,7 +7,7 @@ import { hyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import { textFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import { unsupportedContentPlugin } from '@atlaskit/editor-plugin-unsupported-content';
-import { basePlugin } from '../../../plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';

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

@@ -8,7 +8,6 @@ import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { DN70 } from '@atlaskit/theme/colors';
-import { compareArrays, shallowEqual } from '../utils';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import { FloatingToolbarButton as Button, Announcer } from '@atlaskit/editor-common/ui';
 import Dropdown from './Dropdown';
@@ -16,6 +15,7 @@ import Select from './Select';
 import Separator from './Separator';
 import Input from './Input';
 import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
+import { areSameItems } from '@atlaskit/editor-common/floating-toolbar';
 import { ColorPickerButton } from '@atlaskit/editor-common/ui-menu';
 import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
 import { EmojiPickerButton } from './EmojiPickerButton';
@@ -265,57 +265,6 @@ const toolbarOverflow = (scrollable, scrollDisabled, firstElementIsSelect) => cs
         display: flex;
       `}
 `;
-function makeSameType(_a, _b) {
-  return true;
-}
-const compareItemWithKeys = (leftItem, rightItem, excludedKeys = []) => Object.keys(leftItem).filter(key => excludedKeys.indexOf(key) === -1).every(key => leftItem[key] instanceof Object ? shallowEqual(leftItem[key], rightItem[key]) : leftItem[key] === rightItem[key]);
-export const 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) && !compareArrays(leftItem.options, rightItem.options, (left, right) => 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[][]'
-      !compareArrays(leftItem.options, rightItem.options, (left, right) =>
-      // @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);
-  }
-};
-export const 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((item, index) => isSameItem(rightArr[index], item));
-};
 class Toolbar extends Component {
   constructor(props) {
     super(props);

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

@@ -1,39 +1,3 @@
-export const shallowEqual = (objA, objB) => {
-  if (objA === objB) {
-    return true;
-  }
-  if (objA == null || objB == null) {
-    return false;
-  }
-  const keysA = Object.keys(objA);
-  const keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) {
-    return false;
-  }
-  const bHasOwnProperty = Object.prototype.hasOwnProperty.bind(objB);
-  for (let idx = 0; idx < keysA.length; idx++) {
-    const key = keysA[idx];
-    if (!bHasOwnProperty(key)) {
-      return false;
-    }
-    if (objA[key] !== objB[key]) {
-      return false;
-    }
-  }
-  return true;
-};
-export const compareArrays = (left, right, compareFn = shallowEqual) => {
-  if (left.length !== right.length) {
-    return false;
-  }
-  for (let idx = 0; idx < left.length; idx++) {
-    if (!compareFn(left[idx], right[idx])) {
-      return false;
-    }
-  }
-  return true;
-};
-
 // find node in descendants by condition
 export function findNode(parent, predicate) {
   let matchedNode;

package/dist/es2019/plugins/index.js

@@ -1,4 +1,3 @@
-export { basePlugin } from './base';
 export { default as betterTypeHistoryPlugin } from './better-type-history';
 export { default as clearMarksOnChangeToEmptyDocumentPlugin } from './clear-marks-on-change-to-empty-document';
 export { default as codeBlockPlugin } from './code-block';

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

@@ -1,7 +1,4 @@
-import { pluginKey as datePluginKey } from '../../date/pm-plugins/plugin-key';
-import { pluginKey as floatingToolbarPluginKey } from '../../floating-toolbar';
-import { pluginKey as statusPluginKey } from '../../status/plugin-key';
-import { areSameItems } from '../../floating-toolbar/ui/Toolbar';
+import { areSameItems } from '@atlaskit/editor-common/floating-toolbar';
 import { isTypeAheadOpen } from '../../type-ahead/utils';
 import { trackerStore } from '..';
 const areToolbarsSame = (left, right) => {
@@ -34,6 +31,26 @@ export const subscribeToToolbarAndPickerUpdates = (editorView, cb) => {
     if (isTypeAheadOpen(newEditorState)) {
       return;
     }
+
+    // Creating fake plugin keys for these plugins for the mean time until all these plugins are extracted.
+    const datePluginKey = {
+      key: 'datePlugin$',
+      getState: state => {
+        return state['datePlugin$'];
+      }
+    };
+    const statusPluginKey = {
+      key: 'statusPlugin$',
+      getState: state => {
+        return state['statusPlugin$'];
+      }
+    };
+    const floatingToolbarPluginKey = {
+      key: 'floatingToolbarPluginKey$',
+      getState: state => {
+        return state['floatingToolbarPluginKey$'];
+      }
+    };
     const dateState = datePluginKey.getState(newEditorState);
     const statusState = statusPluginKey.getState(newEditorState);
     const {

package/dist/es2019/test-utils.js

@@ -3,7 +3,7 @@ import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import { createSchema } from './create-editor/create-schema';
 import { sortByOrder } from './create-editor/sort-by-order';
 import { analyticsPluginKey } from './plugins/analytics/plugin-key';
-import { basePlugin } from './plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 export { createTypeAheadTools } from './plugins/type-ahead/api';
 export function getFireAnalytics(editorView) {
   var _analyticsPluginKey$g;

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
 import React from 'react';
 import Editor from '../../editor';
-import EditorNext from '../../editor-next';
+import { ComposableEditor } from '../../composable-editor';
 import EditorWithActions from '../../labs/EditorWithActions';
 import ChromeCollapsed from '../ChromeCollapsed';
 export default class CollapsedEditor extends React.Component {
@@ -24,10 +24,10 @@ export default class CollapsedEditor extends React.Component {
   }
   render() {
     const child = React.Children.only(this.props.children);
-    if (child.type !== Editor && child.type !== EditorWithActions && child.type !== EditorNext) {
+    if (child.type !== Editor && child.type !== EditorWithActions && child.type !== ComposableEditor) {
       throw new Error('Expected child to be of type `Editor`');
     }
-    this.functionalEditor = child.type === EditorNext;
+    this.functionalEditor = child.type === ComposableEditor;
     if (!this.props.isExpanded) {
       return /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(ChromeCollapsed, {
         onFocus: this.props.onFocus,

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.47.9";
+export const version = "187.48.2";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -15,31 +15,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) {
-  var editorProps = props.props,
-    getExperienceStore = props.getExperienceStore,
-    editorActions = props.editorActions,
-    createAnalyticsEvent = props.createAnalyticsEvent;
-  useMeasureEditorMountTime(editorProps, getExperienceStore, createAnalyticsEvent);
-  var providerFactory = useProviderFactory(editorProps, editorActions, createAnalyticsEvent);
-  var updatedProps = _objectSpread(_objectSpread({}, props), {}, {
-    providerFactory: 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(_ref) {
+export function EditorInternal(_ref) {
   var _props$performanceTra, _props$performanceTra2, _props$performanceTra3, _props$performanceTra4;
   var props = _ref.props,
     handleAnalyticsEvent = _ref.handleAnalyticsEvent,

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

@@ -9,7 +9,7 @@ import { FabricEditorAnalyticsContext } from '@atlaskit/analytics-namespaced-con
 import { ACTION, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { getAnalyticsAppearance, startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
-import { basePlugin } from '../plugins';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import EditorActions from '../actions';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import { name, version } from '../version-wrapper';
@@ -17,10 +17,16 @@ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { useConstructor } from '@atlaskit/editor-common/hooks';
 import { useEditorContext } from '../ui/EditorContext';
 import measurements from '../utils/performance/measure-enum';
-import EditorInternal from './editor-internal';
+import { EditorInternal } from './editor-internal';
 import sendDurationAnalytics from './utils/sendDurationAnalytics';
 import trackEditorActions from './utils/trackEditorActions';
-export function Editor(passedProps) {
+import useMeasureEditorMountTime from './hooks/useMeasureEditorMountTime';
+import useProviderFactory from './hooks/useProviderFactory';
+
+/**
+ * Editor wrapper that deals with the lifecycle logic of the editor
+ */
+function Editor(passedProps) {
   var _editorContext$editor;
   var defaultProps = {
     appearance: 'comment',
@@ -68,6 +74,8 @@ export function Editor(passedProps) {
     editorActions.current._privateUnregisterEditor();
     (_props$onDestroy = props.onDestroy) === null || _props$onDestroy === void 0 ? void 0 : _props$onDestroy.call(props);
   };
+  useMeasureEditorMountTime(props, getExperienceStore, createAnalyticsEvent);
+  var providerFactory = useProviderFactory(props, editorActions.current, createAnalyticsEvent);
   return jsx(EditorInternal, {
     props: props,
     handleAnalyticsEvent: handleAnalyticsEvent,
@@ -78,12 +86,12 @@ export 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
   });
 }
-export default function EditorNext(props) {
+export function ComposableEditor(props) {
   var editorSessionId = useRef(uuid());
   return jsx(FabricEditorAnalyticsContext, {
     data: {
@@ -95,7 +103,7 @@ export default function EditorNext(props) {
     }
   }, jsx(Editor, props));
 }
-EditorNext.propTypes = {
+ComposableEditor.propTypes = {
   minHeight: function minHeight(_ref) {
     var appearance = _ref.appearance,
       _minHeight = _ref.minHeight;

package/dist/esm/composable-editor.js

@@ -1 +1 @@
-export { default as ComposableEditor } from './editor-next';
+export { ComposableEditor } from './composable-editor/editor';

package/dist/esm/editor.js

@@ -11,14 +11,14 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { jsx } from '@emotion/react';
 import editorDeprecationWarnings from './utils/editorDeprecationWarnings';
-import EditorNext from './editor-next';
+import { ComposableEditor } from './composable-editor';
 import useUniversalPreset from './labs/next/presets/useUniversalPreset';
-var EditorNextWrapper = function EditorNextWrapper(_ref) {
+var ComposableEditorWrapper = function ComposableEditorWrapper(_ref) {
   var props = _ref.props;
   var preset = useUniversalPreset({
     props: props
   });
-  return jsx(EditorNext, _extends({
+  return jsx(ComposableEditor, _extends({
     preset: preset
   }, props));
 };
@@ -35,7 +35,7 @@ var Editor = /*#__PURE__*/function (_React$Component) {
   _createClass(Editor, [{
     key: "render",
     value: function render() {
-      return jsx(EditorNextWrapper, {
+      return jsx(ComposableEditorWrapper, {
         props: this.props
       });
     }

package/dist/esm/index.js

@@ -41,7 +41,7 @@ export { commitStatusPicker, setStatusPickerAt, updateStatus, updateStatusWithAn
 export { typeAheadPluginKey } from './plugins/type-ahead';
 export { historyPluginKey } from './plugins/history';
 export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-export { setKeyboardHeight } from './plugins/base/commands';
+export { setKeyboardHeight } from '@atlaskit/editor-plugin-base';
 export { setMobilePaddingTop, setIsExpanded } from './plugins/mobile-dimensions/commands';
 
 // Used in editor-test-helpers and mobile bridge

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

@@ -7,7 +7,7 @@ import { hyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import { textFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import { unsupportedContentPlugin } from '@atlaskit/editor-plugin-unsupported-content';
-import { basePlugin } from '../../../plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';

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

@@ -18,7 +18,6 @@ import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { DN70 } from '@atlaskit/theme/colors';
-import { compareArrays, shallowEqual } from '../utils';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import { FloatingToolbarButton as Button, Announcer } from '@atlaskit/editor-common/ui';
 import Dropdown from './Dropdown';
@@ -26,6 +25,7 @@ import Select from './Select';
 import Separator from './Separator';
 import Input from './Input';
 import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
+import { areSameItems } from '@atlaskit/editor-common/floating-toolbar';
 import { ColorPickerButton } from '@atlaskit/editor-common/ui-menu';
 import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
 import { EmojiPickerButton } from './EmojiPickerButton';
@@ -246,71 +246,6 @@ var toolbarContainer = function toolbarContainer(theme, scrollable, hasSelect, f
 var toolbarOverflow = function toolbarOverflow(scrollable, scrollDisabled, firstElementIsSelect) {
   return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  ", "\n"])), scrollable ? css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\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 ? css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n              overflow: hidden;\n            "]))) : css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n              overflow-x: auto;\n              overflow-y: hidden;\n            "]))), "var(--ds-space-050, 4px)", firstElementIsSelect ? css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n                  margin-left: ", ";\n                "])), "var(--ds-space-050, 4px)") : css(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n                  margin-left: ", ";\n                "])), "var(--ds-space-100, 8px)"), "var(--ds-space-100, 8px)") : css(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\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 ? shallowEqual(leftItem[key], rightItem[key]) : leftItem[key] === rightItem[key];
-  });
-};
-export 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) && !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[][]'
-      !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);
-  }
-};
-export 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);
-  });
-};
 var Toolbar = /*#__PURE__*/function (_Component) {
   _inherits(Toolbar, _Component);
   var _super = _createSuper(Toolbar);

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

@@ -1,40 +1,3 @@
-export 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;
-};
-export 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
 export function findNode(parent, predicate) {
   var matchedNode;

package/dist/esm/plugins/index.js

@@ -1,4 +1,3 @@
-export { basePlugin } from './base';
 export { default as betterTypeHistoryPlugin } from './better-type-history';
 export { default as clearMarksOnChangeToEmptyDocumentPlugin } from './clear-marks-on-change-to-empty-document';
 export { default as codeBlockPlugin } from './code-block';

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

@@ -1,7 +1,4 @@
-import { pluginKey as datePluginKey } from '../../date/pm-plugins/plugin-key';
-import { pluginKey as floatingToolbarPluginKey } from '../../floating-toolbar';
-import { pluginKey as statusPluginKey } from '../../status/plugin-key';
-import { areSameItems } from '../../floating-toolbar/ui/Toolbar';
+import { areSameItems } from '@atlaskit/editor-common/floating-toolbar';
 import { isTypeAheadOpen } from '../../type-ahead/utils';
 import { trackerStore } from '..';
 var areToolbarsSame = function areToolbarsSame(left, right) {
@@ -33,6 +30,26 @@ export var subscribeToToolbarAndPickerUpdates = function subscribeToToolbarAndPi
     if (isTypeAheadOpen(newEditorState)) {
       return;
     }
+
+    // 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),

package/dist/esm/test-utils.js

@@ -7,7 +7,7 @@ import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import { createSchema } from './create-editor/create-schema';
 import { sortByOrder } from './create-editor/sort-by-order';
 import { analyticsPluginKey } from './plugins/analytics/plugin-key';
-import { basePlugin } from './plugins/base';
+import { basePlugin } from '@atlaskit/editor-plugin-base';
 export { createTypeAheadTools } from './plugins/type-ahead/api';
 export function getFireAnalytics(editorView) {
   var _analyticsPluginKey$g;