@atlaskit/editor-plugin-text-formatting 1.16.3 → 1.16.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 1.16.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.16.4
+
+### Patch Changes
+
+- [#171551](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171551)
+  [`702c918817e78`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/702c918817e78) -
+  ED-25817: refactors plugins to meet folder standards
+
 ## 1.16.3
 
 ### Patch Changes

package/dist/cjs/{commands → editor-commands}/clear-formatting.js

@@ -9,7 +9,7 @@ exports.clearFormattingWithAnalytics = clearFormattingWithAnalytics;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
-var _cellSelection2 = require("../utils/cell-selection");
+var _cellSelection2 = require("./utils/cell-selection");
 var FORMATTING_NODE_TYPES = exports.FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 var FORMATTING_MARK_TYPES = exports.FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 var formatTypes = {

package/dist/cjs/{commands → editor-commands}/text-formatting.js

@@ -8,7 +8,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _mark = require("@atlaskit/editor-common/mark");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("../utils");
+var _utils = require("./utils");
 var moveRight = exports.moveRight = function moveRight() {
   return function (state, dispatch) {
     var code = state.schema.marks.code;

package/dist/cjs/{utils.js → editor-commands/utils.js}

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.markActive = exports.isArrayContainsContent = exports.hasCode = exports.compareItemsArrays = exports.checkFormattingIsPresent = void 0;
 var _mark = require("@atlaskit/editor-common/mark");
-var _clearFormatting = require("./commands/clear-formatting");
+var _clearFormatting = require("./clear-formatting");
 var hasCode = exports.hasCode = function hasCode(state, pos) {
   var code = state.schema.marks.code;
   var node = pos >= 0 && state.doc.nodeAt(pos);

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "textFormattingPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.textFormattingPlugin;
+    return _textFormattingPlugin.textFormattingPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _textFormattingPlugin = require("./textFormattingPlugin");

package/dist/cjs/pm-plugins/clear-formatting-keymap.js

@@ -8,7 +8,7 @@ exports.keymapPlugin = keymapPlugin;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _clearFormatting = require("../commands/clear-formatting");
+var _clearFormatting = require("../editor-commands/clear-formatting");
 function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.clearFormatting.common, (0, _clearFormatting.clearFormattingWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsAPI), list);

package/dist/cjs/pm-plugins/clear-formatting.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.pluginKey = exports.plugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("../utils");
+var _utils = require("../editor-commands/utils");
 var pluginKey = exports.pluginKey = new _state.PluginKey('clearFormattingPlugin');
 var plugin = exports.plugin = function plugin(dispatch) {
   return new _safePlugin.SafePlugin({

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

@@ -10,10 +10,10 @@ exports.strongRegex2 = exports.strongRegex1 = exports.strikeRegex = exports.ital
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -21,9 +21,9 @@ var _mark = require("@atlaskit/editor-common/mark");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
-var _ValidCombinations;
-function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
+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; })(); }
+function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -33,7 +33,7 @@ var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["CODE"] = "`";
   return ValidAutoformatChars;
 }(ValidAutoformatChars || {});
-var ValidCombinations = exports.ValidCombinations = (_ValidCombinations = {}, (0, _defineProperty2.default)(_ValidCombinations, ValidAutoformatChars.STRIKE, [
+var ValidCombinations = exports.ValidCombinations = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ValidAutoformatChars.STRIKE, [
 // e.g: _~~lol~~_
 ValidAutoformatChars.ITALIC,
 // e.g: __~~lol~~__
@@ -41,25 +41,25 @@ ValidAutoformatChars.STRONG,
 // e.g: **~~lol~~**
 ValidAutoformatChars.STRONG_MARKDOWN,
 // e.g: *~~lol~~*
-ValidAutoformatChars.ITALIC_MARKDOWN]), (0, _defineProperty2.default)(_ValidCombinations, ValidAutoformatChars.STRONG, [
+ValidAutoformatChars.ITALIC_MARKDOWN]), ValidAutoformatChars.STRONG, [
 // e.g: ~~__lol__~~
 ValidAutoformatChars.STRIKE,
 // e.g: *__lol__*
-ValidAutoformatChars.ITALIC_MARKDOWN]), (0, _defineProperty2.default)(_ValidCombinations, ValidAutoformatChars.STRONG_MARKDOWN, [
+ValidAutoformatChars.ITALIC_MARKDOWN]), ValidAutoformatChars.STRONG_MARKDOWN, [
 // e.g: _**lol**_
 ValidAutoformatChars.ITALIC,
 // e.g: ~~**lol**~~
-ValidAutoformatChars.STRIKE]), (0, _defineProperty2.default)(_ValidCombinations, ValidAutoformatChars.ITALIC_MARKDOWN, [
+ValidAutoformatChars.STRIKE]), ValidAutoformatChars.ITALIC_MARKDOWN, [
 // e.g: ~~*lol*~~
 ValidAutoformatChars.STRIKE,
 // e.g: __*lol*__
-ValidAutoformatChars.STRONG]), (0, _defineProperty2.default)(_ValidCombinations, ValidAutoformatChars.ITALIC, [
+ValidAutoformatChars.STRONG]), ValidAutoformatChars.ITALIC, [
 // e.g: ~~_lol_~~
 ValidAutoformatChars.STRIKE,
 // e.g: **_lol_**
-ValidAutoformatChars.STRONG_MARKDOWN]), (0, _defineProperty2.default)(_ValidCombinations, ValidAutoformatChars.CODE, [
+ValidAutoformatChars.STRONG_MARKDOWN]), ValidAutoformatChars.CODE, [
 // e.g: loko (`some code`
-'( ']), _ValidCombinations);
+'( ']);
 function addMark(markType, schema, char) {
   return function (state, match, start, end) {
     var _schema$marks;
@@ -111,20 +111,19 @@ function addMark(markType, schema, char) {
   };
 }
 var ReverseRegexExp = /*#__PURE__*/function (_RegExp) {
-  (0, _inherits2.default)(ReverseRegexExp, _RegExp);
-  var _super = _createSuper(ReverseRegexExp);
   function ReverseRegexExp() {
     (0, _classCallCheck2.default)(this, ReverseRegexExp);
-    return _super.apply(this, arguments);
+    return _callSuper(this, ReverseRegexExp, arguments);
   }
-  (0, _createClass2.default)(ReverseRegexExp, [{
+  (0, _inherits2.default)(ReverseRegexExp, _RegExp);
+  return (0, _createClass2.default)(ReverseRegexExp, [{
     key: "exec",
     value: function exec(str) {
       if (!str) {
         return null;
       }
       var reverseStr = (0, _toConsumableArray2.default)(str).reverse().join('');
-      var result = (0, _get2.default)((0, _getPrototypeOf2.default)(ReverseRegexExp.prototype), "exec", this).call(this, reverseStr);
+      var result = _superPropGet(ReverseRegexExp, "exec", this, 3)([reverseStr]);
       if (!result) {
         return null;
       }
@@ -142,7 +141,6 @@ var ReverseRegexExp = /*#__PURE__*/function (_RegExp) {
       return result;
     }
   }]);
-  return ReverseRegexExp;
 }( /*#__PURE__*/(0, _wrapNativeSuper2.default)(RegExp));
 var buildRegex = function buildRegex(char) {
   var escapedChar = char.replace(/(\W)/g, '\\$1');

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

@@ -8,7 +8,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _commands = require("../commands");
+var _commands = require("./commands");
 function keymapPlugin(schema, editorAnalyticsAPI) {
   var list = {};
   if (schema.marks.strong) {

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

@@ -5,19 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.plugin = void 0;
-Object.defineProperty(exports, "pluginKey", {
-  enumerable: true,
-  get: function get() {
-    return _pluginKey.pluginKey;
-  }
-});
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _mark = require("@atlaskit/editor-common/mark");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _textFormatting = _interopRequireWildcard(require("../commands/text-formatting"));
+var _textFormatting = _interopRequireWildcard(require("../editor-commands/text-formatting"));
 var commands = _textFormatting;
 var _pluginKey = require("./plugin-key");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }

package/dist/cjs/{plugin.js → textFormattingPlugin.js}

@@ -9,13 +9,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _commands = require("./commands");
 var _clearFormatting = require("./pm-plugins/clear-formatting");
 var _clearFormattingKeymap = _interopRequireDefault(require("./pm-plugins/clear-formatting-keymap"));
+var _commands = require("./pm-plugins/commands");
 var _cursor = _interopRequireDefault(require("./pm-plugins/cursor"));
 var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _main = require("./pm-plugins/main");
+var _pluginKey = require("./pm-plugins/plugin-key");
 var _smartInputRule = _interopRequireDefault(require("./pm-plugins/smart-input-rule"));
 var _FloatingToolbarComponent = require("./ui/FloatingToolbarComponent");
 var _PrimaryToolbarComponent = require("./ui/PrimaryToolbarComponent");
@@ -126,7 +127,7 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
       if (!editorState) {
         return undefined;
       }
-      return _objectSpread(_objectSpread({}, _main.pluginKey.getState(editorState)), {}, {
+      return _objectSpread(_objectSpread({}, _pluginKey.pluginKey.getState(editorState)), {}, {
         formattingIsPresent: (_clearFormattingPlugi = _clearFormatting.pluginKey.getState(editorState)) === null || _clearFormattingPlugi === void 0 ? void 0 : _clearFormattingPlugi.formattingIsPresent
       });
     },

package/dist/cjs/textFormattingPluginType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/ui/Toolbar/constants.js

@@ -8,7 +8,6 @@ exports.ResponsiveCustomMenuNext = exports.ResponsiveCustomMenu = exports.Respon
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _types = require("@atlaskit/editor-common/types");
 var _types2 = require("./types");
-var _ResponsiveCustomButt, _ResponsiveCustomMenu, _ResponsiveCustomButt2, _ResponsiveCustomMenu2;
 var DefaultButtonsToolbar = exports.DefaultButtonsToolbar = [_types2.IconTypes.strong, _types2.IconTypes.em];
 var DefaultButtonsMenu = exports.DefaultButtonsMenu = [_types2.IconTypes.underline, _types2.IconTypes.strike, _types2.IconTypes.code, _types2.IconTypes.subscript, _types2.IconTypes.superscript];
 
@@ -17,13 +16,13 @@ var DefaultButtonsMenu = exports.DefaultButtonsMenu = [_types2.IconTypes.underli
  * To be removed as part of ED-25129 in favour of ResponsiveCustomButtonToolbarNext along with references
  * to platform_editor_toolbar_responsive_fixes feature gate
  */
-var ResponsiveCustomButtonToolbar = exports.ResponsiveCustomButtonToolbar = (_ResponsiveCustomButt = {}, (0, _defineProperty2.default)(_ResponsiveCustomButt, _types.ToolbarSize.XXL, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt, _types.ToolbarSize.XL, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt, _types.ToolbarSize.L, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt, _types.ToolbarSize.M, []), (0, _defineProperty2.default)(_ResponsiveCustomButt, _types.ToolbarSize.S, []), (0, _defineProperty2.default)(_ResponsiveCustomButt, _types.ToolbarSize.XXXS, []), _ResponsiveCustomButt);
+var ResponsiveCustomButtonToolbar = exports.ResponsiveCustomButtonToolbar = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsToolbar), _types.ToolbarSize.XL, DefaultButtonsToolbar), _types.ToolbarSize.L, DefaultButtonsToolbar), _types.ToolbarSize.M, []), _types.ToolbarSize.S, []), _types.ToolbarSize.XXXS, []);
 
 // eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
 /** @deprecated
  * To be removed as part of ED-25129 in favour of ResponsiveCustomButtonToolbarNext along with references
  * to platform_editor_toolbar_responsive_fixes feature gate
  */
-var ResponsiveCustomMenu = exports.ResponsiveCustomMenu = (_ResponsiveCustomMenu = {}, (0, _defineProperty2.default)(_ResponsiveCustomMenu, _types.ToolbarSize.XXL, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu, _types.ToolbarSize.XL, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu, _types.ToolbarSize.L, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu, _types.ToolbarSize.M, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu)), (0, _defineProperty2.default)(_ResponsiveCustomMenu, _types.ToolbarSize.S, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu)), (0, _defineProperty2.default)(_ResponsiveCustomMenu, _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu)), _ResponsiveCustomMenu);
-var ResponsiveCustomButtonToolbarNext = exports.ResponsiveCustomButtonToolbarNext = (_ResponsiveCustomButt2 = {}, (0, _defineProperty2.default)(_ResponsiveCustomButt2, _types.ToolbarSize.XXL, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt2, _types.ToolbarSize.XL, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt2, _types.ToolbarSize.L, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt2, _types.ToolbarSize.M, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt2, _types.ToolbarSize.S, DefaultButtonsToolbar), (0, _defineProperty2.default)(_ResponsiveCustomButt2, _types.ToolbarSize.XXXS, []), _ResponsiveCustomButt2);
-var ResponsiveCustomMenuNext = exports.ResponsiveCustomMenuNext = (_ResponsiveCustomMenu2 = {}, (0, _defineProperty2.default)(_ResponsiveCustomMenu2, _types.ToolbarSize.XXL, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu2, _types.ToolbarSize.XL, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu2, _types.ToolbarSize.L, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu2, _types.ToolbarSize.M, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu2, _types.ToolbarSize.S, DefaultButtonsMenu), (0, _defineProperty2.default)(_ResponsiveCustomMenu2, _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu)), _ResponsiveCustomMenu2);
+var ResponsiveCustomMenu = exports.ResponsiveCustomMenu = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsMenu), _types.ToolbarSize.XL, DefaultButtonsMenu), _types.ToolbarSize.L, DefaultButtonsMenu), _types.ToolbarSize.M, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu)), _types.ToolbarSize.S, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu)), _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu));
+var ResponsiveCustomButtonToolbarNext = exports.ResponsiveCustomButtonToolbarNext = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsToolbar), _types.ToolbarSize.XL, DefaultButtonsToolbar), _types.ToolbarSize.L, DefaultButtonsToolbar), _types.ToolbarSize.M, DefaultButtonsToolbar), _types.ToolbarSize.S, DefaultButtonsToolbar), _types.ToolbarSize.XXXS, []);
+var ResponsiveCustomMenuNext = exports.ResponsiveCustomMenuNext = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsMenu), _types.ToolbarSize.XL, DefaultButtonsMenu), _types.ToolbarSize.L, DefaultButtonsMenu), _types.ToolbarSize.M, DefaultButtonsMenu), _types.ToolbarSize.S, DefaultButtonsMenu), _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu));

