@atlaskit/editor-plugin-text-formatting 1.16.9 → 1.16.11

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 1.16.11
+
+### Patch Changes
+
+- [#105009](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105009)
+  [`a4039ebf7ed11`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a4039ebf7ed11) -
+  [ux] Implement variant 2 cohorts experience for platform_editor_contextual_formatting_toolbar_v2
+  experiment
+- Updated dependencies
+
+## 1.16.10
+
+### Patch Changes
+
+- [#97984](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97984)
+  [`8ffeab9aaf1ab`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8ffeab9aaf1ab) -
+  [ux] [ED-23573] Added new actions (resolveMarks and registerMarks) to basePlugin. Callbacks added
+  to mentions, card, emoji and base plugins to handle conversion to inline code. Deprecated code
+  removed from editor-common.
+- Updated dependencies
+
 ## 1.16.9
 
 ### Patch Changes

package/dist/cjs/editor-commands/utils/marks.js

@@ -0,0 +1,120 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.nextToggleMark = exports.nextApplyMarkOnRange = void 0;
+var _mark = require("@atlaskit/editor-common/mark");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+/**
+ * A custom version of the ProseMirror toggleMark, where we only toggle marks
+ * on text nodes in the selection rather than all inline nodes.
+ * @param markType
+ * @param attrs
+ */
+var nextToggleMark = exports.nextToggleMark = function nextToggleMark(markType, api, attrs) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    var mark = markType.create(attrs);
+
+    // For cursor selections we can use the default behaviour.
+    if (tr.selection instanceof _state.TextSelection && tr.selection.$cursor) {
+      if (mark.isInSet(tr.storedMarks || tr.selection.$cursor.marks())) {
+        tr.removeStoredMark(mark);
+      } else {
+        tr.addStoredMark(mark);
+      }
+      return tr;
+    }
+    return nextToggleMarkInRange(mark, api)({
+      tr: tr
+    });
+  };
+};
+var nextToggleMarkInRange = function nextToggleMarkInRange(mark, api) {
+  return function (_ref2) {
+    var tr = _ref2.tr;
+    if (tr.selection instanceof _cellSelection.CellSelection) {
+      var removeMark = true;
+      var cells = [];
+      tr.selection.forEachCell(function (cell, cellPos) {
+        cells.push({
+          node: cell,
+          pos: cellPos
+        });
+        var from = cellPos;
+        var to = cellPos + cell.nodeSize;
+        removeMark && (removeMark = (0, _mark.entireSelectionContainsMark)(mark, tr.doc, from, to));
+      });
+      for (var i = cells.length - 1; i >= 0; i--) {
+        var cell = cells[i];
+        var from = cell.pos;
+        var to = from + cell.node.nodeSize;
+        nextApplyMarkOnRange(from, to, removeMark, mark, tr, api);
+      }
+    } else {
+      var _tr$selection = tr.selection,
+        $from = _tr$selection.$from,
+        $to = _tr$selection.$to;
+      // We decide to remove the mark only if the entire selection contains the mark
+      // Examples with *bold* text
+      // Scenario 1: Selection contains both bold and non-bold text -> bold entire selection
+      // Scenario 2: Selection contains only bold text -> un-bold entire selection
+      // Scenario 3: Selection contains no bold text -> bold entire selection
+      var _removeMark = (0, _mark.entireSelectionContainsMark)(mark, tr.doc, $from.pos, $to.pos);
+      nextApplyMarkOnRange($from.pos, $to.pos, _removeMark, mark, tr, api);
+    }
+    if (tr.docChanged) {
+      return tr;
+    }
+    return null;
+  };
+};
+var nextApplyMarkOnRange = exports.nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, removeMark, mark, tr, api
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
+  var schema = tr.doc.type.schema;
+  var code = schema.marks.code;
+  if (mark.type === code) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_resolve_marks')) {
+      var _api$base;
+      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.resolveMarks(from, to, tr);
+    } else {
+      (0, _mark.transformNonTextNodesToText)(from, to, tr);
+    }
+  }
+
+  /**
+   * We should refactor this so text formatting doesn't reference plugins it doesn't know about.
+   */
+  tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), function (node, pos) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+      if (!node.isText) {
+        var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+        if (!isAllowedInlineNode) {
+          return true;
+        }
+      }
+    } else {
+      if (!node.isText) {
+        return true;
+      }
+    }
+
+    // This is an issue when the user selects some text.
+    // We need to check if the current node position is less than the range selection from.
+    // If it’s true, that means we should apply the mark using the range selection,
+    // not the current node position.
+    var nodeBetweenFrom = Math.max(pos, tr.mapping.map(from));
+    var nodeBetweenTo = Math.min(pos + node.nodeSize, tr.mapping.map(to));
+    if (removeMark) {
+      tr.removeMark(nodeBetweenFrom, nodeBetweenTo, mark);
+    } else {
+      tr.addMark(nodeBetweenFrom, nodeBetweenTo, mark);
+    }
+    return true;
+  });
+  return tr;
+};

