@atlaskit/editor-core 172.3.2 → 173.0.1

package/dist/esm/plugins/type-ahead/ui/TypeAheadList.js

@@ -7,21 +7,42 @@ var _templateObject;
 import React, { useMemo, useRef, useCallback, useLayoutEffect, useState } from 'react';
 import { jsx, css } from '@emotion/react';
 import { MenuGroup } from '@atlaskit/menu';
+import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 import { CellMeasurer, CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
 import { ICON_HEIGHT, ITEM_PADDING, TypeAheadListItem } from './TypeAheadListItem';
-import { injectIntl } from 'react-intl-next';
+import { injectIntl, useIntl } from 'react-intl-next';
 import { typeAheadListMessages } from '../messages';
+import { moveSelectedIndex } from '../utils';
+import { updateSelectedIndex } from '../commands/update-selected-index';
+import { AssistiveText } from './AssistiveText';
+import { TYPE_AHEAD_DECORATION_ELEMENT_ID } from '../constants';
 var LIST_ITEM_ESTIMATED_HEIGHT = ICON_HEIGHT + ITEM_PADDING * 2;
 var LIST_WIDTH = 320;
-var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
-  var items = _ref.items,
-      selectedIndex = _ref.selectedIndex,
-      onItemHover = _ref.onItemHover,
-      onItemClick = _ref.onItemClick,
-      intl = _ref.intl,
-      fitHeight = _ref.fitHeight;
+var TypeaheadAssistiveTextPureComponent = /*#__PURE__*/React.memo(function (_ref) {
+  var numberOfResults = _ref.numberOfResults;
+  var intl = useIntl();
+  return jsx(AssistiveText, {
+    assistiveText: intl.formatMessage(typeAheadListMessages.searchResultsLabel, {
+      itemsLength: numberOfResults
+    }) // when the popup is open its always in focus
+    ,
+    isInFocus: true,
+    id: TYPE_AHEAD_DECORATION_ELEMENT_ID + '__popup'
+  });
+});
+var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref2) {
+  var _decorationElement$qu2;
+
+  var items = _ref2.items,
+      selectedIndex = _ref2.selectedIndex,
+      editorView = _ref2.editorView,
+      onItemClick = _ref2.onItemClick,
+      intl = _ref2.intl,
+      fitHeight = _ref2.fitHeight,
+      decorationElement = _ref2.decorationElement;
   var listRef = useRef();
+  var listContainerRef = useRef(null);
   var lastVisibleIndexes = useRef({
     overscanStartIndex: 0,
     overscanStopIndex: 0,
@@ -48,12 +69,38 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
   }, []);
   var actions = useMemo(function () {
     return {
-      onItemClick: onItemClick,
-      onItemHover: onItemHover
+      onItemClick: onItemClick
     };
-  }, [onItemClick, onItemHover]);
-  var onScroll = useCallback(function (_ref2) {
-    var scrollUpdateWasRequested = _ref2.scrollUpdateWasRequested;
+  }, [onItemClick]);
+
+  var isNavigationKey = function isNavigationKey(event) {
+    return ['ArrowDown', 'ArrowUp', 'Tab', 'Enter'].includes(event.key);
+  };
+
+  var focusTargetElement = useCallback(function () {
+    var _decorationElement$qu;
+
+    //To reset the selected index
+    updateSelectedIndex(-1)(editorView.state, editorView.dispatch);
+    listRef.current.scrollToRow(0);
+    decorationElement === null || decorationElement === void 0 ? void 0 : (_decorationElement$qu = decorationElement.querySelector("[role='combobox']")) === null || _decorationElement$qu === void 0 ? void 0 : _decorationElement$qu.focus();
+  }, [editorView, listRef, decorationElement]);
+  var selectNextItem = useMemo(function () {
+    return moveSelectedIndex({
+      editorView: editorView,
+      direction: 'next'
+    });
+  }, [editorView]);
+  var selectPreviousItem = useMemo(function () {
+    return moveSelectedIndex({
+      editorView: editorView,
+      direction: 'previous'
+    });
+  }, [editorView]);
+  var lastVisibleStartIndex = lastVisibleIndexes.current.startIndex;
+  var lastVisibleStopIndex = lastVisibleIndexes.current.stopIndex;
+  var onScroll = useCallback(function (_ref3) {
+    var scrollUpdateWasRequested = _ref3.scrollUpdateWasRequested;
 
     if (!scrollUpdateWasRequested) {
       return;
@@ -71,27 +118,29 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
 
     requestAnimationFrame(function () {
       requestAnimationFrame(function () {
-        var indexes = lastVisibleIndexes.current;
-        var isSelectedItemVisible = selectedIndex >= indexes.startIndex && selectedIndex <= indexes.stopIndex;
+        var isSelectedItemVisible = selectedIndex >= lastVisibleStartIndex && selectedIndex <= lastVisibleStopIndex; //Should scroll to the list item only when the selectedIndex >= 0 and item is not visible
 
-        if (!isSelectedItemVisible) {
+        if (!isSelectedItemVisible && selectedIndex !== -1) {
           listRef.current.scrollToRow(selectedIndex);
+        } else if (selectedIndex === -1) {
+          listRef.current.scrollToRow(0);
         }
       });
     });
-  }, [selectedIndex, lastVisibleIndexes]);
+  }, [selectedIndex, lastVisibleStartIndex, lastVisibleStopIndex]);
   useLayoutEffect(function () {
     if (!listRef.current) {
       return;
     }
 
-    var indexes = lastVisibleIndexes.current;
-    var isSelectedItemVisible = selectedIndex >= indexes.startIndex && selectedIndex <= indexes.stopIndex;
+    var isSelectedItemVisible = selectedIndex >= lastVisibleStartIndex && selectedIndex <= lastVisibleStopIndex; //Should scroll to the list item only when the selectedIndex >= 0 and item is not visible
 
-    if (!isSelectedItemVisible) {
+    if (!isSelectedItemVisible && selectedIndex !== -1) {
       listRef.current.scrollToRow(selectedIndex);
+    } else if (selectedIndex === -1) {
+      listRef.current.scrollToRow(0);
     }
-  }, [selectedIndex, lastVisibleIndexes]);
+  }, [selectedIndex, lastVisibleStartIndex, lastVisibleStopIndex]);
   useLayoutEffect(function () {
     setCache(new CellMeasurerCache({
       fixedWidth: true,
@@ -106,12 +155,76 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
     }, 0), fitHeight);
     setHeight(height);
   }, [items, cache, fitHeight]);