package/dist/cjs/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -9,8 +9,8 @@ var _react2 = require("@emotion/react");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
-var _clearFormatting = require("../../../commands/clear-formatting");
-var _inputMethodUtils = require("../../../input-method-utils");
+var _clearFormatting = require("../../../editor-commands/clear-formatting");
+var _inputMethodUtils = require("../input-method-utils");
 /**
  * @jsxRuntime classic
  * @jsx jsx

package/dist/cjs/ui/Toolbar/hooks/formatting-icons.js

@@ -16,17 +16,18 @@ var _preset = require("@atlaskit/editor-common/preset");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
 var _textBoldEditorBold = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-bold--editor-bold"));
 var _textItalicEditorItalic = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-italic--editor-italic"));
-var _commands = require("../../../commands");
-var _inputMethodUtils = require("../../../input-method-utils");
+var _commands = require("../../../pm-plugins/commands");
+var _inputMethodUtils = require("../input-method-utils");
 var _types = require("../types");
-var _IconsMarkSchema;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+
 var withInputMethod = function withInputMethod(toolbarType, func) {
   return (0, _preset.editorCommandToPMCommand)(func((0, _inputMethodUtils.getInputMethod)(toolbarType)));
 };
@@ -120,7 +121,7 @@ var getIcon = function getIcon(_ref) {
     'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(tooltipKeymap)
   };
 };
-var IconsMarkSchema = (_IconsMarkSchema = {}, (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strong, 'strong'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.em, 'em'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.strike, 'strike'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.code, 'code'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.underline, 'underline'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.superscript, 'subsup'), (0, _defineProperty2.default)(_IconsMarkSchema, _types.IconTypes.subscript, 'subsup'), _IconsMarkSchema);
+var IconsMarkSchema = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.IconTypes.strong, 'strong'), _types.IconTypes.em, 'em'), _types.IconTypes.strike, 'strike'), _types.IconTypes.code, 'code'), _types.IconTypes.underline, 'underline'), _types.IconTypes.superscript, 'subsup'), _types.IconTypes.subscript, 'subsup');
 var buildMenuIconState = function buildMenuIconState(iconMark) {
   return function (_ref2) {
     var schema = _ref2.schema,

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

@@ -14,7 +14,7 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("../../utils");
+var _utils = require("../../editor-commands/utils");
 var _dropdownMenu = require("./dropdown-menu");
 var _clearFormattingIcon = require("./hooks/clear-formatting-icon");
 var _formattingIcons = require("./hooks/formatting-icons");

package/dist/cjs/{input-method-utils.js → ui/Toolbar/input-method-utils.js}

@@ -7,9 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.toolbarTypeToInputMethod = exports.getInputMethod = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _types = require("./ui/Toolbar/types");
-var _toolbarTypeToInputMe;
-var toolbarTypeToInputMethod = exports.toolbarTypeToInputMethod = (_toolbarTypeToInputMe = {}, (0, _defineProperty2.default)(_toolbarTypeToInputMe, _types.ToolbarType.PRIMARY, _analytics.INPUT_METHOD.TOOLBAR), (0, _defineProperty2.default)(_toolbarTypeToInputMe, _types.ToolbarType.FLOATING, _analytics.INPUT_METHOD.FLOATING_TB), _toolbarTypeToInputMe);
+var _types = require("./types");
+var toolbarTypeToInputMethod = exports.toolbarTypeToInputMethod = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarType.PRIMARY, _analytics.INPUT_METHOD.TOOLBAR), _types.ToolbarType.FLOATING, _analytics.INPUT_METHOD.FLOATING_TB);
 var getInputMethod = exports.getInputMethod = function getInputMethod(toolbarType) {
   return toolbarTypeToInputMethod[toolbarType];
 };

package/dist/cjs/ui/Toolbar/more-button.js

@@ -21,8 +21,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var MoreIconStyle = (0, _react2.css)({
   display: 'flex',
   alignItems: 'center',
-  height: "var(--ds-space-300, 24px)",
-  padding: "0  ".concat("var(--ds-space-025, 2px)")
+  height: "var(--ds-space-300, 24px)"
 });
 var MoreButton = exports.MoreButton = /*#__PURE__*/_react.default.memo(function (_ref) {
   var label = _ref.label,
@@ -46,7 +45,7 @@ var MoreButton = exports.MoreButton = /*#__PURE__*/_react.default.memo(function
     }, (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
       label: "",
       color: "currentColor",
-      spacing: "compact"
+      spacing: "spacious"
     })),
     "aria-expanded": ariaExpanded,
     "aria-label": label,

