@atlaskit/editor-core 153.1.3 → 155.0.0

package/dist/cjs/plugins/base/pm-plugins/frozen-editor.js

@@ -9,9 +9,11 @@ exports.frozenEditorPluginKey = exports.default = exports.NORMAL_SEVERITY_THRESH
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _ufo = require("@atlaskit/editor-common/ufo");
 
@@ -27,9 +29,9 @@ var _frozenEditor = require("../utils/frozen-editor");
 
 var _getPerformanceTiming = require("../../../utils/performance/get-performance-timing");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var frozenEditorPluginKey = new _prosemirrorState.PluginKey('frozenEditor');
 exports.frozenEditorPluginKey = frozenEditorPluginKey;
@@ -83,9 +85,9 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
   var shouldTrackSeverity = (inputTracking === null || inputTracking === void 0 ? void 0 : inputTracking.trackSeverity) || DEFAULT_TRACK_SEVERITY_ENABLED;
   var severityThresholdNormal = (inputTracking === null || inputTracking === void 0 ? void 0 : inputTracking.severityNormalThreshold) || DEFAULT_TRACK_SEVERITY_THRESHOLD_NORMAL;
   var severityThresholdDegraded = (inputTracking === null || inputTracking === void 0 ? void 0 : inputTracking.severityDegradedThreshold) || DEFAULT_TRACK_SEVERITY_THRESHOLD_DEGRADED;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: frozenEditorPluginKey,
