@atlaskit/editor-core 184.0.0 → 185.0.0

package/dist/es2019/plugins/layout/index.js

@@ -4,11 +4,11 @@ import { default as createLayoutPlugin } from './pm-plugins/main';
 import { buildToolbar } from './toolbar';
 import { createDefaultLayoutSection } from './actions';
 import { IconLayout } from '../quick-insert/assets';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { pluginKey } from './pm-plugins/plugin-key';
 export { pluginKey };
-const layoutPlugin = (options = {}) => ({
+const layoutPlugin = (options = {}, api) => ({
   name: 'layout',
   nodes() {
     return [{
@@ -34,7 +34,8 @@ const layoutPlugin = (options = {}) => ({
         allowSingleColumnLayout
       } = pluginKey.getState(state);
       if (pos !== null) {
-        return buildToolbar(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout);
+        var _api$dependencies$dec;
+        return buildToolbar(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout, api === null || api === void 0 ? void 0 : (_api$dependencies$dec = api.dependencies.decorations.actions) === null || _api$dependencies$dec === void 0 ? void 0 : _api$dependencies$dec.hoverDecoration);
       }
       return undefined;
     },
@@ -48,8 +49,9 @@ const layoutPlugin = (options = {}) => ({
       priority: 1100,
       icon: () => /*#__PURE__*/React.createElement(IconLayout, null),
       action(insert, state) {
+        var _api$dependencies$ana, _api$dependencies$ana2;
         const tr = insert(createDefaultLayoutSection(state));
-        return addAnalytics(state, tr, {
+        api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : (_api$dependencies$ana2 = _api$dependencies$ana.actions) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.attachAnalyticsEvent({
           action: ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
@@ -57,7 +59,8 @@ const layoutPlugin = (options = {}) => ({
             inputMethod: INPUT_METHOD.QUICK_INSERT
           },
           eventType: EVENT_TYPE.TRACK
-        });
+        })(tr);
+        return tr;
       }
     }]
   }

package/dist/es2019/plugins/layout/toolbar.js

@@ -9,7 +9,6 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { toolbarMessages } from './toolbar-messages';
 import commonMessages from '../../messages';
 import { setPresetLayout, deleteActiveLayoutNode, getPresetLayout } from './actions';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 const LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
@@ -54,7 +53,7 @@ const buildLayoutButton = (intl, item, currentLayout) => ({
   tabIndex: null
 });
 export const layoutToolbarTitle = 'Layout floating controls';
-export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) => {
+export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout, hoverDecoration) => {
   const node = state.doc.nodeAt(pos);
   if (node) {
     const currentLayout = getPresetLayout(node);
@@ -71,10 +70,10 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       testId: commonMessages.remove.id,
       title: intl.formatMessage(commonMessages.remove),
       onClick: deleteActiveLayoutNode,
-      onMouseEnter: hoverDecoration(nodeType, true),
-      onMouseLeave: hoverDecoration(nodeType, false),
-      onFocus: hoverDecoration(nodeType, true),
-      onBlur: hoverDecoration(nodeType, false),
+      onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+      onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
+      onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
+      onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       tabIndex: null
     };
     const layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;

package/dist/es2019/plugins/media/toolbar/index.js

@@ -6,7 +6,6 @@ import DownloadIcon from '@atlaskit/icon/glyph/download';
 import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import commonMessages from '../../../messages';
 import { stateKey } from '../pm-plugins/plugin-key';
-import { hoverDecoration } from '../../base/pm-plugins/decoration';
 import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
 import buildLayoutButtons from '../../../ui/MediaAndEmbedsToolbar';
 import { getMediaLinkingState } from '../pm-plugins/linking';
@@ -14,7 +13,7 @@ import { getPluginState as getMediaAltTextPluginState } from '../pm-plugins/alt-
 import { altTextButton, getAltTextToolbar } from './alt-text';
 import { showLinkingToolbar } from '../commands/linking';
 import { LinkToolbarAppearance } from './linking-toolbar-appearance';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/media-ui';
 import { messages as cardMessages } from '../../card/messages';
 import { FilePreviewItem } from './filePreviewItem';
@@ -37,7 +36,7 @@ const handleRemoveMediaGroup = (state, dispatch) => {
   }
   return true;
 };
-const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
+const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration) => {
   const {
     mediaGroup
   } = state.schema.nodes;
@@ -102,17 +101,17 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState) => {
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(mediaGroup, true),
-    onMouseLeave: hoverDecoration(mediaGroup, false),
-    onFocus: hoverDecoration(mediaGroup, true),
-    onBlur: hoverDecoration(mediaGroup, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaGroup, false),
     title: intl.formatMessage(commonMessages.remove),
     onClick: handleRemoveMediaGroup,
     testId: 'media-toolbar-remove-button'
   }];
   return items;
 };
-const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState) => {
+const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration) => {
   const {
     mediaInline
   } = state.schema.nodes;
@@ -177,17 +176,18 @@ const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState) => {
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(mediaInline, true),
-    onMouseLeave: hoverDecoration(mediaInline, false),
-    onFocus: hoverDecoration(mediaInline, true),
-    onBlur: hoverDecoration(mediaInline, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaInline, false),
     title: intl.formatMessage(commonMessages.remove),
     onClick: removeInlineCard,
     testId: 'media-toolbar-remove-button'
   }];
   return items;
 };
