@atlaskit/editor-plugin-text-formatting 1.16.2 → 1.16.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 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
+
+- [#172933](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172933)
+  [`8323af2381d00`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8323af2381d00) -
+  [ux] Arranges items in the Selection toolbar under the Contextual toolbar experiment flag
+- Updated dependencies
+
 ## 1.16.2
 
 ### 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/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

@@ -17,7 +17,7 @@ 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,9 +9,9 @@ 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"));
@@ -152,7 +152,8 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 7
           };
         } else {
           return undefined;

package/dist/cjs/textFormattingPluginType.js

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

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -65,7 +65,8 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     moreButtonLabel: FloatingToolbarSettings.moreButtonLabel,
     hasFormattingActive: FloatingToolbarSettings.hasMoreButton,
     hasMoreButton: FloatingToolbarSettings.hasMoreButton,
-    intl: intl
+    intl: intl,
+    toolbarType: FloatingToolbarSettings.toolbarType
   });
 };
 var FloatingToolbarTextFormalWithIntl = exports.FloatingToolbarTextFormalWithIntl = (0, _reactIntlNext.injectIntl)(FloatingToolbarTextFormat);

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

@@ -12,6 +12,7 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _textBoldEditorBold = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-bold--editor-bold"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _types = require("./types");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -26,10 +27,12 @@ var BoldToolbarButton = exports.BoldToolbarButton = function BoldToolbarButton(_
     isSelected = _ref.isSelected,
     ariaExpanded = _ref['aria-expanded'],
     onClick = _ref.onClick,
-    onKeyDown = _ref.onKeyDown;
+    onKeyDown = _ref.onKeyDown,
+    toolbarType = _ref.toolbarType;
+  var reducedSpacing = toolbarType === _types.ToolbarType.FLOATING ? 'compact' : 'none';
   return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
     testId: 'ak-editor-selection-toolbar-format-text-button',
-    spacing: isReducedSpacing ? 'none' : 'default',
+    spacing: isReducedSpacing ? reducedSpacing : 'default',
     disabled: isDisabled,
     selected: isSelected,
     "aria-label": label,

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

@@ -12,12 +12,14 @@ var _ResponsiveCustomButt, _ResponsiveCustomMenu, _ResponsiveCustomButt2, _Respo
 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];
 
+// 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 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);
 
+// 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

package/dist/cjs/ui/Toolbar/dropdown-menu.js

@@ -26,7 +26,8 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
     popupsMountPoint = _ref.popupsMountPoint,
     popupsScrollableElement = _ref.popupsScrollableElement,
     hasMoreButton = _ref.hasMoreButton,
-    intl = _ref.intl;
+    intl = _ref.intl,
+    toolbarType = _ref.toolbarType;
   var _useMenuState = (0, _menuState.useMenuState)(),
     _useMenuState2 = (0, _slicedToArray2.default)(_useMenuState, 3),
     isMenuOpen = _useMenuState2[0],
@@ -104,6 +105,7 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
         toggleMenu();
         setIsOpenedByKeyboard(true);
       }