-    props: (0, _editorCommon.isPerformanceAPIAvailable)() ? {
+    props: (0, _utils.isPerformanceAPIAvailable)() ? {
       handleTextInput: function handleTextInput(view) {
         var state = view.state;
         var now = performance.now();
@@ -135,7 +137,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
             var _nodesCount = allowCountNodes ? (0, _countNodes.countNodes)(view.state) : {};
 
             keystrokeCount = 0;
-            var severity = shouldTrackSeverity ? (0, _editorCommon.getAnalyticsEventSeverity)(diff, severityThresholdNormal, severityThresholdDegraded) : undefined;
+            var severity = shouldTrackSeverity ? (0, _utils.getAnalyticsEventSeverity)(diff, severityThresholdNormal, severityThresholdDegraded) : undefined;
 
             if (inputTracking !== null && inputTracking !== void 0 && inputTracking.enabled) {
               var _getContextIdentifier3;
@@ -180,7 +182,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
       } : undefined
     } : undefined,
     view: function view(_view) {
-      if (!(0, _editorCommon.isPerformanceObserverAvailable)()) {
+      if (!(0, _utils.isPerformanceObserverAvailable)()) {
         return {};
       }
 
@@ -194,7 +196,7 @@ var _default = function _default(dispatchAnalyticsEvent, inputTracking, browserF
             var duration = perfEntries[i].duration;
 
             if (duration > freezeThreshold) {
-              dispatchLongTaskEvent(dispatchAnalyticsEvent, _view, duration, allowCountNodes, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackInteractionType ? interactionType : undefined, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackSeverity ? (0, _editorCommon.getAnalyticsEventSeverity)(duration, browserFreezeTracking.severityNormalThreshold || NORMAL_SEVERITY_THRESHOLD, browserFreezeTracking.severityDegradedThreshold || DEGRADED_SEVERITY_THRESHOLD) : undefined);
+              dispatchLongTaskEvent(dispatchAnalyticsEvent, _view, duration, allowCountNodes, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackInteractionType ? interactionType : undefined, browserFreezeTracking !== null && browserFreezeTracking !== void 0 && browserFreezeTracking.trackSeverity ? (0, _utils.getAnalyticsEventSeverity)(duration, browserFreezeTracking.severityNormalThreshold || NORMAL_SEVERITY_THRESHOLD, browserFreezeTracking.severityDegradedThreshold || DEGRADED_SEVERITY_THRESHOLD) : undefined);
             }
           }
         }); // register observer for long task notifications

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

@@ -7,9 +7,11 @@ exports.isSpecial = exports.inlineCursorTargetStateKey = exports.findSpecialNode
 
 var _prosemirrorView = require("prosemirror-view");
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var inlineCursorTargetStateKey = new _prosemirrorState.PluginKey('inlineCursorTargetPlugin');
 exports.inlineCursorTargetStateKey = inlineCursorTargetStateKey;
@@ -71,7 +73,7 @@ var findSpecialNodeBefore = function findSpecialNodeBefore($pos, tr) {
 exports.findSpecialNodeBefore = findSpecialNodeBefore;
 
 var _default = function _default() {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: inlineCursorTargetStateKey,
     state: {
       init: function init() {
@@ -109,7 +111,7 @@ var _default = function _default() {
         if (positions && positions.length) {
           var decorations = positions.map(function (position) {
             var node = document.createElement('span');
-            node.appendChild(document.createTextNode(_editorCommon.ZERO_WIDTH_SPACE));
+            node.appendChild(document.createTextNode(_utils.ZERO_WIDTH_SPACE));
             return _prosemirrorView.Decoration.widget(position, node, {
               raw: true,
               side: -1,

package/dist/cjs/plugins/base/pm-plugins/newline-preserve-marks.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.newlinePreserveMarksKey = exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorKeymap = require("prosemirror-keymap");
@@ -37,7 +39,7 @@ var splitBlockPreservingMarks = function splitBlockPreservingMarks(state, dispat
 };
 
 var _default = function _default() {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: newlinePreserveMarksKey,
     props: {
       handleKeyDown: (0, _prosemirrorKeymap.keydownHandler)({

package/dist/cjs/plugins/base/pm-plugins/react-nodeview.js

@@ -13,6 +13,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var ReactNodeViewState = /*#__PURE__*/function () {
@@ -48,7 +50,7 @@ var ReactNodeViewState = /*#__PURE__*/function () {
 exports.ReactNodeViewState = ReactNodeViewState;
 var stateKey = new _prosemirrorState.PluginKey('reactNodeView');
 exports.stateKey = stateKey;
-var plugin = new _prosemirrorState.Plugin({
+var plugin = new _safePlugin.SafePlugin({
   state: {
     init: function init() {
       return new ReactNodeViewState();

package/dist/cjs/plugins/base/pm-plugins/scroll-gutter.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.GUTTER_SIZE_MOBILE_IN_PX = exports.GUTTER_SIZE_IN_PX = exports.GUTTER_SELECTOR = void 0;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _utils = require("../../../utils");
 
@@ -182,7 +182,7 @@ var _default = function _default() {
   var gutter = createGutter(gutterSize);
   var scrollElement = null; // | undefined;
 
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     props: {
       // Determines the distance (in pixels) between the cursor and the end of the visible viewport at which point,
       // when scrolling the cursor into view, scrolling takes place.

package/dist/cjs/plugins/block-type/pm-plugins/main.js

@@ -9,13 +9,15 @@ exports.pluginKey = exports.createPlugin = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _types = require("../types");
 
-var _utils = require("../../../utils");
+var _utils2 = require("../../../utils");
 
 var _commands = require("../commands");
 
@@ -23,9 +25,9 @@ var _analytics = require("../../analytics");
 
 var _consts = require("../../../keymaps/consts");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var blockTypeForNode = function blockTypeForNode(node, schema) {
   if (node.type === schema.nodes.heading) {
@@ -108,7 +110,7 @@ exports.pluginKey = pluginKey;
 
 var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
   var altKeyLocation = 0;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
       if (lastNodeMustBeParagraph) {
         var pos = newState.doc.resolve(newState.doc.content.size - 1);
@@ -132,7 +134,7 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
 
         return {
           currentBlockType: detectBlockType(availableBlockTypes, state),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(state),
+          blockTypesDisabled: (0, _utils2.areBlockTypesDisabled)(state),
           availableBlockTypes: availableBlockTypes,
           availableWrapperBlockTypes: availableWrapperBlockTypes
         };
@@ -140,7 +142,7 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypes, newState),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState)
+          blockTypesDisabled: (0, _utils2.areBlockTypesDisabled)(newState)
         });
 
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled) {
@@ -162,9 +164,9 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
         var headingLevel = _consts.HEADING_KEYS.indexOf(event.keyCode);
 
         if (headingLevel > -1 && event.altKey) {
-          if (_editorCommon.browser.mac && event.metaKey) {
+          if (_utils.browser.mac && event.metaKey) {
             return autoformatHeading(headingLevel, view);
-          } else if (!_editorCommon.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
+          } else if (!_utils.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
             return autoformatHeading(headingLevel, view);
           }
         } else if (event.key === 'Alt') {

package/dist/cjs/plugins/block-type/styles.js

@@ -11,9 +11,9 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
 
 var _styledComponents = require("styled-components");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
 var _templateObject;
 
-var blocktypeStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", ";\n    ", ";\n  }\n"])), _editorCommon.blockquoteSharedStyles, _editorCommon.headingsSharedStyles);
+var blocktypeStyles = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", ";\n    ", ";\n  }\n"])), _styles.blockquoteSharedStyles, _styles.headingsSharedStyles);
 exports.blocktypeStyles = blocktypeStyles;

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

@@ -40,6 +40,8 @@ var BlockTypeButton = function BlockTypeButton(props) {
     onClick: props.onClick,
     title: labelTextStyles,
     "aria-label": labelTextStyles,
+    "aria-haspopup": true,
+    "aria-expanded": props['aria-expanded'],
     iconAfter: /*#__PURE__*/_react.default.createElement(_styles.Wrapper, {
       isSmall: props.isSmall
     }, props.isSmall && /*#__PURE__*/_react.default.createElement(_textStyle.default, {

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

@@ -87,6 +87,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
             selected: isActive
           }, /*#__PURE__*/_react.default.createElement(Tag, null, formatMessage(blockType.title))),
           value: blockType,
+          label: formatMessage(blockType.title),
           key: "".concat(blockType.name, "-").concat(index),
           elemAfter: /*#__PURE__*/_react.default.createElement(_styled.KeyboardShortcut, {
             selected: isActive
@@ -156,7 +157,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           scrollableElement: popupsScrollableElement,
           zIndex: _editorSharedStyles.akEditorMenuZIndex,
           fitHeight: 360,
-          fitWidth: 106
+          fitWidth: 106,
+          shouldUseDefaultRole: true
         }, /*#__PURE__*/_react.default.createElement(_blocktypeButton.BlockTypeButton, {
           isSmall: isSmall,
           isReducedSpacing: isReducedSpacing,
@@ -164,7 +166,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           disabled: false,
           title: blockTypeTitles[0],
           onClick: this.handleTriggerClick,
-          formatMessage: formatMessage
+          formatMessage: formatMessage,
+          "aria-expanded": active
         }, longestDropdownMenuItem)), /*#__PURE__*/_react.default.createElement(_styles.Separator, null));
       }
 
@@ -175,7 +178,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         disabled: true,
         title: blockTypeTitles[0],
         onClick: this.handleTriggerClick,
-        formatMessage: formatMessage
+        formatMessage: formatMessage,
+        "aria-expanded": active
       }, longestDropdownMenuItem), /*#__PURE__*/_react.default.createElement(_styles.Separator, null));
     }
   }]);

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

@@ -13,20 +13,20 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _styles = require("@atlaskit/editor-common/styles");
 
-var _styles = require("../../../../ui/styles");
+var _styles2 = require("../../../../ui/styles");
 
 var _templateObject, _templateObject2;
 
-var BlockTypeMenuItem = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  > {\n    h1,\n    h2,\n    h3,\n    h4,\n    h5,\n    h6 {\n      margin-top: 0;\n    }\n  }\n  ", ";\n"])), _editorCommon.headingsSharedStyles, function (props) {
+var BlockTypeMenuItem = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", ";\n  > {\n    h1,\n    h2,\n    h3,\n    h4,\n    h5,\n    h6 {\n      margin-top: 0;\n    }\n  }\n  ", ";\n"])), _styles.headingsSharedStyles, function (props) {
   return (// TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
     props.selected ? "".concat(props.tagName, " { color: white !important; }") : ''
   );
 });
 
 exports.BlockTypeMenuItem = BlockTypeMenuItem;
-var KeyboardShortcut = (0, _styledComponents.default)(_styles.Shortcut)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  margin-left: 16px;\n"])), function (props) {
+var KeyboardShortcut = (0, _styledComponents.default)(_styles2.Shortcut)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  margin-left: 16px;\n"])), function (props) {
   return props.selected ? "color: ".concat(_colors.N400, ";") : '';
 });
 exports.KeyboardShortcut = KeyboardShortcut;

package/dist/cjs/plugins/breakout/index.js

@@ -15,11 +15,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 
@@ -35,9 +35,9 @@ var _dom = require("../../utils/dom");
 
 var _findBreakoutNode = require("./utils/find-breakout-node");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var BreakoutView = /*#__PURE__*/function () {
   function BreakoutView(node, view, eventDispatcher) {
@@ -45,7 +45,7 @@ var BreakoutView = /*#__PURE__*/function () {
 
     (0, _classCallCheck2.default)(this, BreakoutView);
     (0, _defineProperty2.default)(this, "updateWidth", function (widthState) {
-      var width = (0, _editorCommon.calcBreakoutWidth)(_this.node.attrs.mode, widthState.width);
+      var width = (0, _utils.calcBreakoutWidth)(_this.node.attrs.mode, widthState.width);
       var newStyle = "width: ".concat(width, "; ");
       var lineLength = widthState.lineLength;
       var widthPx = (0, _dom.parsePx)(width);
@@ -116,7 +116,7 @@ function shouldPluginStateUpdate(newBreakoutNode, currentBreakoutNode) {
 function createPlugin(_ref) {
   var dispatch = _ref.dispatch,
       eventDispatcher = _ref.eventDispatcher;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: {
       init: function init() {
         return {

package/dist/cjs/plugins/breakout/ui/LayoutButton.js

@@ -33,7 +33,7 @@ var _reactIntlNext = require("react-intl-next");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _collapse = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/collapse"));
 
@@ -178,7 +178,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         element = closestEl.firstChild;
       }
 
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.Popup, {
+      return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
         ariaLabel: title,
         target: element,
         offset: [5, 0],

package/dist/cjs/plugins/caption/nodeviews/index.js

@@ -24,7 +24,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _nodeviews = require("../../../nodeviews/");
 
@@ -69,7 +69,7 @@ var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.Caption, {
+      return /*#__PURE__*/_react.default.createElement(_ui.Caption, {
         selected: this.insideSelection(),
         hasContent: this.node.content.childCount > 0
       }, /*#__PURE__*/_react.default.createElement("div", {

package/dist/cjs/plugins/caption/pm-plugins/main.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
@@ -27,7 +27,7 @@ var fireAnalytic = function fireAnalytic(state, tr, action) {
 };
 
 var _default = function _default(portalProviderAPI, eventDispatcher, providerFactory, dispatch) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     appendTransaction: function appendTransaction(transactions, oldState, newState) {
       // only run for transactions that change selection
       if (!transactions.find(function (tr) {

package/dist/cjs/plugins/card/index.js

@@ -19,9 +19,11 @@ var _toolbar = require("./toolbar");
 
 var _EditorSmartCardEvents = require("./ui/EditorSmartCardEvents");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _keymap = require("./pm-plugins/keymap");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var cardPlugin = function cardPlugin(options) {
   return {
@@ -50,7 +52,7 @@ var cardPlugin = function cardPlugin(options) {
       var allowBlockCards = (_options$allowBlockCa = options.allowBlockCards) !== null && _options$allowBlockCa !== void 0 ? _options$allowBlockCa : true;
       var allowResizing = (_options$allowResizin = options.allowResizing) !== null && _options$allowResizin !== void 0 ? _options$allowResizin : true;
       var useAlternativePreloader = (_options$useAlternati = options.useAlternativePreloader) !== null && _options$useAlternati !== void 0 ? _options$useAlternati : true;
-      return [{
+      var plugins = [{
         name: 'card',
         plugin: (0, _main.createPlugin)(_objectSpread(_objectSpread({}, options), {}, {
           allowBlockCards: allowBlockCards,
@@ -58,9 +60,17 @@ var cardPlugin = function cardPlugin(options) {
           useAlternativePreloader: useAlternativePreloader
         }))
       }];
+      plugins.push({
+        name: 'cardKeymap',
+        plugin: function plugin(_ref) {
+          var featureFlags = _ref.featureFlags;
+          return (0, _keymap.cardKeymap)(featureFlags);
+        }
+      });
+      return plugins;
     },
-    contentComponent: function contentComponent(_ref) {
-      var editorView = _ref.editorView;
+    contentComponent: function contentComponent(_ref2) {
+      var editorView = _ref2.editorView;
       return /*#__PURE__*/_react.default.createElement(_EditorSmartCardEvents.EditorSmartCardEvents, {
         editorView: editorView
       });

package/dist/cjs/plugins/card/messages.js

@@ -47,6 +47,46 @@ var messages = (0, _reactIntlNext.defineMessages)({
     id: 'fabric.editor.displayOptionUnavailableInParentNode',
     defaultMessage: "This display option isn't available inside {node}",
     description: 'Warning message to show the user that this node option is not available inside a parent node type'
+  },
+  urlTitle: {
+    id: 'fabric.editor.urlTitle',
+    defaultMessage: 'URL',
+    description: 'Title for option to convert the card to become a regular text-based hyperlink.'
+  },
+  cardTitle: {
+    id: 'fabric.editor.cardTitle',
+    defaultMessage: 'Card',
+    description: 'Title for option to display link in the card view.'
+  },
+  inlineTitle: {
+    id: 'fabric.editor.inlineTitle',
+    defaultMessage: 'Inline',
+    description: 'Title for option to display link in the inline view.'
+  },
+  embedTitle: {
+    id: 'fabric.editor.embedTitle',
+    defaultMessage: 'Embed',
+    description: 'Title for option to display link as an embedded object.'
+  },
+  urlDescription: {
+    id: 'fabric.editor.urlDescription',
+    defaultMessage: 'Display link as URL',
+    description: 'Description for option to convert the card to become a regular text-based hyperlink.'
+  },
+  cardDescription: {
+    id: 'fabric.editor.cardDescription',
+    defaultMessage: 'Display more information about a link, including a summary and actions',
+    description: 'Description for option to display link in the card view.'
+  },
+  inlineDescription: {
+    id: 'fabric.editor.inlineDescription',
+    defaultMessage: 'Display link as inline text',
+    description: 'Description for option to display link in the inline view.'
+  },
+  embedDescription: {
+    id: 'fabric.editor.ecombedDescription',
+    defaultMessage: 'Display an interactive preview of a link',
+    description: 'Description for option to display link as an embedded object.'
   }
 });
 exports.messages = messages;

package/dist/cjs/plugins/card/nodeviews/blockCard.js

@@ -25,7 +25,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _smartCard = require("@atlaskit/smart-card");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -33,8 +35,6 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 
 var _genericCard = require("./genericCard");
 
-var _nodeviews = require("../../../nodeviews/");
-
 var _actions = require("../pm-plugins/actions");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -81,7 +81,7 @@ var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "gapCursorSpan", function () {
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
-      if (_editorCommon.browser.ie && _editorCommon.browser.ie_version < 79) {
+      if (_utils.browser.ie && _utils.browser.ie_version < 79) {
         return;
       } // render an empty span afterwards to get around Webkit bug
       // that puts caret in next editable text element
@@ -98,7 +98,7 @@ var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     key: "UNSAFE_componentWillMount",
     value: function UNSAFE_componentWillMount() {
       var view = this.props.view;
-      var scrollContainer = (0, _editorCommon.findOverflowScrollParent)(view.dom);
+      var scrollContainer = (0, _ui.findOverflowScrollParent)(view.dom);
       this.scrollContainer = scrollContainer || undefined;
     }
   }, {
@@ -138,10 +138,10 @@ exports.BlockCardComponent = BlockCardComponent;
 (0, _defineProperty2.default)(BlockCardComponent, "contextTypes", {
   contextAdapter: _propTypes.default.object
 });
-var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _editorCommon.UnsupportedBlock);
+var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _ui.UnsupportedBlock);
 
-var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
-  (0, _inherits2.default)(BlockCard, _ReactNodeView);
+var BlockCard = /*#__PURE__*/function (_GenericCard) {
+  (0, _inherits2.default)(BlockCard, _GenericCard);
 
   var _super2 = _createSuper(BlockCard);
 
@@ -155,7 +155,7 @@ var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function createDomRef() {
       var domRef = document.createElement('div');
 
-      if (_editorCommon.browser.chrome && this.reactComponentProps.platform !== 'mobile') {
+      if (_utils.browser.chrome && this.reactComponentProps.platform !== 'mobile') {
         // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
         // see also: https://github.com/ProseMirror/prosemirror/issues/884
         domRef.contentEditable = 'true';
@@ -176,6 +176,6 @@ var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return BlockCard;
-}(_nodeviews.ReactNodeView);
+}(_genericCard.GenericCard);
 
 exports.BlockCard = BlockCard;