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

package/CHANGELOG.md

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

@@ -101,7 +101,9 @@ var textColorPlugin = exports.textColorPlugin = function textColorPlugin(_ref) {
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 6,
+            pluginName: 'textColor'
           };
         } else {
           return undefined;

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

@@ -27,6 +27,7 @@ var _textStyle = _interopRequireDefault(require("@atlaskit/icon/core/text-style"
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _changeColor = require("../../commands/change-color");
+var _types = require("../../types");
 var _inputType = require("../../utils/inputType");
 var _icon = require("./icon");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -172,6 +173,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
       var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(palette, pluginState.color),
         selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
+      var reducedSpacing = this.props.toolbarType === _types.ToolbarType.FLOATING ? 'compact' : 'none';
       return (
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
         (0, _react2.jsx)("span", {
@@ -195,7 +197,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
           },
           trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton, {
             buttonId: _uiMenu.TOOLBAR_BUTTON.TEXT_COLOR,
-            spacing: isReducedSpacing ? 'none' : 'default',
+            spacing: isReducedSpacing ? reducedSpacing : 'default',
             disabled: disabled || pluginState.disabled,
             selected: isOpen,
             "aria-label": labelTextColor,

package/dist/es2019/plugin.js

@@ -89,7 +89,9 @@ export const textColorPlugin = ({
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 6,
+            pluginName: 'textColor'
           };
         } else {
           return undefined;

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

@@ -20,6 +20,7 @@ import TextStyleIcon from '@atlaskit/icon/core/text-style';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
+import { ToolbarType } from '../../types';
 import { getInputMethod } from '../../utils/inputType';
 import { EditorTextColorIcon } from './icon';
 const EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
@@ -153,6 +154,7 @@ export class ToolbarTextColor extends React.Component {
       selectedRowIndex,
       selectedColumnIndex
     } = getSelectedRowAndColumnFromPalette(palette, pluginState.color);
+    const reducedSpacing = this.props.toolbarType === ToolbarType.FLOATING ? 'compact' : 'none';
     return (
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       jsx("span", {
@@ -176,7 +178,7 @@ export class ToolbarTextColor extends React.Component {
         },
         trigger: jsx(ToolbarButton, {
           buttonId: TOOLBAR_BUTTON.TEXT_COLOR,
-          spacing: isReducedSpacing ? 'none' : 'default',
+          spacing: isReducedSpacing ? reducedSpacing : 'default',
           disabled: disabled || pluginState.disabled,
           selected: isOpen,
           "aria-label": labelTextColor,

package/dist/esm/plugin.js

@@ -88,7 +88,9 @@ export var textColorPlugin = function textColorPlugin(_ref) {
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 6,
+            pluginName: 'textColor'
           };
         } else {
           return undefined;

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

@@ -30,6 +30,7 @@ import TextStyleIcon from '@atlaskit/icon/core/text-style';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { changeColor as changeColorWithAnalytics } from '../../commands/change-color';
+import { ToolbarType } from '../../types';
 import { getInputMethod } from '../../utils/inputType';
 import { EditorTextColorIcon } from './icon';
 var EXPERIMENT_NAME = 'editor.toolbarTextColor.moreColors';
@@ -168,6 +169,7 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
       var _getSelectedRowAndCol = getSelectedRowAndColumnFromPalette(palette, pluginState.color),
         selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
+      var reducedSpacing = this.props.toolbarType === ToolbarType.FLOATING ? 'compact' : 'none';
       return (
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
         jsx("span", {
@@ -191,7 +193,7 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
           },
           trigger: jsx(ToolbarButton, {
             buttonId: TOOLBAR_BUTTON.TEXT_COLOR,
-            spacing: isReducedSpacing ? 'none' : 'default',
+            spacing: isReducedSpacing ? reducedSpacing : 'default',
             disabled: disabled || pluginState.disabled,
             selected: isOpen,
             "aria-label": labelTextColor,

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

@@ -9,7 +9,7 @@ import type { DispatchAnalyticsEvent, EditorAnalyticsAPI } from '@atlaskit/edito
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TextColorPluginState } from '../../pm-plugins/main';
-import type { TextColorPlugin, ToolbarType } from '../../types';
+import { type TextColorPlugin, ToolbarType } from '../../types';
 export interface State {
     isOpen: boolean;
     isOpenedByKeyboard: boolean;

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

@@ -9,7 +9,7 @@ import type { DispatchAnalyticsEvent, EditorAnalyticsAPI } from '@atlaskit/edito
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TextColorPluginState } from '../../pm-plugins/main';
-import type { TextColorPlugin, ToolbarType } from '../../types';
+import { type TextColorPlugin, ToolbarType } from '../../types';
 export interface State {
     isOpen: boolean;
     isOpenedByKeyboard: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-color",
-	"version": "1.16.2",
+	"version": "1.16.3",
 	"description": "Text color 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-palette": "1.6.3",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",