@atlaskit/editor-common 83.4.3 → 83.5.1

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-common
 
+## 83.5.1
+
+### Patch Changes
+
+- [#116194](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116194)
+  [`a6ac14257c10a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a6ac14257c10a) -
+  [ux] Update button interactions: non-bodied macros stay flush with macro, bodied macros show
+  config icon on hover/select, have default white background, and maintain the indentaion
+
+## 83.5.0
+
+### Minor Changes
+
+- [#116062](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116062)
+  [`2662cb99be36f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2662cb99be36f) -
+  [ux] ED-23706 - change disabled comment action text
+- [#113441](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113441)
+  [`ea57f8fd294f9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ea57f8fd294f9) -
+  Updates getLinkPreferencesURLFromENV utility to leverage `@atlaskit/atlassian-context` pkg in
+  order to control user preferences link based on environment/perimeter.
+
+### Patch Changes
+
+- [#114548](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114548)
+  [`8b2d47bffb50e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b2d47bffb50e) -
+  bump adf-schema version
+- [#116062](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116062)
+  [`1c26d1ee6fb25`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1c26d1ee6fb25) -
+  Migrated to new atlaskit Buttons.
+- Updated dependencies
+
 ## 83.4.3
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -33,6 +33,9 @@
         {
             "path": "../../../analytics/analytics-next/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../../uip/atlassian-context/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../../design-system/button/afm-cc/tsconfig.json"
         },

package/afm-jira/tsconfig.json

@@ -32,6 +32,9 @@
     {
       "path": "../../../analytics/analytics-next/afm-jira/tsconfig.json"
     },
+    {
+      "path": "../../../uip/atlassian-context/afm-jira/tsconfig.json"
+    },
     {
       "path": "../../../design-system/button/afm-jira/tsconfig.json"
     },

package/dist/cjs/card/LinkToolbarButtonGroup.js

@@ -8,7 +8,7 @@ exports.LinkToolbarButtonGroup = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
-var _button = require("@atlaskit/button");
+var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
 var _ui = require("../ui");
 var _excluded = ["disabled"];
 /** @jsx jsx */
@@ -40,7 +40,7 @@ var disallowedWrapperStyle = (0, _react2.css)({
 });
 var LinkToolbarButtonGroup = exports.LinkToolbarButtonGroup = function LinkToolbarButtonGroup(_ref2) {
   var options = _ref2.options;
-  return (0, _react2.jsx)(_button.ButtonGroup, null, options.map(function (_ref3) {
+  return (0, _react2.jsx)(_buttonGroup.default, null, options.map(function (_ref3) {
     var onClick = _ref3.onClick,
       selected = _ref3.selected,
       disabled = _ref3.disabled,

package/dist/cjs/element-browser/components/ElementList/EmptyState.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = EmptyState;
 var _react = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
-var _button = _interopRequireDefault(require("@atlaskit/button"));
+var _new = require("@atlaskit/button/new");
 var _primitives = require("@atlaskit/primitives");
 var _NotFoundIllustration = _interopRequireDefault(require("./NotFoundIllustration"));
 /** @jsx jsx */
@@ -32,7 +32,7 @@ function EmptyState(_ref) {
     description: "Empty state sub-heading"
   })), (0, _react.jsx)(_primitives.Box, {
     xcss: externalLinkWrapper
-  }, (0, _react.jsx)(_button.default, {
+  }, (0, _react.jsx)(_new.LinkButton, {
     appearance: "primary",
     target: "_blank",
     href: "https://marketplace.atlassian.com/search?category=Macros&hosting=cloud&product=confluence",

package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -48,20 +48,38 @@ var sharedLabelStyles = (0, _react2.css)({
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.inline': {
-    marginLeft: "var(--ds-space-150, 12px)",
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
     top: '-18px'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-background': {
+    background: "var(--ds-surface, ".concat(_colors.N0, ")")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-border': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(_colors.N30, ")"))
   }
 });
 var buttonLabelStyles = (0, _react2.css)({
+  // Need this exact number since this is size with icon
+  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+  minHeight: '26px',
   alignItems: 'center',
   borderRadius: "var(--ds-border-radius, 3px)",
   paddingLeft: "var(--ds-space-050, 4px)",
   paddingRight: "var(--ds-space-050, 4px)",
   color: "var(--ds-text-subtle, ".concat(_colors.N800, ")"),
-  backgroundColor: "var(--ds-background-accent-gray-subtlest, ".concat(_colors.N30, ")")
+  backgroundColor: "var(--ds-background-accent-gray-subtlest, ".concat(_colors.N30, ")"),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.remove-left-margin': {
+    marginLeft: "var(--ds-space-negative-150, -12px)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.remove-nested-left-margin': {
+    marginLeft: 0
+  }
 });
-var placeholderStyles = (0, _react2.css)({
+var spacerStyles = (0, _react2.css)({
   height: "var(--ds-space-150, 12px)"
 });
 var textStyles = (0, _react2.css)({
@@ -70,19 +88,22 @@ var textStyles = (0, _react2.css)({
   padding: "var(--ds-space-025, 2px)".concat(" ", "var(--ds-space-050, 4px)")
 });
 var originalLabelStyles = (0, _react2.css)({
+  background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(_colors.N40, ")"),
   borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.show-label': {
-    background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(_colors.N40, ")"),
     color: "var(--ds-text-subtle, ".concat(_colors.N500, ")")
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-background': {
-    background: "var(--ds-surface, ".concat(_colors.N0, ")")
-  },
+  '&.inline': {
+    // need to add margin since we don't get it for free like block ones via the padding to make it flush with editor elements
+    marginLeft: "var(--ds-space-150, 12px)"
+  }
+});
+var iconStyles = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-border': {
-    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(_colors.N30, ")"))
+  '&.hide-icon': {
+    display: 'none'
   }
 });
 var i18n = (0, _reactIntlNext.defineMessages)({
@@ -103,17 +124,26 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
     showMacroButtonUpdates = _ref.showMacroButtonUpdates;
   var intl = (0, _reactIntlNext.useIntl)();
   var tooltipText = "".concat(intl.formatMessage(i18n.configure), " ").concat(text);
+  var isInlineExtension = extensionName === 'inlineExtension';
   var containerClassNames = (0, _classnames.default)({
     bodied: isBodiedMacro
   });
-  var labelClassNames = (0, _classnames.default)('extension-label', {
+  var sharedLabelClassNames = (0, _classnames.default)('extension-label', {
     nested: isNodeNested,
-    inline: extensionName === 'inlineExtension',
+    inline: isInlineExtension,
     bodied: isBodiedMacro,
-    'bodied-border': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
-    'bodied-background': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
+    'bodied-border': isBodiedMacro && !isNodeHovered,
+    'bodied-background': isBodiedMacro && !isNodeHovered,
     'show-label': isNodeHovered || isBodiedMacro
   });
+  var newButtonLabelClassNames = (0, _classnames.default)({
+    // For new button design, non-bodied macros should have a flush label. Inline macros don't need this since they never had the margin-left applied.
+    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
+  });
+  var iconClassNames = (0, _classnames.default)({
+    'hide-icon': isBodiedMacro && !isNodeHovered
+  });
   return (0, _react2.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     css: containerStyles
@@ -140,19 +170,22 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
       css: [sharedLabelStyles, buttonLabelStyles]
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
-      className: labelClassNames
-    }), text, " ", (0, _react2.jsx)(_preferences.default, {
+      className: "".concat(sharedLabelClassNames, " ").concat(newButtonLabelClassNames)
+    }), text, (0, _react2.jsx)("span", {
+      css: iconStyles,
+      className: iconClassNames,
+      "data-testid": "config-icon"
+    }, (0, _react2.jsx)(_preferences.default, {
       label: ""
-    }));
+    })));
   }), (0, _react2.jsx)("div", {
-    "data-testid": "placeholder",
-    css: placeholderStyles
+    css: spacerStyles
   })) : (0, _react2.jsx)("span", {
     "data-testid": "new-lozenge",
     css: [sharedLabelStyles, originalLabelStyles]
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: labelClassNames
+    className: sharedLabelClassNames
   }, (0, _react2.jsx)("span", {
     css: textStyles
   }, text)));

package/dist/cjs/link/constants.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stagingLinkPreferencesUrl = exports.productionLinkPreferencesUrl = void 0;
+exports.stagingLinkPreferencesUrl = exports.productionLinkPreferencesUrl = exports.linkPreferencesPath = void 0;
+var linkPreferencesPath = exports.linkPreferencesPath = '/manage-profile/link-preferences';
 var stagingLinkPreferencesUrl = exports.stagingLinkPreferencesUrl = 'https://id.stg.internal.atlassian.com/manage-profile/link-preferences';
 var productionLinkPreferencesUrl = exports.productionLinkPreferencesUrl = 'https://id.atlassian.com/manage-profile/link-preferences';

package/dist/cjs/link/utils.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getLinkPreferencesURLFromENV = void 0;
 exports.isLinkAtPos = isLinkAtPos;
 exports.isTextAtPos = isTextAtPos;
+var _atlassianContext = require("@atlaskit/atlassian-context");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("./constants");
 function isTextAtPos(pos) {
   return function (state) {
@@ -20,6 +22,9 @@ function isLinkAtPos(pos) {
   };
 }
 var getLinkPreferencesURLFromENV = exports.getLinkPreferencesURLFromENV = function getLinkPreferencesURLFromENV() {
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.linking-preferences-url-atlassian-context')) {
+    return (0, _atlassianContext.getATLContextUrl)('id') + _constants.linkPreferencesPath;
+  }
   if (process.env.NODE_ENV === 'production' && process.env.CLOUD_ENV === 'staging') {
     // only a production CLOUD_ENV staging environment has a different link preferences URL
     return _constants.stagingLinkPreferencesUrl;

package/dist/cjs/media-single/CommentBadge.js

@@ -9,7 +9,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
-var _button = require("@atlaskit/button");
+var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
 var _constants = require("@atlaskit/theme/constants");
@@ -94,7 +94,7 @@ var CommentBadge = exports.CommentBadge = function CommentBadge(_ref) {
   }, (0, _react2.jsx)(_tooltip.default, {
     position: "top",
     content: title
-  }, (0, _react2.jsx)(_button.CustomThemeButton, {
+  }, (0, _react2.jsx)(_customThemeButton.default, {
     style: {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
       height: badgeDimensions,

package/dist/cjs/messages/annotation.js

@@ -11,11 +11,17 @@ var annotationMessages = exports.annotationMessages = (0, _reactIntlNext.defineM
     defaultMessage: 'Comment',
     description: 'Create/add an inline comment based on the users selection'
   },
+  // TODO: Remove this message when the platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz FF is removed
   createCommentInvalid: {
     id: 'fabric.editor.createCommentInvalid',
     defaultMessage: 'You can only comment on text and headings',
     description: 'Error message to communicate to the user they can only do the current action in certain contexts'
   },
+  createCommentDisabled: {
+    id: 'fabric.editor.createCommentDisabled',
+    defaultMessage: 'You can only comment on text, headings, emojis, dates, mentions, links, and statuses.',
+    description: 'Error message to communicate to the user they can only do the current action in certain contexts'
+  },
   toolbar: {
     id: 'fabric.editor.annotationToolbar',
     defaultMessage: 'Annotation toolbar',

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.4.3";
+var packageVersion = "83.5.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/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.4.3";
+var packageVersion = "83.5.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/ui-menu/ColorPickerButton/index.js

@@ -9,7 +9,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _analyticsNext = require("@atlaskit/analytics-next");
-var _button = _interopRequireDefault(require("@atlaskit/button"));
+var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _colors = require("@atlaskit/theme/colors");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -209,7 +209,7 @@ var ColorPickerButton = function ColorPickerButton(props) {
   }, (0, _react2.jsx)(_tooltip.default, {
     content: title,
     position: "top"
-  }, (0, _react2.jsx)(_button.default, {
+  }, (0, _react2.jsx)(_standardButton.default, {
     ref: buttonRef,
     "aria-label": title,
     "aria-expanded": props.isAriaExpanded ? isPopupOpen : undefined,
@@ -221,7 +221,9 @@ var ColorPickerButton = function ColorPickerButton(props) {
         togglePopup();
         setIsOpenedByKeyboard(true);
       }
-    },
+    }
+    // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
+    ,
     css: buttonStyle,
     iconAfter: (0, _react2.jsx)("span", {
       css: colorPickerExpandContainer

package/dist/cjs/ui-menu/ToolbarButton/styles.js

@@ -12,10 +12,11 @@ var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-
 // If you make any change here, copy it to above file as well
 //  and notify about the change in #team-fc-editor-ai-dev channel.
 var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
   return /*#__PURE__*/_react.default.createElement(_standardButton.default, (0, _extends2.default)({
     ref: ref
   }, props, {
+    // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     style: {
       alignItems: 'center'
     }

package/dist/es2019/card/LinkToolbarButtonGroup.js

@@ -3,7 +3,7 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { ButtonGroup } from '@atlaskit/button';
+import ButtonGroup from '@atlaskit/button/button-group';
 import { FloatingToolbarButton as Button } from '../ui';
 
 /**

package/dist/es2019/element-browser/components/ElementList/EmptyState.js

@@ -2,7 +2,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import Button from '@atlaskit/button';
+import { LinkButton } from '@atlaskit/button/new';
 import { Box, xcss } from '@atlaskit/primitives';
 import NotFoundIllustration from './NotFoundIllustration';
 export default function EmptyState({
@@ -25,7 +25,7 @@ export default function EmptyState({
     description: "Empty state sub-heading"
   })), jsx(Box, {
     xcss: externalLinkWrapper
-  }, jsx(Button, {
+  }, jsx(LinkButton, {
     appearance: "primary",
     target: "_blank",
     href: "https://marketplace.atlassian.com/search?category=Macros&hosting=cloud&product=confluence",

package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -39,20 +39,38 @@ const sharedLabelStyles = css({
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.inline': {
-    marginLeft: "var(--ds-space-150, 12px)",
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
     top: '-18px'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-background': {
+    background: `var(--ds-surface, ${N0})`
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-border': {
+    boxShadow: `0 0 0 1px ${`var(--ds-border, ${N30})`}`
   }
 });
 const buttonLabelStyles = css({
+  // Need this exact number since this is size with icon
+  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+  minHeight: '26px',
   alignItems: 'center',
   borderRadius: "var(--ds-border-radius, 3px)",
   paddingLeft: "var(--ds-space-050, 4px)",
   paddingRight: "var(--ds-space-050, 4px)",
   color: `var(--ds-text-subtle, ${N800})`,
-  backgroundColor: `var(--ds-background-accent-gray-subtlest, ${N30})`
+  backgroundColor: `var(--ds-background-accent-gray-subtlest, ${N30})`,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.remove-left-margin': {
+    marginLeft: "var(--ds-space-negative-150, -12px)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.remove-nested-left-margin': {
+    marginLeft: 0
+  }
 });
-const placeholderStyles = css({
+const spacerStyles = css({
   height: "var(--ds-space-150, 12px)"
 });
 const textStyles = css({
@@ -61,19 +79,22 @@ const textStyles = css({
   padding: `${"var(--ds-space-025, 2px)"} ${"var(--ds-space-050, 4px)"}`
 });
 const originalLabelStyles = css({
+  background: `var(--ds-background-accent-gray-subtle-pressed, ${N40})`,
   borderRadius: `${"var(--ds-border-radius, 3px)"} ${"var(--ds-border-radius, 3px)"} 0 0`,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.show-label': {
-    background: `var(--ds-background-accent-gray-subtle-pressed, ${N40})`,
     color: `var(--ds-text-subtle, ${N500})`
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-background': {
-    background: `var(--ds-surface, ${N0})`
-  },
+  '&.inline': {
+    // need to add margin since we don't get it for free like block ones via the padding to make it flush with editor elements
+    marginLeft: "var(--ds-space-150, 12px)"
+  }
+});
+const iconStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-border': {
-    boxShadow: `0 0 0 1px ${`var(--ds-border, ${N30})`}`
+  '&.hide-icon': {
+    display: 'none'
   }
 });
 const i18n = defineMessages({
@@ -95,17 +116,26 @@ export const ExtensionLabel = ({
 }) => {
   const intl = useIntl();
   const tooltipText = `${intl.formatMessage(i18n.configure)} ${text}`;
+  const isInlineExtension = extensionName === 'inlineExtension';
   const containerClassNames = classnames({
     bodied: isBodiedMacro
   });
-  const labelClassNames = classnames('extension-label', {
+  const sharedLabelClassNames = classnames('extension-label', {
     nested: isNodeNested,
-    inline: extensionName === 'inlineExtension',
+    inline: isInlineExtension,
     bodied: isBodiedMacro,
-    'bodied-border': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
-    'bodied-background': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
+    'bodied-border': isBodiedMacro && !isNodeHovered,
+    'bodied-background': isBodiedMacro && !isNodeHovered,
     'show-label': isNodeHovered || isBodiedMacro
   });
+  const newButtonLabelClassNames = classnames({
+    // For new button design, non-bodied macros should have a flush label. Inline macros don't need this since they never had the margin-left applied.
+    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
+  });
+  const iconClassNames = classnames({
+    'hide-icon': isBodiedMacro && !isNodeHovered
+  });
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     css: containerStyles
@@ -131,18 +161,21 @@ export const ExtensionLabel = ({
     css: [sharedLabelStyles, buttonLabelStyles]
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: labelClassNames
-  }), text, " ", jsx(PreferencesIcon, {
+    className: `${sharedLabelClassNames} ${newButtonLabelClassNames}`
+  }), text, jsx("span", {
+    css: iconStyles,
+    className: iconClassNames,
+    "data-testid": "config-icon"
+  }, jsx(PreferencesIcon, {
     label: ""
-  }))), jsx("div", {
-    "data-testid": "placeholder",
-    css: placeholderStyles
+  })))), jsx("div", {
+    css: spacerStyles
   })) : jsx("span", {
     "data-testid": "new-lozenge",
     css: [sharedLabelStyles, originalLabelStyles]
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: labelClassNames
+    className: sharedLabelClassNames
   }, jsx("span", {
     css: textStyles
   }, text)));

package/dist/es2019/link/constants.js

@@ -1,2 +1,3 @@
+export const linkPreferencesPath = '/manage-profile/link-preferences';
 export const stagingLinkPreferencesUrl = 'https://id.stg.internal.atlassian.com/manage-profile/link-preferences';
 export const productionLinkPreferencesUrl = 'https://id.atlassian.com/manage-profile/link-preferences';

package/dist/es2019/link/utils.js

@@ -1,4 +1,6 @@
-import { productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from './constants';
+import { getATLContextUrl } from '@atlaskit/atlassian-context';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { linkPreferencesPath, productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from './constants';
 export function isTextAtPos(pos) {
   return state => {
     const node = state.doc.nodeAt(pos);
@@ -12,6 +14,9 @@ export function isLinkAtPos(pos) {
   };
 }
 export const getLinkPreferencesURLFromENV = () => {
+  if (getBooleanFF('platform.editor.linking-preferences-url-atlassian-context')) {
+    return getATLContextUrl('id') + linkPreferencesPath;
+  }
   if (process.env.NODE_ENV === 'production' && process.env.CLOUD_ENV === 'staging') {
     // only a production CLOUD_ENV staging environment has a different link preferences URL
     return stagingLinkPreferencesUrl;

package/dist/es2019/media-single/CommentBadge.js

@@ -4,7 +4,7 @@ import { useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
-import { CustomThemeButton } from '@atlaskit/button';
+import CustomThemeButton from '@atlaskit/button/custom-theme-button';
 import { akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
 import { layers } from '@atlaskit/theme/constants';

package/dist/es2019/messages/annotation.js

@@ -5,11 +5,17 @@ export const annotationMessages = defineMessages({
     defaultMessage: 'Comment',
     description: 'Create/add an inline comment based on the users selection'
   },
+  // TODO: Remove this message when the platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz FF is removed
   createCommentInvalid: {
     id: 'fabric.editor.createCommentInvalid',
     defaultMessage: 'You can only comment on text and headings',
     description: 'Error message to communicate to the user they can only do the current action in certain contexts'
   },
+  createCommentDisabled: {
+    id: 'fabric.editor.createCommentDisabled',
+    defaultMessage: 'You can only comment on text, headings, emojis, dates, mentions, links, and statuses.',
+    description: 'Error message to communicate to the user they can only do the current action in certain contexts'
+  },
   toolbar: {
     id: 'fabric.editor.annotationToolbar',
     defaultMessage: 'Annotation toolbar',

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.4.3";
+const packageVersion = "83.5.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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.4.3";
+const packageVersion = "83.5.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/ui-menu/ColorPickerButton/index.js

@@ -4,7 +4,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
-import Button from '@atlaskit/button';
+import Button from '@atlaskit/button/standard-button';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
@@ -201,7 +201,9 @@ const ColorPickerButton = props => {
         togglePopup();
         setIsOpenedByKeyboard(true);
       }
-    },
+    }
+    // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
+    ,
     css: buttonStyle,
     iconAfter: jsx("span", {
       css: colorPickerExpandContainer

package/dist/es2019/ui-menu/ToolbarButton/styles.js

@@ -5,10 +5,11 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import Button from '@atlaskit/button/standard-button';
 export default /*#__PURE__*/React.forwardRef((props, ref) => {
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
   return /*#__PURE__*/React.createElement(Button, _extends({
     ref: ref
   }, props, {
+    // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     style: {
       alignItems: 'center'
     }

package/dist/esm/card/LinkToolbarButtonGroup.js

@@ -5,7 +5,7 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { ButtonGroup } from '@atlaskit/button';
+import ButtonGroup from '@atlaskit/button/button-group';
 import { FloatingToolbarButton as Button } from '../ui';
 
 /**

package/dist/esm/element-browser/components/ElementList/EmptyState.js

@@ -2,7 +2,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import Button from '@atlaskit/button';
+import { LinkButton } from '@atlaskit/button/new';
 import { Box, xcss } from '@atlaskit/primitives';
 import NotFoundIllustration from './NotFoundIllustration';
 export default function EmptyState(_ref) {
@@ -24,7 +24,7 @@ export default function EmptyState(_ref) {
     description: "Empty state sub-heading"
   })), jsx(Box, {
     xcss: externalLinkWrapper
-  }, jsx(Button, {
+  }, jsx(LinkButton, {
     appearance: "primary",
     target: "_blank",
     href: "https://marketplace.atlassian.com/search?category=Macros&hosting=cloud&product=confluence",

package/dist/esm/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -39,20 +39,38 @@ var sharedLabelStyles = css({
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.inline': {
-    marginLeft: "var(--ds-space-150, 12px)",
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
     top: '-18px'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-background': {
+    background: "var(--ds-surface, ".concat(N0, ")")
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.bodied-border': {
+    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(N30, ")"))
   }
 });
 var buttonLabelStyles = css({
+  // Need this exact number since this is size with icon
+  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+  minHeight: '26px',
   alignItems: 'center',
   borderRadius: "var(--ds-border-radius, 3px)",
   paddingLeft: "var(--ds-space-050, 4px)",
   paddingRight: "var(--ds-space-050, 4px)",
   color: "var(--ds-text-subtle, ".concat(N800, ")"),
-  backgroundColor: "var(--ds-background-accent-gray-subtlest, ".concat(N30, ")")
+  backgroundColor: "var(--ds-background-accent-gray-subtlest, ".concat(N30, ")"),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.remove-left-margin': {
+    marginLeft: "var(--ds-space-negative-150, -12px)"
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '&.remove-nested-left-margin': {
+    marginLeft: 0
+  }
 });
-var placeholderStyles = css({
+var spacerStyles = css({
   height: "var(--ds-space-150, 12px)"
 });
 var textStyles = css({
@@ -61,19 +79,22 @@ var textStyles = css({
   padding: "var(--ds-space-025, 2px)".concat(" ", "var(--ds-space-050, 4px)")
 });
 var originalLabelStyles = css({
+  background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(N40, ")"),
   borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.show-label': {
-    background: "var(--ds-background-accent-gray-subtle-pressed, ".concat(N40, ")"),
     color: "var(--ds-text-subtle, ".concat(N500, ")")
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-background': {
-    background: "var(--ds-surface, ".concat(N0, ")")
-  },
+  '&.inline': {
+    // need to add margin since we don't get it for free like block ones via the padding to make it flush with editor elements
+    marginLeft: "var(--ds-space-150, 12px)"
+  }
+});
+var iconStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-  '&.bodied-border': {
-    boxShadow: "0 0 0 1px ".concat("var(--ds-border, ".concat(N30, ")"))
+  '&.hide-icon': {
+    display: 'none'
   }
 });
 var i18n = defineMessages({
@@ -94,17 +115,26 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
     showMacroButtonUpdates = _ref.showMacroButtonUpdates;
   var intl = useIntl();
   var tooltipText = "".concat(intl.formatMessage(i18n.configure), " ").concat(text);
+  var isInlineExtension = extensionName === 'inlineExtension';
   var containerClassNames = classnames({
     bodied: isBodiedMacro
   });
-  var labelClassNames = classnames('extension-label', {
+  var sharedLabelClassNames = classnames('extension-label', {
     nested: isNodeNested,
-    inline: extensionName === 'inlineExtension',
+    inline: isInlineExtension,
     bodied: isBodiedMacro,
-    'bodied-border': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
-    'bodied-background': isBodiedMacro && !isNodeHovered && !showMacroButtonUpdates,
+    'bodied-border': isBodiedMacro && !isNodeHovered,
+    'bodied-background': isBodiedMacro && !isNodeHovered,
     'show-label': isNodeHovered || isBodiedMacro
   });
+  var newButtonLabelClassNames = classnames({
+    // For new button design, non-bodied macros should have a flush label. Inline macros don't need this since they never had the margin-left applied.
+    'remove-left-margin': !isBodiedMacro && !isInlineExtension && !isNodeNested,
+    'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
+  });
+  var iconClassNames = classnames({
+    'hide-icon': isBodiedMacro && !isNodeHovered
+  });
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     css: containerStyles
@@ -131,19 +161,22 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
       css: [sharedLabelStyles, buttonLabelStyles]
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
-      className: labelClassNames
-    }), text, " ", jsx(PreferencesIcon, {
+      className: "".concat(sharedLabelClassNames, " ").concat(newButtonLabelClassNames)
+    }), text, jsx("span", {
+      css: iconStyles,
+      className: iconClassNames,
+      "data-testid": "config-icon"
+    }, jsx(PreferencesIcon, {
       label: ""
-    }));
+    })));
   }), jsx("div", {
-    "data-testid": "placeholder",
-    css: placeholderStyles
+    css: spacerStyles
   })) : jsx("span", {
     "data-testid": "new-lozenge",
     css: [sharedLabelStyles, originalLabelStyles]
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: labelClassNames
+    className: sharedLabelClassNames
   }, jsx("span", {
     css: textStyles
   }, text)));

package/dist/esm/link/constants.js

@@ -1,2 +1,3 @@
+export var linkPreferencesPath = '/manage-profile/link-preferences';
 export var stagingLinkPreferencesUrl = 'https://id.stg.internal.atlassian.com/manage-profile/link-preferences';
 export var productionLinkPreferencesUrl = 'https://id.atlassian.com/manage-profile/link-preferences';

package/dist/esm/link/utils.js

@@ -1,4 +1,6 @@
-import { productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from './constants';
+import { getATLContextUrl } from '@atlaskit/atlassian-context';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { linkPreferencesPath, productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from './constants';
 export function isTextAtPos(pos) {
   return function (state) {
     var node = state.doc.nodeAt(pos);
@@ -12,6 +14,9 @@ export function isLinkAtPos(pos) {
   };
 }
 export var getLinkPreferencesURLFromENV = function getLinkPreferencesURLFromENV() {
+  if (getBooleanFF('platform.editor.linking-preferences-url-atlassian-context')) {
+    return getATLContextUrl('id') + linkPreferencesPath;
+  }
   if (process.env.NODE_ENV === 'production' && process.env.CLOUD_ENV === 'staging') {
     // only a production CLOUD_ENV staging environment has a different link preferences URL
     return stagingLinkPreferencesUrl;

package/dist/esm/media-single/CommentBadge.js

@@ -5,7 +5,7 @@ import { useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
-import { CustomThemeButton } from '@atlaskit/button';
+import CustomThemeButton from '@atlaskit/button/custom-theme-button';
 import { akEditorUnitZIndex } from '@atlaskit/editor-shared-styles';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
 import { layers } from '@atlaskit/theme/constants';

package/dist/esm/messages/annotation.js

@@ -5,11 +5,17 @@ export var annotationMessages = defineMessages({
     defaultMessage: 'Comment',
     description: 'Create/add an inline comment based on the users selection'
   },
+  // TODO: Remove this message when the platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz FF is removed
   createCommentInvalid: {
     id: 'fabric.editor.createCommentInvalid',
     defaultMessage: 'You can only comment on text and headings',
     description: 'Error message to communicate to the user they can only do the current action in certain contexts'
   },
+  createCommentDisabled: {
+    id: 'fabric.editor.createCommentDisabled',
+    defaultMessage: 'You can only comment on text, headings, emojis, dates, mentions, links, and statuses.',
+    description: 'Error message to communicate to the user they can only do the current action in certain contexts'
+  },
   toolbar: {
     id: 'fabric.editor.annotationToolbar',
     defaultMessage: 'Annotation toolbar',

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.4.3";
+var packageVersion = "83.5.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/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.4.3";
+var packageVersion = "83.5.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/ui-menu/ColorPickerButton/index.js

@@ -5,7 +5,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
-import Button from '@atlaskit/button';
+import Button from '@atlaskit/button/standard-button';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
@@ -214,7 +214,9 @@ var ColorPickerButton = function ColorPickerButton(props) {
         togglePopup();
         setIsOpenedByKeyboard(true);
       }
-    },
+    }
+    // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
+    ,
     css: buttonStyle,
     iconAfter: jsx("span", {
       css: colorPickerExpandContainer

package/dist/esm/ui-menu/ToolbarButton/styles.js

@@ -5,10 +5,11 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import Button from '@atlaskit/button/standard-button';
 export default /*#__PURE__*/React.forwardRef(function (props, ref) {
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
   return /*#__PURE__*/React.createElement(Button, _extends({
     ref: ref
   }, props, {
+    // TODO: (from codemod) Buttons with "component", "css" or "style" prop can't be automatically migrated with codemods. Please migrate it manually.
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     style: {
       alignItems: 'center'
     }

package/dist/types/link/constants.d.ts

@@ -1,2 +1,3 @@
+export declare const linkPreferencesPath = "/manage-profile/link-preferences";
 export declare const stagingLinkPreferencesUrl = "https://id.stg.internal.atlassian.com/manage-profile/link-preferences";
 export declare const productionLinkPreferencesUrl = "https://id.atlassian.com/manage-profile/link-preferences";

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

@@ -1,5 +1,4 @@
 import type { Predicate } from '../types';
-import { productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from './constants';
 export declare function isTextAtPos(pos: number): Predicate;
 export declare function isLinkAtPos(pos: number): Predicate;
-export declare const getLinkPreferencesURLFromENV: () => typeof productionLinkPreferencesUrl | typeof stagingLinkPreferencesUrl;
+export declare const getLinkPreferencesURLFromENV: () => string;

package/dist/types/messages/annotation.d.ts

@@ -9,6 +9,11 @@ export declare const annotationMessages: {
         defaultMessage: string;
         description: string;
     };
+    createCommentDisabled: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     toolbar: {
         id: string;
         defaultMessage: string;

package/dist/types-ts4.5/link/constants.d.ts

@@ -1,2 +1,3 @@
+export declare const linkPreferencesPath = "/manage-profile/link-preferences";
 export declare const stagingLinkPreferencesUrl = "https://id.stg.internal.atlassian.com/manage-profile/link-preferences";
 export declare const productionLinkPreferencesUrl = "https://id.atlassian.com/manage-profile/link-preferences";

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

@@ -1,5 +1,4 @@
 import type { Predicate } from '../types';
-import { productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from './constants';
 export declare function isTextAtPos(pos: number): Predicate;
 export declare function isLinkAtPos(pos: number): Predicate;
-export declare const getLinkPreferencesURLFromENV: () => typeof productionLinkPreferencesUrl | typeof stagingLinkPreferencesUrl;
+export declare const getLinkPreferencesURLFromENV: () => string;

package/dist/types-ts4.5/messages/annotation.d.ts

@@ -9,6 +9,11 @@ export declare const annotationMessages: {
         defaultMessage: string;
         description: string;
     };
+    createCommentDisabled: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     toolbar: {
         id: string;
         defaultMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "83.4.3",
+	"version": "83.5.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -96,12 +96,13 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.4.0",
-		"@atlaskit/adf-schema": "^38.0.0",
+		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/adf-utils": "^19.4.0",
 		"@atlaskit/analytics-listeners": "^8.10.0",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
+		"@atlaskit/atlassian-context": "^0.0.0",
 		"@atlaskit/button": "^18.0.0",
 		"@atlaskit/code": "^15.3.0",
 		"@atlaskit/codemod-utils": "^4.2.0",
@@ -123,7 +124,7 @@
 		"@atlaskit/media-file-preview": "^0.5.0",
 		"@atlaskit/media-picker": "^66.4.0",
 		"@atlaskit/media-ui": "^25.10.0",
-		"@atlaskit/media-viewer": "48.6.9",
+		"@atlaskit/media-viewer": "48.6.10",
 		"@atlaskit/mention": "^23.2.0",
 		"@atlaskit/menu": "^2.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
@@ -271,6 +272,9 @@
 		},
 		"platform.editor.review-text-highlighting-styling": {
 			"type": "boolean"
+		},
+		"platform.editor.linking-preferences-url-atlassian-context": {
+			"type": "boolean"
 		}
 	}
 }