@atlaskit/editor-common 83.3.1 → 83.4.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-common
 
+## 83.4.1
+
+### Patch Changes
+
+- [#114832](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114832)
+  [`a38ae4ff11746`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a38ae4ff11746) -
+  Slight change to link overlay button CSS to fix some background colour edge case issues
+
+## 83.4.0
+
+### Minor Changes
+
+- [`955949c077d4f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/955949c077d4f) -
+  [ux] [ED-23627] Text highlighting UI review
+
 ## 83.3.1
 
 ### Patch Changes

package/afm-jira/tsconfig.json

@@ -65,9 +65,6 @@
     {
       "path": "../../../design-system/icon-object/afm-jira/tsconfig.json"
     },
-    {
-      "path": "../../../linking-platform/link-datasource/afm-jira/tsconfig.json"
-    },
     {
       "path": "../../../linking-platform/link-picker/afm-jira/tsconfig.json"
     },

package/dist/cjs/link/ConfigureLinkOverlay/OverlayButton.js

@@ -20,6 +20,7 @@ var _messages = require("../../messages");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 var buttonStyles = (0, _react2.css)({
+  display: 'flex',
   background: "var(--ds-background-neutral, ".concat(_colors.N30A, ")"),
   color: "var(--ds-icon, ".concat(_colors.N700, ")"),
   '&:hover': {
@@ -37,7 +38,8 @@ var buttonWrapperStyles = (0, _react2.css)({
   display: 'inline-flex',
   top: '50%',
   transform: 'translateY(-50%)',
-  background: "var(--ds-surface-raised, ".concat(_colors.N0, ")")
+  background: "var(--ds-surface-raised, ".concat(_colors.N0, ")"),
+  borderRadius: "var(--ds-border-radius, 3px)"
 });
 var OverlayButton = exports.OverlayButton = function OverlayButton(_ref) {
   var _docNode$nodeSize;

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "83.3.1";
+var packageVersion = "83.4.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/styles/shared/background-color.js

@@ -5,20 +5,46 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.backgroundColorStyles = void 0;
 var _react = require("@emotion/react");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
-var backgroundColorStyles = exports.backgroundColorStyles = (0, _react.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.fabric-background-color-mark': {
-    backgroundColor: 'var(--custom-palette-color, inherit)'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  'a .fabric-background-color-mark': {
-    backgroundColor: 'unset'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.fabric-background-color-mark .ak-editor-annotation': {
-    backgroundColor: 'unset'
-  }
-});
+var backgroundColorStyles = exports.backgroundColorStyles = function backgroundColorStyles() {
+  return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.review-text-highlighting-styling') ? (0, _react.css)({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark': {
+      backgroundColor: 'var(--custom-palette-color, inherit)',
+      borderRadius: '2px',
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+      paddingTop: '1px',
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+      paddingBottom: '2px',
+      boxDecorationBreak: 'clone'
+    },
+    // Don't show text highlight styling when there is a hyperlink
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    'a .fabric-background-color-mark': {
+      backgroundColor: 'unset'
+    },
+    // Don't show text highlight styling when there is an inline comment
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark .ak-editor-annotation': {
+      backgroundColor: 'unset'
+    }
+  }) : (0, _react.css)({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark': {
+      backgroundColor: 'var(--custom-palette-color, inherit)'
+    },
+    // Don't show text highlight styling when there is a hyperlink
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    'a .fabric-background-color-mark': {
+      backgroundColor: 'unset'
+    },
+    // Don't show text highlight styling when there is an inline comment
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark .ak-editor-annotation': {
+      backgroundColor: 'unset'
+    }
+  });
+};

package/dist/cjs/ui/DropList/index.js

@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "83.3.1";
+var packageVersion = "83.4.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/link/ConfigureLinkOverlay/OverlayButton.js

@@ -12,6 +12,7 @@ import { layers } from '@atlaskit/theme/constants';
 import Tooltip from '@atlaskit/tooltip';
 import { cardMessages } from '../../messages';
 const buttonStyles = css({
+  display: 'flex',
   background: `var(--ds-background-neutral, ${N30A})`,
   color: `var(--ds-icon, ${N700})`,
   '&:hover': {
@@ -29,7 +30,8 @@ const buttonWrapperStyles = css({
   display: 'inline-flex',
   top: '50%',
   transform: 'translateY(-50%)',
-  background: `var(--ds-surface-raised, ${N0})`
+  background: `var(--ds-surface-raised, ${N0})`,
+  borderRadius: "var(--ds-border-radius, 3px)"
 });
 export const OverlayButton = ({
   editorView,

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "83.3.1";
+const packageVersion = "83.4.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/styles/shared/background-color.js

@@ -1,18 +1,44 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
-export const backgroundColorStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.fabric-background-color-mark': {
-    backgroundColor: 'var(--custom-palette-color, inherit)'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  'a .fabric-background-color-mark': {
-    backgroundColor: 'unset'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.fabric-background-color-mark .ak-editor-annotation': {
-    backgroundColor: 'unset'
-  }
-});
+export const backgroundColorStyles = () => {
+  return getBooleanFF('platform.editor.review-text-highlighting-styling') ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark': {
+      backgroundColor: 'var(--custom-palette-color, inherit)',
+      borderRadius: '2px',
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+      paddingTop: '1px',
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+      paddingBottom: '2px',
+      boxDecorationBreak: 'clone'
+    },
+    // Don't show text highlight styling when there is a hyperlink
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    'a .fabric-background-color-mark': {
+      backgroundColor: 'unset'
+    },
+    // Don't show text highlight styling when there is an inline comment
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark .ak-editor-annotation': {
+      backgroundColor: 'unset'
+    }
+  }) : css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark': {
+      backgroundColor: 'var(--custom-palette-color, inherit)'
+    },
+    // Don't show text highlight styling when there is a hyperlink
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    'a .fabric-background-color-mark': {
+      backgroundColor: 'unset'
+    },
+    // Don't show text highlight styling when there is an inline comment
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark .ak-editor-annotation': {
+      backgroundColor: 'unset'
+    }
+  });
+};

package/dist/es2019/ui/DropList/index.js

@@ -9,7 +9,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "83.3.1";
+const packageVersion = "83.4.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/link/ConfigureLinkOverlay/OverlayButton.js

@@ -12,6 +12,7 @@ import { layers } from '@atlaskit/theme/constants';
 import Tooltip from '@atlaskit/tooltip';
 import { cardMessages } from '../../messages';
 var buttonStyles = css({
+  display: 'flex',
   background: "var(--ds-background-neutral, ".concat(N30A, ")"),
   color: "var(--ds-icon, ".concat(N700, ")"),
   '&:hover': {
@@ -29,7 +30,8 @@ var buttonWrapperStyles = css({
   display: 'inline-flex',
   top: '50%',
   transform: 'translateY(-50%)',
-  background: "var(--ds-surface-raised, ".concat(N0, ")")
+  background: "var(--ds-surface-raised, ".concat(N0, ")"),
+  borderRadius: "var(--ds-border-radius, 3px)"
 });
 export var OverlayButton = function OverlayButton(_ref) {
   var _docNode$nodeSize;

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "83.3.1";
+var packageVersion = "83.4.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/styles/shared/background-color.js

@@ -1,18 +1,44 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
-export var backgroundColorStyles = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.fabric-background-color-mark': {
-    backgroundColor: 'var(--custom-palette-color, inherit)'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  'a .fabric-background-color-mark': {
-    backgroundColor: 'unset'
-  },
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '.fabric-background-color-mark .ak-editor-annotation': {
-    backgroundColor: 'unset'
-  }
-});
+export var backgroundColorStyles = function backgroundColorStyles() {
+  return getBooleanFF('platform.editor.review-text-highlighting-styling') ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark': {
+      backgroundColor: 'var(--custom-palette-color, inherit)',
+      borderRadius: '2px',
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+      paddingTop: '1px',
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+      paddingBottom: '2px',
+      boxDecorationBreak: 'clone'
+    },
+    // Don't show text highlight styling when there is a hyperlink
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    'a .fabric-background-color-mark': {
+      backgroundColor: 'unset'
+    },
+    // Don't show text highlight styling when there is an inline comment
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark .ak-editor-annotation': {
+      backgroundColor: 'unset'
+    }
+  }) : css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark': {
+      backgroundColor: 'var(--custom-palette-color, inherit)'
+    },
+    // Don't show text highlight styling when there is a hyperlink
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    'a .fabric-background-color-mark': {
+      backgroundColor: 'unset'
+    },
+    // Don't show text highlight styling when there is an inline comment
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+    '.fabric-background-color-mark .ak-editor-annotation': {
+      backgroundColor: 'unset'
+    }
+  });
+};

package/dist/esm/ui/DropList/index.js

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "83.3.1";
+var packageVersion = "83.4.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/styles/shared/background-color.d.ts

@@ -1 +1 @@
-export declare const backgroundColorStyles: import("@emotion/react").SerializedStyles;
+export declare const backgroundColorStyles: () => import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/styles/shared/background-color.d.ts

@@ -1 +1 @@
-export declare const backgroundColorStyles: import("@emotion/react").SerializedStyles;
+export declare const backgroundColorStyles: () => import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "83.3.1",
+	"version": "83.4.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -125,7 +125,7 @@
 		"@atlaskit/media-ui": "^25.10.0",
 		"@atlaskit/media-viewer": "48.6.8",
 		"@atlaskit/mention": "^23.2.0",
-		"@atlaskit/menu": "^2.5.0",
+		"@atlaskit/menu": "^2.6.0",
 		"@atlaskit/platform-feature-flags": "^0.2.0",
 		"@atlaskit/primitives": "^9.0.0",
 		"@atlaskit/profilecard": "^19.15.0",
@@ -268,6 +268,9 @@
 		},
 		"platform.editor.a11y-main-toolbar-navigation_osrty": {
 			"type": "boolean"
+		},
+		"platform.editor.review-text-highlighting-styling": {
+			"type": "boolean"
 		}
 	}
 }