@atlaskit/editor-core 162.0.2 → 164.0.1

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -10,13 +10,15 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import Dropdown from '../../../../ui/Dropdown';
 import Alignment from '../../../../ui/Alignment';
-import { ExpandIconWrapper, Separator, TriggerWrapper, Wrapper } from './styles';
+import { expandIconWrapper, separator, triggerWrapper, wrapper } from './styles';
 import { IconMap } from './icon-map';
 import { messages } from './messages';
 export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
@@ -85,7 +87,9 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           disabled = _this$props.disabled,
           intl = _this$props.intl;
       var title = intl.formatMessage(messages.alignment);
-      return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(Dropdown, {
+      return jsx("span", {
+        css: wrapper
+      }, jsx(Dropdown, {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
@@ -94,7 +98,7 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         handleEscapeKeydown: this.hide,
         fitWidth: 112,
         fitHeight: 80,
-        trigger: /*#__PURE__*/React.createElement(ToolbarButton, {
+        trigger: jsx(ToolbarButton, {
           spacing: isReducedSpacing ? 'none' : 'default',
           disabled: disabled,
           selected: isOpen,
@@ -104,18 +108,24 @@ export var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           "aria-expanded": isOpen,
           "aria-haspopup": true,
           onClick: this.toggleOpen,
-          iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(IconMap, {
+          iconBefore: jsx("div", {
+            css: triggerWrapper
+          }, jsx(IconMap, {
             alignment: pluginState.align
-          }), /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
+          }), jsx("span", {
+            css: expandIconWrapper
+          }, jsx(ExpandIcon, {
             label: ""
           })))
         })
-      }, /*#__PURE__*/React.createElement(Alignment, {
+      }, jsx(Alignment, {
         onClick: function onClick(align) {
           return _this2.changeAlignment(align);
         },
         selectedAlignment: pluginState.align
-      })), /*#__PURE__*/React.createElement(Separator, null));
+      })), jsx("span", {
+        css: separator
+      }));
     }
   }]);
 

package/dist/esm/plugins/alignment/ui/ToolbarAlignment/styles.js

@@ -2,9 +2,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
-import styled from 'styled-components';
+import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-export var TriggerWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n"])));
-export var Separator = styled.span(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), N30);
-export var Wrapper = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  div {\n    display: flex;\n  }\n"])));
-export var ExpandIconWrapper = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));
+export var triggerWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n"])));
+export var separator = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), N30);
+export var wrapper = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  div {\n    display: flex;\n  }\n"])));
+export var expandIconWrapper = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));

package/dist/esm/plugins/analytics/types/enums.js

@@ -43,6 +43,7 @@ export var ACTION;
   ACTION["RE_RENDERED"] = "reRendered";
   ACTION["ENTERED"] = "entered";
   ACTION["ERRORED"] = "errored";
+  ACTION["EXPOSED"] = "exposed";
   ACTION["FAILED_TO_UNMOUNT"] = "failedToUnmount";
   ACTION["FIND_NEXT_PERFORMED"] = "findNextPerformed";
   ACTION["FIND_PERFORMED"] = "findPerformed";
@@ -158,6 +159,7 @@ export var ACTION_SUBJECT;
   ACTION_SUBJECT["EMBEDS"] = "embeds";
   ACTION_SUBJECT["EXPAND"] = "expand";
   ACTION_SUBJECT["EXTENSION"] = "extension";
+  ACTION_SUBJECT["FEATURE"] = "feature";
   ACTION_SUBJECT["FEEDBACK_DIALOG"] = "feedbackDialog";
   ACTION_SUBJECT["FIND_REPLACE_DIALOG"] = "findReplaceDialog";
   ACTION_SUBJECT["FLOATING_CONTEXTUAL_BUTTON"] = "floatingContextualButton";

package/dist/esm/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -1,16 +1,16 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject;
+var _templateObject, _templateObject2;
 
-import React, { useEffect } from 'react';
+/** @jsx jsx */
+import { useEffect } from 'react';
+import { css, jsx } from '@emotion/react';
 import AvatarsWithPluginState from '../../collab-edit/ui/avatars-with-plugin-state';
-import styled from 'styled-components';
 import { useIntl } from 'react-intl-next';
 import { avatarGroupMessages } from '../messages';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '../../analytics';
