@atlaskit/editor-core 187.35.4 → 187.36.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 187.36.0
+
+### Minor Changes
+
+- [`085d722e77f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/085d722e77f) - Decoupling the rule plugin and adding the insertHorizontalRule action to the rule plugin.
+
+### Patch Changes
+
+- [`3b7bf91daa5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3b7bf91daa5) - [ux] ED-19785 Add dark mode icon for custom panel and update light mode icon with new colours.
+
+## 187.35.7
+
+### Patch Changes
+
+- [`c377886771f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c377886771f) - ED-19744 moved `mention` styles to `ContentStyles` as part of Scalability Project
+
 ## 187.35.4
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -206,7 +206,7 @@ Object.defineProperty(exports, "commitStatusPicker", {
 Object.defineProperty(exports, "createTable", {
   enumerable: true,
   get: function get() {
-    return _commands3.createTable;
+    return _commands2.createTable;
   }
 });
 Object.defineProperty(exports, "createTypeAheadTools", {
@@ -278,13 +278,7 @@ Object.defineProperty(exports, "insertDate", {
 Object.defineProperty(exports, "insertExpand", {
   enumerable: true,
   get: function get() {
-    return _commands6.insertExpand;
-  }
-});
-Object.defineProperty(exports, "insertHorizontalRule", {
-  enumerable: true,
-  get: function get() {
-    return _commands2.insertHorizontalRule;
+    return _commands5.insertExpand;
   }
 });
 Object.defineProperty(exports, "insertMediaSingleNode", {
@@ -296,7 +290,7 @@ Object.defineProperty(exports, "insertMediaSingleNode", {
 Object.defineProperty(exports, "insertTaskDecisionCommand", {
   enumerable: true,
   get: function get() {
-    return _commands4.insertTaskDecisionCommand;
+    return _commands3.insertTaskDecisionCommand;
   }
 });
 Object.defineProperty(exports, "lightModeStatusColorPalette", {
@@ -323,12 +317,6 @@ Object.defineProperty(exports, "mediaPluginKey", {
     return _main.stateKey;
   }
 });
-Object.defineProperty(exports, "mentionPluginKey", {
-  enumerable: true,
-  get: function get() {
-    return _mentions.mentionPluginKey;
-  }
-});
 Object.defineProperty(exports, "messages", {
   enumerable: true,
   get: function get() {
@@ -362,19 +350,19 @@ Object.defineProperty(exports, "selectionPluginKey", {
 Object.defineProperty(exports, "setIsExpanded", {
   enumerable: true,
   get: function get() {
-    return _commands5.setIsExpanded;
+    return _commands4.setIsExpanded;
   }
 });
 Object.defineProperty(exports, "setKeyboardHeight", {
   enumerable: true,
   get: function get() {
-    return _commands5.setKeyboardHeight;
+    return _commands4.setKeyboardHeight;
   }
 });
 Object.defineProperty(exports, "setMobilePaddingTop", {
   enumerable: true,
   get: function get() {
-    return _commands5.setMobilePaddingTop;
+    return _commands4.setMobilePaddingTop;
   }
 });
 Object.defineProperty(exports, "setStatusPickerAt", {
@@ -459,14 +447,12 @@ var _resource2 = require("@atlaskit/mention/resource");
 var _teamResource = require("@atlaskit/mention/team-resource");
 var _annotation = require("./plugins/annotation");
 var _main = require("./plugins/media/pm-plugins/main");
-var _mentions = require("./plugins/mentions");
 var _textColor = require("./plugins/text-color");
 var _changeColor = require("./plugins/text-color/commands/change-color");
-var _commands2 = require("./plugins/rule/commands");
 var _toolbarAndPickerUpdates = require("./plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates");
 var _typeAheadUpdates = require("./plugins/view-update-subscription/subscribe/type-ahead-updates");
-var _commands3 = require("@atlaskit/editor-plugin-table/commands");
-var _commands4 = require("./plugins/tasks-and-decisions/commands");
+var _commands2 = require("@atlaskit/editor-plugin-table/commands");
+var _commands3 = require("./plugins/tasks-and-decisions/commands");
 var _eventDispatcher = require("./event-dispatcher");
 var _plugin = require("./plugins/status/plugin");
 var _actions = require("./plugins/date/actions");
@@ -476,7 +462,7 @@ var _actions2 = require("./plugins/status/actions");
 var _typeAhead = require("./plugins/type-ahead");
 var _history = require("./plugins/history");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _commands5 = require("./plugins/mobile-dimensions/commands");
+var _commands4 = require("./plugins/mobile-dimensions/commands");
 var _utils = require("./utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _createEditor = require("./create-editor");
@@ -484,7 +470,7 @@ var _actions3 = _interopRequireDefault(require("./actions"));
 var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _gapCursorSelection = require("./plugins/selection/gap-cursor-selection");
 var _mobileSelection = require("./plugins/mobile-selection");
-var _commands6 = require("./plugins/expand/commands");
+var _commands5 = require("./plugins/expand/commands");
 var _WithPluginState = _interopRequireDefault(require("./ui/WithPluginState"));
 var _statusColorPalette = require("./ui/ColorPalette/Palettes/statusColorPalette");
 var _common = require("./ui/ColorPalette/Palettes/common");

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

@@ -32,7 +32,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("./messages");
 var _createItems3 = require("./create-items");
 var _blockInsertMenu = require("./block-insert-menu");
-var _commands3 = require("../../../rule/commands");
 var _withOuterListeners = _interopRequireDefault(require("../../../../ui/with-outer-listeners"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -255,12 +254,13 @@ var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       };
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertHorizontalRule", function (inputMethod) {
+      var _pluginInjectionApi$r, _pluginInjectionApi$r2;
       var _this$props4 = _this.props,
         _this$props4$editorVi = _this$props4.editorView,
         state = _this$props4$editorVi.state,
         dispatch = _this$props4$editorVi.dispatch,
-        featureFlags = _this$props4.featureFlags;
-      return (0, _commands3.insertHorizontalRule)(inputMethod, featureFlags)(state, dispatch);
+        pluginInjectionApi = _this$props4.pluginInjectionApi;
+      return (_pluginInjectionApi$r = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$r2 = pluginInjectionApi.rule) === null || _pluginInjectionApi$r2 === void 0 ? void 0 : _pluginInjectionApi$r2.actions.insertHorizontalRule(inputMethod)(state, dispatch)) !== null && _pluginInjectionApi$r !== void 0 ? _pluginInjectionApi$r : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertExpand", function () {
       var _this$props$editorVie2 = _this.props.editorView,

package/dist/cjs/plugins/rule/commands.js

@@ -5,16 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertHorizontalRule = void 0;
 var _inputRule = require("./pm-plugins/input-rule");
-var insertHorizontalRule = function insertHorizontalRule(inputMethod, featureFlags) {
-  return function (state, dispatch) {
-    var tr = (0, _inputRule.createHorizontalRule)(state, featureFlags, state.selection.from, state.selection.to, inputMethod);
-    if (tr) {
-      if (dispatch) {
-        dispatch(tr);
+var insertHorizontalRule = function insertHorizontalRule(featureFlags, editorAnalyticsAPI) {
+  return function (inputMethod) {
+    return function (state, dispatch) {
+      var tr = (0, _inputRule.createHorizontalRule)(state, featureFlags, state.selection.from, state.selection.to, inputMethod, editorAnalyticsAPI);
+      if (tr) {
+        if (dispatch) {
+          dispatch(tr);
+        }
+        return true;
       }
-      return true;
-    }
-    return false;
+      return false;
+    };
   };
 };
 exports.insertHorizontalRule = insertHorizontalRule;

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

@@ -7,13 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _analytics = require("../analytics");
-var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
+var _commands = require("./commands");
 var rulePlugin = function rulePlugin(_ref) {
-  var _api$featureFlags;
+  var _api$featureFlags, _api$analytics;
   var api = _ref.api;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
@@ -24,17 +25,22 @@ var rulePlugin = function rulePlugin(_ref) {
         node: _adfSchema.rule
       }];
     },
+    actions: {
+      insertHorizontalRule: (0, _commands.insertHorizontalRule)(featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'ruleInputRule',
         plugin: function plugin(_ref2) {
+          var _api$analytics2;
           var schema = _ref2.schema;
-          return (0, _inputRule.default)(schema, featureFlags);
+          return (0, _inputRule.default)(schema, featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
         }
       }, {
         name: 'ruleKeymap',
         plugin: function plugin() {
-          return (0, _keymap.default)(featureFlags);
+          var _api$analytics3;
+          return (0, _keymap.default)(featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
       }];
     },
@@ -43,8 +49,8 @@ var rulePlugin = function rulePlugin(_ref) {
         var formatMessage = _ref3.formatMessage;
         return [{
           id: 'rule',
-          title: formatMessage(_messages.messages.horizontalRule),
-          description: formatMessage(_messages.messages.horizontalRuleDescription),
+          title: formatMessage(_messages.toolbarInsertBlockMessages.horizontalRule),
+          description: formatMessage(_messages.toolbarInsertBlockMessages.horizontalRuleDescription),
           keywords: ['horizontal', 'rule', 'line', 'hr'],
           priority: 1200,
           keyshortcut: '---',
@@ -52,8 +58,9 @@ var rulePlugin = function rulePlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconDivider, null);
           },
           action: function action(insert, state) {
+            var _api$analytics4;
             var tr = insert(state.schema.nodes.rule.createChecked());
-            return (0, _analytics.addAnalytics)(state, tr, {
+            api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions.attachAnalyticsEvent({
               action: _analytics.ACTION.INSERTED,
               actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.DIVIDER,
@@ -61,7 +68,8 @@ var rulePlugin = function rulePlugin(_ref) {
                 inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
               },
               eventType: _analytics.EVENT_TYPE.TRACK
-            });
+            })(tr);
+            return tr;
           }
         }];
       }

package/dist/cjs/plugins/rule/pm-plugins/input-rule.js

@@ -9,8 +9,8 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _insert = require("@atlaskit/editor-common/insert");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _analytics = require("../../analytics");
-var createHorizontalRule = function createHorizontalRule(state, featureFlags, start, end, inputMethod) {
+var _analytics = require("@atlaskit/editor-common/analytics");
+var createHorizontalRule = function createHorizontalRule(state, featureFlags, start, end, inputMethod, editorAnalyticsAPI) {
   if (!state.selection.empty) {
     return null;
   }
@@ -29,7 +29,7 @@ var createHorizontalRule = function createHorizontalRule(state, featureFlags, st
   if (!tr) {
     tr = state.tr.replaceRange(start, end, new _model.Slice(_model.Fragment.from(state.schema.nodes.rule.createChecked()), 0, 0));
   }
-  return (0, _analytics.addAnalytics)(state, tr, {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.DIVIDER,
@@ -37,22 +37,23 @@ var createHorizontalRule = function createHorizontalRule(state, featureFlags, st
       inputMethod: inputMethod
     },
     eventType: _analytics.EVENT_TYPE.TRACK
-  });
+  })(tr);
+  return tr;
 };
 exports.createHorizontalRule = createHorizontalRule;
-var createHorizontalRuleAutoformat = function createHorizontalRuleAutoformat(state, featureFlags, start, end) {
+var createHorizontalRuleAutoformat = function createHorizontalRuleAutoformat(state, featureFlags, start, end, editorAnalyticsAPI) {
   var listItem = state.schema.nodes.listItem;
   if ((0, _utils.hasParentNodeOfType)(listItem)(state.selection)) {
     return null;
   }
-  return createHorizontalRule(state, featureFlags, start, end, _analytics.INPUT_METHOD.FORMATTING);
+  return createHorizontalRule(state, featureFlags, start, end, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsAPI);
 };
-function inputRulePlugin(schema, featureFlags) {
+function inputRulePlugin(schema, featureFlags, editorAnalyticsAPI) {
   var rules = [];
   if (schema.nodes.rule) {
     // '---' and '***' for hr
     rules.push((0, _prosemirrorInputRules.createRule)(/^(\-\-\-|\*\*\*)$/, function (state, _match, start, end) {
-      return createHorizontalRuleAutoformat(state, featureFlags, start, end);
+      return createHorizontalRuleAutoformat(state, featureFlags, start, end, editorAnalyticsAPI);
     }));
 
     // '---' and '***' after shift+enter for hr
@@ -61,7 +62,7 @@ function inputRulePlugin(schema, featureFlags) {
       if (state.doc.resolve(start).nodeAfter.type !== hardBreak) {
         return null;
       }
-      return createHorizontalRuleAutoformat(state, featureFlags, start, end);
+      return createHorizontalRuleAutoformat(state, featureFlags, start, end, editorAnalyticsAPI);
     }));
   }
   if (rules.length !== 0) {

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

@@ -9,9 +9,9 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _commands = require("../commands");
-function keymapPlugin(featureFlags) {
+function keymapPlugin(featureFlags, editorAnalyticsAPI) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertRule.common, (0, _commands.insertHorizontalRule)(_analytics.INPUT_METHOD.SHORTCUT, featureFlags), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertRule.common, (0, _commands.insertHorizontalRule)(featureFlags, editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.escape.common, function () {
     return true;
   }, list);

package/dist/cjs/ui/ContentStyles/index.js

@@ -11,6 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _mention = require("@atlaskit/editor-common/mention");
 var _styles2 = require("../../plugins/collab-edit/styles");
 var _styles3 = require("../../plugins/selection/gap-cursor/styles");
 var _commonStyles = require("@atlaskit/editor-plugin-table/ui/common-styles");
@@ -22,30 +23,31 @@ var _styles8 = require("../../plugins/media/styles");
 var _styles9 = require("../../plugins/layout/styles");
 var _styles10 = require("../../plugins/panel/styles");
 var _styles11 = require("../../plugins/fake-text-cursor/styles");
-var _styles12 = require("../../plugins/mentions/styles");
-var _styles13 = require("../../plugins/placeholder-text/styles");
-var _styles14 = require("../../plugins/extension/ui/styles");
-var _styles15 = require("../../plugins/expand/ui/styles");
+var _styles12 = require("../../plugins/placeholder-text/styles");
+var _styles13 = require("../../plugins/extension/ui/styles");
+var _styles14 = require("../../plugins/expand/ui/styles");
 var _style = require("../../plugins/media/pm-plugins/alt-text/style");
-var _styles16 = require("../../plugins/find-replace/styles");
-var _styles17 = require("../../plugins/tasks-and-decisions/styles");
-var _styles18 = require("../../plugins/status/styles");
-var _styles19 = require("../../plugins/date/styles");
+var _styles15 = require("../../plugins/find-replace/styles");
+var _styles16 = require("../../plugins/tasks-and-decisions/styles");
+var _styles17 = require("../../plugins/status/styles");
+var _styles18 = require("../../plugins/date/styles");
 var _getInlineNodeViewProducer = require("../../nodeviews/getInlineNodeViewProducer.styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _emoji = require("@atlaskit/editor-common/emoji");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _colors = require("@atlaskit/theme/colors");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 /** @jsx jsx */
 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; }
 var linkStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n"])), _styles.linkSharedStyle);
 exports.linkStyles = linkStyles;
-var listsStyles = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    li {\n      position: relative;\n\n      > p:not(:first-child) {\n        margin: ", " 0 0 0;\n      }\n\n      // In SSR the above rule will apply to all p tags because first-child would be a style tag.\n      // The following rule resets the first p tag back to its original margin\n      // defined in packages/editor/editor-common/src/styles/shared/paragraph.ts\n      > style:first-child + p {\n        margin-top: ", ";\n      }\n    }\n\n    & :not([data-node-type='decisionList']) > li {\n      ", "\n    }\n  }\n"])), "var(--ds-space-050, 4px)", _editorSharedStyles.blockNodesVerticalMargin, _utils.browser.safari ? _styles.codeBlockInListSafariFix : '');
-var emojiStyles = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    display: inline-block;\n\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", " {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), _emoji.EmojiSharedCssClassName.EMOJI_CONTAINER, _emoji.EmojiSharedCssClassName.EMOJI_NODE, _emoji.EmojiSharedCssClassName.EMOJI_IMAGE, _editorSharedStyles.akEditorSelectedNodeClassName, _emoji.EmojiSharedCssClassName.EMOJI_SPRITE, _emoji.EmojiSharedCssClassName.EMOJI_IMAGE, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Blanket, _editorSharedStyles.SelectionStyle.BoxShadow]));
+var mentionsStyles = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    &.", " [data-mention-id] > span {\n      ", "\n\n      /* need to specify dark text colour because personal mentions\n         (in dark blue) have white text by default */\n      color: ", ";\n    }\n  }\n\n  .danger {\n    .", ".", "\n      > span\n      > span\n      > span {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n    }\n    .", " > span > span > span {\n      background-color: ", ";\n      color: ", ";\n    }\n  }\n"])), _mention.MentionSharedCssClassName.MENTION_CONTAINER, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Background]), "var(--ds-text-subtle, ".concat(_colors.N500, ")"), _mention.MentionSharedCssClassName.MENTION_CONTAINER, _editorSharedStyles.akEditorSelectedNodeClassName, _editorSharedStyles.akEditorSelectedBorderSize, _editorSharedStyles.akEditorDeleteBorder, "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackgroundWithOpacity, ")"), _mention.MentionSharedCssClassName.MENTION_CONTAINER, "var(--ds-background-neutral, ".concat(_colors.N30A, ")"), "var(--ds-text-subtle, ".concat(_colors.N500, ")"));
+var listsStyles = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    li {\n      position: relative;\n\n      > p:not(:first-child) {\n        margin: ", " 0 0 0;\n      }\n\n      // In SSR the above rule will apply to all p tags because first-child would be a style tag.\n      // The following rule resets the first p tag back to its original margin\n      // defined in packages/editor/editor-common/src/styles/shared/paragraph.ts\n      > style:first-child + p {\n        margin-top: ", ";\n      }\n    }\n\n    & :not([data-node-type='decisionList']) > li {\n      ", "\n    }\n  }\n"])), "var(--ds-space-050, 4px)", _editorSharedStyles.blockNodesVerticalMargin, _utils.browser.safari ? _styles.codeBlockInListSafariFix : '');
+var emojiStyles = (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    display: inline-block;\n\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", " {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), _emoji.EmojiSharedCssClassName.EMOJI_CONTAINER, _emoji.EmojiSharedCssClassName.EMOJI_NODE, _emoji.EmojiSharedCssClassName.EMOJI_IMAGE, _editorSharedStyles.akEditorSelectedNodeClassName, _emoji.EmojiSharedCssClassName.EMOJI_SPRITE, _emoji.EmojiSharedCssClassName.EMOJI_IMAGE, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Blanket, _editorSharedStyles.SelectionStyle.BoxShadow]));
 var contentStyles = function contentStyles(props) {
-  return (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
+  return (0, _react2.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), (0, _editorSharedStyles.editorFontSize)({
     theme: props.theme
-  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles13.placeholderTextStyles, _styles4.placeholderStyles, (0, _styles6.codeBlockStyles)(props), (0, _styles5.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, (0, _styles7.ruleStyles)(props), _styles8.mediaStyles, (0, _styles9.layoutStyles)(props), _styles2.telepointerStyle, _styles3.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _styles10.panelStyles)(props), _styles11.fakeCursorStyles, _styles12.mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles14.extensionStyles, (0, _styles15.expandStyles)(props), _styles16.findReplaceStyles, _styles17.taskDecisionStyles, _styles18.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _styles19.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _style.ClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), _styles.whitespaceSharedStyles, _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", _styles12.placeholderTextStyles, _styles4.placeholderStyles, (0, _styles6.codeBlockStyles)(props), (0, _styles5.blocktypeStyles)(props), (0, _styles.codeMarkSharedStyles)(props), _styles.textColorStyles, listsStyles, (0, _styles7.ruleStyles)(props), _styles8.mediaStyles, (0, _styles9.layoutStyles)(props), _styles2.telepointerStyle, _styles3.gapCursorStyles, (0, _commonStyles.tableStyles)(props), (0, _styles10.panelStyles)(props), _styles11.fakeCursorStyles, mentionsStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _styles13.extensionStyles, (0, _styles14.expandStyles)(props), _styles15.findReplaceStyles, _styles16.taskDecisionStyles, _styles17.statusStyles, (0, _styles.annotationSharedStyles)(props), _styles.smartCardStyles, _styles.smartCardSharedStyles, _styles18.dateStyles, _styles.embedCardStyles, _styles.unsupportedStyles, _styles.resizerStyles, _style.ClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 var createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.35.4";
+var version = "187.36.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/index.js

@@ -16,10 +16,8 @@ export { TeamMentionResource } from '@atlaskit/mention/team-resource';
 export { AnnotationUpdateEmitter } from './plugins/annotation';
 // Used in mobile bridge
 export { stateKey as mediaPluginKey } from './plugins/media/pm-plugins/main';
-export { mentionPluginKey } from './plugins/mentions';
 export { textColorPluginKey } from './plugins/text-color';
 export { changeColor } from './plugins/text-color/commands/change-color';
-export { insertHorizontalRule } from './plugins/rule/commands';
 
 /**
  * @private

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

@@ -19,7 +19,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { messages } from './messages';
 import { createItems } from './create-items';
 import { BlockInsertMenu } from './block-insert-menu';
-import { insertHorizontalRule } from '../../../rule/commands';
 import withOuterListeners from '../../../../ui/with-outer-listeners';
 
 /**
@@ -252,14 +251,15 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return insertTaskDecisionCommand(listType, inputMethod)(state, dispatch);
     });
     _defineProperty(this, "insertHorizontalRule", inputMethod => {
+      var _pluginInjectionApi$r, _pluginInjectionApi$r2;
       const {
         editorView: {
           state,
           dispatch
         },
-        featureFlags
+        pluginInjectionApi
       } = this.props;
-      return insertHorizontalRule(inputMethod, featureFlags)(state, dispatch);
+      return (_pluginInjectionApi$r = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$r2 = pluginInjectionApi.rule) === null || _pluginInjectionApi$r2 === void 0 ? void 0 : _pluginInjectionApi$r2.actions.insertHorizontalRule(inputMethod)(state, dispatch)) !== null && _pluginInjectionApi$r !== void 0 ? _pluginInjectionApi$r : false;
     });
     _defineProperty(this, "insertExpand", () => {
       const {

package/dist/es2019/plugins/rule/commands.js

@@ -1,6 +1,6 @@
 import { createHorizontalRule } from './pm-plugins/input-rule';
-export const insertHorizontalRule = (inputMethod, featureFlags) => (state, dispatch) => {
-  const tr = createHorizontalRule(state, featureFlags, state.selection.from, state.selection.to, inputMethod);
+export const insertHorizontalRule = (featureFlags, editorAnalyticsAPI) => inputMethod => (state, dispatch) => {
+  const tr = createHorizontalRule(state, featureFlags, state.selection.from, state.selection.to, inputMethod, editorAnalyticsAPI);
   if (tr) {
     if (dispatch) {
       dispatch(tr);

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

@@ -1,14 +1,15 @@
 import React from 'react';
 import { rule } from '@atlaskit/adf-schema';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
-import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconDivider } from '@atlaskit/editor-common/quick-insert';
 import inputRulePlugin from './pm-plugins/input-rule';
 import keymapPlugin from './pm-plugins/keymap';
+import { insertHorizontalRule } from './commands';
 const rulePlugin = ({
   api
 }) => {
-  var _api$featureFlags;
+  var _api$featureFlags, _api$analytics;
   const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'rule',
@@ -18,15 +19,24 @@ const rulePlugin = ({
         node: rule
       }];
     },
+    actions: {
+      insertHorizontalRule: insertHorizontalRule(featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
+    },
     pmPlugins() {
       return [{
         name: 'ruleInputRule',
         plugin: ({
           schema
-        }) => inputRulePlugin(schema, featureFlags)
+        }) => {
+          var _api$analytics2;
+          return inputRulePlugin(schema, featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+        }
       }, {
         name: 'ruleKeymap',
-        plugin: () => keymapPlugin(featureFlags)
+        plugin: () => {
+          var _api$analytics3;
+          return keymapPlugin(featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+        }
       }];
     },
     pluginsOptions: {
@@ -41,8 +51,9 @@ const rulePlugin = ({
         keyshortcut: '---',
         icon: () => /*#__PURE__*/React.createElement(IconDivider, null),
         action(insert, state) {
+          var _api$analytics4;
           let tr = insert(state.schema.nodes.rule.createChecked());
-          return addAnalytics(state, tr, {
+          api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions.attachAnalyticsEvent({
             action: ACTION.INSERTED,
             actionSubject: ACTION_SUBJECT.DOCUMENT,
             actionSubjectId: ACTION_SUBJECT_ID.DIVIDER,
@@ -50,7 +61,8 @@ const rulePlugin = ({
               inputMethod: INPUT_METHOD.QUICK_INSERT
             },
             eventType: EVENT_TYPE.TRACK
-          });
+          })(tr);
+          return tr;
         }
       }]
     }

package/dist/es2019/plugins/rule/pm-plugins/input-rule.js

@@ -1,10 +1,9 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
-import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { safeInsert } from '@atlaskit/editor-common/insert';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
-export const createHorizontalRule = (state, featureFlags, start, end, inputMethod) => {
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+export const createHorizontalRule = (state, featureFlags, start, end, inputMethod, editorAnalyticsAPI) => {
   if (!state.selection.empty) {
     return null;
   }
@@ -27,7 +26,7 @@ export const createHorizontalRule = (state, featureFlags, start, end, inputMetho
   if (!tr) {
     tr = state.tr.replaceRange(start, end, new Slice(Fragment.from(state.schema.nodes.rule.createChecked()), 0, 0));
   }
-  return addAnalytics(state, tr, {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.DIVIDER,
@@ -35,22 +34,23 @@ export const createHorizontalRule = (state, featureFlags, start, end, inputMetho
       inputMethod
     },
     eventType: EVENT_TYPE.TRACK
-  });
+  })(tr);
+  return tr;
 };
-const createHorizontalRuleAutoformat = (state, featureFlags, start, end) => {
+const createHorizontalRuleAutoformat = (state, featureFlags, start, end, editorAnalyticsAPI) => {
   const {
     listItem
   } = state.schema.nodes;
   if (hasParentNodeOfType(listItem)(state.selection)) {
     return null;
   }
-  return createHorizontalRule(state, featureFlags, start, end, INPUT_METHOD.FORMATTING);
+  return createHorizontalRule(state, featureFlags, start, end, INPUT_METHOD.FORMATTING, editorAnalyticsAPI);
 };
-export function inputRulePlugin(schema, featureFlags) {
+export function inputRulePlugin(schema, featureFlags, editorAnalyticsAPI) {
   const rules = [];
   if (schema.nodes.rule) {
     // '---' and '***' for hr
-    rules.push(createRule(/^(\-\-\-|\*\*\*)$/, (state, _match, start, end) => createHorizontalRuleAutoformat(state, featureFlags, start, end)));
+    rules.push(createRule(/^(\-\-\-|\*\*\*)$/, (state, _match, start, end) => createHorizontalRuleAutoformat(state, featureFlags, start, end, editorAnalyticsAPI)));
 
     // '---' and '***' after shift+enter for hr
     rules.push(createRule(new RegExp(`${leafNodeReplacementCharacter}(\\-\\-\\-|\\*\\*\\*)`), (state, _match, start, end) => {
@@ -60,7 +60,7 @@ export function inputRulePlugin(schema, featureFlags) {
       if (state.doc.resolve(start).nodeAfter.type !== hardBreak) {
         return null;
       }
-      return createHorizontalRuleAutoformat(state, featureFlags, start, end);
+      return createHorizontalRuleAutoformat(state, featureFlags, start, end, editorAnalyticsAPI);
     }));
   }
   if (rules.length !== 0) {

package/dist/es2019/plugins/rule/pm-plugins/keymap.js

@@ -2,9 +2,9 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { bindKeymapWithCommand, insertRule, escape } from '@atlaskit/editor-common/keymaps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { insertHorizontalRule } from '../commands';
-export function keymapPlugin(featureFlags) {
+export function keymapPlugin(featureFlags, editorAnalyticsAPI) {
   const list = {};
-  bindKeymapWithCommand(insertRule.common, insertHorizontalRule(INPUT_METHOD.SHORTCUT, featureFlags), list);
+  bindKeymapWithCommand(insertRule.common, insertHorizontalRule(featureFlags, editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   bindKeymapWithCommand(escape.common, () => true, list);
   return keymap(list);
 }