-    }
+    },
+    toolbarType: toolbarType
   }));
 });

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,8 +16,8 @@ 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;
 /**

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");
@@ -168,7 +168,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
       hasFormattingActive: hasFormattingActive,
       hasMoreButton: true,
       items: items,
-      intl: intl
+      intl: intl,
+      toolbarType: toolbarType
     }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     (0, _react2.jsx)("span", {

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

@@ -7,7 +7,7 @@ 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 _types = require("./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 getInputMethod = exports.getInputMethod = function getInputMethod(toolbarType) {

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 @@
-export { textFormattingPlugin } from './plugin';
+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,8 +7,8 @@ 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 => {

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

@@ -1,9 +1,9 @@
 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';
@@ -11,6 +11,7 @@ import { plugin as pmPlugin, pluginKey as textFormattingPluginKey } from './pm-p
 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`.
@@ -145,7 +146,8 @@ export const textFormattingPlugin = ({
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 7
           };
         } else {
           return undefined;

package/dist/es2019/textFormattingPluginType.js

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

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -58,7 +58,8 @@ const FloatingToolbarTextFormat = ({
     moreButtonLabel: FloatingToolbarSettings.moreButtonLabel,
     hasFormattingActive: FloatingToolbarSettings.hasMoreButton,
     hasMoreButton: FloatingToolbarSettings.hasMoreButton,
-    intl: intl
+    intl: intl,
+    toolbarType: FloatingToolbarSettings.toolbarType
   });
 };
 export const FloatingToolbarTextFormalWithIntl = injectIntl(FloatingToolbarTextFormat);

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

@@ -11,6 +11,7 @@ import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { ToolbarType } from './types';
 export const BoldToolbarButton = ({
   label,
   isReducedSpacing,
@@ -18,11 +19,13 @@ export const BoldToolbarButton = ({
   isSelected,
   'aria-expanded': ariaExpanded,
   onClick,
-  onKeyDown
+  onKeyDown,
+  toolbarType
 }) => {
+  const reducedSpacing = toolbarType === ToolbarType.FLOATING ? 'compact' : 'none';
   return jsx(ToolbarButton, {
     testId: 'ak-editor-selection-toolbar-format-text-button',
-    spacing: isReducedSpacing ? 'none' : 'default',
+    spacing: isReducedSpacing ? reducedSpacing : 'default',
     disabled: isDisabled,
     selected: isSelected,
     "aria-label": label,

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

@@ -3,6 +3,7 @@ import { IconTypes } from './types';
 export const DefaultButtonsToolbar = [IconTypes.strong, IconTypes.em];
 export const DefaultButtonsMenu = [IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
 
+// 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
@@ -16,6 +17,7 @@ export const ResponsiveCustomButtonToolbar = {
   [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

package/dist/es2019/ui/Toolbar/dropdown-menu.js

@@ -15,7 +15,8 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
   popupsMountPoint,
   popupsScrollableElement,
   hasMoreButton,
-  intl
+  intl,
+  toolbarType
 }) => {
   const [isMenuOpen, toggleMenu, closeMenu] = useMenuState();
   const [isOpenedByKeyboard, setIsOpenedByKeyboard] = useState(false);
@@ -85,6 +86,7 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
         toggleMenu();
         setIsOpenedByKeyboard(true);
       }
-    }
+    },
+    toolbarType: toolbarType
   }));
 });

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';
@@ -155,7 +155,8 @@ const ToolbarFormatting = ({
       hasFormattingActive: hasFormattingActive,
       hasMoreButton: true,
       items: items,
-      intl: intl
+      intl: intl,
+      toolbarType: toolbarType
     }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     jsx("span", {

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/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 @@
-export { textFormattingPlugin } from './plugin';
+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({

package/dist/esm/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) {
   var list = {};
   if (schema.marks.strong) {

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

@@ -7,8 +7,8 @@ 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 };
 var isSelectionInlineCursor = function isSelectionInlineCursor(selection) {

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

@@ -4,9 +4,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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';
@@ -14,6 +14,7 @@ import { plugin as pmPlugin, pluginKey as textFormattingPluginKey } from './pm-p
 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`.
@@ -145,7 +146,8 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 7
           };
         } else {
           return undefined;

package/dist/esm/textFormattingPluginType.js

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

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -57,7 +57,8 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     moreButtonLabel: FloatingToolbarSettings.moreButtonLabel,
     hasFormattingActive: FloatingToolbarSettings.hasMoreButton,
     hasMoreButton: FloatingToolbarSettings.hasMoreButton,
-    intl: intl
+    intl: intl,
+    toolbarType: FloatingToolbarSettings.toolbarType
   });
 };
 export var FloatingToolbarTextFormalWithIntl = injectIntl(FloatingToolbarTextFormat);

package/dist/esm/ui/Toolbar/bold-button.js

@@ -11,6 +11,7 @@ import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { ToolbarType } from './types';
 export var BoldToolbarButton = function BoldToolbarButton(_ref) {
   var label = _ref.label,
     isReducedSpacing = _ref.isReducedSpacing,
@@ -18,10 +19,12 @@ export var BoldToolbarButton = function BoldToolbarButton(_ref) {
     isSelected = _ref.isSelected,
     ariaExpanded = _ref['aria-expanded'],
     onClick = _ref.onClick,
-    onKeyDown = _ref.onKeyDown;
+    onKeyDown = _ref.onKeyDown,
+    toolbarType = _ref.toolbarType;
+  var reducedSpacing = toolbarType === ToolbarType.FLOATING ? 'compact' : 'none';
   return jsx(ToolbarButton, {
     testId: 'ak-editor-selection-toolbar-format-text-button',
-    spacing: isReducedSpacing ? 'none' : 'default',
+    spacing: isReducedSpacing ? reducedSpacing : 'default',
     disabled: isDisabled,
     selected: isSelected,
     "aria-label": label,

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

@@ -5,12 +5,14 @@ import { IconTypes } from './types';
 export var DefaultButtonsToolbar = [IconTypes.strong, IconTypes.em];
 export var DefaultButtonsMenu = [IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
 
+// 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
  */
 export var ResponsiveCustomButtonToolbar = (_ResponsiveCustomButt = {}, _defineProperty(_ResponsiveCustomButt, ToolbarSize.XXL, DefaultButtonsToolbar), _defineProperty(_ResponsiveCustomButt, ToolbarSize.XL, DefaultButtonsToolbar), _defineProperty(_ResponsiveCustomButt, ToolbarSize.L, DefaultButtonsToolbar), _defineProperty(_ResponsiveCustomButt, ToolbarSize.M, []), _defineProperty(_ResponsiveCustomButt, ToolbarSize.S, []), _defineProperty(_ResponsiveCustomButt, ToolbarSize.XXXS, []), _ResponsiveCustomButt);
 
