@atlaskit/editor-core 187.8.10 → 187.8.13

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/ui/ElementBrowser/components/ElementSearch.js

@@ -19,6 +19,7 @@ function ElementSearch({
   },
   focus,
   onClick,
+  onKeyDown,
   searchTerm
 }) {
   const ref = useFocus(focus);
@@ -38,6 +39,7 @@ function ElementSearch({
     onChange: onChange,
     onClick: onClick,
     onFocus: onFocus,
+    onKeyDown: onKeyDown,
     onBlur: onBlur,
     elemBeforeInput: jsx("div", {
       css: elementBeforeInput,
@@ -82,7 +84,7 @@ const wrapper = css`
     & > [data-ds--text-field--input] {
       margin-bottom: 3px;
       font-size: ${relativeFontSizeToBase16(14)};
-      padding: ${GRID_SIZE}px 6px ${GRID_SIZE}px 0;
+      padding: ${GRID_SIZE}px ${"var(--ds-space-075, 6px)"} ${GRID_SIZE}px 0;
     }
   }
 `;
@@ -94,7 +96,7 @@ const wrapperInline = css`
   }
 `;
 const elementBeforeInput = css`
-  margin: 1px 6px 0 8px;
+  margin: 1px ${"var(--ds-space-075, 6px)"} 0 ${"var(--ds-space-100, 8px)"};
   color: ${`var(--ds-icon, ${N200})`};
 
   // Custom SearchIcon style
@@ -105,7 +107,7 @@ const elementBeforeInput = css`
   }
 `;
 const elementAfterInput = css`
-  margin: 0 8px;
+  margin: 0 ${"var(--ds-space-100, 8px)"};
   height: ${SEARCH_ITEM_HEIGHT_WIDTH};
   text-align: center;
 `;

package/dist/es2019/ui/ElementBrowser/components/StatelessElementBrowser.js

@@ -49,7 +49,8 @@ const baseSidebarStyles = css`
 const mobileSideBar = css`
   ${baseSidebarStyles};
   flex: 0 0 ${INLINE_SIDEBAR_HEIGHT};
-  padding: 12px 12px 0 12px;
+  padding: ${"var(--ds-space-150, 12px)"} ${"var(--ds-space-150, 12px)"} 0
+    ${"var(--ds-space-150, 12px)"};
 `;
 const mobileSideBarShowCategories = css`
   flex: 0 0 auto;
@@ -111,6 +112,7 @@ function StatelessElementBrowser(props) {
   const {
     items,
     onSelectItem,
+    onInsertItem,
     viewMoreItem
   } = props;
   const {
@@ -160,10 +162,11 @@ function StatelessElementBrowser(props) {
     if (e.key !== 'Enter') {
       return;
     }
-    if (onSelectItem && selectedItem != null) {
-      onSelectItem(selectedItem);
+    if (onInsertItem && selectedItem != null) {
+      onInsertItem(selectedItem);
     }
-  }, [onSelectItem, selectedItem]);
+    e.preventDefault();
+  }, [onInsertItem, selectedItem]);
 
   /**
    * On arrow key selection and clicks the selectedItemIndex will change.
@@ -225,13 +228,13 @@ function MobileBrowser({
 }) {
   return jsx("div", {
     css: mobileElementBrowserContainer,
-    onKeyPress: onKeyPress,
     onKeyDown: onKeyDown,
     "data-testid": "mobile__element-browser"
   }, jsx("div", {
     css: showCategories ? [mobileSideBar, mobileSideBarShowCategories] : mobileSideBar
   }, showSearch && jsx(ElementSearch, {
     onSearch: onSearch,
+    onKeyDown: onKeyPress,
     mode: mode,
     focus: focusOnSearch,
     onClick: setFocusOnSearch,
@@ -305,13 +308,13 @@ function DesktopBrowser({
     createAnalyticsEvent: createAnalyticsEvent
   }))), jsx("div", {
     css: mainContent,
-    onKeyPress: onKeyPress,
     onKeyDown: onKeyDown,
     "data-testid": "main-content"
   }, showSearch && jsx("div", {
     css: searchContainer
   }, jsx(ElementSearch, {
     onSearch: onSearch,
+    onKeyDown: onKeyPress,
     mode: mode,
     focus: focusOnSearch,
     onClick: setFocusOnSearch,

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.13";
 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.13",
 	"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))));
 });