-const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, widthPluginDependencyApi, getEditorFeatureFlags) => {
+const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) => {
+  var _pluginInjectionApi$d2;
   const {
     mediaSingle
   } = state.schema.nodes;
@@ -230,7 +230,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     });
   }
   if (allowAdvancedToolBarOptions) {
-    toolbarButtons = [...toolbarButtons, ...buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPluginDependencyApi, allowResizing, allowResizingInTables)];
+    toolbarButtons = [...toolbarButtons, ...buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, allowResizing, allowResizingInTables)];
     if (toolbarButtons.length) {
       toolbarButtons.push({
         type: 'separator'
@@ -253,16 +253,20 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             };
             const openLink = () => {
               if (editorView) {
+                var _pluginInjectionApi$d;
                 const {
-                  state,
+                  state: {
+                    tr
+                  },
                   dispatch
                 } = editorView;
-                dispatch(addAnalytics(state, state.tr, {
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.attachAnalyticsEvent({
                   eventType: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
                   actionSubjectId: ACTION_SUBJECT_ID.LINK
-                }));
+                })(tr);
+                dispatch(tr);
                 return true;
               }
             };
@@ -286,16 +290,19 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       type: 'separator'
     });
   }
+  const {
+    hoverDecoration
+  } = (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : {};
   const removeButton = {
     id: 'editor.media.delete',
     type: 'button',
     appearance: 'danger',
     focusEditoronEnter: true,
     icon: RemoveIcon,
-    onMouseEnter: hoverDecoration(mediaSingle, true),
-    onMouseLeave: hoverDecoration(mediaSingle, false),
-    onFocus: hoverDecoration(mediaSingle, true),
-    onBlur: hoverDecoration(mediaSingle, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false),
     title: intl.formatMessage(commonMessages.remove),
     onClick: remove,
     testId: 'media-toolbar-remove-button'
@@ -313,6 +320,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
   return items;
 };
 export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) => {
+  var _pluginInjectionApi$d3;
   const {
     media,
     mediaInline,
@@ -329,6 +337,9 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
   } = options;
   const mediaPluginState = stateKey.getState(state);
   const mediaLinkingState = getMediaLinkingState(state);
+  const {
+    hoverDecoration
+  } = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {};
   if (!mediaPluginState) {
     return;
   }
@@ -365,21 +376,21 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
       const selector = mediaFilmstripItemDOMSelector(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele2;
       const element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(`.${MediaInlineNodeSelector}`);
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
   } else {
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele3;
       const element = (_mediaPluginState$ele3 = mediaPluginState.element) === null || _mediaPluginState$ele3 === void 0 ? void 0 : _mediaPluginState$ele3.querySelector(`.${MediaSingleNodeSelector}`);
       return element || mediaPluginState.element;
     };
-    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, getEditorFeatureFlags);
+    items = generateMediaSingleFloatingToolbar(state, intl, options, mediaPluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags);
   }
   return {
     ...baseToolbar,

package/dist/es2019/plugins/panel/index.js

@@ -25,7 +25,7 @@ const insertPanelTypeWithAnalytics = (panelAttributes, state, insert) => {
   return tr;
 };
 const insertPanelType = (panelAttributes, state) => state.schema.nodes.panel.createChecked(panelAttributes, state.schema.nodes.paragraph.createChecked());
-const panelPlugin = (options = {}) => ({
+const panelPlugin = (options = {}, api) => ({
   name: 'panel',
   nodes() {
     const panelNode = panel(!!options.allowCustomPanel);
@@ -130,7 +130,7 @@ const panelPlugin = (options = {}) => ({
       }
       return quickInsertOptions;
     },
-    floatingToolbar: (state, intl, providerFactory) => getToolbarConfig(state, intl, options, providerFactory)
+    floatingToolbar: (state, intl, providerFactory) => getToolbarConfig(state, intl, options, providerFactory, api === null || api === void 0 ? void 0 : api.dependencies.decorations.actions.hoverDecoration)
   }
 });
 export default panelPlugin;

package/dist/es2019/plugins/panel/toolbar.js

@@ -7,7 +7,6 @@ import ErrorIcon from '@atlaskit/icon/glyph/editor/error';
 import RemoveEmojiIcon from '@atlaskit/icon/glyph/editor/remove-emoji';
 import commonMessages from '../../messages';
 import { removePanel, changePanelType } from './actions';
-import { hoverDecoration } from '../base/pm-plugins/decoration';
 import { panelBackgroundPalette } from '../../ui/ColorPalette/Palettes/panelBackgroundPalette';
 import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/panel';
 import { findPanel } from './utils';
@@ -42,7 +41,7 @@ export const panelIconMap = {
     id: 'atlassian-tip'
   }
 };
-export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon, state) => {
+export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, hoverDecoration, activePanelType, activePanelColor, activePanelIcon, state) => {
   // TODO: ED-14403 investigate why these titles are not getting translated for the tooltips
   const items = [{
     id: 'editor.panel.info',
@@ -235,16 +234,16 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
     focusEditoronEnter: true,
     icon: RemoveIcon,
     onClick: removePanel(),
-    onMouseEnter: hoverDecoration(panelNodeType, true),
-    onMouseLeave: hoverDecoration(panelNodeType, false),
-    onFocus: hoverDecoration(panelNodeType, true),
-    onBlur: hoverDecoration(panelNodeType, false),
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(panelNodeType, false),
     title: formatMessage(commonMessages.remove),
     tabIndex: null
   });
   return items;
 };
-export const getToolbarConfig = (state, intl, options = {}, providerFactory) => {
+export const getToolbarConfig = (state, intl, options = {}, providerFactory, hoverDecoration) => {
   const {
     formatMessage
   } = intl;
@@ -261,7 +260,7 @@ export const getToolbarConfig = (state, intl, options = {}, providerFactory) =>
     };
 
     // force toolbar to be turned on
-    const items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
+    const items = getToolbarItems(formatMessage, nodeType, options.allowCustomPanel || false, options.allowCustomPanel && options.allowCustomPanelEdit || false, providerFactory, hoverDecoration, panelType, options.allowCustomPanel ? panelColor : undefined, options.allowCustomPanel ? panelIcon || isStandardPanel(panelType) : undefined, state);
     const getDomRef = editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);
       const element = findDomRefAtPos(panelObject.pos, domAtPos);

package/dist/es2019/plugins/placeholder-text/index.js

@@ -10,7 +10,7 @@ import PlaceholderFloatingToolbar from './ui/PlaceholderFloatingToolbar';
 import { hidePlaceholderFloatingToolbar, insertPlaceholderTextAtSelection } from './actions';
 import { PlaceholderTextNodeView } from './placeholder-text-nodeview';
 import { pluginKey } from './plugin-key';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { isSelectionAtPlaceholder } from './selection-utils';
 import { createInternalTypeAheadTools } from '../type-ahead/api';
@@ -175,7 +175,7 @@ const basePlaceholderTextPlugin = options => ({
     });
   }
 });
