@atlaskit/editor-core 187.9.0 → 187.10.0

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

@@ -9,11 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-common/utils");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _types = require("../types");
-var _utils2 = require("../../../utils");
+var _consts = require("../consts");
 var _commands = require("../commands");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _consts = require("../../../keymaps/consts");
+var _utils2 = require("../utils");
 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 blockTypeForNode = function blockTypeForNode(node, schema) {
@@ -70,17 +70,17 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
   });
   return blockType || _types.OTHER;
 };
-var autoformatHeading = function autoformatHeading(headingLevel, view) {
+var autoformatHeading = function autoformatHeading(headingLevel, view, editorAnalyticsApi) {
   if (headingLevel === 0) {
-    (0, _commands.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING)(view.state, view.dispatch);
+    (0, _commands.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
   } else {
-    (0, _commands.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING)(view.state, view.dispatch);
+    (0, _commands.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
   }
   return true;
 };
 var pluginKey = new _state.PluginKey('blockTypePlugin');
 exports.pluginKey = pluginKey;
-var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
+var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) {
   var altKeyLocation = 0;
   return new _safePlugin.SafePlugin({
     appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
@@ -131,9 +131,9 @@ var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
         var headingLevel = _consts.HEADING_KEYS.indexOf(event.keyCode);
         if (headingLevel > -1 && event.altKey) {
           if (_utils.browser.mac && event.metaKey) {
-            return autoformatHeading(headingLevel, view);
+            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
           } else if (!_utils.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
-            return autoformatHeading(headingLevel, view);
+            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
           }
         } else if (event.key === 'Alt') {
           // event.location is for the current key only; when a user hits Ctrl-Alt-1 the

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

@@ -10,10 +10,10 @@ var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _textStyle = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/text-style"));
-var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
-var _styles = require("../../../../ui/styles");
-var _styles2 = require("@atlaskit/editor-common/styles");
+var _styles = require("@atlaskit/editor-common/styles");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _types = require("../../types");
+var _styled = require("./styled");
 /** @jsx jsx */
 
 var messages = (0, _reactIntlNext.defineMessages)({
@@ -26,7 +26,7 @@ var messages = (0, _reactIntlNext.defineMessages)({
 exports.messages = messages;
 var BlockTypeButton = function BlockTypeButton(props) {
   var labelTextStyles = props.formatMessage(messages.textStyles);
-  return (0, _react2.jsx)(_ToolbarButton.default, {
+  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
     spacing: props.isReducedSpacing ? 'none' : 'default',
     selected: props.selected,
     className: "block-type-btn",
@@ -38,17 +38,17 @@ var BlockTypeButton = function BlockTypeButton(props) {
     "aria-haspopup": true,
     "aria-expanded": props['aria-expanded'],
     iconAfter: (0, _react2.jsx)("span", {
-      css: [_styles2.wrapperStyle, props.isSmall && _styles.wrapperSmallStyle],
+      css: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
     }, props.isSmall && (0, _react2.jsx)(_textStyle.default, {
       label: labelTextStyles
     }), (0, _react2.jsx)("span", {
-      css: _styles.expandIconWrapperStyle
+      css: _styled.expandIconWrapperStyle
     }, (0, _react2.jsx)(_chevronDown.default, {
       label: ""
     })))
   }, !props.isSmall && (0, _react2.jsx)("span", {
-    css: [_styles.buttonContentStyle, props.isReducedSpacing && _styles.buttonContentReducedSpacingStyle]
+    css: [_styled.buttonContentStyle, props.isReducedSpacing && _styled.buttonContentReducedSpacingStyle]
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, props.title || _types.NORMAL_TEXT.title)));
 };
 exports.BlockTypeButton = BlockTypeButton;

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

@@ -16,12 +16,11 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _styles = require("@atlaskit/editor-common/styles");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _styled = require("./styled");
-var _keymaps = require("../../../../keymaps");
 var _blocktypeButton = require("./blocktype-button");
-var _keymaps2 = require("@atlaskit/editor-common/keymaps");
 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; }
 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); }; }
@@ -78,7 +77,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           value: blockType,
           label: formatMessage(blockType.title),
           'aria-label': (0, _keymaps.tooltip)(keyMap, formatMessage(blockType.title)),
-          keyShortcuts: (0, _keymaps2.getAriaKeyshortcuts)(keyMap),
+          keyShortcuts: (0, _keymaps.getAriaKeyshortcuts)(keyMap),
           key: "".concat(blockType.name, "-").concat(index),
           elemAfter: (0, _react2.jsx)("div", {
             css: [_styled.keyboardShortcut, isActive && _styled.keyboardShortcutSelect]

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

@@ -4,13 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.keyboardShortcutSelect = exports.keyboardShortcut = exports.blockTypeMenuItemStyle = void 0;
+exports.wrapperSmallStyle = exports.keyboardShortcutSelect = exports.keyboardShortcut = exports.expandIconWrapperStyle = exports.buttonContentStyle = exports.buttonContentReducedSpacingStyle = exports.blockTypeMenuItemStyle = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
 var _styles = require("@atlaskit/editor-common/styles");
-var _styles2 = require("../../../../ui/styles");
-var _templateObject, _templateObject2, _templateObject3;
+var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 /** @jsx jsx */
 var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected) {
   // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
@@ -20,7 +20,15 @@ var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected)
   };
 };
 exports.blockTypeMenuItemStyle = blockTypeMenuItemStyle;
-var keyboardShortcut = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  margin-left: 16px;\n"])), _styles2.shortcutStyle);
+var keyboardShortcut = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  margin-left: ", ";\n"])), _shortcut.shortcutStyle, "var(--ds-space-200, 16px)");
 exports.keyboardShortcut = keyboardShortcut;
 var keyboardShortcutSelect = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n"])), "var(--ds-icon, ".concat(_colors.N400, ")"));
-exports.keyboardShortcutSelect = keyboardShortcutSelect;
+exports.keyboardShortcutSelect = keyboardShortcutSelect;
+var buttonContentStyle = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  min-width: 80px;\n  align-items: center;\n  overflow: hidden;\n  justify-content: center;\n  flex-direction: column;\n  padding: ", ";\n"])), "var(--ds-space-075, 6px)");
+exports.buttonContentStyle = buttonContentStyle;
+var buttonContentReducedSpacingStyle = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  padding: ", ";\n"])), "var(--ds-space-100, 8px)");
+exports.buttonContentReducedSpacingStyle = buttonContentReducedSpacingStyle;
+var wrapperSmallStyle = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  margin-left: ", ";\n  min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
+exports.wrapperSmallStyle = wrapperSmallStyle;
+var expandIconWrapperStyle = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  margin-left: -8px;\n"])));
+exports.expandIconWrapperStyle = expandIconWrapperStyle;

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

@@ -3,7 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNodeAWrappingBlockNode = void 0;
+exports.areBlockTypesDisabled = areBlockTypesDisabled;
+exports.isNodeAWrappingBlockNode = exports.createWrappingTextBlockRule = exports.createJoinNodesRule = void 0;
+var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
+var _utils = require("@atlaskit/editor-common/utils");
 var _types = require("./types");
 var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -13,4 +16,72 @@ var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
     return blockNode.name === node.type.name;
   });
 };
-exports.isNodeAWrappingBlockNode = isNodeAWrappingBlockNode;
+exports.isNodeAWrappingBlockNode = isNodeAWrappingBlockNode;
+var createJoinNodesRule = function createJoinNodesRule(match, nodeType) {
+  return (0, _utils.createWrappingJoinRule)({
+    nodeType: nodeType,
+    match: match,
+    getAttrs: {},
+    joinPredicate: function joinPredicate(_, node) {
+      return node.type === nodeType;
+    }
+  });
+};
+exports.createJoinNodesRule = createJoinNodesRule;
+var createWrappingTextBlockRule = function createWrappingTextBlockRule(_ref) {
+  var match = _ref.match,
+    nodeType = _ref.nodeType,
+    getAttrs = _ref.getAttrs;
+  var handler = function handler(state, match, start, end) {
+    var fixedStart = Math.max(start, 1);
+    var $start = state.doc.resolve(fixedStart);
+    var attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
+    var nodeBefore = $start.node(-1);
+    if (nodeBefore && !nodeBefore.canReplaceWith($start.index(-1), $start.indexAfter(-1), nodeType)) {
+      return null;
+    }
+    return state.tr.delete(fixedStart, end).setBlockType(fixedStart, fixedStart, nodeType, attrs);
+  };
+  return (0, _prosemirrorInputRules.createRule)(match, handler);
+};
+
+/**
+ * Function will create a list of wrapper blocks present in a selection.
+ */
+exports.createWrappingTextBlockRule = createWrappingTextBlockRule;
+function getSelectedWrapperNodes(state) {
+  var nodes = [];
+  if (state.selection) {
+    var _state$selection = state.selection,
+      $from = _state$selection.$from,
+      $to = _state$selection.$to;
+    var _state$schema$nodes = state.schema.nodes,
+      blockquote = _state$schema$nodes.blockquote,
+      panel = _state$schema$nodes.panel,
+      orderedList = _state$schema$nodes.orderedList,
+      bulletList = _state$schema$nodes.bulletList,
+      listItem = _state$schema$nodes.listItem,
+      codeBlock = _state$schema$nodes.codeBlock,
+      decisionItem = _state$schema$nodes.decisionItem,
+      decisionList = _state$schema$nodes.decisionList,
+      taskItem = _state$schema$nodes.taskItem,
+      taskList = _state$schema$nodes.taskList;
+    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+      if (node.isBlock && [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList].indexOf(node.type) >= 0) {
+        nodes.push(node.type);
+      }
+    });
+  }
+  return nodes;
+}
+
+/**
+ * Function will check if changing block types: Paragraph, Heading is enabled.
+ */
+function areBlockTypesDisabled(state) {
+  var nodesTypes = getSelectedWrapperNodes(state);
+  var panel = state.schema.nodes.panel;
+  return nodesTypes.filter(function (type) {
+    return type !== panel;
+  }).length > 0;
+}

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

@@ -9,7 +9,7 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _commands = require("../../../commands");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _selection = require("../../selection/gap-cursor/selection");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -28,7 +28,7 @@ function captionKeymap() {
 var createNewParagraphBelowCaption = function createNewParagraphBelowCaption(state, dispatch) {
   var caption = (0, _utils.findParentNodeOfType)(state.schema.nodes.caption)(state.selection);
   if (caption) {
-    return (0, _commands.createNewParagraphBelow)(state, dispatch);
+    return (0, _utils2.createNewParagraphBelow)(state, dispatch);
   }
   return false;
 };

package/dist/cjs/plugins/emoji/commands/insert-emoji.js

@@ -4,40 +4,43 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.insertEmoji = insertEmoji;
+exports.insertEmoji = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 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; }
-function insertEmoji(emojiId, inputMethod) {
-  return function (state, dispatch) {
-    var emoji = state.schema.nodes.emoji;
-    if (emoji && emojiId) {
-      var node = emoji.createChecked(_objectSpread(_objectSpread({}, emojiId), {}, {
-        text: emojiId.fallback || emojiId.shortName
-      }));
-      var textNode = state.schema.text(' ');
-      if (dispatch) {
-        var fragment = _model.Fragment.fromArray([node, textNode]);
-        var tr = (0, _utils.safeInsert)(fragment)(state.tr);
-        if (inputMethod) {
-          (0, _analytics.addAnalytics)(state, tr, {
-            action: _analytics.ACTION.INSERTED,
-            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.EMOJI,
-            attributes: {
-              inputMethod: inputMethod
-            },
-            eventType: _analytics.EVENT_TYPE.TRACK
-          });
+var insertEmoji = function insertEmoji(editorAnalyticsAPI) {
+  return function (emojiId, inputMethod) {
+    return function (state, dispatch) {
+      var emoji = state.schema.nodes.emoji;
+      if (emoji && emojiId) {
+        var node = emoji.createChecked(_objectSpread(_objectSpread({}, emojiId), {}, {
+          text: emojiId.fallback || emojiId.shortName
+        }));
+        var textNode = state.schema.text(' ');
+        if (dispatch) {
+          var fragment = _model.Fragment.fromArray([node, textNode]);
+          var tr = (0, _utils.safeInsert)(fragment)(state.tr);
+          if (inputMethod) {
+            editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+              action: _analytics.ACTION.INSERTED,
+              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: _analytics.ACTION_SUBJECT_ID.EMOJI,
+              attributes: {
+                inputMethod: inputMethod
+              },
+              eventType: _analytics.EVENT_TYPE.TRACK
+            })(tr);
+          }
+          dispatch(tr.setSelection(_state.Selection.near(tr.doc.resolve(state.selection.$from.pos + fragment.size))));
         }
-        dispatch(tr.setSelection(_state.Selection.near(tr.doc.resolve(state.selection.$from.pos + fragment.size))));
+        return true;
       }
-      return true;
-    }
-    return false;
+      return false;
+    };
   };
-}
+};
+exports.insertEmoji = insertEmoji;

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

@@ -188,10 +188,11 @@ var emojiPlugin = function emojiPlugin(options, api) {
       }, {
         name: 'emojiAsciiInputRule',
         plugin: function plugin(_ref6) {
+          var _api$dependencies$ana8;
           var schema = _ref6.schema,
             providerFactory = _ref6.providerFactory,
             featureFlags = _ref6.featureFlags;
-          return (0, _asciiInputRules.inputRulePlugin)(schema, providerFactory, featureFlags);
+          return (0, _asciiInputRules.inputRulePlugin)(schema, providerFactory, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions);
         }
       }];
     },
