@atlaskit/editor-plugin-highlight 1.14.3 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-highlight
 
+## 1.16.0
+
+### Minor Changes
+
+- [`0605ac78bd8a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0605ac78bd8a6) -
+  [ED-23398] Deleted background color plugin and moved background-color mark into the highlight
+  plugin
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.15.0
+
+### Minor Changes
+
+- [#133191](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133191)
+  [`78a1927084934`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/78a1927084934) -
+  [ux] Remove icon migration feature gate and migrate new icons on primary toolbar
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.14.3
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.highlightPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _adfSchema = require("@atlaskit/adf-schema");
 var _commands = require("./commands");
 var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
@@ -39,6 +40,12 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
   });
   return {
     name: 'highlight',
+    marks: function marks() {
+      return [{
+        name: 'backgroundColor',
+        mark: _adfSchema.backgroundColor
+      }];
+    },
     commands: {
       changeColor: (0, _commands.changeColor)(editorAnalyticsAPI)
     },

package/dist/cjs/ui/PrimaryToolbarHighlightColor.js

@@ -15,7 +15,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorPalette = require("@atlaskit/editor-palette");
-var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _primitives = require("@atlaskit/primitives");
 var _commands = require("../commands");
 var _EditorHighlightIcon = require("./shared/EditorHighlightIcon");
@@ -98,9 +98,12 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
         selectedColor: activeColorToken,
         disabled: highlightState.disabled
       }), (0, _react2.jsx)("span", {
-        css: _styles.expandIconWrapperStyle
+        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+        css: _styles.expandIconContainerStyle
       }, (0, _react2.jsx)(_chevronDown.default, {
-        label: ""
+        label: "",
+        color: "currentColor",
+        LEGACY_margin: "0 0 0 -8px"
       })))
     }),
     onColorChange: function onColorChange(color) {

package/dist/es2019/plugin.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { backgroundColor } from '@atlaskit/adf-schema';
 import { changeColor } from './commands';
 import { keymapPlugin } from './pm-plugins/keymap';
 import { createPlugin, highlightPluginKey } from './pm-plugins/main';
@@ -32,6 +33,12 @@ export const highlightPlugin = ({
   });
   return {
     name: 'highlight',
+    marks() {
+      return [{
+        name: 'backgroundColor',
+        mark: backgroundColor
+      }];
+    },
     commands: {
       changeColor: changeColor(editorAnalyticsAPI)
     },

package/dist/es2019/ui/PrimaryToolbarHighlightColor.js

@@ -11,10 +11,10 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
 import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles';
 import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { Flex } from '@atlaskit/primitives';
 import { setPalette } from '../commands';
 import { EditorHighlightIcon } from './shared/EditorHighlightIcon';
@@ -97,9 +97,12 @@ const PrimaryToolbarHighlightColor = ({
         selectedColor: activeColorToken,
         disabled: highlightState.disabled
       }), jsx("span", {
-        css: expandIconWrapperStyle
-      }, jsx(ExpandIcon, {
-        label: ""
+        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+        css: expandIconContainerStyle
+      }, jsx(ChevronDownIcon, {
+        label: "",
+        color: "currentColor",
+        LEGACY_margin: "0 0 0 -8px"
       })))
     }),
     onColorChange: color => handleColorChange({

package/dist/esm/plugin.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { backgroundColor } from '@atlaskit/adf-schema';
 import { changeColor } from './commands';
 import { keymapPlugin } from './pm-plugins/keymap';
 import { createPlugin, highlightPluginKey } from './pm-plugins/main';
@@ -32,6 +33,12 @@ export var highlightPlugin = function highlightPlugin(_ref) {
   });
   return {
     name: 'highlight',
+    marks: function marks() {
+      return [{
+        name: 'backgroundColor',
+        mark: backgroundColor
+      }];
+    },
     commands: {
       changeColor: changeColor(editorAnalyticsAPI)
     },

package/dist/esm/ui/PrimaryToolbarHighlightColor.js

@@ -11,10 +11,10 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
 import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles';
 import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { Flex } from '@atlaskit/primitives';
 import { setPalette } from '../commands';
 import { EditorHighlightIcon } from './shared/EditorHighlightIcon';
@@ -90,9 +90,12 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
         selectedColor: activeColorToken,
         disabled: highlightState.disabled
       }), jsx("span", {
-        css: expandIconWrapperStyle
-      }, jsx(ExpandIcon, {
-        label: ""
+        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+        css: expandIconContainerStyle
+      }, jsx(ChevronDownIcon, {
+        label: "",
+        color: "currentColor",
+        LEGACY_margin: "0 0 0 -8px"
       })))
     }),
     onColorChange: function onColorChange(color) {

package/dist/types/plugin.d.ts

@@ -1,7 +1,6 @@
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { BackgroundColorPlugin } from '@atlaskit/editor-plugin-background-color';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import type { HighlightPluginState } from './pm-plugins/main';
@@ -11,7 +10,6 @@ export type HighlightPluginOptions = {
 export type HighlightPlugin = NextEditorPlugin<'highlight', {
     pluginConfiguration?: HighlightPluginOptions;
     dependencies: [
-        BackgroundColorPlugin,
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<TextFormattingPlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>

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

@@ -1,7 +1,6 @@
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { BackgroundColorPlugin } from '@atlaskit/editor-plugin-background-color';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
 import type { HighlightPluginState } from './pm-plugins/main';
@@ -11,7 +10,6 @@ export type HighlightPluginOptions = {
 export type HighlightPlugin = NextEditorPlugin<'highlight', {
     pluginConfiguration?: HighlightPluginOptions;
     dependencies: [
-        BackgroundColorPlugin,
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<TextFormattingPlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-highlight",
-	"version": "1.14.3",
+	"version": "1.16.0",
 	"description": "Highlight plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,16 +38,16 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^88.0.0",
+		"@atlaskit/adf-schema": "^40.8.1",
+		"@atlaskit/editor-common": "^88.1.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
-		"@atlaskit/editor-plugin-background-color": "^1.6.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
-		"@atlaskit/editor-plugin-text-formatting": "^1.13.0",
+		"@atlaskit/editor-plugin-text-formatting": "^1.14.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.14.0",
+		"@atlaskit/icon": "^22.15.0",
 		"@atlaskit/primitives": "^12.0.0",
 		"@atlaskit/tokens": "^1.59.0",
 		"@babel/runtime": "^7.0.0",