+  useLayoutEffect(function () {
+    if (!listContainerRef.current) {
+      return;
+    }
+
+    var element = listContainerRef.current;
+    /**
+     * To handle the key events on the list
+     * @param event
+     */
+
+    var handleKeyDown = function handleKeyDown(event) {
+      if (isNavigationKey(event)) {
+        switch (event.key) {
+          case 'ArrowDown':
+            if (selectedIndex === items.length - 1) {
+              event.stopPropagation();
+            } else {
+              selectNextItem();
+            }
 
-  var renderRow = function renderRow(_ref3) {
-    var index = _ref3.index,
-        key = _ref3.key,
-        style = _ref3.style,
-        parent = _ref3.parent;
+            event.preventDefault();
+            break;
+
+          case 'ArrowUp':
+            if (selectedIndex === 0) {
+              //To set focus on target element when up arrow is pressed on first option of list
+              focusTargetElement();
+            } else {
+              selectPreviousItem();
+            }
+
+            event.preventDefault();
+            break;
+
+          case 'Tab':
+            //Tab key quick inserts the selected item.
+            onItemClick(SelectItemMode.TAB, selectedIndex);
+            event.preventDefault();
+            break;
+
+          case 'Enter':
+            //Enter key quick inserts the selected item.
+            if (!event.isComposing || event.which !== 229 && event.keyCode !== 229) {
+              onItemClick(event.shiftKey ? SelectItemMode.SHIFT_ENTER : SelectItemMode.ENTER, selectedIndex);
+              event.preventDefault();
+            }
+
+            break;
+
+          default:
+            event.preventDefault();
+        }
+      } else {
+        //All the remaining keys sets focus on the typeahead query(inputQuery.tsx))
+        focusTargetElement();
+      }
+    };
+
+    element === null || element === void 0 ? void 0 : element.addEventListener('keydown', handleKeyDown);
+    return function () {
+      element === null || element === void 0 ? void 0 : element.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [editorView.state, focusTargetElement, selectNextItem, selectPreviousItem, selectedIndex, onItemClick, items.length]);
+
+  var renderRow = function renderRow(_ref4) {
+    var index = _ref4.index,
+        key = _ref4.key,
+        style = _ref4.style,
+        parent = _ref4.parent;
     return jsx(CellMeasurer, {
       key: key,
       cache: cache,
@@ -126,10 +239,10 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
     }, jsx(TypeAheadListItem, {
       key: items[index].title,
       item: items[index],
+      itemsLength: items.length,
       itemIndex: index,
       selectedIndex: selectedIndex,
-      onItemClick: actions.onItemClick,
-      onItemHover: actions.onItemHover
+      onItemClick: actions.onItemClick
     }))));
   };
 
@@ -137,11 +250,13 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
     return null;
   }
 