@@ -208,13 +209,13 @@ var emojiPlugin = function emojiPlugin(options, api) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconEmoji, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana8;
+            var _api$dependencies$ana9;
             var tr = insert(undefined);
             (0, _openTypeaheadAtCursor.openTypeAheadAtCursor)({
               triggerHandler: typeAhead,
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
             })(tr);
-            api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions.attachAnalyticsEvent({
+            api === null || api === void 0 ? void 0 : (_api$dependencies$ana9 = api.dependencies.analytics) === null || _api$dependencies$ana9 === void 0 ? void 0 : _api$dependencies$ana9.actions.attachAnalyticsEvent({
               action: _analytics.ACTION.INVOKED,
               actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_EMOJI,

package/dist/cjs/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -16,14 +16,14 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 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); }; }
 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; } }
 var matcher;
-function inputRulePlugin(schema, providerFactory, featureFlags) {
+function inputRulePlugin(schema, providerFactory, featureFlags, editorAnalyticsAPI) {
   if (schema.nodes.emoji && providerFactory) {
     initMatcher(providerFactory);
-    var asciiEmojiRule = (0, _prosemirrorInputRules.createRule)(AsciiEmojiMatcher.REGEX, inputRuleHandler);
+    var asciiEmojiRule = (0, _prosemirrorInputRules.createRule)(AsciiEmojiMatcher.REGEX, inputRuleHandler(editorAnalyticsAPI));
     return (0, _prosemirrorInputRules.createPlugin)('emoji', [asciiEmojiRule]);
   }
   return;
@@ -41,17 +41,19 @@ function initMatcher(providerFactory) {
   };
   providerFactory.subscribe('emojiProvider', handleProvider);
 }
-function inputRuleHandler(state, matchParts, start, end) {
-  if (!matcher) {
+var inputRuleHandler = function inputRuleHandler(editorAnalyticsAPI) {
+  return function (state, matchParts, start, end) {
+    if (!matcher) {
+      return null;
+    }
+    var match = matcher.match(matchParts);
+    if (match) {
+      var transactionCreator = new AsciiEmojiTransactionCreator(state, match, start, end, editorAnalyticsAPI);
+      return transactionCreator.create();
+    }
     return null;
-  }
-  var match = matcher.match(matchParts);
-  if (match) {
-    var transactionCreator = new AsciiEmojiTransactionCreator(state, match, start, end);
-    return transactionCreator.create();
-  }
-  return null;
-}
+  };
+};
 var REGEX_LEADING_CAPTURE_INDEX = 1;
 var REGEX_EMOJI_LEADING_PARENTHESES = 2;
 var REGEX_EMOJI_ASCII_CAPTURE_INDEX = 3;
@@ -150,18 +152,20 @@ var RecordingAsciiEmojiMatcher = /*#__PURE__*/function (_AsciiEmojiMatcher) {
   return RecordingAsciiEmojiMatcher;
 }(AsciiEmojiMatcher);
 var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
-  function AsciiEmojiTransactionCreator(state, match, start, end) {
+  function AsciiEmojiTransactionCreator(state, match, start, end, editorAnalyticsAPI) {
     (0, _classCallCheck2.default)(this, AsciiEmojiTransactionCreator);
     this.state = state;
     this.match = match;
     this.start = start;
     this.end = end;
+    this.editorAnalyticsAPI = editorAnalyticsAPI;
   }
   (0, _createClass2.default)(AsciiEmojiTransactionCreator, [{
     key: "create",
     value: function create() {
+      var _this$editorAnalytics;
       var tr = this.state.tr.replaceWith(this.from, this.to, this.createNodes());
-      return (0, _analytics.addAnalytics)(this.state, tr, {
+      (_this$editorAnalytics = this.editorAnalyticsAPI) === null || _this$editorAnalytics === void 0 ? void 0 : _this$editorAnalytics.attachAnalyticsEvent({
         action: _analytics.ACTION.INSERTED,
         actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.EMOJI,
@@ -169,7 +173,8 @@ var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
           inputMethod: _analytics.INPUT_METHOD.ASCII
         },
         eventType: _analytics.EVENT_TYPE.TRACK
-      });
+      })(tr);
+      return tr;
     }
   }, {
     key: "from",
@@ -221,8 +226,8 @@ var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
 }();
 var stateKey = new _state.PluginKey('asciiEmojiPlugin');
 exports.stateKey = stateKey;
-var plugins = function plugins(schema, providerFactory, featureFlags) {
-  return [inputRulePlugin(schema, providerFactory, featureFlags)].filter(function (plugin) {
+var plugins = function plugins(schema, providerFactory, featureFlags, editorAnalyticsAPI) {
+  return [inputRulePlugin(schema, providerFactory, featureFlags, editorAnalyticsAPI)].filter(function (plugin) {
     return !!plugin;
   });
 };

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

@@ -27,14 +27,17 @@ Object.defineProperty(exports, "pluginKey", {
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("../../selection/utils");
+var _selection = require("@atlaskit/editor-common/selection");
+var _utils2 = require("../../selection/utils");
 var _extension = _interopRequireDefault(require("../nodeviews/extension"));
 var _commands = require("../commands");
-var _utils2 = require("../utils");
+var _utils3 = require("../utils");
 var _pluginFactory = require("../plugin-factory");
 var _pluginKey = require("../plugin-key");
-var _utils3 = require("./utils");
+var _utils4 = require("./utils");
 var shouldShowEditButton = function shouldShowEditButton(extensionHandler, extensionProvider) {
   var usesLegacyMacroBrowser = !extensionHandler && !extensionProvider || typeof extensionHandler === 'function';
   var usesModernUpdateMethod = (0, _typeof2.default)(extensionHandler) === 'object' && typeof extensionHandler.update === 'function';
@@ -60,7 +63,7 @@ var getUpdateExtensionPromise = /*#__PURE__*/function () {
             break;
           }
           _context.next = 7;
-          return (0, _utils3.updateEditButton)(view, extensionProvider);
+          return (0, _utils4.updateEditButton)(view, extensionProvider);
         case 7:
           updateMethod = _context.sent;
           if (!updateMethod) {
@@ -100,7 +103,7 @@ var createExtensionProviderHandler = function createExtensionProviderHandler(vie
               extensionProvider: extensionProvider
             })(view.state, view.dispatch);
             _context2.next = 8;
-            return (0, _utils3.updateEditButton)(view, extensionProvider);
+            return (0, _utils4.updateEditButton)(view, extensionProvider);
           case 8:
             _context2.next = 13;
             break;
@@ -177,7 +180,7 @@ var handleUpdate = function handleUpdate(_ref4) {
     showEditButton = _getPluginState.showEditButton;
 
   // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
-  var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
+  var selectedExtension = (0, _utils3.getSelectedExtension)(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
       (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
@@ -185,11 +188,11 @@ var handleUpdate = function handleUpdate(_ref4) {
     return;
   }
   var node = selectedExtension.node;
-  var newElement = (0, _utils2.getSelectedDomElement)(state.schema, domAtPos, selectedExtension);
+  var newElement = (0, _utils3.getSelectedDomElement)(state.schema, domAtPos, selectedExtension);
 
   // In some cases, showEditButton can be stale and the edit button doesn't show - @see ED-15285
   // To be safe, we update the showEditButton state here
-  var shouldUpdateEditButton = !showEditButton && extensionProvider && element === newElement && !(0, _utils2.getSelectedExtension)(prevState, true);
+  var shouldUpdateEditButton = !showEditButton && extensionProvider && element === newElement && !(0, _utils3.getSelectedExtension)(prevState, true);
   var isNewNodeSelected = node.attrs.localId ? localId !== node.attrs.localId :
   // This is the current assumption and it's wrong but we are keeping it
   // as fallback in case we need to turn off `allowLocalIdGeneration`
@@ -263,6 +266,48 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
     },
     key: _pluginKey.pluginKey,
     props: {
+      handleDOMEvents: {
+        /**
+         * ED-18072 - Cannot shift + arrow past bodied extension if it is not empty.
+         * This code is to handle the case where the selection starts inside or on the node and the user is trying to shift + arrow.
+         * For other part of the solution see code in: packages/editor/editor-core/src/plugins/selection/pm-plugins/events/keydown.ts
+         */
+        keydown: function keydown(view, event) {
+          if (event instanceof KeyboardEvent && event.shiftKey && ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(event.key)) {
+            var _view$state = view.state,
+              schema = _view$state.schema,
+              selection = _view$state.selection,
+              $head = _view$state.selection.$head,
+              doc = _view$state.doc,
+              tr = _view$state.tr;
+            var bodiedExtension = schema.nodes.bodiedExtension;
+            if (selection instanceof _state.TextSelection || selection instanceof _state.NodeSelection) {
+              var maybeBodiedExtension = selection instanceof _state.TextSelection ? (0, _utils.findParentNodeOfTypeClosestToPos)($head, bodiedExtension) : (0, _utils.findSelectedNodeOfType)(bodiedExtension)(selection);
+              if (maybeBodiedExtension) {
+                var end = maybeBodiedExtension.pos + maybeBodiedExtension.node.nodeSize;
+                if (event.key === 'ArrowUp' || event.key === 'ArrowLeft' && (0, _selection.isSelectionAtStartOfNode)($head, maybeBodiedExtension)) {
+                  var anchor = end + 1;
+
+                  // an offset is used here so that left arrow selects the first character before the node (consistent with arrow right)
+                  var headOffset = event.key === 'ArrowLeft' ? -1 : 0;
+                  var head = maybeBodiedExtension.pos + headOffset;
+                  var newSelection = _state.TextSelection.create(doc, Math.max(anchor, selection.anchor), head);
+                  view.dispatch(tr.setSelection(newSelection));
+                  return true;
+                }
+                if (event.key === 'ArrowDown' || event.key === 'ArrowRight' && (0, _selection.isSelectionAtEndOfNode)($head, maybeBodiedExtension)) {
+                  var _anchor = maybeBodiedExtension.pos - 1;
+                  var _head = end + 1;
+                  var _newSelection = _state.TextSelection.create(doc, Math.min(_anchor, selection.anchor), _head);
+                  view.dispatch(tr.setSelection(_newSelection));
+                  return true;
+                }
+              }
+            }
+          }
+          return false;
+        }
+      },
       nodeViews: {
         // WARNING: referentiality-plugin also creates these nodeviews
         extension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
@@ -271,7 +316,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         // WARNING: referentiality-plugin also creates these nodeviews
         inlineExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
-      handleClickOn: (0, _utils.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
+      handleClickOn: (0, _utils2.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
         return !target.closest('.extension-content');
       }, {
         useLongPressSelection: useLongPressSelection

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -288,7 +288,7 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSelectedEmoji", function (emojiId) {
       _this.props.editorView.focus();
-      (0, _insertEmoji.insertEmoji)(emojiId, _analytics.INPUT_METHOD.PICKER)(_this.props.editorView.state, _this.props.editorView.dispatch);
+      (0, _insertEmoji.insertEmoji)(_this.editorAnalyticsAPI)(emojiId, _analytics.INPUT_METHOD.PICKER)(_this.props.editorView.state, _this.props.editorView.dispatch);
       _this.toggleEmojiPicker();
       return true;
     });

package/dist/cjs/plugins/media/utils/media-common.js

@@ -7,8 +7,8 @@ exports.unwrapNestedMediaElements = exports.transformSliceToCorrectMediaWrapper
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _commands2 = require("../../../commands");
-var _utils2 = require("../../../utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
+var _utils3 = require("../../../utils");
 var _slice = require("../../../utils/slice");
 var _dom = require("../../../utils/dom");
 var _isImage = require("./is-image");
@@ -128,7 +128,7 @@ var removeMediaNode = function removeMediaNode(view, node, getPos) {
     return;
   }
   tr.deleteRange(currentMediaNodePos, currentMediaNodePos + node.nodeSize);
-  if ((0, _utils2.isTemporary)(id)) {
+  if ((0, _utils3.isTemporary)(id)) {
     tr.setMeta('addToHistory', false);
   }
   var $currentMediaNodePos = doc.resolve(currentMediaNodePos);
@@ -158,9 +158,9 @@ var splitMediaGroup = function splitMediaGroup(view) {
   (0, _commands.deleteSelection)(view.state, view.dispatch);
   if (selection.$to.nodeAfter) {
     (0, _commands.splitBlock)(view.state, view.dispatch);
-    (0, _commands2.createParagraphNear)(false)(view.state, view.dispatch);
+    (0, _utils2.createParagraphNear)(false)(view.state, view.dispatch);
   } else {
-    (0, _commands2.createNewParagraphBelow)(view.state, view.dispatch);
+    (0, _utils2.createNewParagraphBelow)(view.state, view.dispatch);
   }
   return true;
 };