@atlaskit/editor-plugin-highlight 1.15.0 → 1.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/editor-plugin-highlight
2
2
 
3
+ ## 1.16.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`0605ac78bd8a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0605ac78bd8a6) -
8
+ [ED-23398] Deleted background color plugin and moved background-color mark into the highlight
9
+ plugin
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
3
15
  ## 1.15.0
4
16
 
5
17
  ### Minor Changes
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.highlightPlugin = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
+ var _adfSchema = require("@atlaskit/adf-schema");
9
10
  var _commands = require("./commands");
10
11
  var _keymap = require("./pm-plugins/keymap");
11
12
  var _main = require("./pm-plugins/main");
@@ -39,6 +40,12 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
39
40
  });
40
41
  return {
41
42
  name: 'highlight',
43
+ marks: function marks() {
44
+ return [{
45
+ name: 'backgroundColor',
46
+ mark: _adfSchema.backgroundColor
47
+ }];
48
+ },
42
49
  commands: {
43
50
  changeColor: (0, _commands.changeColor)(editorAnalyticsAPI)
44
51
  },
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { backgroundColor } from '@atlaskit/adf-schema';
2
3
  import { changeColor } from './commands';
3
4
  import { keymapPlugin } from './pm-plugins/keymap';
4
5
  import { createPlugin, highlightPluginKey } from './pm-plugins/main';
@@ -32,6 +33,12 @@ export const highlightPlugin = ({
32
33
  });
33
34
  return {
34
35
  name: 'highlight',
36
+ marks() {
37
+ return [{
38
+ name: 'backgroundColor',
39
+ mark: backgroundColor
40
+ }];
41
+ },
35
42
  commands: {
36
43
  changeColor: changeColor(editorAnalyticsAPI)
37
44
  },
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { backgroundColor } from '@atlaskit/adf-schema';
2
3
  import { changeColor } from './commands';
3
4
  import { keymapPlugin } from './pm-plugins/keymap';
4
5
  import { createPlugin, highlightPluginKey } from './pm-plugins/main';
@@ -32,6 +33,12 @@ export var highlightPlugin = function highlightPlugin(_ref) {
32
33
  });
33
34
  return {
34
35
  name: 'highlight',
36
+ marks: function marks() {
37
+ return [{
38
+ name: 'backgroundColor',
39
+ mark: backgroundColor
40
+ }];
41
+ },
35
42
  commands: {
36
43
  changeColor: changeColor(editorAnalyticsAPI)
37
44
  },
@@ -1,7 +1,6 @@
1
1
  import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
2
  import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
3
3
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
4
- import type { BackgroundColorPlugin } from '@atlaskit/editor-plugin-background-color';
5
4
  import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
6
5
  import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
7
6
  import type { HighlightPluginState } from './pm-plugins/main';
@@ -11,7 +10,6 @@ export type HighlightPluginOptions = {
11
10
  export type HighlightPlugin = NextEditorPlugin<'highlight', {
12
11
  pluginConfiguration?: HighlightPluginOptions;
13
12
  dependencies: [
14
- BackgroundColorPlugin,
15
13
  OptionalPlugin<AnalyticsPlugin>,
16
14
  OptionalPlugin<TextFormattingPlugin>,
17
15
  OptionalPlugin<PrimaryToolbarPlugin>
@@ -1,7 +1,6 @@
1
1
  import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
2
  import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
3
3
  import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
4
- import type { BackgroundColorPlugin } from '@atlaskit/editor-plugin-background-color';
5
4
  import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
6
5
  import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
7
6
  import type { HighlightPluginState } from './pm-plugins/main';
@@ -11,7 +10,6 @@ export type HighlightPluginOptions = {
11
10
  export type HighlightPlugin = NextEditorPlugin<'highlight', {
12
11
  pluginConfiguration?: HighlightPluginOptions;
13
12
  dependencies: [
14
- BackgroundColorPlugin,
15
13
  OptionalPlugin<AnalyticsPlugin>,
16
14
  OptionalPlugin<TextFormattingPlugin>,
17
15
  OptionalPlugin<PrimaryToolbarPlugin>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-highlight",
3
- "version": "1.15.0",
3
+ "version": "1.16.0",
4
4
  "description": "Highlight plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -38,16 +38,16 @@
38
38
  ".": "./src/index.ts"
39
39
  },
40
40
  "dependencies": {
41
+ "@atlaskit/adf-schema": "^40.8.1",
41
42
  "@atlaskit/editor-common": "^88.1.0",
42
43
  "@atlaskit/editor-palette": "1.6.0",
43
44
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
44
- "@atlaskit/editor-plugin-background-color": "^1.6.0",
45
45
  "@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
46
46
  "@atlaskit/editor-plugin-text-formatting": "^1.14.0",
47
47
  "@atlaskit/editor-prosemirror": "5.0.1",
48
48
  "@atlaskit/editor-shared-styles": "^2.13.0",
49
49
  "@atlaskit/editor-tables": "^2.8.0",
50
- "@atlaskit/icon": "^22.14.0",
50
+ "@atlaskit/icon": "^22.15.0",
51
51
  "@atlaskit/primitives": "^12.0.0",
52
52
  "@atlaskit/tokens": "^1.59.0",
53
53
  "@babel/runtime": "^7.0.0",