+  var menuGroupId = ((_decorationElement$qu2 = decorationElement.querySelector("[role='combobox']")) === null || _decorationElement$qu2 === void 0 ? void 0 : _decorationElement$qu2.getAttribute('aria-controls')) || TYPE_AHEAD_DECORATION_ELEMENT_ID;
   return jsx(MenuGroup, {
-    role: "listbox",
-    "aria-live": "polite",
     "aria-label": intl.formatMessage(typeAheadListMessages.typeAheadResultLabel),
     "aria-relevant": "additions removals"
+  }, jsx("div", {
+    id: menuGroupId,
+    ref: listContainerRef
   }, jsx(List, {
     rowRenderer: renderRow,
     ref: listRef,
@@ -152,8 +267,12 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref) {
     onScroll: onScroll,
     height: height,
     overscanRowCount: 3,
-    css: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            button {\n              padding: 12px 12px 11px;\n              span:last-child span:last-child {\n                white-space: normal;\n              }\n            }\n          "])))
-  }));
+    containerRole: "presentation",
+    role: "listbox",
+    css: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              button {\n                padding: 12px 12px 11px;\n                span:last-child span:last-child {\n                  white-space: normal;\n                }\n              }\n            "])))
+  }), jsx(TypeaheadAssistiveTextPureComponent, {
+    numberOfResults: items.length.toString()
+  })));
 });
 export var TypeAheadList = injectIntl(TypeAheadListComponent);
 TypeAheadList.displayName = 'TypeAheadList';

package/dist/esm/plugins/type-ahead/ui/TypeAheadListItem.js

@@ -1,11 +1,11 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 /** @jsx jsx */
-import React, { useCallback, useMemo, useRef, useLayoutEffect } from 'react';
+import React, { useCallback, useMemo, useLayoutEffect } from 'react';
 import { css, jsx } from '@emotion/react';
-import { DN600, N200, N800 } from '@atlaskit/theme/colors';
+import { DN600, N200, N800, N30, B100 } from '@atlaskit/theme/colors';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { ButtonItem } from '@atlaskit/menu';
@@ -28,9 +28,23 @@ var itemText = function itemText(theme) {
 };
 
 var itemAfter = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  flex: 0 0 auto;\n"])));
