@atlaskit/editor-plugin-highlight 12.1.36 → 12.1.37

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-highlight
 
+## 12.1.37
+
+### Patch Changes
+
+- [`e74b3e9fc5c95`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e74b3e9fc5c95) -
+  Account for container backgrounds in text color contrast warnings
+- Updated dependencies
+
 ## 12.1.36
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isMultiHighlightColorSelection = exports.getActiveColor = exports.MULTIPLE_HIGHLIGHT_COLORS_SELECTED = void 0;
+exports.getActiveColor = exports.MULTIPLE_HIGHLIGHT_COLORS_SELECTED = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _mark = require("@atlaskit/editor-common/mark");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -109,26 +109,4 @@ var getActiveColor = exports.getActiveColor = function getActiveColor(tr) {
     color = getColorFromRange(selection.from, selection.to, tr);
   }
   return color;
-};
-
-/**
- * Returns true when the selection contains two or more distinct highlight colors,
- * counting unmarked text as the default transparent highlight.
- */
-var isMultiHighlightColorSelection = exports.isMultiHighlightColorSelection = function isMultiHighlightColorSelection(_ref) {
-  var selection = _ref.selection,
-    doc = _ref.doc;
-  if (!(selection instanceof _state.TextSelection)) {
-    return false;
-  }
-  var backgroundColor = doc.type.schema.marks.backgroundColor;
-  var colors = new Set();
-  doc.nodesBetween(selection.from, selection.to, function (node) {
-    if (node.isText) {
-      var _mark$attrs$color2;
-      var mark = backgroundColor.isInSet(node.marks);
-      colors.add((_mark$attrs$color2 = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color2 !== void 0 ? _mark$attrs$color2 : 'default');
-    }
-  });
-  return colors.size > 1;
 };

package/dist/cjs/highlightPlugin.js

@@ -79,9 +79,7 @@ var highlightPlugin = exports.highlightPlugin = function highlightPlugin(_ref) {
       var plugins = [{
         name: 'highlight',
         plugin: function plugin() {
-          return (0, _main.createPlugin)({
-            api: api
-          });
+          return (0, _main.createPlugin)();
         }
       }, {
         name: 'highlightKeymap',

package/dist/cjs/pm-plugins/main.js

@@ -7,10 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.highlightPluginKey = exports.createPlugin = exports.HighlightPluginAction = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _color = require("../editor-commands/color");
 var _disabled = require("../editor-commands/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; }
@@ -21,37 +18,16 @@ var HighlightPluginAction = exports.HighlightPluginAction = /*#__PURE__*/functio
   HighlightPluginAction[HighlightPluginAction["SET_PALETTE"] = 1] = "SET_PALETTE";
   return HighlightPluginAction;
 }({});
-var DEFAULT_BACKGROUND_COLOR = '#FFFFFF';
-var getActiveColorInNonActiveTheme = function getActiveColorInNonActiveTheme(color) {
-  return (0, _uiColor.getHighlightColorInNonActiveTheme)(color, {
-    defaultBackgroundColor: DEFAULT_BACKGROUND_COLOR
-  });
-};
-var getColorAccessibilityState = function getColorAccessibilityState(activeColor, tr) {
-  var isMultiHighlightColor = activeColor === _color.MULTIPLE_HIGHLIGHT_COLORS_SELECTED || (0, _color.isMultiHighlightColorSelection)(tr);
-  return {
-    // When the selection spans multiple highlight colors, `activeColor` is the
-    // `MULTIPLE_HIGHLIGHT_COLORS_SELECTED` sentinel rather than a real hex value.
-    // Passing it through would resolve the literal sentinel as a color, so fall
-    // back to the neutral default instead.
-    activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(isMultiHighlightColor ? null : activeColor),
-    isMultiHighlightColor: isMultiHighlightColor
-  };
-};
-var createPlugin = exports.createPlugin = function createPlugin(_ref) {
-  var api = _ref.api;
+var createPlugin = exports.createPlugin = function createPlugin() {
   return new _safePlugin.SafePlugin({
     key: highlightPluginKey,
     state: {
       init: function init(_, editorState) {
-        return _objectSpread({
+        return {
           activeColor: null,
           disabled: (0, _disabled.getDisabledState)(editorState),
           isPaletteOpen: false
-        }, (0, _platformFeatureFlags.fg)('platform_editor_lovability_text_bg_color_patch_1') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) && {
-          activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(null),
-          isMultiHighlightColor: (0, _color.isMultiHighlightColorSelection)(editorState)
-        });
+        };
       },
       apply: function apply(tr, pluginState, _oldState, newState) {
         var _tr$getMeta;
@@ -62,9 +38,6 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
               color = _tr$getMeta2.color;
             return _objectSpread(_objectSpread({}, pluginState), {}, {
               activeColor: color
-            }, (0, _platformFeatureFlags.fg)('platform_editor_lovability_text_bg_color_patch_1') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) && {
-              activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(color),
-              isMultiHighlightColor: false
             });
           case HighlightPluginAction.SET_PALETTE:
             var _tr$getMeta3 = tr.getMeta(highlightPluginKey),
@@ -74,13 +47,10 @@ var createPlugin = exports.createPlugin = function createPlugin(_ref) {
             });
           default:
             var activeColor = (0, _color.getActiveColor)(tr);
-            var colorAccessibilityState =
-            // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-            (0, _platformFeatureFlags.fg)('platform_editor_lovability_text_bg_color_patch_1') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) && (activeColor !== pluginState.activeColor || tr.selectionSet || !tr.selection.empty && tr.docChanged) ? getColorAccessibilityState(activeColor, tr) : {};
             return _objectSpread(_objectSpread({}, pluginState), {}, {
               activeColor: activeColor,
               disabled: (0, _disabled.getDisabledState)(newState)
-            }, colorAccessibilityState);
+            });
         }
       }
     }

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

@@ -108,29 +108,4 @@ export const getActiveColor = tr => {
     color = getColorFromRange(selection.from, selection.to, tr);
   }
   return color;
-};
-
-/**
- * Returns true when the selection contains two or more distinct highlight colors,
- * counting unmarked text as the default transparent highlight.
- */
-export const isMultiHighlightColorSelection = ({
-  selection,
-  doc
-}) => {
-  if (!(selection instanceof TextSelection)) {
-    return false;
-  }
-  const {
-    backgroundColor
-  } = doc.type.schema.marks;
-  const colors = new Set();
-  doc.nodesBetween(selection.from, selection.to, node => {
-    if (node.isText) {
-      var _mark$attrs$color2;
-      const mark = backgroundColor.isInSet(node.marks);
-      colors.add((_mark$attrs$color2 = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color2 !== void 0 ? _mark$attrs$color2 : 'default');
-    }
-  });
-  return colors.size > 1;
 };

package/dist/es2019/highlightPlugin.js

@@ -71,9 +71,7 @@ export const highlightPlugin = ({
     pmPlugins: () => {
       const plugins = [{
         name: 'highlight',
-        plugin: () => createPlugin({
-          api
-        })
+        plugin: () => createPlugin()
       }, {
         name: 'highlightKeymap',
         plugin: () => keymapPlugin({

package/dist/es2019/pm-plugins/main.js

@@ -1,9 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { getHighlightColorInNonActiveTheme } from '@atlaskit/editor-common/ui-color';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { getActiveColor, isMultiHighlightColorSelection, MULTIPLE_HIGHLIGHT_COLORS_SELECTED } from '../editor-commands/color';
+import { getActiveColor } from '../editor-commands/color';
 import { getDisabledState } from '../editor-commands/disabled';
 export const highlightPluginKey = new PluginKey('highlight');
 export let HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
@@ -11,36 +8,14 @@ export let HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction)
   HighlightPluginAction[HighlightPluginAction["SET_PALETTE"] = 1] = "SET_PALETTE";
   return HighlightPluginAction;
 }({});
-const DEFAULT_BACKGROUND_COLOR = '#FFFFFF';
-const getActiveColorInNonActiveTheme = color => getHighlightColorInNonActiveTheme(color, {
-  defaultBackgroundColor: DEFAULT_BACKGROUND_COLOR
-});
-const getColorAccessibilityState = (activeColor, tr) => {
-  const isMultiHighlightColor = activeColor === MULTIPLE_HIGHLIGHT_COLORS_SELECTED || isMultiHighlightColorSelection(tr);
-  return {
-    // When the selection spans multiple highlight colors, `activeColor` is the
-    // `MULTIPLE_HIGHLIGHT_COLORS_SELECTED` sentinel rather than a real hex value.
-    // Passing it through would resolve the literal sentinel as a color, so fall
-    // back to the neutral default instead.
-    activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(isMultiHighlightColor ? null : activeColor),
-    isMultiHighlightColor
-  };
-};
-export const createPlugin = ({
-  api
-}) => {
+export const createPlugin = () => {
   return new SafePlugin({
     key: highlightPluginKey,
     state: {
       init: (_, editorState) => ({
         activeColor: null,
         disabled: getDisabledState(editorState),
-        isPaletteOpen: false,
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        ...(fg('platform_editor_lovability_text_bg_color_patch_1') && expValEqualsNoExposure('platform_editor_lovability_text_bg_color', 'isEnabled', true) && {
-          activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(null),
-          isMultiHighlightColor: isMultiHighlightColorSelection(editorState)
-        })
+        isPaletteOpen: false
       }),
       apply: (tr, pluginState, _oldState, newState) => {
         var _tr$getMeta;
@@ -52,12 +27,7 @@ export const createPlugin = ({
             } = tr.getMeta(highlightPluginKey);
             return {
               ...pluginState,
-              activeColor: color,
-              // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-              ...(fg('platform_editor_lovability_text_bg_color_patch_1') && expValEqualsNoExposure('platform_editor_lovability_text_bg_color', 'isEnabled', true) && {
-                activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(color),
-                isMultiHighlightColor: false
-              })
+              activeColor: color
             };
           case HighlightPluginAction.SET_PALETTE:
             const {
@@ -69,14 +39,10 @@ export const createPlugin = ({
             };
           default:
             const activeColor = getActiveColor(tr);
-            const colorAccessibilityState =
-            // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-            fg('platform_editor_lovability_text_bg_color_patch_1') && expValEqualsNoExposure('platform_editor_lovability_text_bg_color', 'isEnabled', true) && (activeColor !== pluginState.activeColor || tr.selectionSet || !tr.selection.empty && tr.docChanged) ? getColorAccessibilityState(activeColor, tr) : {};
             return {
               ...pluginState,
               activeColor,
-              disabled: getDisabledState(newState),
-              ...colorAccessibilityState
+              disabled: getDisabledState(newState)
             };
         }
       }

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

@@ -103,26 +103,4 @@ export var getActiveColor = function getActiveColor(tr) {
     color = getColorFromRange(selection.from, selection.to, tr);
   }
   return color;
-};
-
-/**
- * Returns true when the selection contains two or more distinct highlight colors,
- * counting unmarked text as the default transparent highlight.
- */
-export var isMultiHighlightColorSelection = function isMultiHighlightColorSelection(_ref) {
-  var selection = _ref.selection,
-    doc = _ref.doc;
-  if (!(selection instanceof TextSelection)) {
-    return false;
-  }
-  var backgroundColor = doc.type.schema.marks.backgroundColor;
-  var colors = new Set();
-  doc.nodesBetween(selection.from, selection.to, function (node) {
-    if (node.isText) {
-      var _mark$attrs$color2;
-      var mark = backgroundColor.isInSet(node.marks);
-      colors.add((_mark$attrs$color2 = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color2 !== void 0 ? _mark$attrs$color2 : 'default');
-    }
-  });
-  return colors.size > 1;
 };

package/dist/esm/highlightPlugin.js

@@ -72,9 +72,7 @@ export var highlightPlugin = function highlightPlugin(_ref) {
       var plugins = [{
         name: 'highlight',
         plugin: function plugin() {
-          return createPlugin({
-            api: api
-          });
+          return createPlugin();
         }
       }, {
         name: 'highlightKeymap',

package/dist/esm/pm-plugins/main.js

@@ -2,11 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { getHighlightColorInNonActiveTheme } from '@atlaskit/editor-common/ui-color';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { getActiveColor, isMultiHighlightColorSelection, MULTIPLE_HIGHLIGHT_COLORS_SELECTED } from '../editor-commands/color';
+import { getActiveColor } from '../editor-commands/color';
 import { getDisabledState } from '../editor-commands/disabled';
 export var highlightPluginKey = new PluginKey('highlight');
 export var HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction) {
@@ -14,37 +11,16 @@ export var HighlightPluginAction = /*#__PURE__*/function (HighlightPluginAction)
   HighlightPluginAction[HighlightPluginAction["SET_PALETTE"] = 1] = "SET_PALETTE";
   return HighlightPluginAction;
 }({});
-var DEFAULT_BACKGROUND_COLOR = '#FFFFFF';
-var getActiveColorInNonActiveTheme = function getActiveColorInNonActiveTheme(color) {
-  return getHighlightColorInNonActiveTheme(color, {
-    defaultBackgroundColor: DEFAULT_BACKGROUND_COLOR
-  });
-};
-var getColorAccessibilityState = function getColorAccessibilityState(activeColor, tr) {
-  var isMultiHighlightColor = activeColor === MULTIPLE_HIGHLIGHT_COLORS_SELECTED || isMultiHighlightColorSelection(tr);
-  return {
-    // When the selection spans multiple highlight colors, `activeColor` is the
-    // `MULTIPLE_HIGHLIGHT_COLORS_SELECTED` sentinel rather than a real hex value.
-    // Passing it through would resolve the literal sentinel as a color, so fall
-    // back to the neutral default instead.
-    activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(isMultiHighlightColor ? null : activeColor),
-    isMultiHighlightColor: isMultiHighlightColor
-  };
-};
-export var createPlugin = function createPlugin(_ref) {
-  var api = _ref.api;
+export var createPlugin = function createPlugin() {
   return new SafePlugin({
     key: highlightPluginKey,
     state: {
       init: function init(_, editorState) {
-        return _objectSpread({
+        return {
           activeColor: null,
           disabled: getDisabledState(editorState),
           isPaletteOpen: false
-        }, fg('platform_editor_lovability_text_bg_color_patch_1') && expValEqualsNoExposure('platform_editor_lovability_text_bg_color', 'isEnabled', true) && {
-          activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(null),
-          isMultiHighlightColor: isMultiHighlightColorSelection(editorState)
-        });
+        };
       },
       apply: function apply(tr, pluginState, _oldState, newState) {
         var _tr$getMeta;
@@ -55,9 +31,6 @@ export var createPlugin = function createPlugin(_ref) {
               color = _tr$getMeta2.color;
             return _objectSpread(_objectSpread({}, pluginState), {}, {
               activeColor: color
-            }, fg('platform_editor_lovability_text_bg_color_patch_1') && expValEqualsNoExposure('platform_editor_lovability_text_bg_color', 'isEnabled', true) && {
-              activeColorInNonActiveTheme: getActiveColorInNonActiveTheme(color),
-              isMultiHighlightColor: false
             });
           case HighlightPluginAction.SET_PALETTE:
             var _tr$getMeta3 = tr.getMeta(highlightPluginKey),
@@ -67,13 +40,10 @@ export var createPlugin = function createPlugin(_ref) {
             });
           default:
             var activeColor = getActiveColor(tr);
-            var colorAccessibilityState =
-            // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-            fg('platform_editor_lovability_text_bg_color_patch_1') && expValEqualsNoExposure('platform_editor_lovability_text_bg_color', 'isEnabled', true) && (activeColor !== pluginState.activeColor || tr.selectionSet || !tr.selection.empty && tr.docChanged) ? getColorAccessibilityState(activeColor, tr) : {};
             return _objectSpread(_objectSpread({}, pluginState), {}, {
               activeColor: activeColor,
               disabled: getDisabledState(newState)
-            }, colorAccessibilityState);
+            });
         }
       }
     }

package/dist/types/editor-commands/color.d.ts

@@ -1,4 +1,4 @@
-import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
 /**
  * Value returned by `getActiveColor` when the selection spans more than one
  * distinct highlight (background) color. Callers can compare against this to
@@ -6,8 +6,3 @@ import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/ed
  */
 export declare const MULTIPLE_HIGHLIGHT_COLORS_SELECTED = "multiple";
 export declare const getActiveColor: (tr: Transaction | ReadonlyTransaction) => string | null;
-/**
- * Returns true when the selection contains two or more distinct highlight colors,
- * counting unmarked text as the default transparent highlight.
- */
-export declare const isMultiHighlightColorSelection: ({ selection, doc, }: EditorState | Transaction | ReadonlyTransaction) => boolean;

package/dist/types/pm-plugins/main.d.ts

@@ -1,23 +1,13 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { HighlightPlugin } from '../highlightPluginType';
 export declare const highlightPluginKey: PluginKey<HighlightPluginState>;
 export type HighlightPluginState = {
     activeColor: string | null;
-    activeColorInNonActiveTheme?: string;
     disabled: boolean;
-    /**
-     * True when the current selection spans more than one highlight color. Only
-     * populated behind the lovability text/bg color patch gate + experiment.
-     */
-    isMultiHighlightColor?: boolean;
     isPaletteOpen: boolean;
 };
 export declare enum HighlightPluginAction {
     CHANGE_COLOR = 0,
     SET_PALETTE = 1
 }
-export declare const createPlugin: ({ api, }: {
-    api: ExtractInjectionAPI<HighlightPlugin> | undefined;
-}) => SafePlugin<HighlightPluginState>;
+export declare const createPlugin: () => SafePlugin<HighlightPluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-highlight",
-	"version": "12.1.36",
+	"version": "12.1.37",
 	"description": "Highlight plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,13 +41,13 @@
 		"@atlaskit/icon": "^37.1.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/primitives": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^130.0.0",
+		"@atlaskit/tmp-editor-statsig": "^130.1.0",
 		"@atlaskit/tokens": "^16.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.33.0",
+		"@atlaskit/editor-common": "^116.34.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},