@atlaskit/editor-core 187.28.3 → 187.28.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 187.28.5
+
+### Patch Changes
+
+- [`5ce0bea6aa6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5ce0bea6aa6) - [ED-19399] Fixing text color underline on toolbar
+
 ## 187.28.3
 
 ### Patch Changes

package/dist/cjs/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -181,7 +181,7 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         // Not sure where the extra 2px comes from
         fitWidth = 242;
       }
-      var selectedColor = pluginState.color !== pluginState.defaultColor && pluginState.color;
+      var selectedColor = this.getSelectedColor(pluginState);
       var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(palette, pluginState.color),
         selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
@@ -246,6 +246,12 @@ var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         css: _styles2.separatorStyles
       }));
     }
+  }, {
+    key: "getSelectedColor",
+    value: function getSelectedColor(pluginState) {
+      var selectedColor = pluginState.color !== pluginState.defaultColor && (pluginState.color ? (0, _editorPalette.hexToEditorTextPaletteColor)(pluginState.color) : pluginState.color);
+      return selectedColor;
+    }
   }, {
     key: "getCommonAnalyticsAttributes",
     value: function getCommonAnalyticsAttributes() {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.28.3";
+var version = "187.28.5";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -159,7 +159,7 @@ export class ToolbarTextColor extends React.Component {
       // Not sure where the extra 2px comes from
       fitWidth = 242;
     }
-    const selectedColor = pluginState.color !== pluginState.defaultColor && pluginState.color;
+    const selectedColor = this.getSelectedColor(pluginState);
     const {
       selectedRowIndex,
       selectedColumnIndex
@@ -223,6 +223,10 @@ export class ToolbarTextColor extends React.Component {
       css: separatorStyles
     }));
   }
+  getSelectedColor(pluginState) {
+    const selectedColor = pluginState.color !== pluginState.defaultColor && (pluginState.color ? hexToEditorTextPaletteColor(pluginState.color) : pluginState.color);
+    return selectedColor;
+  }
   getCommonAnalyticsAttributes() {
     return {
       experiment: EXPERIMENT_NAME,

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.28.3";
+export const version = "187.28.5";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/text-color/ui/ToolbarTextColor/index.js

@@ -171,7 +171,7 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         // Not sure where the extra 2px comes from
         fitWidth = 242;
       }
-      var selectedColor = pluginState.color !== pluginState.defaultColor && pluginState.color;
+      var selectedColor = this.getSelectedColor(pluginState);
       var _getSelectedRowAndCol = getSelectedRowAndColumnFromPalette(palette, pluginState.color),
         selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
@@ -236,6 +236,12 @@ export var ToolbarTextColor = /*#__PURE__*/function (_React$Component) {
         css: separatorStyles
       }));
     }
+  }, {
+    key: "getSelectedColor",
+    value: function getSelectedColor(pluginState) {
+      var selectedColor = pluginState.color !== pluginState.defaultColor && (pluginState.color ? hexToEditorTextPaletteColor(pluginState.color) : pluginState.color);
+      return selectedColor;
+    }
   }, {
     key: "getCommonAnalyticsAttributes",
     value: function getCommonAnalyticsAttributes() {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.28.3";
+export var version = "187.28.5";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/text-color/ui/ToolbarTextColor/index.d.ts

@@ -40,6 +40,7 @@ export declare class ToolbarTextColor extends React.Component<Props & WrappedCom
     private handleOpenChange;
     private hide;
     private hideonEsc;
+    private getSelectedColor;
     private getCommonAnalyticsAttributes;
     private buildAnalyticsPalette;
     private buildAnalyticsSelectColor;

package/dist/types-ts4.5/plugins/text-color/ui/ToolbarTextColor/index.d.ts

@@ -40,6 +40,7 @@ export declare class ToolbarTextColor extends React.Component<Props & WrappedCom
     private handleOpenChange;
     private hide;
     private hideonEsc;
+    private getSelectedColor;
     private getCommonAnalyticsAttributes;
     private buildAnalyticsPalette;
     private buildAnalyticsSelectColor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.28.3",
+  "version": "187.28.5",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"