-var hidden = {
-  overflow: 'hidden'
+var customRenderItemDivStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  overflow: hidden;\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus {\n    box-shadow: inset 0px 0px 0px 2px ", ";\n    outline: none;\n  }\n"])), token('color.background.selected', N30), token('color.border.focused', B100));
+/**
+ * This CSS emulates the desired behaviour with :focus-visible for firefox.
+ * Firefox unfortunately does not register keyboard focus if user mouseDown and drag a typeahead item
+ * resulting in focus-visible style not drawn.
+ */
+
+var selectionFrame = {
+  '& > button:focus': {
+    boxShadow: "inset 0px 0px 0px 2px ".concat(token('color.border.focused', B100)),
+    outline: 'none',
+    '&:active': {
+      boxShadow: 'none'
+    }
+  }
 };
+var selectedStyle = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  background-color: ", ";\n"])), token('color.background.selected', N30));
 var FallbackIcon = /*#__PURE__*/React.memo(function (_ref) {
   var label = _ref.label;
   return jsx(IconFallback, null);
@@ -40,31 +54,16 @@ var noop = function noop() {};
 
 export var TypeAheadListItem = function TypeAheadListItem(_ref2) {
   var item = _ref2.item,
+      itemsLength = _ref2.itemsLength,
       selectedIndex = _ref2.selectedIndex,
-      onItemHover = _ref2.onItemHover,
       onItemClick = _ref2.onItemClick,
       itemIndex = _ref2.itemIndex;
-  var isSelected = itemIndex === selectedIndex; // It's possible for onMouseMove to be called multiple times in quick
-  // succession because the mousemove event can fire very rapidly. This
-  // provides an additional safety net to prevent that.
 
-  var mouseMoveCalled = useRef(false);
-  var onMouseMove = useCallback(function () {
-    if (isSelected || mouseMoveCalled.current) {
-      return;
-    }
-
-    mouseMoveCalled.current = true;
-    onItemHover({
-      item: item,
-      index: itemIndex
-    });
-  }, [item, itemIndex, onItemHover, isSelected]);
-  useLayoutEffect(function () {
-    if (!isSelected) {
-      mouseMoveCalled.current = false;
-    }
-  }, [isSelected]);
+  /**
+   * To select and highlight the first Item when no item is selected
+   * However selectedIndex remains -1, So that user does not skip the first item when down arrow key is used from typeahead query(inputQuery.tsx)
+   */
+  var isSelected = itemIndex === selectedIndex || selectedIndex === -1 && itemIndex === 0;
   var icon = item.icon,
       title = item.title,
       customRenderItem = item.render;
@@ -78,39 +77,63 @@ export var TypeAheadListItem = function TypeAheadListItem(_ref2) {
   var insertSelectedItem = useCallback(function () {
     onItemClick(SelectItemMode.SELECTED, itemIndex);
   }, [onItemClick, itemIndex]);
+  var customItemRef = /*#__PURE__*/React.createRef();
+  var buttonItemRef = /*#__PURE__*/React.createRef();
+  var shouldUpdateFocus = selectedIndex === itemIndex;
+  useLayoutEffect(function () {
+    if (shouldUpdateFocus) {
+      var _customItemRef$curren;
+
+      customItemRef === null || customItemRef === void 0 ? void 0 : (_customItemRef$curren = customItemRef.current) === null || _customItemRef$curren === void 0 ? void 0 : _customItemRef$curren.focus();
+    }
+  }, [customItemRef, shouldUpdateFocus]);
+  useLayoutEffect(function () {
+    if (shouldUpdateFocus) {
+      var _buttonItemRef$curren;
+
+      buttonItemRef === null || buttonItemRef === void 0 ? void 0 : (_buttonItemRef$curren = buttonItemRef.current) === null || _buttonItemRef$curren === void 0 ? void 0 : _buttonItemRef$curren.focus();
+    }
+  }, [buttonItemRef, shouldUpdateFocus]);
   var customItem = useMemo(function () {
     if (!customRenderItem) {
       return null;
     }
 
     var Comp = customRenderItem;
+    var listItemClasses = [customRenderItemDivStyle, isSelected && selectedStyle];
     return jsx("div", {
       "aria-selected": isSelected,
       "aria-label": title,
       role: "option",
+      "aria-setsize": itemsLength,
       tabIndex: 0,
-      style: hidden,
-      onMouseMove: onMouseMove
+      css: listItemClasses,
+      className: "ak-typeahead-item ".concat(isSelected ? 'typeahead-selected-item' : '') //CSS classes added for test cases purpose
+      ,
+      ref: customItemRef
     }, jsx(Comp, {
       onClick: insertSelectedItem,
-      isSelected: isSelected,
+      isSelected: false //The selection styles are handled in the parent div instead. Hence isSelected is made false always.
+      ,
       onHover: noop
     }));
-  }, [customRenderItem, insertSelectedItem, onMouseMove, isSelected, title]);
+  }, [customRenderItem, insertSelectedItem, isSelected, title, customItemRef, itemsLength]);
 
   if (customItem) {
     return customItem;
   }
 
   return jsx("span", {
-    onMouseMove: onMouseMove
+    css: selectionFrame
   }, jsx(ButtonItem, {
     onClick: insertSelectedItem,
     iconBefore: elementIcon,
     isSelected: isSelected,
     "aria-selected": isSelected,
     "aria-label": item.title,
+    "aria-setsize": itemsLength,
     role: "option",
+    ref: buttonItemRef,
     description: item.description
   }, jsx("div", {
     css: itemBody

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

@@ -41,7 +41,6 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
       popupsScrollableElement = props.popupsScrollableElement,
       items = props.items,
       selectedIndex = props.selectedIndex,
-      setSelectedItem = props.setSelectedItem,
       onItemInsert = props.onItemInsert,
       fireAnalyticsCallback = props.fireAnalyticsCallback,
       isEmptyQuery = props.isEmptyQuery;
@@ -175,9 +174,10 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
   }), jsx(TypeAheadList, {
     items: items,
     selectedIndex: selectedIndex,
-    onItemHover: setSelectedItem,
     onItemClick: onItemInsert,
-    fitHeight: fitHeight
+    fitHeight: fitHeight,
+    editorView: editorView,
+    decorationElement: anchorElement
   })));
 });
 TypeAheadPopup.displayName = 'TypeAheadPopup';

package/dist/esm/plugins/type-ahead/ui/WrapperTypeAhead.js

@@ -120,6 +120,9 @@ export var WrapperTypeAhead = /*#__PURE__*/React.memo(function (_ref) {
     cancel: cancel,
     forceFocus: shouldFocusCursorInsideQuery,
     onUndoRedo: onUndoRedo,
-    reopenQuery: reopenQuery
+    reopenQuery: reopenQuery,
+    editorView: editorView,
+    items: items
   });
-});
+});
+WrapperTypeAhead.displayName = 'WrapperTypeAhead';

