@atlaskit/editor-plugin-insert-block 27.0.4 → 27.0.6

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

@@ -11,13 +11,15 @@ import React from 'react';
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports */
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { Popup, TableSelectorPopup } from '@atlaskit/editor-common/ui';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import Popup from '@atlaskit/editor-common/Popup';
+import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import { TableSelectorPopup } from '@atlaskit/editor-common/TableSelector';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import withOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // Ignored via go/ees005

package/dist/es2019/ui/ToolbarInsertBlock/item.js

@@ -8,7 +8,7 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import memoizeOne from 'memoize-one';
 import { addLink, getAriaKeyshortcuts, toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 import FieldTextIcon from '@atlaskit/icon-lab/core/field-text';
 import LozengeIcon from '@atlaskit/icon-lab/core/lozenge';
 import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';

package/dist/es2019/ui/registered-insert-menu/RegisteredInsertButton.js

@@ -1,12 +1,13 @@
 import React, { useCallback, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { getAriaKeyshortcuts, insertElements, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import Popup from '@atlaskit/editor-common/Popup';
 import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
-import { TOOLBAR_BUTTON_TEST_ID, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { AddIcon } from '@atlaskit/editor-toolbar/add-icon';
 import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';

package/dist/es2019/ui/registered-insert-menu/RegisteredInsertMenu.js

@@ -4,7 +4,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { getDocument } from '@atlaskit/browser-apis';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { MENU } from '@atlaskit/editor-common/quick-insert/keys';
 import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, getQuickInsertMenuRows, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
@@ -21,6 +21,7 @@ const styles = {
 export const RegisteredInsertMenu = ({
   components,
   emptyStateHandler,
+  getItemRank,
   editorView,
   isOffline,
   maxHeight = DEFAULT_MENU_MAX_HEIGHT,
@@ -55,13 +56,14 @@ export const RegisteredInsertMenu = ({
   const hasSectionOverflowItems = useMemo(() => components.some(({
     key
   }) => isSectionOverflowItemKey(key)), [components]);
-  const model = useMemo(() => query === '' ? buildQuickInsertMenuModel(components, MENU, hasSectionOverflowItems ? selectQuickInsertCategoryItems : undefined, surfaceContext) : getMatchingQuickInsertComponents({
+  const model = useMemo(() => query === '' ? buildQuickInsertMenuModel(components, MENU, hasSectionOverflowItems ? selectQuickInsertCategoryItems : undefined, surfaceContext, getItemRank) : getMatchingQuickInsertComponents({
     components,
     formatMessage,
     query,
     rootComponent: MENU,
-    surfaceContext
-  }), [components, formatMessage, hasSectionOverflowItems, query, surfaceContext]);
+    surfaceContext,
+    getItemRank
+  }), [components, formatMessage, getItemRank, hasSectionOverflowItems, query, surfaceContext]);
   const selectableItems = useMemo(() => getQuickInsertMenuRows(model).filter(row => row.type === 'menu-item'), [model]);
   const itemCount = selectableItems.length + (model.footer ? 1 : 0);
   const selectableItemKeys = useMemo(() => [...selectableItems, ...(model.footer ? [model.footer] : [])].map(({

package/dist/es2019/ui/registered-insert-menu/RegisteredInsertMenuContent.js

@@ -1,6 +1,7 @@
 import React, { useCallback, useContext, useState } from 'react';
 import { MENU } from '@atlaskit/editor-common/quick-insert/keys';
-import { PlainOutsideClickTargetRefContext, withOuterListeners } from '@atlaskit/editor-common/ui';
+import { PlainOutsideClickTargetRefContext } from '@atlaskit/editor-common/ui';
+import withOuterListeners from '@atlaskit/editor-common/with-outer-listeners';
 import { RegisteredInsertMenu } from './RegisteredInsertMenu';
 const RegisteredInsertMenuContainer = ({
   children
@@ -21,7 +22,7 @@ export const RegisteredInsertMenuContent = ({
   onSelect,
   target
 }) => {
-  var _api$quickInsert, _api$quickInsert$shar;
+  var _api$quickInsert, _api$quickInsert$shar, _api$quickInsert2, _api$quickInsert2$sha;
   // Keep registrations stable while the open menu is searched or navigated.
   const [components] = useState(() => {
     var _api$uiControlRegistr, _api$uiControlRegistr2;
@@ -39,6 +40,7 @@ export const RegisteredInsertMenuContent = ({
     components: components,
     editorView: editorView,
     emptyStateHandler: api === null || api === void 0 ? void 0 : (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 ? void 0 : (_api$quickInsert$shar = _api$quickInsert.sharedState.currentState()) === null || _api$quickInsert$shar === void 0 ? void 0 : _api$quickInsert$shar.emptyStateHandler,
+    getItemRank: api === null || api === void 0 ? void 0 : (_api$quickInsert2 = api.quickInsert) === null || _api$quickInsert2 === void 0 ? void 0 : (_api$quickInsert2$sha = _api$quickInsert2.sharedState.currentState()) === null || _api$quickInsert2$sha === void 0 ? void 0 : _api$quickInsert2$sha.getItemRank,
     isOffline: isOffline,
     maxHeight: maxHeight,
     onClose: onClose,

package/dist/es2019/ui/registered-insert-menu/RegisteredInsertMenuItem.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { insertSelectedItem } from '@atlaskit/editor-common/insert';
 import { QuickInsertProvider } from '@atlaskit/editor-common/quick-insert/provider';
 export const RegisteredInsertMenuItem = ({

package/dist/es2019/ui/toolbar-components/CodeBlockButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolTipContent, getAriaKeyshortcuts, toggleCodeBlock } from '@atlaskit/editor-common/keymaps';
-import { blockTypeMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, CodeIcon } from '@atlaskit/editor-toolbar';
+import { messages as blockTypeMessages } from '@atlaskit/editor-common/messages/block-type';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { CodeIcon } from '@atlaskit/editor-toolbar/code-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const CodeBlockButton = ({
   api
 }) => {

package/dist/es2019/ui/toolbar-components/EmojiButton.js

@@ -1,10 +1,13 @@
 import React, { useRef } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolTipContent, insertEmoji } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, EmojiIcon, useToolbarUI } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { EmojiIcon } from '@atlaskit/editor-toolbar/emoji-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
 import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';
 import { EmojiPickerPopup } from './popups/EmojiPickerPopup';
 export const EmojiButton = ({

package/dist/es2019/ui/toolbar-components/ImageButton.js

@@ -1,10 +1,13 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar, TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { ToolbarButton, ToolbarTooltip, ImageIcon } from '@atlaskit/editor-toolbar';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ImageIcon } from '@atlaskit/editor-toolbar/image-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const ImageButton = ({
   api
 }) => {

package/dist/es2019/ui/toolbar-components/InsertButton.js

@@ -1,13 +1,17 @@
 import React, { useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { getAriaKeyshortcuts, insertElements, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { TOOLBAR_BUTTON_TEST_ID, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { ToolbarButton, ToolbarTooltip, AddIcon, useToolbarUI } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import Popup from '@atlaskit/editor-common/Popup';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
+import { AddIcon } from '@atlaskit/editor-toolbar/add-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
 import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
 import { LINK_BUTTON_KEY } from './hooks/filterDropdownItems';
 import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';

package/dist/es2019/ui/toolbar-components/LayoutButton.js

@@ -1,9 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar, TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, LayoutIcon } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { LayoutIcon } from '@atlaskit/editor-toolbar/layout-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const LayoutButton = ({
   api
 }) => {

package/dist/es2019/ui/toolbar-components/MediaButton.js

@@ -1,11 +1,14 @@
 import React, { useRef } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { ToolbarButton, ToolbarTooltip, ImageIcon, useToolbarUI } from '@atlaskit/editor-toolbar';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ImageIcon } from '@atlaskit/editor-toolbar/image-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export const MediaButton = ({
   api

package/dist/es2019/ui/toolbar-components/MentionButton.js

@@ -1,11 +1,13 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolTipContent, insertMention } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, MentionIcon } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { MentionIcon } from '@atlaskit/editor-toolbar/mention-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export const MentionButton = ({
   api

package/dist/es2019/ui/toolbar-components/TableButton.js

@@ -1,10 +1,13 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolTipContent, getAriaKeyshortcuts, toggleTable } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar, TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, TableIcon } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { TableIcon } from '@atlaskit/editor-toolbar/table-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const TableButton = ({
   api
 }) => {

package/dist/es2019/ui/toolbar-components/TableSizePicker.js

@@ -1,8 +1,11 @@
 import React, { useRef } from 'react';
 import { useIntl } from 'react-intl';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
-import { MoreItemsIcon, ToolbarButton, ToolbarTooltip, useToolbarUI } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { MoreItemsIcon } from '@atlaskit/editor-toolbar/more-items-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
 import { useTableSelectorPopup } from './hooks/useTableSelectorPopup';
 import { TableSelectorPopupWrapper } from './popups/TableSelectorPopupWrapper';
 export const TableSizePicker = ({

package/dist/es2019/ui/toolbar-components/TaskListButton.js

@@ -1,10 +1,13 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolTipContent, insertTaskList } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { TOOLBAR_BUTTON_TEST_ID, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, TaskIcon } from '@atlaskit/editor-toolbar';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { TaskIcon } from '@atlaskit/editor-toolbar/task-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const TaskListButton = ({
   api
 }) => {

package/dist/es2019/ui/toolbar-components/hooks/useEmojiPickerPopup.js

@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { usePopupManager } from './usePopupManager';
 export const useEmojiPickerPopup = ({
   api,

package/dist/es2019/ui/toolbar-components/hooks/useInsertButtonState.js

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
 import { createItems } from '../../ToolbarInsertBlock/create-items';
 import { filterDropdownItemsByBreakpoint } from './filterDropdownItems';
 export const useInsertButtonState = ({

package/dist/es2019/ui/toolbar-components/hooks/useTableSelectorPopup.js

@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { usePopupManager } from './usePopupManager';
 export const useTableSelectorPopup = ({
   api,

package/dist/es2019/ui/toolbar-components/popups/EmojiPickerPopup.js

@@ -1,7 +1,8 @@
 import React from 'react';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import Popup from '@atlaskit/editor-common/Popup';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import withOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
 const EmojiPicker = props => {
   const setOutsideClickTargetRef = React.useContext(OutsideClickTargetRefContext);

package/dist/es2019/ui/toolbar-components/popups/TableSelectorPopupWrapper.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TableSelectorPopup } from '@atlaskit/editor-common/ui';
+import { TableSelectorPopup } from '@atlaskit/editor-common/TableSelector';
 export const TableSelectorPopupWrapper = ({
   isOpen,
   targetRef,

package/dist/es2019/ui/toolbar-components.js

@@ -1,6 +1,8 @@
 import React from 'react';
-import { INSERT_BLOCK_SECTION, TASK_LIST_GROUP, MEDIA_GROUP, INSERT_BLOCK_SECTION_RANK, TASK_LIST_BUTTON, TASK_LIST_GROUP_RANK, MEDIA_BUTTON, MENTION_GROUP, MEDIA_GROUP_RANK, MENTION_BUTTON, MENTION_GROUP_RANK, EMOJI_GROUP, EMOJI_BUTTON, EMOJI_GROUP_RANK, LAYOUT_GROUP, LAYOUT_BUTTON, LAYOUT_GROUP_RANK, TABLE_GROUP_RANK, TABLE_BUTTON, TABLE_GROUP, TABLE_SIZE_PICKER, INSERT_GROUP, INSERT_BUTTON, INSERT_GROUP_RANK, CODE_BLOCK_GROUP, CODE_BLOCK_BUTTON, CODE_BLOCK_GROUP_RANK } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { INSERT_BLOCK_SECTION, TASK_LIST_GROUP, MEDIA_GROUP, TASK_LIST_BUTTON, MEDIA_BUTTON, MENTION_GROUP, MENTION_BUTTON, EMOJI_GROUP, EMOJI_BUTTON, LAYOUT_GROUP, LAYOUT_BUTTON, TABLE_BUTTON, TABLE_GROUP, TABLE_SIZE_PICKER, INSERT_GROUP, INSERT_BUTTON, CODE_BLOCK_GROUP, CODE_BLOCK_BUTTON } from '@atlaskit/editor-common/toolbar/keys';
+import { INSERT_BLOCK_SECTION_RANK, TASK_LIST_GROUP_RANK, MEDIA_GROUP_RANK, MENTION_GROUP_RANK, EMOJI_GROUP_RANK, LAYOUT_GROUP_RANK, TABLE_GROUP_RANK, INSERT_GROUP_RANK, CODE_BLOCK_GROUP_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { RegisteredInsertButton } from './registered-insert-menu/RegisteredInsertButton';
 import { CodeBlockButton } from './toolbar-components/CodeBlockButton';

package/dist/esm/insertBlockPlugin.js

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { ElementBrowser } from '@atlaskit/editor-common/element-browser';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import ElementBrowser from '@atlaskit/editor-common/element-browser/ElementBrowserLoader';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts/block-types';
 import { getToolbarActionExperiencesPlugin } from './pm-plugins/experiences/toolbar-action-experiences';
 import { toggleInsertBlockPmKey, toggleInsertBlockPmPlugin } from './pm-plugins/toggleInsertBlock';
 import { getToolbarComponents } from './ui/toolbar-components';

package/dist/esm/pm-plugins/experiences/toolbar-action-experiences.js

@@ -1,9 +1,14 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { bind } from 'bind-event-listener';
 import { getDocument } from '@atlaskit/browser-apis';
-import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckPopupMutation, ExperienceCheckTimeout, getSelectionAncestorDOM } from '@atlaskit/editor-common/experiences';
+import { getSelectionAncestorDOM } from '@atlaskit/editor-common/experiences';
+import { EXPERIENCE_ID } from '@atlaskit/editor-common/experiences/consts';
+import { Experience } from '@atlaskit/editor-common/experiences/Experience';
+import { ExperienceCheckDomMutation } from '@atlaskit/editor-common/experiences/ExperienceCheckDomMutation';
+import { ExperienceCheckPopupMutation } from '@atlaskit/editor-common/experiences/ExperienceCheckPopupMutation';
+import { ExperienceCheckTimeout } from '@atlaskit/editor-common/experiences/ExperienceCheckTimeout';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { handleEditorNodeInsertDomMutation, isToolbarButtonClick } from './toolbar-experience-utils';
 var pluginKey = new PluginKey('toolbarActionExperiences');

package/dist/esm/ui/ElementBrowser/InsertMenu.js

@@ -16,12 +16,14 @@ import { useCallback, useContext, useLayoutEffect, useMemo, useState } from 'rea
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports, jsdoc/require-description -- Ignored via go/DSP-18766; jsdoc debt surfaced by this mechanical PR */
 import { css, jsx } from '@emotion/react';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { ELEMENT_ITEM_HEIGHT, ElementBrowser } from '@atlaskit/editor-common/element-browser';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/assets';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { ELEMENT_ITEM_HEIGHT } from '@atlaskit/editor-common/element-browser/constants';
+import ElementBrowser from '@atlaskit/editor-common/element-browser/ElementBrowserLoader';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import withOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 export var DEFAULT_HEIGHT = 560;
 
 /**

package/dist/esm/ui/ElementRail/useInsertMenuRailItems.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { createItems } from '../ToolbarInsertBlock/create-items';
 var selector = function selector(states) {
   var _states$dateState, _states$hyperlinkStat, _states$hyperlinkStat2, _states$typeAheadStat, _states$blockTypeStat, _states$imageUploadSt, _states$placeholderTe, _states$emojiState, _states$mentionState, _states$mentionState2, _states$mediaState;

package/dist/esm/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
+import Popup from '@atlaskit/editor-common/Popup';
 import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
-import { Popup } from '@atlaskit/editor-common/ui';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
 import { RegisteredInsertMenuContent } from '../registered-insert-menu/RegisteredInsertMenuContent';

package/dist/esm/ui/ToolbarInsertBlock/create-items.js

@@ -6,7 +6,8 @@ import React from 'react';
 import memoize from 'lodash/memoize';
 import memoizeOne from 'memoize-one';
 import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { blockTypeMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { messages as blockTypeMessages } from '@atlaskit/editor-common/messages/block-type';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { action, blockquote, codeblock, date, decision, emoji, expand, horizontalrule, imageUpload, layout, link, media, mention, panel, placeholder, status, table, tableSelector } from './item';
 import { shallowEquals } from './shallow-equals';
 var buttonToItem = memoize(function (button) {

package/dist/esm/ui/ToolbarInsertBlock/dropdown-button.js

@@ -7,7 +7,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
 import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import AddIcon from '@atlaskit/icon/core/add';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import { triggerWrapper } from './styles';

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

@@ -26,13 +26,15 @@ import React from 'react';
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports */
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { Popup, TableSelectorPopup } from '@atlaskit/editor-common/ui';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import Popup from '@atlaskit/editor-common/Popup';
+import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import { TableSelectorPopup } from '@atlaskit/editor-common/TableSelector';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import withOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // Ignored via go/ees005

package/dist/esm/ui/ToolbarInsertBlock/item.js

@@ -8,7 +8,7 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import memoizeOne from 'memoize-one';
 import { addLink, getAriaKeyshortcuts, toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 import FieldTextIcon from '@atlaskit/icon-lab/core/field-text';
 import LozengeIcon from '@atlaskit/icon-lab/core/lozenge';
 import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';

package/dist/esm/ui/registered-insert-menu/RegisteredInsertButton.js

@@ -1,13 +1,14 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
 import { getAriaKeyshortcuts, insertElements, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import Popup from '@atlaskit/editor-common/Popup';
 import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
-import { TOOLBAR_BUTTON_TEST_ID, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { AddIcon } from '@atlaskit/editor-toolbar/add-icon';
 import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';

package/dist/esm/ui/registered-insert-menu/RegisteredInsertMenu.js

@@ -6,7 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { getDocument } from '@atlaskit/browser-apis';
-import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
 import { MENU } from '@atlaskit/editor-common/quick-insert/keys';
 import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, getQuickInsertMenuRows, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
@@ -23,6 +23,7 @@ var styles = {
 export var RegisteredInsertMenu = function RegisteredInsertMenu(_ref) {
   var components = _ref.components,
     emptyStateHandler = _ref.emptyStateHandler,
+    getItemRank = _ref.getItemRank,
     editorView = _ref.editorView,
     isOffline = _ref.isOffline,
     _ref$maxHeight = _ref.maxHeight,
@@ -75,14 +76,15 @@ export var RegisteredInsertMenu = function RegisteredInsertMenu(_ref) {
     });
   }, [components]);
   var model = useMemo(function () {
-    return query === '' ? buildQuickInsertMenuModel(components, MENU, hasSectionOverflowItems ? selectQuickInsertCategoryItems : undefined, surfaceContext) : getMatchingQuickInsertComponents({
+    return query === '' ? buildQuickInsertMenuModel(components, MENU, hasSectionOverflowItems ? selectQuickInsertCategoryItems : undefined, surfaceContext, getItemRank) : getMatchingQuickInsertComponents({
       components: components,
       formatMessage: formatMessage,
       query: query,
       rootComponent: MENU,
-      surfaceContext: surfaceContext
+      surfaceContext: surfaceContext,
+      getItemRank: getItemRank
     });
-  }, [components, formatMessage, hasSectionOverflowItems, query, surfaceContext]);
+  }, [components, formatMessage, getItemRank, hasSectionOverflowItems, query, surfaceContext]);
   var selectableItems = useMemo(function () {
     return getQuickInsertMenuRows(model).filter(function (row) {
       return row.type === 'menu-item';