-const decorateWithPluginOptions = (plugin, options) => {
+const decorateWithPluginOptions = (plugin, options, api) => {
   if (!options.allowInserting) {
     return plugin;
   }
@@ -192,11 +192,12 @@ const decorateWithPluginOptions = (plugin, options) => {
         label: ""
       }),
       action(insert, state) {
+        var _api$dependencies$ana;
         const tr = state.tr;
         tr.setMeta(pluginKey, {
           showInsertPanelAt: tr.selection.anchor
         });
-        return addAnalytics(state, tr, {
+        api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions.attachAnalyticsEvent({
           action: ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.PLACEHOLDER_TEXT,
@@ -204,11 +205,12 @@ const decorateWithPluginOptions = (plugin, options) => {
             inputMethod: INPUT_METHOD.QUICK_INSERT
           },
           eventType: EVENT_TYPE.TRACK
-        });
+        })(tr);
+        return tr;
       }
     }]
   };
   return plugin;
 };
-const placeholderTextPlugin = (options, api) => decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options);
+const placeholderTextPlugin = (options, api) => decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options, api);
 export default placeholderTextPlugin;

package/dist/es2019/plugins/type-ahead/ui/TypeAheadPopup.js

@@ -182,6 +182,27 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
       element === null || element === void 0 ? void 0 : element.removeEventListener('focusout', focusOut);
     };
   }, [ref, cancel]);