+// 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

package/dist/esm/ui/Toolbar/dropdown-menu.js

@@ -16,7 +16,8 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
     popupsMountPoint = _ref.popupsMountPoint,
     popupsScrollableElement = _ref.popupsScrollableElement,
     hasMoreButton = _ref.hasMoreButton,
-    intl = _ref.intl;
+    intl = _ref.intl,
+    toolbarType = _ref.toolbarType;
   var _useMenuState = useMenuState(),
     _useMenuState2 = _slicedToArray(_useMenuState, 3),
     isMenuOpen = _useMenuState2[0],
@@ -94,6 +95,7 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
         toggleMenu();
         setIsOpenedByKeyboard(true);
       }
-    }
+    },
+    toolbarType: toolbarType
   }));
 });

package/dist/esm/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 var useClearIcon = function useClearIcon(_ref) {
   var intl = _ref.intl,
     textFormattingState = _ref.textFormattingState,

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

@@ -15,8 +15,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';
 var withInputMethod = function withInputMethod(toolbarType, func) {
   return editorCommandToPMCommand(func(getInputMethod(toolbarType)));

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

@@ -13,7 +13,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';
@@ -160,7 +160,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
       hasFormattingActive: hasFormattingActive,
       hasMoreButton: true,
       items: items,
-      intl: intl
+      intl: intl,
+      toolbarType: toolbarType
     }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     jsx("span", {

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _toolbarTypeToInputMe;
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { ToolbarType } from './ui/Toolbar/types';
+import { ToolbarType } from './types';
 export var toolbarTypeToInputMethod = (_toolbarTypeToInputMe = {}, _defineProperty(_toolbarTypeToInputMe, ToolbarType.PRIMARY, INPUT_METHOD.TOOLBAR), _defineProperty(_toolbarTypeToInputMe, ToolbarType.FLOATING, INPUT_METHOD.FLOATING_TB), _toolbarTypeToInputMe);
 export var getInputMethod = function getInputMethod(toolbarType) {
   return toolbarTypeToInputMethod[toolbarType];

package/dist/types/{utils.d.ts → editor-commands/utils.d.ts}

@@ -1,6 +1,6 @@
 import type { Mark as PMMark } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import type { MenuIconItem } from './ui/Toolbar/types';
+import type { MenuIconItem } from '../ui/Toolbar/types';
 export declare const hasCode: (state: EditorState, pos: number) => boolean;
 /**
  * Determine if a mark (with specific attribute values) exists anywhere in the selection.

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export { textFormattingPlugin } from './plugin';
-export type { TextFormattingPlugin } from './plugin';
-export type { ToggleMarkEditorCommand } from './commands';
+export { textFormattingPlugin } from './textFormattingPlugin';
+export type { TextFormattingPlugin } from './textFormattingPluginType';
+export type { ToggleMarkEditorCommand } from './pm-plugins/commands';

package/dist/types/textFormattingPlugin.d.ts

@@ -0,0 +1,6 @@
+import type { TextFormattingPlugin } from './textFormattingPluginType';
+/**
+ * Text formatting plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
+ * from `@atlaskit/editor-core`.
+ */
+export declare const textFormattingPlugin: TextFormattingPlugin;

package/dist/types/{plugin.d.ts → textFormattingPluginType.d.ts}

@@ -1,7 +1,7 @@
 import type { NextEditorPlugin, OptionalPlugin, TextFormattingOptions, TextFormattingState } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { ToggleMarkEditorCommand } from './commands';
+import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
 export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
     pluginConfiguration: TextFormattingOptions | undefined;
     dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<PrimaryToolbarPlugin>];
@@ -16,8 +16,3 @@ export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
     };
     sharedState: TextFormattingState | undefined;
 }>;
-/**
- * Text formatting plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
- * from `@atlaskit/editor-core`.
- */
-export declare const textFormattingPlugin: TextFormattingPlugin;

package/dist/types/ui/FloatingToolbarComponent.d.ts

@@ -3,7 +3,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
 import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { TextFormattingPlugin } from '../plugin';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
 export declare const FloatingToolbarTextFormalWithIntl: import("react").FC<import("react-intl-next").WithIntlProps<{
     editorView: EditorView;
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;

package/dist/types/ui/PrimaryToolbarComponent.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { ExtractInjectionAPI, ToolbarSize } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { TextFormattingPlugin } from '../plugin';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
 interface PrimaryToolbarComponentProps {
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
     editorView: EditorView;

package/dist/types/ui/Toolbar/bold-button.d.ts

@@ -4,6 +4,7 @@
  */
 import React from 'react';
 import { jsx } from '@emotion/react';
+import { ToolbarType } from './types';
 type BoldButtonProps = {
     label: string;
     isReducedSpacing: boolean;
@@ -12,6 +13,7 @@ type BoldButtonProps = {
     'aria-expanded': React.AriaAttributes['aria-expanded'];
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
     onKeyDown?: (event: React.KeyboardEvent) => void;
+    toolbarType: ToolbarType;
 };
-export declare const BoldToolbarButton: ({ label, isReducedSpacing, isDisabled, isSelected, "aria-expanded": ariaExpanded, onClick, onKeyDown, }: BoldButtonProps) => jsx.JSX.Element;
+export declare const BoldToolbarButton: ({ label, isReducedSpacing, isDisabled, isSelected, "aria-expanded": ariaExpanded, onClick, onKeyDown, toolbarType, }: BoldButtonProps) => jsx.JSX.Element;
 export {};

package/dist/types/ui/Toolbar/dropdown-menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { MenuIconItem } from './types';
+import { type MenuIconItem, ToolbarType } from './types';
 type DropdownMenuProps = {
     editorView: EditorView;
     isReducedSpacing: boolean;
@@ -12,6 +12,7 @@ type DropdownMenuProps = {
     popupsMountPoint?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
     hasMoreButton: boolean;
+    toolbarType: ToolbarType;
 } & WrappedComponentProps;
-export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, }: DropdownMenuProps) => JSX.Element>;
+export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, toolbarType, }: DropdownMenuProps) => JSX.Element>;
 export {};

package/dist/types/ui/Toolbar/index.d.ts

@@ -3,7 +3,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI, TextFormattingState, ToolbarSize } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { TextFormattingPlugin } from '../../plugin';
+import type { TextFormattingPlugin } from '../../textFormattingPluginType';
 import type { ToolbarType } from './types';
 export type ToolbarFormattingProps = {
     editorView: EditorView;

package/dist/types/{input-method-utils.d.ts → ui/Toolbar/input-method-utils.d.ts}

@@ -1,5 +1,5 @@
 import type { InputMethodToolbar } from '@atlaskit/editor-common/types';
-import { ToolbarType } from './ui/Toolbar/types';
+import { ToolbarType } from './types';
 type ToolbarTypeToInputMethodMap = Record<ToolbarType, InputMethodToolbar>;
 export declare const toolbarTypeToInputMethod: ToolbarTypeToInputMethodMap;
 export declare const getInputMethod: (toolbarType: ToolbarType) => InputMethodToolbar;

package/dist/types-ts4.5/{utils.d.ts → editor-commands/utils.d.ts}

@@ -1,6 +1,6 @@
 import type { Mark as PMMark } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import type { MenuIconItem } from './ui/Toolbar/types';
+import type { MenuIconItem } from '../ui/Toolbar/types';
 export declare const hasCode: (state: EditorState, pos: number) => boolean;
 /**
  * Determine if a mark (with specific attribute values) exists anywhere in the selection.

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

@@ -1,3 +1,3 @@
-export { textFormattingPlugin } from './plugin';
-export type { TextFormattingPlugin } from './plugin';
-export type { ToggleMarkEditorCommand } from './commands';
+export { textFormattingPlugin } from './textFormattingPlugin';
+export type { TextFormattingPlugin } from './textFormattingPluginType';
+export type { ToggleMarkEditorCommand } from './pm-plugins/commands';

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

@@ -0,0 +1,6 @@
+import type { TextFormattingPlugin } from './textFormattingPluginType';
+/**
+ * Text formatting plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
+ * from `@atlaskit/editor-core`.
+ */
+export declare const textFormattingPlugin: TextFormattingPlugin;

package/dist/types-ts4.5/{plugin.d.ts → textFormattingPluginType.d.ts}

@@ -1,7 +1,7 @@
 import type { NextEditorPlugin, OptionalPlugin, TextFormattingOptions, TextFormattingState } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { ToggleMarkEditorCommand } from './commands';
+import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
 export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
     pluginConfiguration: TextFormattingOptions | undefined;
     dependencies: [
@@ -19,8 +19,3 @@ export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
     };
     sharedState: TextFormattingState | undefined;
 }>;