-var ToolbarButtonWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-grow: ", ";\n  justify-content: flex-end;\n  align-items: center;\n  & > div {\n    margin-right: 0;\n  }\n"])), function (props) {
-  return props.takeFullWidth ? 1 : 0;
-});
+var toolbarButtonWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: flex-end;\n  flex-grow: 0;\n  align-items: center;\n  & > div {\n    margin-right: 0;\n  }\n"])));
+var toolbarButtonWrapperFullWidth = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  flex-grow: 1;\n"])), toolbarButtonWrapper);
 
 var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
   var dispatchAnalyticsEvent = props.dispatchAnalyticsEvent;
@@ -27,11 +27,11 @@ var AvatarGroupPluginWrapper = function AvatarGroupPluginWrapper(props) {
       eventType: EVENT_TYPE.UI
     });
   }, [dispatchAnalyticsEvent]);
-  return /*#__PURE__*/React.createElement(ToolbarButtonWrapper, {
+  return jsx("div", {
     "aria-label": intl.formatMessage(avatarGroupMessages.editors),
     "data-testid": 'avatar-group-in-plugin',
-    takeFullWidth: props.takeFullWidth
-  }, /*#__PURE__*/React.createElement(AvatarsWithPluginState, {
+    css: props.takeFullWidth ? toolbarButtonWrapperFullWidth : toolbarButtonWrapper
+  }, jsx(AvatarsWithPluginState, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,

package/dist/esm/plugins/base/index.js

@@ -34,12 +34,31 @@ var basePlugin = function basePlugin(options) {
           var dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
           return filterStepsPlugin(dispatchAnalyticsEvent);
         }
-      }, {
-        name: 'inlineCursorTargetPlugin',
-        plugin: function plugin() {
-          return options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined;
-        }
-      }, {
+      }]; // In Chrome, when the selection is placed between adjacent nodes which are not contenteditatble
+      // the cursor appears at the right most point of the parent container.
+      // In Firefox, when the selection is placed between adjacent nodes which are not contenteditatble
+      // no cursor is presented to users.
+      // In Safari, when the selection is placed between adjacent nodes which are not contenteditatble
+      // the cursor appears inside the adjacent nodes.
+      // This plugin workarounds the issues with chrome and firefox by inserting decorations between
+      // inline nodes which are set as contenteditable, and have a zero width space.
+      // At time of development, using this workaround in Safari caused additional issues;
+      // - visual artifacts when moving across inline nodes (ie. using the arrow key to traverse a
+      //   series of inline nodes)
+      // - blocking the right arrow key when at the start of a line from moving to the end of the
+      //   previous line.
+      // As such we only apply the workaround for firefox and chrome.
+
+      if (browser.chrome || browser.gecko) {
+        plugins.push({
+          name: 'inlineCursorTargetPlugin',
+          plugin: function plugin() {
+            return options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined;
+          }
+        });
+      }
+
+      plugins.push({
         name: 'focusHandlerPlugin',
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch;
@@ -98,7 +117,7 @@ var basePlugin = function basePlugin(options) {
               providerFactory = _ref5.providerFactory;
           return betterTypeHistoryPlugin();
         }
-      }];
+      });
 
       if (options && options.allowScrollGutter) {
         plugins.push({

package/dist/esm/plugins/base/pm-plugins/inline-cursor-target.js

@@ -2,52 +2,10 @@ import { DecorationSet, Decoration } from 'prosemirror-view';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+import { isTextSelection } from '../../../utils';
 export var inlineCursorTargetStateKey = new PluginKey('inlineCursorTargetPlugin');
-export var SPECIAL_NODES = ['mention', 'emoji'];
-export var isSpecial = function isSpecial(node) {
-  return node && SPECIAL_NODES.indexOf(node.type.name) !== -1;
-};
-export var findSpecialNodeAfter = function findSpecialNodeAfter($pos, tr) {
-  if (isSpecial($pos.nodeAfter)) {
-    return $pos.pos + 1;
-  }
-
-  var parentOffset = $pos.parentOffset,
-      parent = $pos.parent;
-  var docSize = tr.doc.nodeSize - 2;
-
-  if (parentOffset === parent.content.size && $pos.pos + 1 < docSize - 2) {
-    var _tr$doc$resolve = tr.doc.resolve($pos.pos + 1),
-        nodeAfter = _tr$doc$resolve.nodeAfter;
-
-    if (nodeAfter && isSpecial(nodeAfter.firstChild)) {
-      return $pos.pos + 2;
-    }
-  }
-
-  return;
-};
-export var findSpecialNodeBefore = function findSpecialNodeBefore($pos, tr) {
-  if (isSpecial($pos.nodeBefore)) {
-    return $pos.pos - 1;
-  }
-
-  if ($pos.pos === 0) {
-    return;
-  }
-
-  var parentOffset = $pos.parentOffset;
-
-  if (parentOffset === 0) {
-    var _tr$doc$resolve2 = tr.doc.resolve($pos.pos - 1),
-        nodeBefore = _tr$doc$resolve2.nodeBefore;
-
-    if (nodeBefore && isSpecial(nodeBefore.firstChild)) {
-      return $pos.pos - 2;
-    }
-  }
-
-  return;
+export var isInlineNodeView = function isInlineNodeView(node) {
+  return node && node.type.isInline && !node.type.isText;
 };
 export default (function () {
   return new SafePlugin({
@@ -55,26 +13,56 @@ export default (function () {
     state: {
       init: function init() {
         return {
-          positions: []
+          cursorTarget: undefined
         };
       },
       apply: function apply(tr) {
-        var selection = tr.selection;
-        var $from = selection.$from;
-        var positions = [];
-        var posAfter = findSpecialNodeAfter($from, tr);
-        var posBefore = findSpecialNodeBefore($from, tr);
-
-        if (posAfter !== undefined) {
-          positions.push(posAfter);
-        }
+        var selection = tr.selection,
+            doc = tr.doc;
+        var $from = selection.$from,
+            $to = selection.$to;
+
+        if (selection && isTextSelection(selection)) {
+          var hasInlineNodeViewAfter = isInlineNodeView($from.nodeAfter);
+          var hasInlineNodeViewBefore = isInlineNodeView($from.nodeBefore);
+          var isAtStart = $from.parentOffset === 0 && isInlineNodeView($from.nodeAfter);
+          var isAtEnd = doc.resolve($from.pos).node().lastChild === $from.nodeBefore && isInlineNodeView($from.nodeBefore); // Create editable decoration widgets either side of the cursor to allow
+          // text input.
+          // We check beforeInput events below to prevent content
+          // being added to the decorations.
+          //
+          // This prevents issues with the cursor disappearing
+          // or appearing in the wrong place when;
+          // - positioned between inline nodes (chrome + firefox)
+          // - positioned between the beginning of another node and an inline node (firefox)
+          // - positioned between an inline node and the end of a node (chrome)
+
+          if ((hasInlineNodeViewAfter || isAtEnd) && (hasInlineNodeViewBefore || isAtStart)) {
+            var createWidget = function createWidget(side) {
+              var node = document.createElement('span');
+              node.contentEditable = 'true';
+              node.appendChild(document.createTextNode(ZERO_WIDTH_SPACE));
+              return Decoration.widget(selection.from, node, {
+                raw: true,
+                side: side === 'left' ? -1 : 1,
+                key: 'inlineCursor'
+              });
+            };
 
-        if (posBefore !== undefined) {
-          positions.push(posBefore);
+            return {
+              cursorTarget: {
+                decorations: [createWidget('left'), createWidget('right')],
+                positions: {
+                  from: $from.pos,
+                  to: $to.pos
+                }
+              }
+            };
+          }
         }
 
         return {
-          positions: positions
+          cursorTarget: undefined
         };
       }
     },
@@ -82,24 +70,100 @@ export default (function () {
       decorations: function decorations(state) {
         var doc = state.doc;
 
-        var _inlineCursorTargetSt = inlineCursorTargetStateKey.getState(state),
-            positions = _inlineCursorTargetSt.positions;
-
-        if (positions && positions.length) {
-          var decorations = positions.map(function (position) {
-            var node = document.createElement('span');
-            node.appendChild(document.createTextNode(ZERO_WIDTH_SPACE));
-            return Decoration.widget(position, node, {
-              raw: true,
-              side: -1,
-              key: 'inlineCursor'
-            });
-          });
-          return DecorationSet.create(doc, decorations);
+        var _ref = inlineCursorTargetStateKey.getState(state),
+            cursorTarget = _ref.cursorTarget;
+
+        if (cursorTargetHasValidDecorations(cursorTarget)) {
+          return DecorationSet.create(doc, cursorTarget.decorations);
         }
 
         return null;
+      },
+      handleDOMEvents: {
+        // Check the DOM to see if there are inline cursor targets
+        // after a composition event ends. If so, manually insert the
+        // event data in order to prevent contents ending up inside
+        // of the cursor target decorations.
+        compositionend: function compositionend(view, incorrectlyTypedEvent) {
+          // This is typed by the prosemirror definitions as Event,
+          // this type is incorrect, and it is actually an InputEvent
+          var event = incorrectlyTypedEvent;
+          var state = view.state;
+
+          var _ref2 = inlineCursorTargetStateKey.getState(state),
+              cursorTarget = _ref2.cursorTarget;
+
+          if (cursorTarget !== undefined) {
+            handleTextInputInsideCursorTargetDecoration({
+              event: event,
+              cursorTarget: cursorTarget,
+              view: view
+            });
+            return true;
+          }
+
+          return false;
+        },
+        // Check the DOM to see if there are inline cursor targets
+        // before any input event. If so, manually insert the
+        // event data in order to prevent contents ending up inside
+        // of the cursor target decorations.
+        beforeinput: function beforeinput(view, incorrectlyTypedEvent) {
+          // This is typed by the prosemirror definitions as Event,
+          // this type is incorrect, and it is actually an InputEvent
+          var event = incorrectlyTypedEvent;
+          var state = view.state;
+
+          var _ref3 = inlineCursorTargetStateKey.getState(state),
+              cursorTarget = _ref3.cursorTarget;
+
+          if (!event.isComposing && cursorTarget !== undefined) {
+            handleTextInputInsideCursorTargetDecoration({
+              event: event,
+              cursorTarget: cursorTarget,
+              view: view
+            });
+            return true;
+          }
+
+          return false;
+        }
       }
     }
   });
-});
+});
+
+function cursorTargetHasValidDecorations(cursorTarget) {
+  if (!cursorTarget || // Decorations can end up as null when the decorations prop is
+  // called after the decorations have been removed from the dom.
+  // https://github.com/ProseMirror/prosemirror-view/blob/8f0d313a6389b86a335274fba36534ba1cb21f12/src/decoration.js#L30
+  cursorTarget.decorations.includes(null)) {
+    return false;
+  }
+
+  return true;
+}
+
+function handleTextInputInsideCursorTargetDecoration(_ref4) {
+  var event = _ref4.event,
+      view = _ref4.view,
+      cursorTarget = _ref4.cursorTarget;
+  event.stopPropagation();
+  event.preventDefault();
+  var content = event.data || '';
+  var tr = view.state.tr; // ensure any custom handleTextInput handlers are called for the input event
+  // ie. type ahead, emoji shortcuts.
+
+  var potentiallyHandleByHandleTextInput = view.someProp('handleTextInput', function (f) {
+    return f(view, cursorTarget.positions.from, cursorTarget.positions.to, content);
+  });
+
+  if (potentiallyHandleByHandleTextInput) {
+    // if a handleTextInput handler has handled the event, we don't want to
+    // manually update the document.
+    return;
+  }
+
+  tr.insertText(content);
+  view.dispatch(tr);
+}

package/dist/esm/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -2,11 +2,12 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject;
 
-import React from 'react';
-import styled from 'styled-components';
-export var BeforePrimaryToolbarPluginWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  margin-right: 8px;\n  flex-grow: 1;\n  justify-content: flex-end;\n  align-items: center;\n"])));
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
+var beforePrimaryToolbarPluginWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  margin-right: 8px;\n  flex-grow: 1;\n  justify-content: flex-end;\n  align-items: center;\n"])));
 export var BeforePrimaryToolbarWrapper = function BeforePrimaryToolbarWrapper(props) {
-  return /*#__PURE__*/React.createElement(BeforePrimaryToolbarPluginWrapper, {
+  return jsx("div", {
+    css: beforePrimaryToolbarPluginWrapper,
     "data-testid": 'before-primary-toolbar-components-plugin'
   }, props.beforePrimaryToolbarComponents);
 };

package/dist/esm/plugins/block-type/commands/block-type.js

@@ -6,8 +6,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 import { Selection } from 'prosemirror-state';
 import { findWrapping } from 'prosemirror-transform';
+import { safeInsert } from 'prosemirror-utils';
 import { CODE_BLOCK, BLOCK_QUOTE, PANEL, HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
 import { removeBlockMarks } from '../../../utils/mark';
+import { shouldSplitSelectedNodeOnNodeInsertion } from '../../../utils/insert';
 import { withAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../analytics';
 import { filterChildrenBetween } from '../../../utils';
 import { PanelType } from '@atlaskit/adf-schema';
@@ -230,7 +232,6 @@ function wrapSelectionIn(type) {
     var _state$selection3 = state.selection,
         $from = _state$selection3.$from,
         $to = _state$selection3.$to;
-    var paragraph = state.schema.nodes.paragraph;
     var _state$schema$marks = state.schema.marks,
         alignment = _state$schema$marks.alignment,
         indentation = _state$schema$marks.indentation;
@@ -245,8 +246,7 @@ function wrapSelectionIn(type) {
       tr.wrap(range, wrapping).scrollIntoView();
     } else {
       /** We always want to append a block type */
-      tr.replaceRangeWith($to.pos + 1, $to.pos + 1, type.createAndFill({}, paragraph.create()));
-      tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to + 1)));
+      safeInsert(type.createAndFill())(tr).scrollIntoView();
     }
 
     if (dispatch) {
@@ -263,15 +263,25 @@ function wrapSelectionIn(type) {
 
 function insertCodeBlock() {
   return function (state, dispatch) {
+    var _state$selection$$fro;
+
     var tr = state.tr;
-    var $to = state.selection.$to;
+    var _state$selection4 = state.selection,
+        $to = _state$selection4.$to,
+        $from = _state$selection4.$from;
     var codeBlock = state.schema.nodes.codeBlock;
-    var getNextNode = state.doc.nodeAt($to.pos + 1);
-    var addPos = getNextNode && getNextNode.isText ? 0 : 1;
-    /** We always want to append a block type */
+    var grandParentType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+    var parentType = state.selection.$from.parent.type;
+    /** We always want to append a block type unless we're inserting into a paragraph
+     * AND it's a valid child of the grandparent node
+     */
 
-    tr.replaceRangeWith($to.pos + addPos, $to.pos + addPos, codeBlock.createAndFill());
-    tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to + addPos)));
+    if (shouldSplitSelectedNodeOnNodeInsertion(parentType, grandParentType, codeBlock.createAndFill())) {
+      tr.replaceRangeWith($from.pos, $to.pos, codeBlock.createAndFill());
+      tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to)));
+    } else {
+      safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
+    }
 
     if (dispatch) {
       dispatch(tr);

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -1,9 +1,11 @@
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { FormattedMessage, defineMessages } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import TextStyleIcon from '@atlaskit/icon/glyph/editor/text-style';
 import ToolbarButton from '../../../../ui/ToolbarButton';
-import { ButtonContent, Wrapper, ExpandIconWrapper } from '../../../../ui/styles';
+import { buttonContentStyle, buttonContentReducedSpacingStyle, wrapperStyle, wrapperSmallStyle, expandIconWrapperStyle } from '../../../../ui/styles';
 import { NORMAL_TEXT } from '../../types';
 export var messages = defineMessages({
   textStyles: {
@@ -14,7 +16,7 @@ export var messages = defineMessages({
 });
 export var BlockTypeButton = function BlockTypeButton(props) {
   var labelTextStyles = props.formatMessage(messages.textStyles);
-  return /*#__PURE__*/React.createElement(ToolbarButton, {
+  return jsx(ToolbarButton, {
     spacing: props.isReducedSpacing ? 'none' : 'default',
     selected: props.selected,
     className: "block-type-btn",
@@ -24,16 +26,18 @@ export var BlockTypeButton = function BlockTypeButton(props) {
     "aria-label": labelTextStyles,
     "aria-haspopup": true,
     "aria-expanded": props['aria-expanded'],
-    iconAfter: /*#__PURE__*/React.createElement(Wrapper, {
-      isSmall: props.isSmall
-    }, props.isSmall && /*#__PURE__*/React.createElement(TextStyleIcon, {
+    iconAfter: jsx("span", {
+      css: [wrapperStyle, props.isSmall && wrapperSmallStyle]
+    }, props.isSmall && jsx(TextStyleIcon, {
       label: labelTextStyles
-    }), /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
+    }), jsx("span", {
+      css: expandIconWrapperStyle
+    }, jsx(ExpandIcon, {
       label: ""
     })))
-  }, !props.isSmall && /*#__PURE__*/React.createElement(ButtonContent, {
-    spacing: props.isReducedSpacing ? 'none' : 'default'
-  }, /*#__PURE__*/React.createElement(FormattedMessage, props.title || NORMAL_TEXT.title), /*#__PURE__*/React.createElement("div", {
+  }, !props.isSmall && jsx("span", {
+    css: [buttonContentStyle, props.isReducedSpacing && buttonContentReducedSpacingStyle]
+  }, jsx(FormattedMessage, props.title || NORMAL_TEXT.title), jsx("div", {
     style: {
       overflow: 'hidden',
       height: 0

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/index.js

@@ -17,9 +17,9 @@ import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import DropdownMenu from '../../../../ui/DropdownMenu';
-import { Separator, Wrapper, MenuWrapper } from '../../../../ui/styles';
+import { separatorStyles, wrapperStyle } from '../../../../ui/styles';
 import { NORMAL_TEXT } from '../../types';
-import { blockTypeMenuItemStyle, KeyboardShortcut } from './styled';
+import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect } from './styled';
 import { tooltip, findKeymapByDescription } from '../../../../keymaps';
 import { BlockTypeButton } from './blocktype-button';
 
@@ -71,8 +71,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           value: blockType,
           label: formatMessage(blockType.title),
           key: "".concat(blockType.name, "-").concat(index),
-          elemAfter: jsx(KeyboardShortcut, {
-            selected: isActive
+          elemAfter: jsx("div", {
+            css: [keyboardShortcut, isActive && keyboardShortcutSelect]
           }, tooltip(findKeymapByDescription(blockType.title.defaultMessage))),
           isActive: isActive
         };
@@ -131,7 +131,9 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
 
       if (!this.props.isDisabled && !blockTypesDisabled) {
         var items = this.createItems();
-        return jsx(MenuWrapper, null, jsx(DropdownMenu, {
+        return jsx("span", {
+          css: wrapperStyle
+        }, jsx(DropdownMenu, {
           items: items,
           onOpenChange: this.onOpenChange,
           onItemActivated: this.handleSelectBlockType,
@@ -152,10 +154,14 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           onClick: this.handleTriggerClick,
           formatMessage: formatMessage,
           "aria-expanded": active
-        }, longestDropdownMenuItem)), jsx(Separator, null));
+        }, longestDropdownMenuItem)), jsx("span", {
+          css: separatorStyles
+        }));
       }
 
-      return jsx(Wrapper, null, jsx(BlockTypeButton, {
+      return jsx("span", {
+        css: wrapperStyle
+      }, jsx(BlockTypeButton, {
         isSmall: isSmall,
         isReducedSpacing: isReducedSpacing,
         selected: active,
@@ -164,7 +170,9 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         onClick: this.handleTriggerClick,
         formatMessage: formatMessage,
         "aria-expanded": active
-      }, longestDropdownMenuItem), jsx(Separator, null));
+      }, longestDropdownMenuItem), jsx("span", {
+        css: separatorStyles
+      }));
     }
   }]);
 

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/styled.js

@@ -1,13 +1,12 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 
 /** @jsx jsx */
 import { css } from '@emotion/react';
 import { N400 } from '@atlaskit/theme/colors';
-import styled from 'styled-components';
 import { headingsSharedStyles } from '@atlaskit/editor-common/styles';
-import { Shortcut } from '../../../../ui/styles';
+import { shortcutStyle } from '../../../../ui/styles';
 export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected) {
   // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
   var selectedStyle = selected ? "".concat(tagName, " { color: white !important; }") : '';
@@ -15,6 +14,5 @@ export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, sel
     return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    ", ";\n    > {\n      h1,\n      h2,\n      h3,\n      h4,\n      h5,\n      h6 {\n        margin-top: 0;\n      }\n    }\n    ", ";\n  "])), headingsSharedStyles(themeProps), selectedStyle);
   };
 };
-export var KeyboardShortcut = styled(Shortcut)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  margin-left: 16px;\n"])), function (props) {
-  return props.selected ? "color: ".concat(N400, ";") : '';
-});
+export var keyboardShortcut = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  margin-left: 16px;\n"])), shortcutStyle);
+export var keyboardShortcutSelect = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  color: ", ";\n"])), N400);