package/dist/esm/plugins/type-ahead/utils.js

@@ -87,7 +87,7 @@ export var moveSelectedIndex = function moveSelectedIndex(_ref2) {
     var selectedIndex = typeAheadState.selectedIndex,
         items = typeAheadState.items;
     var stats = typeAheadState.stats instanceof StatsModifier ? typeAheadState.stats : new StatsModifier();
-    var nextIndex = 0;
+    var nextIndex;
 
     if (direction === 'next') {
       stats.increaseArrowDown();

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

@@ -15,6 +15,7 @@ import { DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { addAnalytics } from '../../plugins/analytics/utils';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION } from '../../plugins/analytics';
 import { toolbarMessages } from './toolbar-messages';
+import { insideTable, isInLayoutColumn } from '../../utils';
 var alignmentIcons = [{
   id: 'editor.media.alignLeft',
   value: 'align-start',
@@ -88,6 +89,12 @@ var makeAlign = function makeAlign(layout, nodeType) {
     // setNodeMarkup is called
 
     tr.setSelection(NodeSelection.create(tr.doc, state.selection.from));
+    var paragraph = tr.doc.type.schema.nodes.paragraph; // see https://product-fabric.atlassian.net/browse/ED-15518 insert a new paragraph when an embedded card is wrapped left or right
+
+    if (layout.startsWith('wrap') && paragraph && !tr.doc.nodeAt(state.selection.to) && (insideTable(state) || isInLayoutColumn(state))) {
+      tr.insert(state.selection.to, paragraph.createAndFill());
+    }
+
     dispatch(addAnalytics(state, tr, {
       eventType: EVENT_TYPE.TRACK,
       action: ACTION.SELECTED,

package/dist/esm/ui/PortalProvider/PortalProviderThemesProvider.js

@@ -3,7 +3,6 @@ import React from 'react';
 import AtlaskitTheme from '@atlaskit/theme/components';
 import { CHANNEL } from '@atlaskit/theme/constants';
 import { ThemeProvider } from '@emotion/react';
-import { ThemeProvider as DeprectateStyledComponentsProvider } from 'styled-components';
 export function PortalProviderThemeProviders(props) {
   var children = props.children,
       mode = props.mode;
@@ -29,11 +28,9 @@ export function PortalProviderThemeProviders(props) {
       mode: mode
     };
   }, [mode]);
-  return /*#__PURE__*/React.createElement(DeprectateStyledComponentsProvider, {
-    theme: styledComponentsAndEmotionTheme
-  }, /*#__PURE__*/React.createElement(ThemeProvider, {
+  return /*#__PURE__*/React.createElement(ThemeProvider, {
     theme: styledComponentsAndEmotionTheme
   }, /*#__PURE__*/React.createElement(AtlaskitTheme.Provider, {
     value: atlaskitTheme
-  }, children)));
+  }, children));
 }

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

@@ -50,8 +50,6 @@ export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
   _createClass(PortalProviderAPI, [{
     key: "render",
     value: function render(children, container) {
-      var _this2 = this;
-
       var hasAnalyticsContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var hasIntlContext = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       this.portals.set(container, {
@@ -59,14 +57,10 @@ export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
         hasAnalyticsContext: hasAnalyticsContext,
         hasIntlContext: hasIntlContext
       });
-
-      var childrenWithThemeProviders = function childrenWithThemeProviders() {
-        return /*#__PURE__*/React.createElement(PortalProviderThemeProviders, {
-          mode: _this2.themeMode
-        }, children());
-      };
-
-      var wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, childrenWithThemeProviders()) : childrenWithThemeProviders();
+      var childrenWithThemeProviders = /*#__PURE__*/React.createElement(PortalProviderThemeProviders, {
+        mode: this.themeMode
+      }, children());
+      var wrappedChildren = this.useAnalyticsContext ? /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, childrenWithThemeProviders) : childrenWithThemeProviders;
 
       if (hasIntlContext) {
         wrappedChildren = /*#__PURE__*/React.createElement(RawIntlProvider, {
@@ -82,36 +76,33 @@ export var PortalProviderAPI = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "forceUpdate",
     value: function forceUpdate(_ref) {
-      var _this3 = this;
+      var _this2 = this;
 
       var intl = _ref.intl,
           themeMode = _ref.themeMode;
       this.intl = intl;
       this.themeMode = themeMode;
       this.portals.forEach(function (portal, container) {
-        if (!portal.hasAnalyticsContext && !_this3.useAnalyticsContext && !portal.hasIntlContext) {
+        if (!portal.hasAnalyticsContext && !_this2.useAnalyticsContext && !portal.hasIntlContext) {
           return;
         }
 
         var wrappedChildren = portal.children();
+        var childrenWithThemeProviders = /*#__PURE__*/React.createElement(PortalProviderThemeProviders, {
+          mode: themeMode
+        }, wrappedChildren);
 
-        var childrenWithThemeProviders = function childrenWithThemeProviders() {
-          return /*#__PURE__*/React.createElement(PortalProviderThemeProviders, {
-            mode: themeMode
-          }, wrappedChildren);
-        };
-
-        if (portal.hasAnalyticsContext && _this3.useAnalyticsContext) {
-          wrappedChildren = /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, childrenWithThemeProviders());
+        if (portal.hasAnalyticsContext && _this2.useAnalyticsContext) {
+          wrappedChildren = /*#__PURE__*/React.createElement(AnalyticsContextWrapper, null, childrenWithThemeProviders);
         }
 
         if (portal.hasIntlContext) {
           wrappedChildren = /*#__PURE__*/React.createElement(RawIntlProvider, {
-            value: _this3.intl
-          }, childrenWithThemeProviders());
+            value: _this2.intl
+          }, childrenWithThemeProviders);
         }
 
-        unstable_renderSubtreeIntoContainer(_this3.context, wrappedChildren, container);
+        unstable_renderSubtreeIntoContainer(_this2.context, wrappedChildren, container);
       });
     }
   }, {
@@ -157,13 +148,13 @@ var BasePortalProvider = /*#__PURE__*/function (_React$Component) {
   var _super2 = _createSuper(BasePortalProvider);
 
   function BasePortalProvider(props) {
-    var _this4;
+    var _this3;
 
     _classCallCheck(this, BasePortalProvider);
 
-    _this4 = _super2.call(this, props);
-    _this4.portalProviderAPI = new PortalProviderAPI(props.intl, props.onAnalyticsEvent, props.useAnalyticsContext, props.themeMode);
-    return _this4;
+    _this3 = _super2.call(this, props);
+    _this3.portalProviderAPI = new PortalProviderAPI(props.intl, props.onAnalyticsEvent, props.useAnalyticsContext, props.themeMode);
+    return _this3;
   }
 
   _createClass(BasePortalProvider, [{
@@ -204,24 +195,24 @@ export var PortalRenderer = /*#__PURE__*/function (_React$Component2) {
   var _super3 = _createSuper(PortalRenderer);
 
   function PortalRenderer(props) {
-    var _this5;
+    var _this4;
 
     _classCallCheck(this, PortalRenderer);
 
-    _this5 = _super3.call(this, props);
+    _this4 = _super3.call(this, props);
 
-    _defineProperty(_assertThisInitialized(_this5), "handleUpdate", function (portals) {
-      return _this5.setState({
+    _defineProperty(_assertThisInitialized(_this4), "handleUpdate", function (portals) {
+      return _this4.setState({
         portals: portals
       });
     });
 
-    props.portalProviderAPI.setContext(_assertThisInitialized(_this5));
-    props.portalProviderAPI.on('update', _this5.handleUpdate);
-    _this5.state = {
+    props.portalProviderAPI.setContext(_assertThisInitialized(_this4));
+    props.portalProviderAPI.on('update', _this4.handleUpdate);
+    _this4.state = {
       portals: new Map()
     };
-    return _this5;
+    return _this4;
   }
 
   _createClass(PortalRenderer, [{

package/dist/esm/utils/index.js

@@ -515,6 +515,10 @@ export var isInListItem = function isInListItem(state) {
 export var hasOpenEnd = function hasOpenEnd(slice) {
   return slice.openStart > 0 || slice.openEnd > 0;
 };
+export var isInsideBlockQuote = function isInsideBlockQuote(state) {
+  var blockquote = state.schema.nodes.blockquote;
+  return hasParentNodeOfType(blockquote)(state.selection);
+};
 export function filterChildrenBetween(doc, from, to, predicate) {
   var results = [];
   doc.nodesBetween(from, to, function (node, pos, parent) {

package/dist/esm/utils/selection.js

@@ -7,13 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { NodeSelection, TextSelection, AllSelection } from 'prosemirror-state';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
-export { setNodeSelection } from '@atlaskit/editor-common/utils';
-export function setTextSelection(view, anchor, head) {
-  var state = view.state,
-      dispatch = view.dispatch;
-  var tr = state.tr.setSelection(TextSelection.create(state.doc, anchor, head));
-  dispatch(tr);
-}
+export { setNodeSelection, setTextSelection } from '@atlaskit/editor-common/utils';
 export function setAllSelection(view) {
   var state = view.state,
       dispatch = view.dispatch;

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "172.3.2";
+export var version = "173.0.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

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