+
+  // ED-17443 When you press escape on typeahead panel, it should remove focus and close the panel
+  // This is the expected keyboard behaviour advised by the Accessibility team
+  useLayoutEffect(() => {
+    const escape = event => {
+      if (event.key === 'Escape') {
+        cancel({
+          addPrefixTrigger: true,
+          setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
+          forceFocusOnEditor: true
+        });
+      }
+    };
+    const {
+      current: element
+    } = ref;
+    element === null || element === void 0 ? void 0 : element.addEventListener('keydown', escape);
+    return () => {
+      element === null || element === void 0 ? void 0 : element.removeEventListener('keydown', escape);
+    };
+  }, [ref, cancel]);
   return jsx(Popup, {
     zIndex: akEditorFloatingDialogZIndex,
     target: anchorElement,

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

@@ -3,7 +3,6 @@ import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
 import React from 'react';
 import Editor from '../../editor';
 import EditorNext from '../../editor-next';
-import EditorMigrationComponent from '../../editor-next/editor-migration-component';
 import EditorWithActions from '../../labs/EditorWithActions';
 import ChromeCollapsed from '../ChromeCollapsed';
 export default class CollapsedEditor extends React.Component {
@@ -25,7 +24,7 @@ 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 && child.type !== EditorMigrationComponent) {
+    if (child.type !== Editor && child.type !== EditorWithActions && child.type !== EditorNext) {
       throw new Error('Expected child to be of type `Editor`');
     }
     if (!this.props.isExpanded) {

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

@@ -165,8 +165,8 @@ const ColorPickerButton = props => {
       border: 1px solid ${DEFAULT_BORDER_COLOR};
       border-radius: ${borderRadius()}px;
       background-color: ${currentColor || 'transparent'};
-      width: ${((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || 14}px;
-      height: ${((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || 14}px;
+      width: ${((_props$size2 = props.size) === null || _props$size2 === void 0 ? void 0 : _props$size2.width) || '14px'};
+      height: ${((_props$size3 = props.size) === null || _props$size3 === void 0 ? void 0 : _props$size3.height) || '14px'};
       padding: 0;
     }
   `;

package/dist/es2019/ui/ConfigPanel/Fields/ColorPicker.js

@@ -5,8 +5,6 @@ import { Field } from '@atlaskit/form';
 import { hexToEditorTableChartsPaletteColor } from '@atlaskit/editor-palette';
 import { DEFAULT_BORDER_COLOR } from '../../../ui/ColorPalette/Palettes/common';
 import { validate } from '../utils';
-// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
-import { gridSize } from '@atlaskit/theme/constants';
 import { requiredIndicator } from './common/RequiredIndicator';
 import { headingSizes } from '@atlaskit/theme/typography';
 import FieldMessages from '../FieldMessages';
@@ -373,13 +371,10 @@ const ColorPicker = props => {
     showSomewhatSemanticTooltips: useSomewhatSemanticTextColorNames,
     cols: EXPANDED_COLOR_PICKER_COLUMNS,
     alignX: "right",
-    placement: "ConfigPanel"
-    // TODO: Migrate away from gridSize
-    // Recommendation: Update types of size object to accept string width/height and then replace gridSize with tokens
-    ,
+    placement: "ConfigPanel",
     size: {
-      width: 3 * gridSize(),
-      height: 3 * gridSize()
+      width: "var(--ds-space-300, 24px)",
+      height: "var(--ds-space-300, 24px)"
     }
   }) : jsx(ColorPickerButton, {
     title: title,
@@ -390,8 +385,8 @@ const ColorPicker = props => {
     alignX: "right",
     placement: "ConfigPanel",
     size: {
-      width: 3 * gridSize(),
-      height: 3 * gridSize()
+      width: "var(--ds-space-300, 24px)",
+      height: "var(--ds-space-300, 24px)"
     }
   });
 };

package/dist/es2019/ui/ElementBrowser/components/StatelessElementBrowser.js

@@ -152,18 +152,20 @@ function StatelessElementBrowser(props) {
   /* Only for hitting enter to select item when focused on search bar,
    * The actual enter key press is handled on individual items level.
    */
+  const selectedItem = items[selectedItemIndex];
   const onItemsEnterKeyPress = useCallback(e => {
     if (e.key !== 'Enter') {
       return;
     }
-    props.onInsertItem(items[selectedItemIndex]);
-  }, [props, items, selectedItemIndex]);
+    if (onSelectItem && selectedItem != null) {
+      onSelectItem(selectedItem);
+    }
+  }, [onSelectItem, selectedItem]);
 
   /**
    * On arrow key selection and clicks the selectedItemIndex will change.
    * Making sure to update parent component.
    */
-  const selectedItem = items[selectedItemIndex];
   useEffect(() => {
     if (onSelectItem && selectedItem != null) {
       onSelectItem(selectedItem);

package/dist/es2019/ui/styles.js

@@ -10,6 +10,9 @@ export const buttonGroupStyle = css`
     display: flex;
   }
 `;
+
+// This style is copied to packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/styles.tsx
+// If you make change here, change in above file as well.
 export const separatorStyles = css`
   background: ${`var(--ds-border, ${N30})`};
   width: 1px;
@@ -18,6 +21,9 @@ export const separatorStyles = css`
   margin: 0 8px;
   user-select: none;
 `;
+
+// This style is copied to packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/styles.tsx
+// If you make change here, change in above file as well.
 export const wrapperStyle = css`
   display: flex;
   align-items: center;

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "184.0.0",
+	"version": "185.0.0",
 	"sideEffects": false
 }

package/dist/esm/create-editor/feature-flags-from-props.js

@@ -25,7 +25,7 @@ function getSpellCheck(featureFlags) {
  * which is used by both current and archv3 editors.
  */
 export function createFeatureFlagsFromProps(props) {
-  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46, _props$featureFlags47;
+  var _props$featureFlags, _ref, _props$featureFlags$u, _props$featureFlags2, _props$featureFlags3, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags4, _props$featureFlags5, _props$allowTables, _props$featureFlags6, _props$featureFlags7, _props$allowTables2, _props$featureFlags8, _props$featureFlags9, _props$allowTables3, _props$featureFlags10, _props$featureFlags11, _props$allowTables4, _props$allowTables5, _props$featureFlags12, _props$featureFlags13, _props$allowTables6, _props$allowExtension, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$collabEdit, _props$collabEdit2, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39, _props$featureFlags40, _props$featureFlags41, _props$featureFlags42, _props$featureFlags43, _props$featureFlags44, _props$featureFlags45, _props$featureFlags46;
   var normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   var tableCellOptionsInFloatingToolbar = normalizedFeatureFlags.tableCellOptionsInFloatingToolbar || ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.tableCellOptionsInFloatingToolbar) || undefined;
 
@@ -72,7 +72,6 @@ export function createFeatureFlagsFromProps(props) {
     useSomewhatSemanticTextColorNames: Boolean(typeof normalizedFeatureFlags.useSomewhatSemanticTextColorNames === 'boolean' && !!normalizedFeatureFlags.useSomewhatSemanticTextColorNames || (typeof ((_props$featureFlags43 = props.featureFlags) === null || _props$featureFlags43 === void 0 ? void 0 : _props$featureFlags43.useSomewhatSemanticTextColorNames) === 'boolean' ? !!((_props$featureFlags44 = props.featureFlags) !== null && _props$featureFlags44 !== void 0 && _props$featureFlags44.useSomewhatSemanticTextColorNames) : false)),
     lpLinkPickerFocusTrap: Boolean(normalizedFeatureFlags.lpLinkPickerFocusTrap),
     preventPopupOverflow: Boolean(typeof ((_props$featureFlags45 = props.featureFlags) === null || _props$featureFlags45 === void 0 ? void 0 : _props$featureFlags45['prevent-popup-overflow']) === 'boolean' ? !!((_props$featureFlags46 = props.featureFlags) !== null && _props$featureFlags46 !== void 0 && _props$featureFlags46['prevent-popup-overflow']) : false),
-    useEditorNext: normalizedFeatureFlags.useEditorNext === true || ((_props$featureFlags47 = props.featureFlags) === null || _props$featureFlags47 === void 0 ? void 0 : _props$featureFlags47.useEditorNext) === true,
     // duplicated logic from `create-plugins-list.ts` due to presets not being finalised
     useBetterTypeaheadNavigation: Boolean(typeof pseudoNormalisedUseBetterTypeaheadNavigation === 'boolean' ? !!pseudoNormalisedUseBetterTypeaheadNavigation : true)
   });