package/dist/es2019/{commands → editor-commands}/clear-formatting.js

@@ -1,7 +1,7 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { cellSelectionNodesBetween } from '../utils/cell-selection';
+import { cellSelectionNodesBetween } from './utils/cell-selection';
 export const FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 export const FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 const formatTypes = {

package/dist/es2019/{commands → editor-commands}/text-formatting.js

@@ -2,7 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { hasCode, markActive } from '../utils';
+import { hasCode, markActive } from './utils';
 export const moveRight = () => {
   return (state, dispatch) => {
     const {

package/dist/es2019/{utils.js → editor-commands/utils.js}

@@ -1,5 +1,5 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
-import { FORMATTING_MARK_TYPES, FORMATTING_NODE_TYPES } from './commands/clear-formatting';
+import { FORMATTING_MARK_TYPES, FORMATTING_NODE_TYPES } from './clear-formatting';
 export const hasCode = (state, pos) => {
   const {
     code

package/dist/es2019/index.js

@@ -1 +1,4 @@
-export { textFormattingPlugin } from './plugin';
+/* eslint-disable @atlaskit/editor/no-re-export */
+// Entry file in package.json
+
+export { textFormattingPlugin } from './textFormattingPlugin';

package/dist/es2019/pm-plugins/clear-formatting-keymap.js

@@ -1,7 +1,7 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithCommand, clearFormatting } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { clearFormattingWithAnalytics } from '../commands/clear-formatting';
+import { clearFormattingWithAnalytics } from '../editor-commands/clear-formatting';
 export function keymapPlugin(editorAnalyticsAPI) {
   const list = {};
   bindKeymapWithCommand(clearFormatting.common, clearFormattingWithAnalytics(INPUT_METHOD.SHORTCUT, editorAnalyticsAPI), list);

package/dist/es2019/pm-plugins/clear-formatting.js

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { checkFormattingIsPresent } from '../utils';
+import { checkFormattingIsPresent } from '../editor-commands/utils';
 export const pluginKey = new PluginKey('clearFormattingPlugin');
 export const plugin = dispatch => new SafePlugin({
   state: {

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

@@ -2,7 +2,7 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithEditorCommand, isCapsLockOnAndModifyKeyboardEvent, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../commands';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
 export default function keymapPlugin(schema, editorAnalyticsAPI) {
   const list = {};
   if (schema.marks.strong) {

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

@@ -7,10 +7,9 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { createInlineCodeFromTextInputWithAnalytics } from '../commands/text-formatting';
-import * as commands from '../commands/text-formatting';
+import { createInlineCodeFromTextInputWithAnalytics } from '../editor-commands/text-formatting';
+import * as commands from '../editor-commands/text-formatting';
 import { pluginKey } from './plugin-key';
-export { pluginKey };
 const isSelectionInlineCursor = selection => {
   if (selection instanceof NodeSelection) {
     return true;

package/dist/es2019/{plugin.js → textFormattingPlugin.js}

@@ -1,16 +1,18 @@
 import React from 'react';
 import { code, em, strike, strong, subsup, underline } from '@atlaskit/adf-schema';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
 import { plugin as clearFormattingPlugin, pluginKey as clearFormattingPluginKey } from './pm-plugins/clear-formatting';
 import clearFormattingKeymapPlugin from './pm-plugins/clear-formatting-keymap';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './pm-plugins/commands';
 import textFormattingCursorPlugin from './pm-plugins/cursor';
 import textFormattingInputRulePlugin from './pm-plugins/input-rule';
 import keymapPlugin from './pm-plugins/keymap';
-import { plugin as pmPlugin, pluginKey as textFormattingPluginKey } from './pm-plugins/main';
+import { plugin as pmPlugin } from './pm-plugins/main';
+import { pluginKey as textFormattingPluginKey } from './pm-plugins/plugin-key';
 import textFormattingSmartInputRulePlugin from './pm-plugins/smart-input-rule';
 import { FloatingToolbarTextFormalWithIntl as FloatingToolbarComponent } from './ui/FloatingToolbarComponent';
 import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
+
 /**
  * Text formatting plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.

package/dist/es2019/textFormattingPluginType.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -9,8 +9,8 @@ import { jsx } from '@emotion/react';
 import { clearFormatting as clearFormattingKeymap, tooltip } from '@atlaskit/editor-common/keymaps';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-import { clearFormattingWithAnalytics } from '../../../commands/clear-formatting';
-import { getInputMethod } from '../../../input-method-utils';
+import { clearFormattingWithAnalytics } from '../../../editor-commands/clear-formatting';
+import { getInputMethod } from '../input-method-utils';
 export const useClearIcon = ({
   intl,
   textFormattingState,

package/dist/es2019/ui/Toolbar/hooks/formatting-icons.js

@@ -13,8 +13,8 @@ import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
 import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../commands';
-import { getInputMethod } from '../../../input-method-utils';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../pm-plugins/commands';
+import { getInputMethod } from '../input-method-utils';
 import { IconTypes } from '../types';
 const withInputMethod = (toolbarType, func) => editorCommandToPMCommand(func(getInputMethod(toolbarType)));
 const IconButtons = (editorAnalyticsAPI, toolbarType) => ({

package/dist/es2019/ui/Toolbar/index.js

@@ -11,7 +11,7 @@ import { usePreviousState } from '@atlaskit/editor-common/hooks';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { Announcer } from '@atlaskit/editor-common/ui';
-import { compareItemsArrays, isArrayContainsContent } from '../../utils';
+import { compareItemsArrays, isArrayContainsContent } from '../../editor-commands/utils';
 import { FormattingTextDropdownMenu } from './dropdown-menu';
 import { useClearIcon } from './hooks/clear-formatting-icon';
 import { useFormattingIcons, useHasFormattingActived } from './hooks/formatting-icons';

package/dist/es2019/{input-method-utils.js → ui/Toolbar/input-method-utils.js}

@@ -1,5 +1,5 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { ToolbarType } from './ui/Toolbar/types';
+import { ToolbarType } from './types';
 export const toolbarTypeToInputMethod = {
   [ToolbarType.PRIMARY]: INPUT_METHOD.TOOLBAR,
   [ToolbarType.FLOATING]: INPUT_METHOD.FLOATING_TB

package/dist/es2019/ui/Toolbar/more-button.js

@@ -13,8 +13,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 const MoreIconStyle = css({
   display: 'flex',
   alignItems: 'center',
-  height: "var(--ds-space-300, 24px)",
-  padding: `0  ${"var(--ds-space-025, 2px)"}`
+  height: "var(--ds-space-300, 24px)"
 });
 export const MoreButton = /*#__PURE__*/React.memo(({
   label,
@@ -39,7 +38,7 @@ export const MoreButton = /*#__PURE__*/React.memo(({
     }, jsx(ShowMoreHorizontalIcon, {
       label: "",
       color: "currentColor",
-      spacing: "compact"
+      spacing: "spacious"
     })),
     "aria-expanded": ariaExpanded,
     "aria-label": label,

package/dist/esm/{commands → editor-commands}/clear-formatting.js

@@ -1,7 +1,7 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { cellSelectionNodesBetween } from '../utils/cell-selection';
+import { cellSelectionNodesBetween } from './utils/cell-selection';
 export var FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 export var FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 var formatTypes = {

package/dist/esm/{commands → editor-commands}/text-formatting.js

@@ -2,7 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { hasCode, markActive } from '../utils';
+import { hasCode, markActive } from './utils';
 export var moveRight = function moveRight() {
   return function (state, dispatch) {
     var code = state.schema.marks.code;

package/dist/esm/{utils.js → editor-commands/utils.js}

@@ -1,5 +1,5 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
-import { FORMATTING_MARK_TYPES, FORMATTING_NODE_TYPES } from './commands/clear-formatting';
+import { FORMATTING_MARK_TYPES, FORMATTING_NODE_TYPES } from './clear-formatting';
 export var hasCode = function hasCode(state, pos) {
   var code = state.schema.marks.code;
   var node = pos >= 0 && state.doc.nodeAt(pos);

package/dist/esm/index.js

@@ -1 +1,4 @@
-export { textFormattingPlugin } from './plugin';
+/* eslint-disable @atlaskit/editor/no-re-export */
+// Entry file in package.json
+
+export { textFormattingPlugin } from './textFormattingPlugin';

package/dist/esm/pm-plugins/clear-formatting-keymap.js

@@ -1,7 +1,7 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithCommand, clearFormatting } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { clearFormattingWithAnalytics } from '../commands/clear-formatting';
+import { clearFormattingWithAnalytics } from '../editor-commands/clear-formatting';
 export function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
   bindKeymapWithCommand(clearFormatting.common, clearFormattingWithAnalytics(INPUT_METHOD.SHORTCUT, editorAnalyticsAPI), list);

package/dist/esm/pm-plugins/clear-formatting.js

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { checkFormattingIsPresent } from '../utils';
+import { checkFormattingIsPresent } from '../editor-commands/utils';
 export var pluginKey = new PluginKey('clearFormattingPlugin');
 export var plugin = function plugin(dispatch) {
   return new SafePlugin({