@atlaskit/editor-core 187.8.10 → 187.8.11

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 187.8.11
+
+### Patch Changes
+
+- [`2b54c3b0d24`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2b54c3b0d24) - [ED-19203] Decouple text-formatting plugin and editor-core
+- Updated dependencies
+
 ## 187.8.10
 
 ### Patch Changes

package/dist/cjs/plugins/text-formatting/index.js

@@ -57,52 +57,54 @@ var textFormatting = function textFormatting() {
         }
       }, {
         name: 'textFormattingInputRule',
+        // Don't remove the unused featureFlags, this gets used to test if we're properly passing them to the PM plugin
         plugin: function plugin(_ref2) {
+          var _api$dependencies$ana2;
           var schema = _ref2.schema,
             featureFlags = _ref2.featureFlags;
-          return (0, _inputRule.default)(schema, featureFlags);
+          return (0, _inputRule.default)(schema, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
         }
       }, {
         name: 'textFormattingSmartRule',
-        plugin: function plugin(_ref3) {
-          var featureFlags = _ref3.featureFlags;
-          return !options.disableSmartTextCompletion ? (0, _smartInputRule.default)(featureFlags) : undefined;
+        plugin: function plugin() {
+          var _api$dependencies$ana3;
+          return !options.disableSmartTextCompletion ? (0, _smartInputRule.default)(api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions) : undefined;
         }
       }, {
         name: 'textFormattingClear',
-        plugin: function plugin(_ref4) {
-          var dispatch = _ref4.dispatch;
+        plugin: function plugin(_ref3) {
+          var dispatch = _ref3.dispatch;
           return (0, _clearFormatting.plugin)(dispatch);
         }
       }, {
         name: 'textFormattingClearKeymap',
         plugin: function plugin() {
-          var _api$dependencies$ana2;
-          return (0, _clearFormattingKeymap.default)(api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
+          var _api$dependencies$ana4;
+          return (0, _clearFormattingKeymap.default)(api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions);
         }
       }, {
         name: 'textFormattingKeymap',
-        plugin: function plugin(_ref5) {
-          var _api$dependencies$ana3;
-          var schema = _ref5.schema;
-          return (0, _keymap.default)(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions);
+        plugin: function plugin(_ref4) {
+          var _api$dependencies$ana5;
+          var schema = _ref4.schema;
+          return (0, _keymap.default)(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana5 = api.dependencies.analytics) === null || _api$dependencies$ana5 === void 0 ? void 0 : _api$dependencies$ana5.actions);
         }
       }];
     },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref6) {
-      var editorView = _ref6.editorView,
-        popupsMountPoint = _ref6.popupsMountPoint,
-        popupsScrollableElement = _ref6.popupsScrollableElement,
-        isToolbarReducedSpacing = _ref6.isToolbarReducedSpacing,
-        toolbarSize = _ref6.toolbarSize,
-        disabled = _ref6.disabled;
+    primaryToolbarComponent: function primaryToolbarComponent(_ref5) {
+      var editorView = _ref5.editorView,
+        popupsMountPoint = _ref5.popupsMountPoint,
+        popupsScrollableElement = _ref5.popupsScrollableElement,
+        isToolbarReducedSpacing = _ref5.isToolbarReducedSpacing,
+        toolbarSize = _ref5.toolbarSize,
+        disabled = _ref5.disabled;
       return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
         plugins: {
           textFormattingState: _main.pluginKey,
           clearFormattingPluginState: _clearFormatting.pluginKey
         },
         render: function render() {
-          var _api$dependencies$ana4;
+          var _api$dependencies$ana6;
           return /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
             editorState: editorView.state,
             popupsMountPoint: popupsMountPoint,
@@ -112,7 +114,7 @@ var textFormatting = function textFormatting() {
             editorView: editorView,
             isToolbarDisabled: disabled,
             shouldUseResponsiveToolbar: Boolean(options.responsiveToolbarMenu),
-            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions
+            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana6 = api.dependencies.analytics) === null || _api$dependencies$ana6 === void 0 ? void 0 : _api$dependencies$ana6.actions
           });
         }
       });

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

@@ -16,10 +16,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _inputRules = require("../../../utils/input-rules");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _mark = require("@atlaskit/editor-common/mark");
+var _utils = require("@atlaskit/editor-common/utils");
 var _ValidCombinations;
 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; } }
@@ -175,18 +175,16 @@ var codeRegex = buildRegex(ValidAutoformatChars.CODE);
  * @returns {InputRuleWrapper[]}
  */
 exports.codeRegex = codeRegex;