-/**
- * Text formatting plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
- * from `@atlaskit/editor-core`.
- */
-export declare const textFormattingPlugin: TextFormattingPlugin;

package/dist/types-ts4.5/ui/FloatingToolbarComponent.d.ts

@@ -3,7 +3,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
 import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { TextFormattingPlugin } from '../plugin';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
 export declare const FloatingToolbarTextFormalWithIntl: import("react").FC<import("react-intl-next").WithIntlProps<{
     editorView: EditorView;
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;

package/dist/types-ts4.5/ui/PrimaryToolbarComponent.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { ExtractInjectionAPI, ToolbarSize } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { TextFormattingPlugin } from '../plugin';
+import type { TextFormattingPlugin } from '../textFormattingPluginType';
 interface PrimaryToolbarComponentProps {
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
     editorView: EditorView;

package/dist/types-ts4.5/ui/Toolbar/bold-button.d.ts

@@ -4,6 +4,7 @@
  */
 import React from 'react';
 import { jsx } from '@emotion/react';
+import { ToolbarType } from './types';
 type BoldButtonProps = {
     label: string;
     isReducedSpacing: boolean;
@@ -12,6 +13,7 @@ type BoldButtonProps = {
     'aria-expanded': React.AriaAttributes['aria-expanded'];
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
     onKeyDown?: (event: React.KeyboardEvent) => void;
+    toolbarType: ToolbarType;
 };
-export declare const BoldToolbarButton: ({ label, isReducedSpacing, isDisabled, isSelected, "aria-expanded": ariaExpanded, onClick, onKeyDown, }: BoldButtonProps) => jsx.JSX.Element;
+export declare const BoldToolbarButton: ({ label, isReducedSpacing, isDisabled, isSelected, "aria-expanded": ariaExpanded, onClick, onKeyDown, toolbarType, }: BoldButtonProps) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/ui/Toolbar/dropdown-menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { MenuIconItem } from './types';
+import { type MenuIconItem, ToolbarType } from './types';
 type DropdownMenuProps = {
     editorView: EditorView;
     isReducedSpacing: boolean;
@@ -12,6 +12,7 @@ type DropdownMenuProps = {
     popupsMountPoint?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
     hasMoreButton: boolean;
+    toolbarType: ToolbarType;
 } & WrappedComponentProps;
-export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, }: DropdownMenuProps) => JSX.Element>;
+export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, toolbarType, }: DropdownMenuProps) => JSX.Element>;
 export {};