package/dist/cjs/pm-plugins/commands.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _mark = require("@atlaskit/editor-common/mark");
+var _marks = require("../editor-commands/utils/marks");
 var toggleEm = exports.toggleEm = function toggleEm(_ref) {
   var tr = _ref.tr;
   var em = tr.doc.type.schema.marks.em;
@@ -221,21 +222,26 @@ var toggleSubscriptWithAnalytics = exports.toggleSubscriptWithAnalytics = functi
   };
 };
 var toggleCode = exports.toggleCode = function toggleCode(_ref13) {
-  var tr = _ref13.tr;
-  var code = tr.doc.type.schema.marks.code;
-  if (!code) {
-    // No transaction to apply
-    return null;
-  }
-  return (0, _mark.toggleMark)(code)({
-    tr: tr
-  });
+  var api = _ref13.api;
+  return function (_ref14) {
+    var tr = _ref14.tr;
+    var code = tr.doc.type.schema.marks.code;
+    if (!code) {
+      // No transaction to apply
+      return null;
+    }
+    return (0, _marks.nextToggleMark)(code, api)({
+      tr: tr
+    });
+  };
 };
-var toggleCodeWithAnalytics = exports.toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsApi) {
+var toggleCodeWithAnalytics = exports.toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsApi, api) {
   return function (inputMethod) {
-    return function (_ref14) {
-      var tr = _ref14.tr;
+    return function (_ref15) {
+      var tr = _ref15.tr;
       var newTr = toggleCode({
+        api: api
+      })({
         tr: tr
       });
       if (!newTr) {

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

@@ -20,6 +20,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _mark = require("@atlaskit/editor-common/mark");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -60,10 +61,12 @@ ValidAutoformatChars.STRIKE,
 ValidAutoformatChars.STRONG_MARKDOWN]), ValidAutoformatChars.CODE, [
 // e.g: loko (`some code`
 '( ']);
-function addMark(markType, schema, char) {
+
+// eslint-disable-next-line @typescript-eslint/max-params
+function addMark(markType, _schema, char, api) {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/max-params
-  return function (state, match, start, end) {
+  return function (state, _match, start, end) {
     var _schema$marks;
     var doc = state.doc,
       schema = state.schema,
@@ -97,7 +100,12 @@ function addMark(markType, schema, char) {
       return null;
     }
     if (markType.name === 'code') {
-      (0, _mark.transformNonTextNodesToText)(tr.mapping.map(start), tr.mapping.map(end), tr);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_resolve_marks')) {
+        var _api$base;
+        api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
+      } else {
+        (0, _mark.transformNonTextNodesToText)(tr.mapping.map(start), tr.mapping.map(end), tr);
+      }
     }
     var mappedStart = tr.mapping.map(start);
     var mappedEnd = tr.mapping.map(end);
@@ -242,7 +250,7 @@ function getStrikeInputRules(schema, editorAnalyticsAPI) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getCodeInputRules(schema, editorAnalyticsAPI) {
+function getCodeInputRules(schema, editorAnalyticsAPI, api) {
   var ruleWithCodeAnalytics = (0, _utils.inputRuleWithAnalytics)({
     action: _analytics.ACTION.FORMATTED,
     actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -252,10 +260,10 @@ function getCodeInputRules(schema, editorAnalyticsAPI) {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var backTickRule = (0, _utils.createRule)(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
+  var backTickRule = (0, _utils.createRule)(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
-function inputRulePlugin(schema, editorAnalyticsAPI) {
+function inputRulePlugin(schema, editorAnalyticsAPI, api) {
   var rules = [];
   if (schema.marks.strong) {
     rules.push.apply(rules, (0, _toConsumableArray2.default)(getStrongInputRules(schema, editorAnalyticsAPI)));
@@ -267,7 +275,7 @@ function inputRulePlugin(schema, editorAnalyticsAPI) {
     rules.push.apply(rules, (0, _toConsumableArray2.default)(getStrikeInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.code) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeInputRules(schema, editorAnalyticsAPI)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeInputRules(schema, editorAnalyticsAPI, api)));
   }
   if (rules.length !== 0) {
     return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('text-formatting', rules));

package/dist/cjs/textFormattingPlugin.js

@@ -93,7 +93,7 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
         plugin: function plugin(_ref4) {
           var _api$analytics2;
           var schema = _ref4.schema;
-          return (0, _inputRule.default)(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+          return (0, _inputRule.default)(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api);
         }
       }, {
         name: 'textFormattingSmartRule',
@@ -135,6 +135,8 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
       selectionToolbar: function selectionToolbar() {
         if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true, {
           exposure: true
+        }) || (0, _experiments.editorExperiment)('platform_editor_contextual_formatting_toolbar_v2', 'variant2', {
+          exposure: true
         })) {
           var toolbarCustom = {
             type: 'custom',

package/dist/es2019/editor-commands/utils/marks.js

@@ -0,0 +1,117 @@
+import { entireSelectionContainsMark, transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { fg } from '@atlaskit/platform-feature-flags';
+/**
+ * A custom version of the ProseMirror toggleMark, where we only toggle marks
+ * on text nodes in the selection rather than all inline nodes.
+ * @param markType
+ * @param attrs
+ */
+export const nextToggleMark = (markType, api, attrs) => ({
+  tr
+}) => {
+  const mark = markType.create(attrs);
+
+  // For cursor selections we can use the default behaviour.
+  if (tr.selection instanceof TextSelection && tr.selection.$cursor) {
+    if (mark.isInSet(tr.storedMarks || tr.selection.$cursor.marks())) {
+      tr.removeStoredMark(mark);
+    } else {
+      tr.addStoredMark(mark);
+    }
+    return tr;
+  }
+  return nextToggleMarkInRange(mark, api)({
+    tr
+  });
+};
+const nextToggleMarkInRange = (mark, api) => ({
+  tr
+}) => {
+  if (tr.selection instanceof CellSelection) {
+    let removeMark = true;
+    const cells = [];
+    tr.selection.forEachCell((cell, cellPos) => {
+      cells.push({
+        node: cell,
+        pos: cellPos
+      });
+      const from = cellPos;
+      const to = cellPos + cell.nodeSize;
+      removeMark && (removeMark = entireSelectionContainsMark(mark, tr.doc, from, to));
+    });
+    for (let i = cells.length - 1; i >= 0; i--) {
+      const cell = cells[i];
+      const from = cell.pos;
+      const to = from + cell.node.nodeSize;
+      nextApplyMarkOnRange(from, to, removeMark, mark, tr, api);
+    }
+  } else {
+    const {
+      $from,
+      $to
+    } = tr.selection;
+    // We decide to remove the mark only if the entire selection contains the mark
+    // Examples with *bold* text
+    // Scenario 1: Selection contains both bold and non-bold text -> bold entire selection
+    // Scenario 2: Selection contains only bold text -> un-bold entire selection
+    // Scenario 3: Selection contains no bold text -> bold entire selection
+    const removeMark = entireSelectionContainsMark(mark, tr.doc, $from.pos, $to.pos);
+    nextApplyMarkOnRange($from.pos, $to.pos, removeMark, mark, tr, api);
+  }
+  if (tr.docChanged) {
+    return tr;
+  }
+  return null;
+};
+export const nextApplyMarkOnRange = (from, to, removeMark, mark, tr, api
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
+  const {
+    schema
+  } = tr.doc.type;
+  const {
+    code
+  } = schema.marks;
+  if (mark.type === code) {
+    if (fg('platform_editor_resolve_marks')) {
+      var _api$base;
+      api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : _api$base.actions.resolveMarks(from, to, tr);
+    } else {
+      transformNonTextNodesToText(from, to, tr);
+    }
+  }
+
+  /**
+   * We should refactor this so text formatting doesn't reference plugins it doesn't know about.
+   */
+  tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), (node, pos) => {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
+      if (!node.isText) {
+        const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+        if (!isAllowedInlineNode) {
+          return true;
+        }
+      }
+    } else {
+      if (!node.isText) {
+        return true;
+      }
+    }
+
+    // This is an issue when the user selects some text.
+    // We need to check if the current node position is less than the range selection from.
+    // If it’s true, that means we should apply the mark using the range selection,
+    // not the current node position.
+    const nodeBetweenFrom = Math.max(pos, tr.mapping.map(from));
+    const nodeBetweenTo = Math.min(pos + node.nodeSize, tr.mapping.map(to));
+    if (removeMark) {
+      tr.removeMark(nodeBetweenFrom, nodeBetweenTo, mark);
+    } else {
+      tr.addMark(nodeBetweenFrom, nodeBetweenTo, mark);
+    }
+    return true;
+  });
+  return tr;
+};

package/dist/es2019/pm-plugins/commands.js

@@ -1,5 +1,6 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { toggleMark } from '@atlaskit/editor-common/mark';
+import { nextToggleMark } from '../editor-commands/utils/marks';
 export const toggleEm = ({
   tr
 }) => {
@@ -215,6 +216,8 @@ export const toggleSubscriptWithAnalytics = editorAnalyticsApi => inputMethod =>
   return newTr;
 };
 export const toggleCode = ({
+  api
+}) => ({
   tr
 }) => {
   const {
@@ -224,14 +227,16 @@ export const toggleCode = ({
     // No transaction to apply
     return null;
   }
-  return toggleMark(code)({
+  return nextToggleMark(code, api)({
     tr
   });
 };
-export const toggleCodeWithAnalytics = editorAnalyticsApi => inputMethod => ({
+export const toggleCodeWithAnalytics = (editorAnalyticsApi, api) => inputMethod => ({
   tr
 }) => {
   const newTr = toggleCode({
+    api
+  })({
     tr
   });
   if (!newTr) {

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

@@ -2,6 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
@@ -46,10 +47,12 @@ export const ValidCombinations = {
   // e.g: loko (`some code`
   '( ']
 };
-function addMark(markType, schema, char) {
+
+// eslint-disable-next-line @typescript-eslint/max-params
+function addMark(markType, _schema, char, api) {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/max-params
-  return (state, match, start, end) => {
+  return (state, _match, start, end) => {
     var _schema$marks, _schema$marks$code;
     const {
       doc,
@@ -85,7 +88,12 @@ function addMark(markType, schema, char) {
       return null;
     }
     if (markType.name === 'code') {
-      transformNonTextNodesToText(tr.mapping.map(start), tr.mapping.map(end), tr);
+      if (fg('platform_editor_resolve_marks')) {
+        var _api$base, _api$base$actions;
+        api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : (_api$base$actions = _api$base.actions) === null || _api$base$actions === void 0 ? void 0 : _api$base$actions.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
+      } else {
+        transformNonTextNodesToText(tr.mapping.map(start), tr.mapping.map(end), tr);
+      }
     }
     const mappedStart = tr.mapping.map(start);
     const mappedEnd = tr.mapping.map(end);
@@ -220,7 +228,7 @@ function getStrikeInputRules(schema, editorAnalyticsAPI) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getCodeInputRules(schema, editorAnalyticsAPI) {
+function getCodeInputRules(schema, editorAnalyticsAPI, api) {
   const ruleWithCodeAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
@@ -230,10 +238,10 @@ function getCodeInputRules(schema, editorAnalyticsAPI) {
       inputMethod: INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  const backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
+  const backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
-export function inputRulePlugin(schema, editorAnalyticsAPI) {
+export function inputRulePlugin(schema, editorAnalyticsAPI, api) {
   const rules = [];
   if (schema.marks.strong) {
     rules.push(...getStrongInputRules(schema, editorAnalyticsAPI));
@@ -245,7 +253,7 @@ export function inputRulePlugin(schema, editorAnalyticsAPI) {
     rules.push(...getStrikeInputRules(schema, editorAnalyticsAPI));
   }
   if (schema.marks.code) {
-    rules.push(...getCodeInputRules(schema, editorAnalyticsAPI));
+    rules.push(...getCodeInputRules(schema, editorAnalyticsAPI, api));
   }
   if (rules.length !== 0) {
     return new SafePlugin(createPlugin('text-formatting', rules));

package/dist/es2019/textFormattingPlugin.js

@@ -86,7 +86,7 @@ export const textFormattingPlugin = ({
           schema
         }) => {
           var _api$analytics2;
-          return textFormattingInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+          return textFormattingInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api);
         }
       }, {
         name: 'textFormattingSmartRule',
@@ -129,6 +129,8 @@ export const textFormattingPlugin = ({
       selectionToolbar: () => {
         if (editorExperiment('contextual_formatting_toolbar', true, {
           exposure: true
+        }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant2', {
+          exposure: true
         })) {
           const toolbarCustom = {
             type: 'custom',

package/dist/esm/editor-commands/utils/marks.js

@@ -0,0 +1,114 @@
+import { entireSelectionContainsMark, transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { fg } from '@atlaskit/platform-feature-flags';
+/**
+ * A custom version of the ProseMirror toggleMark, where we only toggle marks
+ * on text nodes in the selection rather than all inline nodes.
+ * @param markType
+ * @param attrs
+ */
+export var nextToggleMark = function nextToggleMark(markType, api, attrs) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    var mark = markType.create(attrs);
+
+    // For cursor selections we can use the default behaviour.
+    if (tr.selection instanceof TextSelection && tr.selection.$cursor) {
+      if (mark.isInSet(tr.storedMarks || tr.selection.$cursor.marks())) {
+        tr.removeStoredMark(mark);
+      } else {
+        tr.addStoredMark(mark);
+      }
+      return tr;
+    }
+    return nextToggleMarkInRange(mark, api)({
+      tr: tr
+    });
+  };
+};
+var nextToggleMarkInRange = function nextToggleMarkInRange(mark, api) {
+  return function (_ref2) {
+    var tr = _ref2.tr;
+    if (tr.selection instanceof CellSelection) {
+      var removeMark = true;
+      var cells = [];
+      tr.selection.forEachCell(function (cell, cellPos) {
+        cells.push({
+          node: cell,
+          pos: cellPos
+        });
+        var from = cellPos;
+        var to = cellPos + cell.nodeSize;
+        removeMark && (removeMark = entireSelectionContainsMark(mark, tr.doc, from, to));
+      });
+      for (var i = cells.length - 1; i >= 0; i--) {
+        var cell = cells[i];
+        var from = cell.pos;
+        var to = from + cell.node.nodeSize;
+        nextApplyMarkOnRange(from, to, removeMark, mark, tr, api);
+      }
+    } else {
+      var _tr$selection = tr.selection,
+        $from = _tr$selection.$from,
+        $to = _tr$selection.$to;
+      // We decide to remove the mark only if the entire selection contains the mark
+      // Examples with *bold* text
+      // Scenario 1: Selection contains both bold and non-bold text -> bold entire selection
+      // Scenario 2: Selection contains only bold text -> un-bold entire selection
+      // Scenario 3: Selection contains no bold text -> bold entire selection
+      var _removeMark = entireSelectionContainsMark(mark, tr.doc, $from.pos, $to.pos);
+      nextApplyMarkOnRange($from.pos, $to.pos, _removeMark, mark, tr, api);
+    }
+    if (tr.docChanged) {
+      return tr;
+    }
+    return null;
+  };
+};
+export var nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, removeMark, mark, tr, api
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
+  var schema = tr.doc.type.schema;
+  var code = schema.marks.code;
+  if (mark.type === code) {
+    if (fg('platform_editor_resolve_marks')) {
+      var _api$base;
+      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.resolveMarks(from, to, tr);
+    } else {
+      transformNonTextNodesToText(from, to, tr);
+    }
+  }
+
+  /**
+   * We should refactor this so text formatting doesn't reference plugins it doesn't know about.
+   */
+  tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), function (node, pos) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
+      if (!node.isText) {
+        var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+        if (!isAllowedInlineNode) {
+          return true;
+        }
+      }
+    } else {
+      if (!node.isText) {
+        return true;
+      }
+    }
+
+    // This is an issue when the user selects some text.
+    // We need to check if the current node position is less than the range selection from.
+    // If it’s true, that means we should apply the mark using the range selection,
+    // not the current node position.
+    var nodeBetweenFrom = Math.max(pos, tr.mapping.map(from));
+    var nodeBetweenTo = Math.min(pos + node.nodeSize, tr.mapping.map(to));
+    if (removeMark) {
+      tr.removeMark(nodeBetweenFrom, nodeBetweenTo, mark);
+    } else {
+      tr.addMark(nodeBetweenFrom, nodeBetweenTo, mark);
+    }
+    return true;
+  });
+  return tr;
+};

package/dist/esm/pm-plugins/commands.js

@@ -1,5 +1,6 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { toggleMark } from '@atlaskit/editor-common/mark';
+import { nextToggleMark } from '../editor-commands/utils/marks';
 export var toggleEm = function toggleEm(_ref) {
   var tr = _ref.tr;
   var em = tr.doc.type.schema.marks.em;
@@ -215,21 +216,26 @@ export var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(
   };
 };
 export var toggleCode = function toggleCode(_ref13) {
-  var tr = _ref13.tr;
-  var code = tr.doc.type.schema.marks.code;
-  if (!code) {
-    // No transaction to apply
-    return null;
-  }
-  return toggleMark(code)({
-    tr: tr
-  });
+  var api = _ref13.api;
+  return function (_ref14) {
+    var tr = _ref14.tr;
+    var code = tr.doc.type.schema.marks.code;
+    if (!code) {
+      // No transaction to apply
+      return null;
+    }
+    return nextToggleMark(code, api)({
+      tr: tr
+    });
+  };
 };
-export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsApi) {
+export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsApi, api) {
   return function (inputMethod) {
-    return function (_ref14) {
-      var tr = _ref14.tr;
+    return function (_ref15) {
+      var tr = _ref15.tr;
       var newTr = toggleCode({
+        api: api
+      })({
         tr: tr
       });
       if (!newTr) {

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

@@ -14,6 +14,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
@@ -51,10 +52,12 @@ ValidAutoformatChars.STRIKE,
 ValidAutoformatChars.STRONG_MARKDOWN]), ValidAutoformatChars.CODE, [
 // e.g: loko (`some code`
 '( ']);
-function addMark(markType, schema, char) {
+
+// eslint-disable-next-line @typescript-eslint/max-params
+function addMark(markType, _schema, char, api) {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/max-params
-  return function (state, match, start, end) {
+  return function (state, _match, start, end) {
     var _schema$marks;
     var doc = state.doc,
       schema = state.schema,
@@ -88,7 +91,12 @@ function addMark(markType, schema, char) {
       return null;
     }
     if (markType.name === 'code') {
-      transformNonTextNodesToText(tr.mapping.map(start), tr.mapping.map(end), tr);
+      if (fg('platform_editor_resolve_marks')) {
+        var _api$base;
+        api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
+      } else {
+        transformNonTextNodesToText(tr.mapping.map(start), tr.mapping.map(end), tr);
+      }
     }
     var mappedStart = tr.mapping.map(start);
     var mappedEnd = tr.mapping.map(end);
@@ -233,7 +241,7 @@ function getStrikeInputRules(schema, editorAnalyticsAPI) {
  * @param {Schema} schema
  * @returns {InputRuleWrapper[]}
  */
-function getCodeInputRules(schema, editorAnalyticsAPI) {
+function getCodeInputRules(schema, editorAnalyticsAPI, api) {
   var ruleWithCodeAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
@@ -243,10 +251,10 @@ function getCodeInputRules(schema, editorAnalyticsAPI) {
       inputMethod: INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE));
+  var backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api));
   return [ruleWithCodeAnalytics(backTickRule)];
 }
-export function inputRulePlugin(schema, editorAnalyticsAPI) {
+export function inputRulePlugin(schema, editorAnalyticsAPI, api) {
   var rules = [];
   if (schema.marks.strong) {
     rules.push.apply(rules, _toConsumableArray(getStrongInputRules(schema, editorAnalyticsAPI)));
@@ -258,7 +266,7 @@ export function inputRulePlugin(schema, editorAnalyticsAPI) {
     rules.push.apply(rules, _toConsumableArray(getStrikeInputRules(schema, editorAnalyticsAPI)));
   }
   if (schema.marks.code) {
-    rules.push.apply(rules, _toConsumableArray(getCodeInputRules(schema, editorAnalyticsAPI)));
+    rules.push.apply(rules, _toConsumableArray(getCodeInputRules(schema, editorAnalyticsAPI, api)));
   }
   if (rules.length !== 0) {
     return new SafePlugin(createPlugin('text-formatting', rules));

package/dist/esm/textFormattingPlugin.js

@@ -87,7 +87,7 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
         plugin: function plugin(_ref4) {
           var _api$analytics2;
           var schema = _ref4.schema;
-          return textFormattingInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+          return textFormattingInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api);
         }
       }, {
         name: 'textFormattingSmartRule',
@@ -129,6 +129,8 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
       selectionToolbar: function selectionToolbar() {
         if (editorExperiment('contextual_formatting_toolbar', true, {
           exposure: true
+        }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant2', {
+          exposure: true
         })) {
           var toolbarCustom = {
             type: 'custom',

package/dist/types/editor-commands/utils/marks.d.ts

@@ -0,0 +1,14 @@
+import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Mark, MarkType } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TextFormattingPlugin } from '../../textFormattingPluginType';
+/**
+ * A custom version of the ProseMirror toggleMark, where we only toggle marks
+ * on text nodes in the selection rather than all inline nodes.
+ * @param markType
+ * @param attrs
+ */
+export declare const nextToggleMark: (markType: MarkType, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined, attrs?: {
+    [key: string]: any;
+} | undefined) => EditorCommand;
+export declare const nextApplyMarkOnRange: (from: number, to: number, removeMark: boolean, mark: Mark, tr: Transaction, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined) => Transaction;

package/dist/types/pm-plugins/commands.d.ts

@@ -1,6 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand, InputMethodBasic } from '@atlaskit/editor-common/types';
-type ToggleMarkWithAnalyticsEditorCommand = (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => ToggleMarkEditorCommand;
+import type { EditorCommand, ExtractInjectionAPI, InputMethodBasic } from '@atlaskit/editor-common/types';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
+type ToggleMarkWithAnalyticsEditorCommand = (editorAnalyticsApi: EditorAnalyticsAPI | undefined, api?: ExtractInjectionAPI<TextFormattingPlugin>) => ToggleMarkEditorCommand;
 export type ToggleMarkEditorCommand = (inputMethod: InputMethodBasic) => EditorCommand;
 export declare const toggleEm: EditorCommand;
 export declare const toggleEmWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
@@ -14,6 +15,8 @@ export declare const toggleSuperscript: EditorCommand;
 export declare const toggleSuperscriptWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
 export declare const toggleSubscript: EditorCommand;
 export declare const toggleSubscriptWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
-export declare const toggleCode: EditorCommand;
+export declare const toggleCode: ({ api }: {
+    api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
+}) => EditorCommand;
 export declare const toggleCodeWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
 export {};

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

@@ -1,6 +1,8 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
 declare enum ValidAutoformatChars {
     STRONG = "__",
     STRIKE = "~~",
@@ -19,5 +21,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, editorAnalyticsAPI: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
+export declare function inputRulePlugin(schema: Schema, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined): SafePlugin | undefined;
 export default inputRulePlugin;

package/dist/types/textFormattingPluginType.d.ts

@@ -1,10 +1,15 @@
 import type { NextEditorPlugin, OptionalPlugin, TextFormattingOptions, TextFormattingState } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
 export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
     pluginConfiguration: TextFormattingOptions | undefined;
-    dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<PrimaryToolbarPlugin>];
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<PrimaryToolbarPlugin>,
+        OptionalPlugin<BasePlugin>
+    ];
     commands: {
         toggleSuperscript: ToggleMarkEditorCommand;
         toggleSubscript: ToggleMarkEditorCommand;

package/dist/types-ts4.5/editor-commands/utils/marks.d.ts

@@ -0,0 +1,14 @@
+import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Mark, MarkType } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { TextFormattingPlugin } from '../../textFormattingPluginType';
+/**
+ * A custom version of the ProseMirror toggleMark, where we only toggle marks
+ * on text nodes in the selection rather than all inline nodes.
+ * @param markType
+ * @param attrs
+ */
+export declare const nextToggleMark: (markType: MarkType, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined, attrs?: {
+    [key: string]: any;
+} | undefined) => EditorCommand;
+export declare const nextApplyMarkOnRange: (from: number, to: number, removeMark: boolean, mark: Mark, tr: Transaction, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined) => Transaction;

package/dist/types-ts4.5/pm-plugins/commands.d.ts

@@ -1,6 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand, InputMethodBasic } from '@atlaskit/editor-common/types';
-type ToggleMarkWithAnalyticsEditorCommand = (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => ToggleMarkEditorCommand;
+import type { EditorCommand, ExtractInjectionAPI, InputMethodBasic } from '@atlaskit/editor-common/types';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
+type ToggleMarkWithAnalyticsEditorCommand = (editorAnalyticsApi: EditorAnalyticsAPI | undefined, api?: ExtractInjectionAPI<TextFormattingPlugin>) => ToggleMarkEditorCommand;
 export type ToggleMarkEditorCommand = (inputMethod: InputMethodBasic) => EditorCommand;
 export declare const toggleEm: EditorCommand;
 export declare const toggleEmWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
@@ -14,6 +15,8 @@ export declare const toggleSuperscript: EditorCommand;
 export declare const toggleSuperscriptWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
 export declare const toggleSubscript: EditorCommand;
 export declare const toggleSubscriptWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
-export declare const toggleCode: EditorCommand;
+export declare const toggleCode: ({ api }: {
+    api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
+}) => EditorCommand;
 export declare const toggleCodeWithAnalytics: ToggleMarkWithAnalyticsEditorCommand;
 export {};

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

@@ -1,6 +1,8 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
 declare enum ValidAutoformatChars {
     STRONG = "__",
     STRIKE = "~~",
@@ -19,5 +21,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, editorAnalyticsAPI: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
+export declare function inputRulePlugin(schema: Schema, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined): SafePlugin | undefined;
 export default inputRulePlugin;

package/dist/types-ts4.5/textFormattingPluginType.d.ts

@@ -1,12 +1,14 @@
 import type { NextEditorPlugin, OptionalPlugin, TextFormattingOptions, TextFormattingState } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
 export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
     pluginConfiguration: TextFormattingOptions | undefined;
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<PrimaryToolbarPlugin>
+        OptionalPlugin<PrimaryToolbarPlugin>,
+        OptionalPlugin<BasePlugin>
     ];
     commands: {
         toggleSuperscript: ToggleMarkEditorCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "1.16.9",
+	"version": "1.16.11",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,18 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^98.2.0",
-		"@atlaskit/editor-plugin-analytics": "^1.10.0",
+		"@atlaskit/editor-common": "^99.5.0",
+		"@atlaskit/editor-plugin-analytics": "^1.11.0",
+		"@atlaskit/editor-plugin-base": "^2.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.2.0",
+		"@atlaskit/icon": "^23.4.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
-		"@atlaskit/tmp-editor-statsig": "^2.33.0",
-		"@atlaskit/tokens": "^2.5.0",
+		"@atlaskit/tmp-editor-statsig": "^2.39.0",
+		"@atlaskit/tokens": "^3.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -99,6 +100,12 @@
 		},
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
+		},
+		"platform_editor_resolve_marks": {
+			"type": "boolean"
+		},
+		"editor_inline_comments_on_inline_nodes": {
+			"type": "boolean"
 		}
 	}
 }

package/dist/cjs/editor-commands/transform-to-code.js

@@ -1,79 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.transformSmartCharsMentionsAndEmojis = void 0;
-var _mark = require("@atlaskit/editor-common/mark");
-var SMART_TO_ASCII = {
-  '…': '...',
-  '→': '->',
-  '←': '<-',
-  '–': '--',
-  '“': '"',
-  '”': '"',
-  '‘': "'",
-  '’': "'"
-};
-
-// Ignored via go/ees005
-// eslint-disable-next-line require-unicode-regexp
-var FIND_SMART_CHAR = new RegExp("[".concat(Object.keys(SMART_TO_ASCII).join(''), "]"), 'g');
-var replaceMentionOrEmojiForTextContent = function replaceMentionOrEmojiForTextContent(position, nodeSize, textContent, tr
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
-  var currentPos = tr.mapping.map(position);
-  var schema = tr.doc.type.schema;
-  tr.replaceWith(currentPos, currentPos + nodeSize, schema.text(textContent));
-};
-var replaceSmartCharsToAscii = function replaceSmartCharsToAscii(position, textContent, tr) {
-  var schema = tr.doc.type.schema;
-  var match;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line no-cond-assign
-  while (match = FIND_SMART_CHAR.exec(textContent)) {
-    var _match = match,
-      smartChar = _match[0],
-      offset = _match.index;
-    var replacePos = tr.mapping.map(position + offset);
-    var replacementText = schema.text(SMART_TO_ASCII[smartChar]);
-    tr.replaceWith(replacePos, replacePos + smartChar.length, replacementText);
-  }
-};
-var isNodeTextBlock = function isNodeTextBlock(schema) {
-  var _schema$nodes = schema.nodes,
-    mention = _schema$nodes.mention,
-    text = _schema$nodes.text,
-    emoji = _schema$nodes.emoji;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return function (node, _, parent) {
-    if (node.type === mention || node.type === emoji || node.type === text) {
-      return parent === null || parent === void 0 ? void 0 : parent.isTextblock;
-    }
-    return;
-  };
-};
-var transformSmartCharsMentionsAndEmojis = exports.transformSmartCharsMentionsAndEmojis = function transformSmartCharsMentionsAndEmojis(from, to, tr) {
-  var schema = tr.doc.type.schema;
-  var _schema$nodes2 = schema.nodes,
-    mention = _schema$nodes2.mention,
-    text = _schema$nodes2.text,
-    emoji = _schema$nodes2.emoji;
-  // Traverse through all the nodes within the range and replace them with their plaintext counterpart
-  var children = (0, _mark.filterChildrenBetween)(tr.doc, from, to, isNodeTextBlock(schema));
-  children.forEach(function (_ref) {
-    var node = _ref.node,
-      pos = _ref.pos;
-    if (node.type === mention || node.type === emoji) {
-      replaceMentionOrEmojiForTextContent(pos, node.nodeSize, node.attrs.text, tr);
-    } else if (node.type === text && node.text) {
-      var replacePosition = pos > from ? pos : from;
-      var textToReplace = pos > from ? node.text : node.text.substr(from - pos);
-      replaceSmartCharsToAscii(replacePosition, textToReplace, tr);
-    }
-  });
-};

package/dist/es2019/editor-commands/transform-to-code.js

@@ -1,83 +0,0 @@
-import { filterChildrenBetween } from '@atlaskit/editor-common/mark';
-const SMART_TO_ASCII = {
-  '…': '...',
-  '→': '->',
-  '←': '<-',
-  '–': '--',
-  '“': '"',
-  '”': '"',
-  '‘': "'",
-  '’': "'"
-};
-
-// Ignored via go/ees005
-// eslint-disable-next-line require-unicode-regexp
-const FIND_SMART_CHAR = new RegExp(`[${Object.keys(SMART_TO_ASCII).join('')}]`, 'g');
-const replaceMentionOrEmojiForTextContent = (position, nodeSize, textContent, tr
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
-  const currentPos = tr.mapping.map(position);
-  const {
-    schema
-  } = tr.doc.type;
-  tr.replaceWith(currentPos, currentPos + nodeSize, schema.text(textContent));
-};
-const replaceSmartCharsToAscii = (position, textContent, tr) => {
-  const {
-    schema
-  } = tr.doc.type;
-  let match;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line no-cond-assign
-  while (match = FIND_SMART_CHAR.exec(textContent)) {
-    const {
-      0: smartChar,
-      index: offset
-    } = match;
-    const replacePos = tr.mapping.map(position + offset);
-    const replacementText = schema.text(SMART_TO_ASCII[smartChar]);
-    tr.replaceWith(replacePos, replacePos + smartChar.length, replacementText);
-  }
-};
-const isNodeTextBlock = schema => {
-  const {
-    mention,
-    text,
-    emoji
-  } = schema.nodes;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return (node, _, parent) => {
-    if (node.type === mention || node.type === emoji || node.type === text) {
-      return parent === null || parent === void 0 ? void 0 : parent.isTextblock;
-    }
-    return;
-  };
-};
-export const transformSmartCharsMentionsAndEmojis = (from, to, tr) => {
-  const {
-    schema
-  } = tr.doc.type;
-  const {
-    mention,
-    text,
-    emoji
-  } = schema.nodes;
-  // Traverse through all the nodes within the range and replace them with their plaintext counterpart
-  const children = filterChildrenBetween(tr.doc, from, to, isNodeTextBlock(schema));
-  children.forEach(({
-    node,
-    pos
-  }) => {
-    if (node.type === mention || node.type === emoji) {
-      replaceMentionOrEmojiForTextContent(pos, node.nodeSize, node.attrs.text, tr);
-    } else if (node.type === text && node.text) {
-      const replacePosition = pos > from ? pos : from;
-      const textToReplace = pos > from ? node.text : node.text.substr(from - pos);
-      replaceSmartCharsToAscii(replacePosition, textToReplace, tr);
-    }
-  });
-};

package/dist/esm/editor-commands/transform-to-code.js

@@ -1,73 +0,0 @@
-import { filterChildrenBetween } from '@atlaskit/editor-common/mark';
-var SMART_TO_ASCII = {
-  '…': '...',
-  '→': '->',
-  '←': '<-',
-  '–': '--',
-  '“': '"',
-  '”': '"',
-  '‘': "'",
-  '’': "'"
-};
-
-// Ignored via go/ees005
-// eslint-disable-next-line require-unicode-regexp
-var FIND_SMART_CHAR = new RegExp("[".concat(Object.keys(SMART_TO_ASCII).join(''), "]"), 'g');
-var replaceMentionOrEmojiForTextContent = function replaceMentionOrEmojiForTextContent(position, nodeSize, textContent, tr
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
-  var currentPos = tr.mapping.map(position);
-  var schema = tr.doc.type.schema;
-  tr.replaceWith(currentPos, currentPos + nodeSize, schema.text(textContent));
-};
-var replaceSmartCharsToAscii = function replaceSmartCharsToAscii(position, textContent, tr) {
-  var schema = tr.doc.type.schema;
-  var match;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line no-cond-assign
-  while (match = FIND_SMART_CHAR.exec(textContent)) {
-    var _match = match,
-      smartChar = _match[0],
-      offset = _match.index;
-    var replacePos = tr.mapping.map(position + offset);
-    var replacementText = schema.text(SMART_TO_ASCII[smartChar]);
-    tr.replaceWith(replacePos, replacePos + smartChar.length, replacementText);
-  }
-};
-var isNodeTextBlock = function isNodeTextBlock(schema) {
-  var _schema$nodes = schema.nodes,
-    mention = _schema$nodes.mention,
-    text = _schema$nodes.text,
-    emoji = _schema$nodes.emoji;
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return function (node, _, parent) {
-    if (node.type === mention || node.type === emoji || node.type === text) {
-      return parent === null || parent === void 0 ? void 0 : parent.isTextblock;
-    }
-    return;
-  };
-};
-export var transformSmartCharsMentionsAndEmojis = function transformSmartCharsMentionsAndEmojis(from, to, tr) {
-  var schema = tr.doc.type.schema;
-  var _schema$nodes2 = schema.nodes,
-    mention = _schema$nodes2.mention,
-    text = _schema$nodes2.text,
-    emoji = _schema$nodes2.emoji;
-  // Traverse through all the nodes within the range and replace them with their plaintext counterpart
-  var children = filterChildrenBetween(tr.doc, from, to, isNodeTextBlock(schema));
-  children.forEach(function (_ref) {
-    var node = _ref.node,
-      pos = _ref.pos;
-    if (node.type === mention || node.type === emoji) {
-      replaceMentionOrEmojiForTextContent(pos, node.nodeSize, node.attrs.text, tr);
-    } else if (node.type === text && node.text) {
-      var replacePosition = pos > from ? pos : from;
-      var textToReplace = pos > from ? node.text : node.text.substr(from - pos);
-      replaceSmartCharsToAscii(replacePosition, textToReplace, tr);
-    }
-  });
-};

package/dist/types/editor-commands/transform-to-code.d.ts

@@ -1,2 +0,0 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const transformSmartCharsMentionsAndEmojis: (from: number, to: number, tr: Transaction) => void;

package/dist/types-ts4.5/editor-commands/transform-to-code.d.ts

@@ -1,2 +0,0 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const transformSmartCharsMentionsAndEmojis: (from: number, to: number, tr: Transaction) => void;