-function getStrongInputRules(schema) {
-  var ruleWithStrongAnalytics = (0, _inputRules.ruleWithAnalytics)(function () {
-    return {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getStrongInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithStrongAnalytics = (0, _utils.inputRuleWithAnalytics)({
+    action: _analytics.ACTION.FORMATTED,
+    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
+    eventType: _analytics.EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   // **string** or __strong__ should bold the text
   var doubleUnderscoreRule = (0, _prosemirrorInputRules.createRule)(strongRegex1, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG));
   var doubleAsterixRule = (0, _prosemirrorInputRules.createRule)(strongRegex2, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG_MARKDOWN));
@@ -199,18 +197,16 @@ function getStrongInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getItalicInputRules(schema) {
-  var ruleWithItalicAnalytics = (0, _inputRules.ruleWithAnalytics)(function () {
-    return {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getItalicInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithItalicAnalytics = (0, _utils.inputRuleWithAnalytics)({
+    action: _analytics.ACTION.FORMATTED,
+    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
+    eventType: _analytics.EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   var underscoreRule = (0, _prosemirrorInputRules.createRule)(italicRegex1, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC));
   var asterixRule = (0, _prosemirrorInputRules.createRule)(italicRegex2, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC_MARKDOWN));
   return [ruleWithItalicAnalytics(underscoreRule), ruleWithItalicAnalytics(asterixRule)];
@@ -222,18 +218,16 @@ function getItalicInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getStrikeInputRules(schema) {
-  var ruleWithStrikeAnalytics = (0, _inputRules.ruleWithAnalytics)(function () {
-    return {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getStrikeInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithStrikeAnalytics = (0, _utils.inputRuleWithAnalytics)({
+    action: _analytics.ACTION.FORMATTED,
+    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
+    eventType: _analytics.EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   var doubleTildeRule = (0, _prosemirrorInputRules.createRule)(strikeRegex, addMark(schema.marks.strike, schema, ValidAutoformatChars.STRIKE));
   return [ruleWithStrikeAnalytics(doubleTildeRule)];
 }
@@ -244,34 +238,34 @@ function getStrikeInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getCodeInputRules(schema) {
-  var ruleWithCodeAnalytics = (0, _inputRules.ruleWithAnalytics)(function () {
-    return {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getCodeInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithCodeAnalytics = (0, _utils.inputRuleWithAnalytics)({
+    action: _analytics.ACTION.FORMATTED,
+    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
+    eventType: _analytics.EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   var backTickRule = (0, _prosemirrorInputRules.createRule)(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
-function inputRulePlugin(schema, featureFlags) {
+function inputRulePlugin(schema,
+// Don't remove the unused featureFlags, this gets used to test if we're properly passing them to the PM plugin
+_featureFlags, editorAnalyticsAPI) {
   var rules = [];
   if (schema.marks.strong) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getStrongInputRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getStrongInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.em) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getItalicInputRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getItalicInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.strike) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getStrikeInputRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getStrikeInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.code) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeInputRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeInputRules(schema, editorAnalyticsAPI)));
   }
   if (rules.length !== 0) {
     return (0, _prosemirrorInputRules.createPlugin)('text-formatting', rules);

package/dist/cjs/plugins/text-formatting/pm-plugins/smart-input-rule.js

@@ -8,10 +8,10 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _state2 = require("@atlaskit/editor-prosemirror/state");
-var _inputRules = require("../../../utils/input-rules");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils = require("@atlaskit/editor-common/utils");
 /**
  * Creates an InputRuleHandler that will match on a regular expression of the
  * form `(prefix, content, suffix?)`, and replace it with some given text,
@@ -33,7 +33,7 @@ function replaceTextUsingCaptureGroup(text) {
     // But, this is JS #trustnoone
     Math.max(startPos, 0), end);
     tr.replaceWith(safePos, end, state.schema.text(replacement, $to.marks()));
-    tr.setSelection(_state2.Selection.near(tr.doc.resolve(tr.selection.to)));
+    tr.setSelection(_state.Selection.near(tr.doc.resolve(tr.selection.to)));
     return tr;
   };
 }
@@ -86,9 +86,9 @@ function createSingleQuotesRules() {
 /**
  * Get replacement rules related to product
  */
-function getProductRules() {
+function getProductRules(editorAnalyticsAPI) {
   var productRuleWithAnalytics = function productRuleWithAnalytics(product) {
-    return (0, _inputRules.ruleWithAnalytics)(function (_state, match) {
+    return (0, _utils.inputRuleWithAnalytics)(function (_, match) {
       return {
         action: _analytics.ACTION.SUBSTITUTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -99,7 +99,7 @@ function getProductRules() {
           originalSpelling: match[2]
         }
       };
-    });
+    }, editorAnalyticsAPI);
   };
   return createReplacementRules({
     Atlassian: /(\s+|^)(atlassian)(\s)$/,
@@ -113,24 +113,22 @@ function getProductRules() {
 /**
  * Get replacement rules related to symbol
  */
-function getSymbolRules() {
+function getSymbolRules(editorAnalyticsAPI) {
   var symbolToString = {
     '→': _analytics.SYMBOL.ARROW_RIGHT,
     '←': _analytics.SYMBOL.ARROW_LEFT,
     '↔︎': _analytics.SYMBOL.ARROW_DOUBLE
   };
   var symbolRuleWithAnalytics = function symbolRuleWithAnalytics(symbol) {
-    return (0, _inputRules.ruleWithAnalytics)(function () {
-      return {
-        action: _analytics.ACTION.SUBSTITUTED,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYMBOL,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          symbol: symbolToString[symbol]
-        }
-      };
-    });
+    return (0, _utils.inputRuleWithAnalytics)({
+      action: _analytics.ACTION.SUBSTITUTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYMBOL,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      attributes: {
+        symbol: symbolToString[symbol]
+      }
+    }, editorAnalyticsAPI);
   };
   return createReplacementRules({
     '→': /(\s+|^)(--?>)(\s)$/,
@@ -142,25 +140,22 @@ function getSymbolRules() {
 /**
  * Get replacement rules related to punctuation
  */
-function getPunctuationRules() {
+function getPunctuationRules(editorAnalyticsAPI) {
   var punctuationToString = (0, _defineProperty2.default)({
     '–': _analytics.PUNC.DASH,
     '…': _analytics.PUNC.ELLIPSIS,
-    '“': _analytics.PUNC.QUOTE_DOUBLE,
     '”': _analytics.PUNC.QUOTE_DOUBLE
   }, _analytics.PUNC.QUOTE_SINGLE, _analytics.PUNC.QUOTE_SINGLE);
   var punctuationRuleWithAnalytics = function punctuationRuleWithAnalytics(punctuation) {
-    return (0, _inputRules.ruleWithAnalytics)(function () {
-      return {
-        action: _analytics.ACTION.SUBSTITUTED,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.PUNC,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          punctuation: punctuationToString[punctuation]
-        }
-      };
-    });
+    return (0, _utils.inputRuleWithAnalytics)({
+      action: _analytics.ACTION.SUBSTITUTED,
+      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.PUNC,
+      eventType: _analytics.EVENT_TYPE.TRACK,
+      attributes: {
+        punctuation: punctuationToString[punctuation]
+      }
+    }, editorAnalyticsAPI);
   };
   var dashEllipsisRules = createReplacementRules({
     '–': /(\s+|^)(--)(\s)$/,
@@ -175,7 +170,7 @@ function getPunctuationRules() {
     return punctuationRuleWithAnalytics(_analytics.PUNC.QUOTE_SINGLE)(rule);
   })));
 }
-var _default = function _default(featureFlags) {
-  return (0, _prosemirrorInputRules.createPlugin)('text-formatting:smart-input', [].concat((0, _toConsumableArray2.default)(getProductRules()), (0, _toConsumableArray2.default)(getSymbolRules()), (0, _toConsumableArray2.default)(getPunctuationRules())));
+var _default = function _default(editorAnalyticsAPI) {
+  return (0, _prosemirrorInputRules.createPlugin)('text-formatting:smart-input', [].concat((0, _toConsumableArray2.default)(getProductRules(editorAnalyticsAPI)), (0, _toConsumableArray2.default)(getSymbolRules(editorAnalyticsAPI)), (0, _toConsumableArray2.default)(getPunctuationRules(editorAnalyticsAPI))));
 };
 exports.default = _default;

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.8.10";
+var version = "187.8.11";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/plugins/text-formatting/index.js

@@ -46,15 +46,20 @@ const textFormatting = (options = {}, api) => ({
       plugin: () => textFormattingCursorPlugin
     }, {
       name: 'textFormattingInputRule',
+      // Don't remove the unused featureFlags, this gets used to test if we're properly passing them to the PM plugin
       plugin: ({
         schema,
         featureFlags
-      }) => textFormattingInputRulePlugin(schema, featureFlags)
+      }) => {
+        var _api$dependencies$ana2;
+        return textFormattingInputRulePlugin(schema, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
+      }
     }, {
       name: 'textFormattingSmartRule',
-      plugin: ({
-        featureFlags
-      }) => !options.disableSmartTextCompletion ? textFormattingSmartInputRulePlugin(featureFlags) : undefined
+      plugin: () => {
+        var _api$dependencies$ana3;
+        return !options.disableSmartTextCompletion ? textFormattingSmartInputRulePlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions) : undefined;
+      }
     }, {
       name: 'textFormattingClear',
       plugin: ({
@@ -63,16 +68,16 @@ const textFormatting = (options = {}, api) => ({
     }, {
       name: 'textFormattingClearKeymap',
       plugin: () => {
-        var _api$dependencies$ana2;
-        return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
+        var _api$dependencies$ana4;
+        return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions);
       }
     }, {
       name: 'textFormattingKeymap',
       plugin: ({
         schema
       }) => {
-        var _api$dependencies$ana3;
-        return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions);
+        var _api$dependencies$ana5;
+        return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana5 = api.dependencies.analytics) === null || _api$dependencies$ana5 === void 0 ? void 0 : _api$dependencies$ana5.actions);
       }
     }];
   },
@@ -90,7 +95,7 @@ const textFormatting = (options = {}, api) => ({
         clearFormattingPluginState: clearFormattingPluginKey
       },
       render: () => {
-        var _api$dependencies$ana4;
+        var _api$dependencies$ana6;
         return /*#__PURE__*/React.createElement(Toolbar, {
           editorState: editorView.state,
           popupsMountPoint: popupsMountPoint,
@@ -100,7 +105,7 @@ const textFormatting = (options = {}, api) => ({
           editorView: editorView,
           isToolbarDisabled: disabled,
           shouldUseResponsiveToolbar: Boolean(options.responsiveToolbarMenu),
-          editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions
+          editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana6 = api.dependencies.analytics) === null || _api$dependencies$ana6 === void 0 ? void 0 : _api$dependencies$ana6.actions
         });
       }
     });

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

@@ -1,7 +1,7 @@
-import { ruleWithAnalytics } from '../../../utils/input-rules';
 import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { transformSmartCharsMentionsAndEmojis } from '@atlaskit/editor-common/mark';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -144,8 +144,8 @@ export const codeRegex = buildRegex(ValidAutoformatChars.CODE);
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getStrongInputRules(schema) {
-  const ruleWithStrongAnalytics = ruleWithAnalytics(() => ({
+function getStrongInputRules(schema, editorAnalyticsAPI) {
+  const ruleWithStrongAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
@@ -153,7 +153,7 @@ function getStrongInputRules(schema) {
     attributes: {
       inputMethod: INPUT_METHOD.FORMATTING
     }
-  }));
+  }, editorAnalyticsAPI);
   // **string** or __strong__ should bold the text
   const doubleUnderscoreRule = createRule(strongRegex1, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG));
   const doubleAsterixRule = createRule(strongRegex2, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG_MARKDOWN));
@@ -166,8 +166,8 @@ function getStrongInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getItalicInputRules(schema) {
-  const ruleWithItalicAnalytics = ruleWithAnalytics(() => ({
+function getItalicInputRules(schema, editorAnalyticsAPI) {
+  const ruleWithItalicAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
@@ -175,7 +175,7 @@ function getItalicInputRules(schema) {
     attributes: {
       inputMethod: INPUT_METHOD.FORMATTING
     }
-  }));
+  }, editorAnalyticsAPI);
   const underscoreRule = createRule(italicRegex1, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC));
   const asterixRule = createRule(italicRegex2, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC_MARKDOWN));
   return [ruleWithItalicAnalytics(underscoreRule), ruleWithItalicAnalytics(asterixRule)];
@@ -187,8 +187,8 @@ function getItalicInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getStrikeInputRules(schema) {
-  const ruleWithStrikeAnalytics = ruleWithAnalytics(() => ({
+function getStrikeInputRules(schema, editorAnalyticsAPI) {
+  const ruleWithStrikeAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
@@ -196,7 +196,7 @@ function getStrikeInputRules(schema) {
     attributes: {
       inputMethod: INPUT_METHOD.FORMATTING
     }
-  }));
+  }, editorAnalyticsAPI);
   const doubleTildeRule = createRule(strikeRegex, addMark(schema.marks.strike, schema, ValidAutoformatChars.STRIKE));
   return [ruleWithStrikeAnalytics(doubleTildeRule)];
 }
@@ -207,8 +207,8 @@ function getStrikeInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getCodeInputRules(schema) {
-  const ruleWithCodeAnalytics = ruleWithAnalytics(() => ({
+function getCodeInputRules(schema, editorAnalyticsAPI) {
+  const ruleWithCodeAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
@@ -216,23 +216,25 @@ function getCodeInputRules(schema) {
     attributes: {
       inputMethod: INPUT_METHOD.FORMATTING
     }
-  }));
+  }, editorAnalyticsAPI);
   const backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
-export function inputRulePlugin(schema, featureFlags) {
+export function inputRulePlugin(schema,
+// Don't remove the unused featureFlags, this gets used to test if we're properly passing them to the PM plugin
+_featureFlags, editorAnalyticsAPI) {
   const rules = [];
   if (schema.marks.strong) {
-    rules.push(...getStrongInputRules(schema));
+    rules.push(...getStrongInputRules(schema, editorAnalyticsAPI));
   }
   if (schema.marks.em) {
-    rules.push(...getItalicInputRules(schema));
+    rules.push(...getItalicInputRules(schema, editorAnalyticsAPI));
   }
   if (schema.marks.strike) {
-    rules.push(...getStrikeInputRules(schema));
+    rules.push(...getStrikeInputRules(schema, editorAnalyticsAPI));
   }
   if (schema.marks.code) {
-    rules.push(...getCodeInputRules(schema));
+    rules.push(...getCodeInputRules(schema, editorAnalyticsAPI));
   }
   if (rules.length !== 0) {
     return createPlugin('text-formatting', rules);

package/dist/es2019/plugins/text-formatting/pm-plugins/smart-input-rule.js

@@ -1,7 +1,7 @@
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { ruleWithAnalytics } from '../../../utils/input-rules';
 import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, PUNC, SYMBOL } from '@atlaskit/editor-common/analytics';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 
 /**
  * Creates an InputRuleHandler that will match on a regular expression of the
@@ -77,8 +77,8 @@ function createSingleQuotesRules() {
 /**
  * Get replacement rules related to product
  */
-function getProductRules() {
-  const productRuleWithAnalytics = product => ruleWithAnalytics((_state, match) => ({
+function getProductRules(editorAnalyticsAPI) {
+  const productRuleWithAnalytics = product => inputRuleWithAnalytics((_, match) => ({
     action: ACTION.SUBSTITUTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.PRODUCT_NAME,
@@ -87,7 +87,7 @@ function getProductRules() {
       product,
       originalSpelling: match[2]
     }
-  }));
+  }), editorAnalyticsAPI);
   return createReplacementRules({
     Atlassian: /(\s+|^)(atlassian)(\s)$/,
     Jira: /(\s+|^)(jira|JIRA)(\s)$/,
@@ -100,13 +100,13 @@ function getProductRules() {
 /**
  * Get replacement rules related to symbol
  */
-function getSymbolRules() {
+function getSymbolRules(editorAnalyticsAPI) {
   const symbolToString = {
     '→': SYMBOL.ARROW_RIGHT,
     '←': SYMBOL.ARROW_LEFT,
     '↔︎': SYMBOL.ARROW_DOUBLE
   };
-  const symbolRuleWithAnalytics = symbol => ruleWithAnalytics(() => ({
+  const symbolRuleWithAnalytics = symbol => inputRuleWithAnalytics({
     action: ACTION.SUBSTITUTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.SYMBOL,
@@ -114,7 +114,7 @@ function getSymbolRules() {
     attributes: {
       symbol: symbolToString[symbol]
     }
-  }));
+  }, editorAnalyticsAPI);
   return createReplacementRules({
     '→': /(\s+|^)(--?>)(\s)$/,
     '←': /(\s+|^)(<--?)(\s)$/,
@@ -125,15 +125,14 @@ function getSymbolRules() {
 /**
  * Get replacement rules related to punctuation
  */
-function getPunctuationRules() {
+function getPunctuationRules(editorAnalyticsAPI) {
   const punctuationToString = {
     '–': PUNC.DASH,
     '…': PUNC.ELLIPSIS,
-    '“': PUNC.QUOTE_DOUBLE,
     '”': PUNC.QUOTE_DOUBLE,
     [PUNC.QUOTE_SINGLE]: PUNC.QUOTE_SINGLE
   };
-  const punctuationRuleWithAnalytics = punctuation => ruleWithAnalytics(() => ({
+  const punctuationRuleWithAnalytics = punctuation => inputRuleWithAnalytics({
     action: ACTION.SUBSTITUTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     actionSubjectId: ACTION_SUBJECT_ID.PUNC,
@@ -141,7 +140,7 @@ function getPunctuationRules() {
     attributes: {
       punctuation: punctuationToString[punctuation]
     }
-  }));
+  }, editorAnalyticsAPI);
   const dashEllipsisRules = createReplacementRules({
     '–': /(\s+|^)(--)(\s)$/,
     '…': /()(\.\.\.)$/
@@ -153,4 +152,4 @@ function getPunctuationRules() {
   const singleQuoteRules = createSingleQuotesRules();
   return [...dashEllipsisRules, ...doubleQuoteRules, ...singleQuoteRules.map(rule => punctuationRuleWithAnalytics(PUNC.QUOTE_SINGLE)(rule))];
 }
-export default (featureFlags => createPlugin('text-formatting:smart-input', [...getProductRules(), ...getSymbolRules(), ...getPunctuationRules()]));
+export default (editorAnalyticsAPI => createPlugin('text-formatting:smart-input', [...getProductRules(editorAnalyticsAPI), ...getSymbolRules(editorAnalyticsAPI), ...getPunctuationRules(editorAnalyticsAPI)]));

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.8.10";
+export const version = "187.8.11";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/plugins/text-formatting/index.js

@@ -50,52 +50,54 @@ var textFormatting = function textFormatting() {
         }
       }, {
         name: 'textFormattingInputRule',
+        // Don't remove the unused featureFlags, this gets used to test if we're properly passing them to the PM plugin
         plugin: function plugin(_ref2) {
+          var _api$dependencies$ana2;
           var schema = _ref2.schema,
             featureFlags = _ref2.featureFlags;
-          return textFormattingInputRulePlugin(schema, featureFlags);
+          return textFormattingInputRulePlugin(schema, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
         }
       }, {
         name: 'textFormattingSmartRule',
-        plugin: function plugin(_ref3) {
-          var featureFlags = _ref3.featureFlags;
-          return !options.disableSmartTextCompletion ? textFormattingSmartInputRulePlugin(featureFlags) : undefined;
+        plugin: function plugin() {
+          var _api$dependencies$ana3;
+          return !options.disableSmartTextCompletion ? textFormattingSmartInputRulePlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions) : undefined;
         }
       }, {
         name: 'textFormattingClear',
-        plugin: function plugin(_ref4) {
-          var dispatch = _ref4.dispatch;
+        plugin: function plugin(_ref3) {
+          var dispatch = _ref3.dispatch;
           return clearFormattingPlugin(dispatch);
         }
       }, {
         name: 'textFormattingClearKeymap',
         plugin: function plugin() {
-          var _api$dependencies$ana2;
-          return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
+          var _api$dependencies$ana4;
+          return clearFormattingKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions);
         }
       }, {
         name: 'textFormattingKeymap',
-        plugin: function plugin(_ref5) {
-          var _api$dependencies$ana3;
-          var schema = _ref5.schema;
-          return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions);
+        plugin: function plugin(_ref4) {
+          var _api$dependencies$ana5;
+          var schema = _ref4.schema;
+          return keymapPlugin(schema, api === null || api === void 0 ? void 0 : (_api$dependencies$ana5 = api.dependencies.analytics) === null || _api$dependencies$ana5 === void 0 ? void 0 : _api$dependencies$ana5.actions);
         }
       }];
     },
-    primaryToolbarComponent: function primaryToolbarComponent(_ref6) {
-      var editorView = _ref6.editorView,
-        popupsMountPoint = _ref6.popupsMountPoint,
-        popupsScrollableElement = _ref6.popupsScrollableElement,
-        isToolbarReducedSpacing = _ref6.isToolbarReducedSpacing,
-        toolbarSize = _ref6.toolbarSize,
-        disabled = _ref6.disabled;
+    primaryToolbarComponent: function primaryToolbarComponent(_ref5) {
+      var editorView = _ref5.editorView,
+        popupsMountPoint = _ref5.popupsMountPoint,
+        popupsScrollableElement = _ref5.popupsScrollableElement,
+        isToolbarReducedSpacing = _ref5.isToolbarReducedSpacing,
+        toolbarSize = _ref5.toolbarSize,
+        disabled = _ref5.disabled;
       return /*#__PURE__*/React.createElement(WithPluginState, {
         plugins: {
           textFormattingState: textFormattingPluginKey,
           clearFormattingPluginState: clearFormattingPluginKey
         },
         render: function render() {
-          var _api$dependencies$ana4;
+          var _api$dependencies$ana6;
           return /*#__PURE__*/React.createElement(Toolbar, {
             editorState: editorView.state,
             popupsMountPoint: popupsMountPoint,
@@ -105,7 +107,7 @@ var textFormatting = function textFormatting() {
             editorView: editorView,
             isToolbarDisabled: disabled,
             shouldUseResponsiveToolbar: Boolean(options.responsiveToolbarMenu),
-            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions
+            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$dependencies$ana6 = api.dependencies.analytics) === null || _api$dependencies$ana6 === void 0 ? void 0 : _api$dependencies$ana6.actions
           });
         }
       });

package/dist/esm/plugins/text-formatting/pm-plugins/input-rule.js

@@ -10,10 +10,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _ValidCombinations;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-import { ruleWithAnalytics } from '../../../utils/input-rules';
 import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { transformSmartCharsMentionsAndEmojis } from '@atlaskit/editor-common/mark';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -159,18 +159,16 @@ export var codeRegex = buildRegex(ValidAutoformatChars.CODE);
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getStrongInputRules(schema) {
-  var ruleWithStrongAnalytics = ruleWithAnalytics(function () {
-    return {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getStrongInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithStrongAnalytics = inputRuleWithAnalytics({
+    action: ACTION.FORMATTED,
+    actionSubject: ACTION_SUBJECT.TEXT,
+    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
+    eventType: EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   // **string** or __strong__ should bold the text
   var doubleUnderscoreRule = createRule(strongRegex1, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG));
   var doubleAsterixRule = createRule(strongRegex2, addMark(schema.marks.strong, schema, ValidAutoformatChars.STRONG_MARKDOWN));
@@ -183,18 +181,16 @@ function getStrongInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getItalicInputRules(schema) {
-  var ruleWithItalicAnalytics = ruleWithAnalytics(function () {
-    return {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getItalicInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithItalicAnalytics = inputRuleWithAnalytics({
+    action: ACTION.FORMATTED,
+    actionSubject: ACTION_SUBJECT.TEXT,
+    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
+    eventType: EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   var underscoreRule = createRule(italicRegex1, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC));
   var asterixRule = createRule(italicRegex2, addMark(schema.marks.em, schema, ValidAutoformatChars.ITALIC_MARKDOWN));
   return [ruleWithItalicAnalytics(underscoreRule), ruleWithItalicAnalytics(asterixRule)];
@@ -206,18 +202,16 @@ function getItalicInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getStrikeInputRules(schema) {
-  var ruleWithStrikeAnalytics = ruleWithAnalytics(function () {
-    return {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getStrikeInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithStrikeAnalytics = inputRuleWithAnalytics({
+    action: ACTION.FORMATTED,
+    actionSubject: ACTION_SUBJECT.TEXT,
+    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
+    eventType: EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   var doubleTildeRule = createRule(strikeRegex, addMark(schema.marks.strike, schema, ValidAutoformatChars.STRIKE));
   return [ruleWithStrikeAnalytics(doubleTildeRule)];
 }
@@ -228,34 +222,34 @@ function getStrikeInputRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getCodeInputRules(schema) {
-  var ruleWithCodeAnalytics = ruleWithAnalytics(function () {
-    return {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        inputMethod: INPUT_METHOD.FORMATTING
-      }
-    };
-  });
+function getCodeInputRules(schema, editorAnalyticsAPI) {
+  var ruleWithCodeAnalytics = inputRuleWithAnalytics({
+    action: ACTION.FORMATTED,
+    actionSubject: ACTION_SUBJECT.TEXT,
+    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
+    eventType: EVENT_TYPE.TRACK,
+    attributes: {
+      inputMethod: INPUT_METHOD.FORMATTING
+    }
+  }, editorAnalyticsAPI);
   var backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
-export function inputRulePlugin(schema, featureFlags) {
+export function inputRulePlugin(schema,
+// Don't remove the unused featureFlags, this gets used to test if we're properly passing them to the PM plugin
+_featureFlags, editorAnalyticsAPI) {
   var rules = [];
   if (schema.marks.strong) {
-    rules.push.apply(rules, _toConsumableArray(getStrongInputRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getStrongInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.em) {
-    rules.push.apply(rules, _toConsumableArray(getItalicInputRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getItalicInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.strike) {
-    rules.push.apply(rules, _toConsumableArray(getStrikeInputRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getStrikeInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.code) {
-    rules.push.apply(rules, _toConsumableArray(getCodeInputRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getCodeInputRules(schema, editorAnalyticsAPI)));
   }
   if (rules.length !== 0) {
     return createPlugin('text-formatting', rules);

package/dist/esm/plugins/text-formatting/pm-plugins/smart-input-rule.js

@@ -2,9 +2,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { ruleWithAnalytics } from '../../../utils/input-rules';
 import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, PUNC, SYMBOL } from '@atlaskit/editor-common/analytics';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 
 /**
  * Creates an InputRuleHandler that will match on a regular expression of the
@@ -80,9 +80,9 @@ function createSingleQuotesRules() {
 /**
  * Get replacement rules related to product
  */
-function getProductRules() {
+function getProductRules(editorAnalyticsAPI) {
   var productRuleWithAnalytics = function productRuleWithAnalytics(product) {
-    return ruleWithAnalytics(function (_state, match) {
+    return inputRuleWithAnalytics(function (_, match) {
       return {
         action: ACTION.SUBSTITUTED,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -93,7 +93,7 @@ function getProductRules() {
           originalSpelling: match[2]
         }
       };
-    });
+    }, editorAnalyticsAPI);
   };
   return createReplacementRules({
     Atlassian: /(\s+|^)(atlassian)(\s)$/,
@@ -107,24 +107,22 @@ function getProductRules() {
 /**
  * Get replacement rules related to symbol
  */
-function getSymbolRules() {
+function getSymbolRules(editorAnalyticsAPI) {
   var symbolToString = {
     '→': SYMBOL.ARROW_RIGHT,
     '←': SYMBOL.ARROW_LEFT,
     '↔︎': SYMBOL.ARROW_DOUBLE
   };
   var symbolRuleWithAnalytics = function symbolRuleWithAnalytics(symbol) {
-    return ruleWithAnalytics(function () {
-      return {
-        action: ACTION.SUBSTITUTED,
-        actionSubject: ACTION_SUBJECT.TEXT,
-        actionSubjectId: ACTION_SUBJECT_ID.SYMBOL,
-        eventType: EVENT_TYPE.TRACK,
-        attributes: {
-          symbol: symbolToString[symbol]
-        }
-      };
-    });
+    return inputRuleWithAnalytics({
+      action: ACTION.SUBSTITUTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      actionSubjectId: ACTION_SUBJECT_ID.SYMBOL,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {
+        symbol: symbolToString[symbol]
+      }
+    }, editorAnalyticsAPI);
   };
   return createReplacementRules({
     '→': /(\s+|^)(--?>)(\s)$/,
@@ -136,25 +134,22 @@ function getSymbolRules() {
 /**
  * Get replacement rules related to punctuation
  */
-function getPunctuationRules() {
+function getPunctuationRules(editorAnalyticsAPI) {
   var punctuationToString = _defineProperty({
     '–': PUNC.DASH,
     '…': PUNC.ELLIPSIS,
-    '“': PUNC.QUOTE_DOUBLE,
     '”': PUNC.QUOTE_DOUBLE
   }, PUNC.QUOTE_SINGLE, PUNC.QUOTE_SINGLE);
   var punctuationRuleWithAnalytics = function punctuationRuleWithAnalytics(punctuation) {
-    return ruleWithAnalytics(function () {
-      return {
-        action: ACTION.SUBSTITUTED,
-        actionSubject: ACTION_SUBJECT.TEXT,
-        actionSubjectId: ACTION_SUBJECT_ID.PUNC,
-        eventType: EVENT_TYPE.TRACK,
-        attributes: {
-          punctuation: punctuationToString[punctuation]
-        }
-      };
-    });
+    return inputRuleWithAnalytics({
+      action: ACTION.SUBSTITUTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      actionSubjectId: ACTION_SUBJECT_ID.PUNC,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {
+        punctuation: punctuationToString[punctuation]
+      }
+    }, editorAnalyticsAPI);
   };
   var dashEllipsisRules = createReplacementRules({
     '–': /(\s+|^)(--)(\s)$/,
@@ -169,6 +164,6 @@ function getPunctuationRules() {
     return punctuationRuleWithAnalytics(PUNC.QUOTE_SINGLE)(rule);
   })));
 }
-export default (function (featureFlags) {
-  return createPlugin('text-formatting:smart-input', [].concat(_toConsumableArray(getProductRules()), _toConsumableArray(getSymbolRules()), _toConsumableArray(getPunctuationRules())));
+export default (function (editorAnalyticsAPI) {
+  return createPlugin('text-formatting:smart-input', [].concat(_toConsumableArray(getProductRules(editorAnalyticsAPI)), _toConsumableArray(getSymbolRules(editorAnalyticsAPI)), _toConsumableArray(getPunctuationRules(editorAnalyticsAPI))));
 });

package/dist/esm/version-wrapper.js

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

package/dist/esm/version.json

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

package/dist/types/plugins/text-formatting/pm-plugins/input-rule.d.ts

@@ -1,5 +1,6 @@
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
 declare enum ValidAutoformatChars {
     STRONG = "__",
@@ -19,5 +20,5 @@ export declare const italicRegex1: ReverseRegexExp;
 export declare const italicRegex2: ReverseRegexExp;
 export declare const strikeRegex: ReverseRegexExp;
 export declare const codeRegex: ReverseRegexExp;
-export declare function inputRulePlugin(schema: Schema, featureFlags: FeatureFlags): SafePlugin | undefined;
+export declare function inputRulePlugin(schema: Schema, _featureFlags: FeatureFlags, editorAnalyticsAPI: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
 export default inputRulePlugin;

package/dist/types/plugins/text-formatting/pm-plugins/smart-input-rule.d.ts

@@ -1,3 +1,3 @@
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
-declare const _default: (featureFlags: FeatureFlags) => import("@atlaskit/editor-common/safe-plugin").SafePlugin<any>;
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+declare const _default: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/safe-plugin").SafePlugin<any>;
 export default _default;

package/dist/types-ts4.5/plugins/text-formatting/pm-plugins/input-rule.d.ts

@@ -1,5 +1,6 @@
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
 declare enum ValidAutoformatChars {
     STRONG = "__",
@@ -19,5 +20,5 @@ export declare const italicRegex1: ReverseRegexExp;
 export declare const italicRegex2: ReverseRegexExp;
 export declare const strikeRegex: ReverseRegexExp;
 export declare const codeRegex: ReverseRegexExp;
-export declare function inputRulePlugin(schema: Schema, featureFlags: FeatureFlags): SafePlugin | undefined;
+export declare function inputRulePlugin(schema: Schema, _featureFlags: FeatureFlags, editorAnalyticsAPI: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
 export default inputRulePlugin;

package/dist/types-ts4.5/plugins/text-formatting/pm-plugins/smart-input-rule.d.ts

@@ -1,3 +1,3 @@
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
-declare const _default: (featureFlags: FeatureFlags) => import("@atlaskit/editor-common/safe-plugin").SafePlugin<any>;
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+declare const _default: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => import("@atlaskit/editor-common/safe-plugin").SafePlugin<any>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.8.10",
+  "version": "187.8.11",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
     "@atlaskit/code": "^14.6.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^12.7.0",
-    "@atlaskit/editor-common": "^74.31.0",
+    "@atlaskit/editor-common": "^74.32.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-palette": "1.5.1",