package/dist/types-ts4.5/ui/Toolbar/index.d.ts

@@ -3,7 +3,7 @@ import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { ExtractInjectionAPI, TextFormattingState, ToolbarSize } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { TextFormattingPlugin } from '../../plugin';
+import type { TextFormattingPlugin } from '../../textFormattingPluginType';
 import type { ToolbarType } from './types';
 export type ToolbarFormattingProps = {
     editorView: EditorView;

package/dist/types-ts4.5/{input-method-utils.d.ts → ui/Toolbar/input-method-utils.d.ts}

@@ -1,5 +1,5 @@
 import type { InputMethodToolbar } from '@atlaskit/editor-common/types';
-import { ToolbarType } from './ui/Toolbar/types';
+import { ToolbarType } from './types';
 type ToolbarTypeToInputMethodMap = Record<ToolbarType, InputMethodToolbar>;
 export declare const toolbarTypeToInputMethod: ToolbarTypeToInputMethodMap;
 export declare const getInputMethod: (toolbarType: ToolbarType) => InputMethodToolbar;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "1.16.2",
+	"version": "1.16.4",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,16 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.0.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.23.0",
 		"@atlaskit/tokens": "^2.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -59,6 +59,9 @@
 	},
 	"techstack": {
 		"@atlassian/frontend": {
+			"code-structure": [
+				"editor-plugin"
+			],
 			"import-structure": [
 				"atlassian-conventions"
 			],