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

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 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/plugin.js

@@ -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/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/index.js

@@ -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/es2019/plugin.js

@@ -145,7 +145,8 @@ export const textFormattingPlugin = ({
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 7
           };
         } else {
           return undefined;

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/index.js

@@ -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/esm/plugin.js

@@ -145,7 +145,8 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 7
           };
         } else {
           return undefined;

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/index.js

@@ -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/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-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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "1.16.2",
+	"version": "1.16.3",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.0.0",
+		"@atlaskit/editor-common": "^96.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",