@atlaskit/editor-plugin-text-color 12.3.19 → 12.3.20

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-text-color
 
+## 12.3.20
+
+### Patch Changes
+
+- [`1a6b32ef3760e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1a6b32ef3760e) -
+  Treat default text and highlight colors as mixed selection colors
+- Updated dependencies
+
 ## 12.3.19
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils/color.js

@@ -52,15 +52,8 @@ var getActiveColor = exports.getActiveColor = function getActiveColor(state) {
 };
 
 /**
- * Returns true only when the selection contains two or more *distinct* text
- * colors.
- *
- * This is deliberately narrower than `getActiveColor() === null`: `getActiveColor`
- * also returns `null` for a mixed selection where a single colored region sits
- * alongside uncolored text (`marksWithColor.length === 1 && marks.length > 1`).
- * That mixed case is not a multi-color selection and must not trigger the
- * expensive worst-status selection walk, so we key the `isMultiTextColor` flag
- * off this predicate instead.
+ * Returns true when the selection contains two or more distinct text colors,
+ * counting unmarked text as the default color.
  */
 var isMultiTextColorSelection = exports.isMultiTextColorSelection = function isMultiTextColorSelection(state) {
   var selection = state.selection,
@@ -71,11 +64,10 @@ var isMultiTextColorSelection = exports.isMultiTextColorSelection = function isM
   var textColor = doc.type.schema.marks.textColor;
   var colors = new Set();
   doc.nodesBetween(selection.from, selection.to, function (node) {
-    if (node.isLeaf) {
+    if (node.isText) {
+      var _mark$attrs$color;
       var mark = textColor.isInSet(node.marks);
-      if (mark) {
-        colors.add(mark.attrs.color);
-      }
+      colors.add((_mark$attrs$color = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color !== void 0 ? _mark$attrs$color : _constants.DEFAULT_COLOR.color);
     }
   });
   return colors.size > 1;

package/dist/cjs/ui/ColorAccessibilityMenuItem.js

@@ -20,7 +20,7 @@ var _accessibility = _interopRequireDefault(require("@atlaskit/icon/core/accessi
 var _questionCircle = _interopRequireDefault(require("@atlaskit/icon/core/question-circle"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
-var _tokens = require("@atlaskit/tokens");
+var _getTokenValue = require("@atlaskit/tokens/get-token-value");
 var _colorContrast = require("../pm-plugins/utils/color-contrast");
 var _constants = require("../pm-plugins/utils/constants");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -31,14 +31,14 @@ var resolveColorValue = function resolveColorValue(color, fallback) {
 };
 var getForegroundColor = function getForegroundColor(textColor, defaultColor) {
   if (!textColor || defaultColor && textColor === defaultColor) {
-    return (0, _tokens.getTokenValue)('color.text', defaultColor || _constants.DEFAULT_COLOR.color);
+    return (0, _getTokenValue.getTokenValue)('color.text', defaultColor || _constants.DEFAULT_COLOR.color);
   }
   var colorValue = (0, _editorPalette.hexToEditorTextPaletteColor)(textColor) || textColor;
   return resolveColorValue(colorValue, textColor);
 };
 var getBackgroundColor = function getBackgroundColor(highlightColor) {
   if (!highlightColor || highlightColor === _constants.TRANSPARENT_HIGHLIGHT_COLOR) {
-    return (0, _tokens.getTokenValue)('elevation.surface', _constants.DEFAULT_BACKGROUND_COLOR);
+    return (0, _getTokenValue.getTokenValue)('elevation.surface', _constants.DEFAULT_BACKGROUND_COLOR);
   }
   var colorValue = (0, _editorPalette.hexToEditorTextBackgroundPaletteColor)(highlightColor) || highlightColor;
   return resolveColorValue(colorValue, highlightColor);

package/dist/es2019/pm-plugins/utils/color.js

@@ -47,15 +47,8 @@ export const getActiveColor = state => {
 };
 
 /**
- * Returns true only when the selection contains two or more *distinct* text
- * colors.
- *
- * This is deliberately narrower than `getActiveColor() === null`: `getActiveColor`
- * also returns `null` for a mixed selection where a single colored region sits
- * alongside uncolored text (`marksWithColor.length === 1 && marks.length > 1`).
- * That mixed case is not a multi-color selection and must not trigger the
- * expensive worst-status selection walk, so we key the `isMultiTextColor` flag
- * off this predicate instead.
+ * Returns true when the selection contains two or more distinct text colors,
+ * counting unmarked text as the default color.
  */
 export const isMultiTextColorSelection = state => {
   const {
@@ -70,11 +63,10 @@ export const isMultiTextColorSelection = state => {
   } = doc.type.schema.marks;
   const colors = new Set();
   doc.nodesBetween(selection.from, selection.to, node => {
-    if (node.isLeaf) {
+    if (node.isText) {
+      var _mark$attrs$color;
       const mark = textColor.isInSet(node.marks);
-      if (mark) {
-        colors.add(mark.attrs.color);
-      }
+      colors.add((_mark$attrs$color = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color !== void 0 ? _mark$attrs$color : DEFAULT_COLOR.color);
     }
   });
   return colors.size > 1;

package/dist/es2019/ui/ColorAccessibilityMenuItem.js

@@ -13,7 +13,7 @@ import AccessibilityIcon from '@atlaskit/icon/core/accessibility';
 import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
-import { getTokenValue } from '@atlaskit/tokens';
+import { getTokenValue } from '@atlaskit/tokens/get-token-value';
 import { getContrastRatio as calcContrastRatio } from '../pm-plugins/utils/color-contrast';
 import { DEFAULT_COLOR, DEFAULT_BACKGROUND_COLOR, TRANSPARENT_HIGHLIGHT_COLOR, ACCESSIBLE_CONTRAST_RATIO, DIFFICULT_CONTRAST_RATIO } from '../pm-plugins/utils/constants';
 const resolveColorValue = (color, fallback) => {

package/dist/esm/pm-plugins/utils/color.js

@@ -47,15 +47,8 @@ export var getActiveColor = function getActiveColor(state) {
 };
 
 /**
- * Returns true only when the selection contains two or more *distinct* text
- * colors.
- *
- * This is deliberately narrower than `getActiveColor() === null`: `getActiveColor`
- * also returns `null` for a mixed selection where a single colored region sits
- * alongside uncolored text (`marksWithColor.length === 1 && marks.length > 1`).
- * That mixed case is not a multi-color selection and must not trigger the
- * expensive worst-status selection walk, so we key the `isMultiTextColor` flag
- * off this predicate instead.
+ * Returns true when the selection contains two or more distinct text colors,
+ * counting unmarked text as the default color.
  */
 export var isMultiTextColorSelection = function isMultiTextColorSelection(state) {
   var selection = state.selection,
@@ -66,11 +59,10 @@ export var isMultiTextColorSelection = function isMultiTextColorSelection(state)
   var textColor = doc.type.schema.marks.textColor;
   var colors = new Set();
   doc.nodesBetween(selection.from, selection.to, function (node) {
-    if (node.isLeaf) {
+    if (node.isText) {
+      var _mark$attrs$color;
       var mark = textColor.isInSet(node.marks);
-      if (mark) {
-        colors.add(mark.attrs.color);
-      }
+      colors.add((_mark$attrs$color = mark === null || mark === void 0 ? void 0 : mark.attrs.color) !== null && _mark$attrs$color !== void 0 ? _mark$attrs$color : DEFAULT_COLOR.color);
     }
   });
   return colors.size > 1;

package/dist/esm/ui/ColorAccessibilityMenuItem.js

@@ -16,7 +16,7 @@ import AccessibilityIcon from '@atlaskit/icon/core/accessibility';
 import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
-import { getTokenValue } from '@atlaskit/tokens';
+import { getTokenValue } from '@atlaskit/tokens/get-token-value';
 import { getContrastRatio as calcContrastRatio } from '../pm-plugins/utils/color-contrast';
 import { DEFAULT_COLOR, DEFAULT_BACKGROUND_COLOR, TRANSPARENT_HIGHLIGHT_COLOR, ACCESSIBLE_CONTRAST_RATIO, DIFFICULT_CONTRAST_RATIO } from '../pm-plugins/utils/constants';
 var resolveColorValue = function resolveColorValue(color, fallback) {

package/dist/types/pm-plugins/utils/color.d.ts

@@ -4,15 +4,8 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
  */
 export declare const getActiveColor: (state: EditorState) => string | null;
 /**
- * Returns true only when the selection contains two or more *distinct* text
- * colors.
- *
- * This is deliberately narrower than `getActiveColor() === null`: `getActiveColor`
- * also returns `null` for a mixed selection where a single colored region sits
- * alongside uncolored text (`marksWithColor.length === 1 && marks.length > 1`).
- * That mixed case is not a multi-color selection and must not trigger the
- * expensive worst-status selection walk, so we key the `isMultiTextColor` flag
- * off this predicate instead.
+ * Returns true when the selection contains two or more distinct text colors,
+ * counting unmarked text as the default color.
  */
 export declare const isMultiTextColorSelection: (state: EditorState) => boolean;
 export declare const getActiveColorNew: (tr: Transaction) => string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-color",
-	"version": "12.3.19",
+	"version": "12.3.20",
 	"description": "Text color plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,13 +41,13 @@
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/platform-feature-flags-react": "^1.1.0",
 		"@atlaskit/primitives": "^20.6.0",
-		"@atlaskit/tmp-editor-statsig": "^124.1.0",
-		"@atlaskit/tokens": "^15.6.0",
+		"@atlaskit/tmp-editor-statsig": "^124.9.0",
+		"@atlaskit/tokens": "^15.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.26.0",
+		"@atlaskit/editor-common": "^116.30.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"