@atlaskit/editor-plugin-highlight 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-highlight
 
+## 1.6.0
+
+### Minor Changes
+
+-   [#104271](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104271)
+    [`5d03a899b0c9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5d03a899b0c9) -
+    [ux] [ED-23155] Adds plugin state for currently selected color for highlight button
+
+### Patch Changes
+
+-   [#103816](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103816)
+    [`3fb50173376f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3fb50173376f) -
+    [ED-23159] Added blending styling for when highlights overlap inline comments
+
 ## 1.5.0
 
 ### Minor Changes

package/dist/cjs/commands/change-color.js

@@ -51,7 +51,7 @@ var createAnalyticsEvent = function createAnalyticsEvent(color, tr) {
     return value === previousColor;
   });
   var newColorLabel = newColorFromPalette ? newColorFromPalette.label : color;
-  var previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor || '';
+  var previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor;
   return {
     action: _analytics.ACTION.FORMATTED,
     actionSubject: _analytics.ACTION_SUBJECT.TEXT,

package/dist/cjs/pm-plugin.js

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _color = require("./utils/color");
 var _disabled = require("./utils/disabled");
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -41,12 +42,10 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
             });
           default:
             nextState = _objectSpread(_objectSpread({}, pluginState), {}, {
+              activeColor: (0, _color.getActiveColor)(tr),
               disabled: (0, _disabled.getDisabledState)(newState)
             });
-            if (pluginState && pluginState.disabled !== nextState.disabled) {
-              return nextState;
-            }
-            return pluginState;
+            return nextState;
         }
       }
     }

package/dist/cjs/utils/color.js

@@ -10,8 +10,7 @@ var getActiveColor = exports.getActiveColor = function getActiveColor(tr) {
     $from = _ref.$from,
     $to = _ref.$to,
     $cursor = _ref.$cursor;
-  var _ref2 = tr.doc.type.schema.marks,
-    backgroundColor = _ref2.backgroundColor;
+  var backgroundColor = tr.doc.type.schema.marks.backgroundColor;
 
   // Filter out other marks
   var marks = [];
@@ -41,8 +40,8 @@ var getActiveColor = exports.getActiveColor = function getActiveColor(tr) {
     return !!mark;
   });
   // When multiple colors are selected revert back to default color
-  if (marksWithColor.length > 1 || marksWithColor.length === 1 && marks.length > 1) {
-    return null;
+  if (marksWithColor.length > 1 || marksWithColor.length === 1 && marks.length > 1 || marksWithColor.length === 0) {
+    return _uiColor.REMOVE_HIGHLIGHT_COLOR;
   }
-  return marksWithColor.length ? marksWithColor[0].attrs.color : _uiColor.REMOVE_HIGHLIGHT_COLOR;
+  return marksWithColor[0].attrs.color;
 };

package/dist/es2019/commands/change-color.js

@@ -43,7 +43,7 @@ const createAnalyticsEvent = (color, tr) => {
     value
   }) => value === previousColor);
   const newColorLabel = newColorFromPalette ? newColorFromPalette.label : color;
-  const previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor || '';
+  const previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor;
   return {
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,

package/dist/es2019/pm-plugin.js

@@ -1,6 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { getActiveColor } from './utils/color';
 import { getDisabledState } from './utils/disabled';
 export const highlightPluginKey = new PluginKey('highlight');
 export let HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
@@ -33,12 +34,10 @@ export const createPlugin = ({
           default:
             nextState = {
               ...pluginState,
+              activeColor: getActiveColor(tr),
               disabled: getDisabledState(newState)
             };
-            if (pluginState && pluginState.disabled !== nextState.disabled) {
-              return nextState;
-            }
-            return pluginState;
+            return nextState;
         }
       }
     }

package/dist/es2019/utils/color.js

@@ -35,8 +35,8 @@ export const getActiveColor = tr => {
   });
   const marksWithColor = marks.filter(mark => !!mark);
   // When multiple colors are selected revert back to default color
-  if (marksWithColor.length > 1 || marksWithColor.length === 1 && marks.length > 1) {
-    return null;
+  if (marksWithColor.length > 1 || marksWithColor.length === 1 && marks.length > 1 || marksWithColor.length === 0) {
+    return REMOVE_HIGHLIGHT_COLOR;
   }
-  return marksWithColor.length ? marksWithColor[0].attrs.color : REMOVE_HIGHLIGHT_COLOR;
+  return marksWithColor[0].attrs.color;
 };

package/dist/esm/commands/change-color.js

@@ -45,7 +45,7 @@ var createAnalyticsEvent = function createAnalyticsEvent(color, tr) {
     return value === previousColor;
   });
   var newColorLabel = newColorFromPalette ? newColorFromPalette.label : color;
-  var previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor || '';
+  var previousColorLabel = previousColorFromPalette ? previousColorFromPalette.label : previousColor;
   return {
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,

package/dist/esm/pm-plugin.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { getActiveColor } from './utils/color';
 import { getDisabledState } from './utils/disabled';
 export var highlightPluginKey = new PluginKey('highlight');
 export var HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
@@ -34,12 +35,10 @@ export var createPlugin = function createPlugin(_ref) {
             });
           default:
             nextState = _objectSpread(_objectSpread({}, pluginState), {}, {
+              activeColor: getActiveColor(tr),
               disabled: getDisabledState(newState)
             });
-            if (pluginState && pluginState.disabled !== nextState.disabled) {
-              return nextState;
-            }
-            return pluginState;
+            return nextState;
         }
       }
     }

package/dist/esm/utils/color.js

@@ -4,8 +4,7 @@ export var getActiveColor = function getActiveColor(tr) {
     $from = _ref.$from,
     $to = _ref.$to,
     $cursor = _ref.$cursor;
-  var _ref2 = tr.doc.type.schema.marks,
-    backgroundColor = _ref2.backgroundColor;
+  var backgroundColor = tr.doc.type.schema.marks.backgroundColor;
 
   // Filter out other marks
   var marks = [];
@@ -35,8 +34,8 @@ export var getActiveColor = function getActiveColor(tr) {
     return !!mark;
   });
   // When multiple colors are selected revert back to default color
-  if (marksWithColor.length > 1 || marksWithColor.length === 1 && marks.length > 1) {
-    return null;
+  if (marksWithColor.length > 1 || marksWithColor.length === 1 && marks.length > 1 || marksWithColor.length === 0) {
+    return REMOVE_HIGHLIGHT_COLOR;
   }
-  return marksWithColor.length ? marksWithColor[0].attrs.color : REMOVE_HIGHLIGHT_COLOR;
+  return marksWithColor[0].attrs.color;
 };

package/dist/types/utils/color.d.ts

@@ -1,2 +1,2 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const getActiveColor: (tr: Transaction) => string | null;
+import type { ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getActiveColor: (tr: Transaction | ReadonlyTransaction) => string;

package/dist/types-ts4.5/utils/color.d.ts

@@ -1,2 +1,2 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const getActiveColor: (tr: Transaction) => string | null;
+import type { ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getActiveColor: (tr: Transaction | ReadonlyTransaction) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-highlight",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Highlight plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^36.10.7",
-    "@atlaskit/editor-common": "^81.0.0",
+    "@atlaskit/editor-common": "^81.1.0",
     "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
     "@atlaskit/editor-plugin-primary-toolbar": "^1.1.0",