@atlaskit/editor-core 215.1.5 → 215.2.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-core
 
+## 215.2.0
+
+### Minor Changes
+
+- [`0560b4dfd1361`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0560b4dfd1361) -
+  Experiment with disabling prosemirror rendering in SSR
+
+### Patch Changes
+
+- [`e22968790f2b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e22968790f2b5) -
+  [ux] [EDITOR-2374] prevent style overrides on codemarks in excerpts
+- Updated dependencies
+
+## 215.1.6
+
+### Patch Changes
+
+- [`8a6477def0c7d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8a6477def0c7d) -
+  [ux] clean up platform_editor_a11y_macro_sidebar_dialog
+- [`1c601de07087b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1c601de07087b) -
+  Fix for CLS issue in Editor Resizer Component
+- [`5c07f0d4e428f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c07f0d4e428f) -
+  [EDITOR-1998] Make media captions follow dense/ compact content mode
+- Updated dependencies
+
 ## 215.1.5
 
 ### Patch Changes
@@ -8891,9 +8916,7 @@
   -
   50. Another list item
 
-  Should NOT auto join to be 1 & 2 in a single list however...
-  49. A list item
-  -
+  ## Should NOT auto join to be 1 & 2 in a single list however... 49. A list item
   50. Another list item
 
   Should join to be 49 & 50 in a single list.
@@ -25789,9 +25812,7 @@ Remove applicationCard node and action mark
 
 ## 112.2.10
 
-- [patch][051800806c](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/051800806c):
-  -
-
+- ## [patch][051800806c](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/051800806c):
   - MediaPicker Clipboard component is now a React Component
 
   These changes provide a new React api for Clipboard component. First one to be delivered, coming

package/dist/cjs/create-editor/ReactEditorView.js

@@ -14,6 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _eventDispatcher = require("@atlaskit/editor-common/event-dispatcher");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _nodeVisibility = require("@atlaskit/editor-common/node-visibility");
@@ -30,6 +31,7 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _interactionMetrics = require("@atlaskit/react-ufo/interaction-metrics");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _useProviders = require("../composable-editor/hooks/useProviders");
 var _featureFlagsFromProps = require("../utils/feature-flags-from-props");
 var _getNodesCount = require("../utils/getNodesCount");
@@ -552,7 +554,11 @@ function ReactEditorView(props) {
     };
   }, []);
   var handleEditorViewRef = (0, _react.useCallback)(function (node) {
+    if ((0, _coreUtils.isSSR)() && (0, _expVal.expVal)('platform_editor_no_ssr', 'isEnabled', false)) {
+      return;
+    }
     if (node) {
+      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       var cleanupListeners = function cleanupListeners() {
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -195,7 +195,10 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined
+    disabled: patch6Enabled ? !!disabled : undefined,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

package/dist/cjs/ui/Appearance/Comment/CommentToolbar.js

@@ -17,7 +17,10 @@ var CommentToolbar = exports.CommentToolbar = function CommentToolbar(_ref) {
   var editorAPI = _ref.editorAPI,
     editorView = _ref.editorView,
     editorAppearance = _ref.editorAppearance,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement;
   var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
   var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
     return component.key === _toolbar.TOOLBARS.PRIMARY_TOOLBAR;
@@ -31,6 +34,9 @@ var CommentToolbar = exports.CommentToolbar = function CommentToolbar(_ref) {
     editorView: editorView,
     editorAPI: editorAPI,
     editorAppearance: editorAppearance,
-    isDisabled: disabled
+    isDisabled: disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   });
 };

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

@@ -145,8 +145,6 @@ var SwappableContentAreaInner = /*#__PURE__*/function (_React$PureComponent) {
         width: "".concat(this.props.customWidth, "px"),
         overflowX: 'hidden'
       });
-      var ariaModal = (0, _platformFeatureFlags.fg)('platform_editor_a11y_macro_sidebar_dialog') ? 'false' : undefined;
-      var ariaLabelledBy = (0, _platformFeatureFlags.fg)('platform_editor_a11y_macro_sidebar_dialog') ? undefined : 'context-panel-title';
       return (0, _react2.jsx)(_contextPanel.ContextPanelConsumer, null, function (_ref) {
         var _this2$props$intl;
         var broadcastWidth = _ref.broadcastWidth;
@@ -158,8 +156,7 @@ var SwappableContentAreaInner = /*#__PURE__*/function (_React$PureComponent) {
           _this2.props.customWidth && customPanelWidthStyles, !visible && panelHidden, (0, _platformFeatureFlags.fg)('platform_editor_disable_context_panel_animation') && disablePanelAnimation],
           "data-testid": "context-panel-panel",
           "aria-label": ((_this2$props$intl = _this2.props.intl) === null || _this2$props$intl === void 0 ? void 0 : _this2$props$intl.formatMessage(_messages.contextPanelMessages.panelLabel)) || '',
-          "aria-labelledby": ariaLabelledBy,
-          "aria-modal": ariaModal,
+          "aria-modal": "false",
           role: "dialog"
         }, (0, _react2.jsx)("div", {
           "data-testid": "context-panel-content",

package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js

@@ -140,9 +140,13 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     '--ak-editor--large-gutter-padding': "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
   };
   var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
+  var allClassNames = [className];
+  if ((0, _expVal.expVal)('platform_editor_resizer_cls_fix', 'isEnabled', false)) {
+    allClassNames.push('resizer-hover-zone-cls-fix');
+  }
   return (0, _react2.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: className,
+    className: allClassNames.join(' '),
     ref: ref,
     css: [
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -216,7 +220,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     (0, _platformFeatureFlags.fg)('aifc_create_enabled') && _smartCardStyles.smartCardDiffStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _mediaStyles.mediaStyles,
+    _mediaStyles.mediaStyles, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _mediaStyles.mediaCaptionStyles,
     // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
     (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/extensionStyles.js

@@ -368,13 +368,12 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
     }
   });
 
-  // Dense content mode TOC styling fix - addresses EDITOR-1992
+  // Dense content mode extensions styling fix - addresses EDITOR-1992
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   var fontSize = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _editorSharedStyles.relativeFontSizeToBase16)(_editorSharedStyles.akEditorFullPageDenseFontSize) : undefined;
-  // Fixes issue where TOC links fall back to default DST styles
-  var denseContentModeTocStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
+  var denseExtensionStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '.extension-container :not([data-inline-card-lozenge] *)': {
+    '.extension-container :not([data-inline-card-lozenge] *, [data-prosemirror-mark-name="code"])': {
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       fontSize: 'var(--ak-editor-base-font-size)'
     }
@@ -387,5 +386,5 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
   }) : (0, _react.css)({});
 
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  return (0, _react.css)(baseExtensionStyles, denseContentModeTocStyles);
+  return (0, _react.css)(baseExtensionStyles, denseExtensionStyles);
 };

package/dist/cjs/ui/EditorContentContainer/styles/mediaStyles.js

@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mediaStyles = exports.mediaGroupStyles = exports.mediaDangerStyles = exports.mediaAlignmentStyles = void 0;
+exports.mediaStyles = exports.mediaGroupStyles = exports.mediaDangerStyles = exports.mediaCaptionStyles = exports.mediaAlignmentStyles = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _mediaInline = require("@atlaskit/editor-common/media-inline");
+var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _mediaCard = require("@atlaskit/media-card");
@@ -277,4 +278,14 @@ var mediaAlignmentStyles = exports.mediaAlignmentStyles = (0, _react.css)({
       }
     }
   }
+});
+
+// When cleaning up platform_editor_content_mode_button_mvp, move this style into mediaStyles variable ⬆️
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var mediaCaptionStyles = exports.mediaCaptionStyles = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.mediaSingleView-content-wrap': (0, _defineProperty2.default)({}, "span#".concat(_mediaSingle.CAPTION_PLACEHOLDER_ID), {
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
+    fontSize: 'var(--ak-editor-base-font-size)'
+  })
 });

package/dist/cjs/ui/EditorContentContainer/styles/resizerStyles.js

@@ -21,7 +21,7 @@ var resizerHandleThumbWidth = exports.resizerHandleThumbWidth = 3;
 var handleWrapperClass = exports.handleWrapperClass = 'resizer-handle-wrapper';
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766, Seems perfectly safe to autofix, but comments would be lost…
-var resizerStyles = exports.resizerStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(resizerItemClassName), (0, _defineProperty2.default)({
+var resizerStyles = exports.resizerStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(resizerItemClassName), (0, _defineProperty2.default)({
   willChange: 'width',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '&:hover, &.display-handle': (0, _defineProperty2.default)({}, "& > .".concat(handleWrapperClass, " > .").concat(resizerHandleClassName), {
@@ -152,6 +152,8 @@ var resizerStyles = exports.resizerStyles = (0, _react.css)((0, _defineProperty2
   background: "var(--ds-border-focused, #388BFF)"
 })), ".ak-editor-no-interaction .ak-editor-selected-node .".concat(resizerHandleClassName, ":not(:hover) .").concat(resizerHandleThumbClassName), {
   background: "var(--ds-border, #091E4224)"
+}), "&.resizer-hover-zone-cls-fix .".concat(resizerHoverZoneClassName), {
+  display: 'flow-root'
 }), ".".concat(resizerHoverZoneClassName), (0, _defineProperty2.default)({
   position: 'relative',
   display: 'inline-block',

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "215.1.4";
+var version = exports.version = "215.1.6";

package/dist/es2019/create-editor/ReactEditorView.js

@@ -2,6 +2,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from '
 import { injectIntl } from 'react-intl-next';
 import uuid from 'uuid/v4';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent, PLATFORMS } from '@atlaskit/editor-common/analytics';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { createDispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { useConstructor, usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeVisibilityManager } from '@atlaskit/editor-common/node-visibility';
@@ -18,6 +19,7 @@ import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useProviders } from '../composable-editor/hooks/useProviders';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
 import { getNodesCount } from '../utils/getNodesCount';
@@ -509,7 +511,11 @@ export function ReactEditorView(props) {
     };
   }, []);
   const handleEditorViewRef = useCallback(node => {
+    if (isSSR() && expVal('platform_editor_no_ssr', 'isEnabled', false)) {
+      return;
+    }
     if (node) {
+      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       const cleanupListeners = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -183,7 +183,10 @@ export const CommentEditorWithIntl = props => {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined
+    disabled: patch6Enabled ? !!disabled : undefined,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

package/dist/es2019/ui/Appearance/Comment/CommentToolbar.js

@@ -9,7 +9,10 @@ export const CommentToolbar = ({
   editorAPI,
   editorView,
   editorAppearance,
-  disabled
+  disabled,
+  popupsBoundariesElement,
+  popupsMountPoint,
+  popupsScrollableElement
 }) => {
   var _editorAPI$toolbar;
   const components = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
@@ -23,6 +26,9 @@ export const CommentToolbar = ({
     editorView: editorView,
     editorAPI: editorAPI,
     editorAppearance: editorAppearance,
-    isDisabled: disabled
+    isDisabled: disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   });
 };

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

@@ -132,8 +132,6 @@ class SwappableContentAreaInner extends React.PureComponent {
       width: `${this.props.customWidth}px`,
       overflowX: 'hidden'
     });
-    const ariaModal = fg('platform_editor_a11y_macro_sidebar_dialog') ? 'false' : undefined;
-    const ariaLabelledBy = fg('platform_editor_a11y_macro_sidebar_dialog') ? undefined : 'context-panel-title';
     return jsx(ContextPanelConsumer, null, ({
       broadcastWidth
     }) => {
@@ -146,8 +144,7 @@ class SwappableContentAreaInner extends React.PureComponent {
         this.props.customWidth && customPanelWidthStyles, !visible && panelHidden, fg('platform_editor_disable_context_panel_animation') && disablePanelAnimation],
         "data-testid": "context-panel-panel",
         "aria-label": ((_this$props$intl = this.props.intl) === null || _this$props$intl === void 0 ? void 0 : _this$props$intl.formatMessage(contextPanelMessages.panelLabel)) || '',
-        "aria-labelledby": ariaLabelledBy,
-        "aria-modal": ariaModal,
+        "aria-modal": "false",
         role: "dialog"
       }, jsx("div", {
         "data-testid": "context-panel-content",

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -14,7 +14,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
+import { expVal, expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useThemeObserver } from '@atlaskit/tokens';
 import { getBaseFontSize } from '../../composable-editor/utils/getBaseFontSize';
 import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
@@ -45,7 +45,7 @@ import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles'
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
 import { listsStyles, listsStylesSafariFix } from './styles/list';
-import { mediaAlignmentStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
+import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsStylesMixin_platform_editor_centre_mention_padding, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
 import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
@@ -136,9 +136,13 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     '--ak-editor--large-gutter-padding': `${akEditorGutterPaddingDynamic()}px`
   };
   const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  const allClassNames = [className];
+  if (expVal('platform_editor_resizer_cls_fix', 'isEnabled', false)) {
+    allClassNames.push('resizer-hover-zone-cls-fix');
+  }
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: className,
+    className: allClassNames.join(' '),
     ref: ref,
     css: [
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -212,7 +216,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('aifc_create_enabled') && smartCardDiffStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    mediaStyles,
+    mediaStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    mediaCaptionStyles,
     // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
     fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/extensionStyles.js

@@ -362,13 +362,12 @@ export const getExtensionStyles = () => {
     }
   });
 
-  // Dense content mode TOC styling fix - addresses EDITOR-1992
+  // Dense content mode extensions styling fix - addresses EDITOR-1992
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   const fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
-  // Fixes issue where TOC links fall back to default DST styles
-  const denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
+  const denseExtensionStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '.extension-container :not([data-inline-card-lozenge] *)': {
+    '.extension-container :not([data-inline-card-lozenge] *, [data-prosemirror-mark-name="code"])': {
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       fontSize: 'var(--ak-editor-base-font-size)'
     }
@@ -381,5 +380,5 @@ export const getExtensionStyles = () => {
   }) : css({});
 
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  return css(baseExtensionStyles, denseContentModeTocStyles);
+  return css(baseExtensionStyles, denseExtensionStyles);
 };

package/dist/es2019/ui/EditorContentContainer/styles/mediaStyles.js

@@ -1,6 +1,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 import { INLINE_IMAGE_WRAPPER_CLASS_NAME } from '@atlaskit/editor-common/media-inline';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 import { MediaSharedClassNames, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { akEditorMediaResizeHandlerPadding, akEditorMediaResizeHandlerPaddingWide, akEditorSelectedBorderBoldSize, akEditorSelectedBoxShadow, akEditorSelectedNodeClassName, akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
 import { fileCardImageViewSelector, inlinePlayerClassName, newFileExperienceClassName } from '@atlaskit/media-card';
@@ -414,4 +415,17 @@ export const mediaAlignmentStyles = css({
       }
     }
   }
+});
+
+// When cleaning up platform_editor_content_mode_button_mvp, move this style into mediaStyles variable ⬆️
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const mediaCaptionStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.mediaSingleView-content-wrap': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+    [`span#${CAPTION_PLACEHOLDER_ID}`]: {
+      // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
+      fontSize: 'var(--ak-editor-base-font-size)'
+    }
+  }
 });

package/dist/es2019/ui/EditorContentContainer/styles/resizerStyles.js

@@ -191,10 +191,16 @@ export const resizerStyles = css({
     background: "var(--ds-border, #091E4224)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+  [`&.resizer-hover-zone-cls-fix .${resizerHoverZoneClassName}`]: {
+    display: 'flow-root'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
   [`.${resizerHoverZoneClassName}`]: {
     position: 'relative',
     display: 'inline-block',
     width: '100%',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
+
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
     [`&.${resizerExtendedZone}`]: {
       padding: `0 ${"var(--ds-space-150, 12px)"}`,

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "215.1.4";
+export const version = "215.1.6";

package/dist/esm/create-editor/ReactEditorView.js

@@ -10,6 +10,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from '
 import { injectIntl } from 'react-intl-next';
 import uuid from 'uuid/v4';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent, PLATFORMS } from '@atlaskit/editor-common/analytics';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { createDispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { useConstructor, usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeVisibilityManager } from '@atlaskit/editor-common/node-visibility';
@@ -26,6 +27,7 @@ import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useProviders } from '../composable-editor/hooks/useProviders';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
 import { getNodesCount } from '../utils/getNodesCount';
@@ -542,7 +544,11 @@ export function ReactEditorView(props) {
     };
   }, []);
   var handleEditorViewRef = useCallback(function (node) {
+    if (isSSR() && expVal('platform_editor_no_ssr', 'isEnabled', false)) {
+      return;
+    }
     if (node) {
+      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       var cleanupListeners = function cleanupListeners() {
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/esm/ui/Appearance/Comment/Comment.js

@@ -184,7 +184,10 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined
+    disabled: patch6Enabled ? !!disabled : undefined,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

package/dist/esm/ui/Appearance/Comment/CommentToolbar.js

@@ -10,7 +10,10 @@ export var CommentToolbar = function CommentToolbar(_ref) {
   var editorAPI = _ref.editorAPI,
     editorView = _ref.editorView,
     editorAppearance = _ref.editorAppearance,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement;
   var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
   var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
     return component.key === TOOLBARS.PRIMARY_TOOLBAR;
@@ -24,6 +27,9 @@ export var CommentToolbar = function CommentToolbar(_ref) {
     editorView: editorView,
     editorAPI: editorAPI,
     editorAppearance: editorAppearance,
-    isDisabled: disabled
+    isDisabled: disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   });
 };

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

@@ -140,8 +140,6 @@ var SwappableContentAreaInner = /*#__PURE__*/function (_React$PureComponent) {
         width: "".concat(this.props.customWidth, "px"),
         overflowX: 'hidden'
       });
-      var ariaModal = fg('platform_editor_a11y_macro_sidebar_dialog') ? 'false' : undefined;
-      var ariaLabelledBy = fg('platform_editor_a11y_macro_sidebar_dialog') ? undefined : 'context-panel-title';
       return jsx(ContextPanelConsumer, null, function (_ref) {
         var _this2$props$intl;
         var broadcastWidth = _ref.broadcastWidth;
@@ -153,8 +151,7 @@ var SwappableContentAreaInner = /*#__PURE__*/function (_React$PureComponent) {
           _this2.props.customWidth && customPanelWidthStyles, !visible && panelHidden, fg('platform_editor_disable_context_panel_animation') && disablePanelAnimation],
           "data-testid": "context-panel-panel",
           "aria-label": ((_this2$props$intl = _this2.props.intl) === null || _this2$props$intl === void 0 ? void 0 : _this2$props$intl.formatMessage(contextPanelMessages.panelLabel)) || '',
-          "aria-labelledby": ariaLabelledBy,
-          "aria-modal": ariaModal,
+          "aria-modal": "false",
           role: "dialog"
         }, jsx("div", {
           "data-testid": "context-panel-content",

package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js

@@ -15,7 +15,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
+import { expVal, expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useThemeObserver } from '@atlaskit/tokens';
 import { getBaseFontSize } from '../../composable-editor/utils/getBaseFontSize';
 import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
@@ -46,7 +46,7 @@ import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles'
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
 import { listsStyles, listsStylesSafariFix } from './styles/list';
-import { mediaAlignmentStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
+import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsStylesMixin_platform_editor_centre_mention_padding, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
 import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
@@ -132,9 +132,13 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     '--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingDynamic(), "px")
   };
   var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  var allClassNames = [className];
+  if (expVal('platform_editor_resizer_cls_fix', 'isEnabled', false)) {
+    allClassNames.push('resizer-hover-zone-cls-fix');
+  }
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: className,
+    className: allClassNames.join(' '),
     ref: ref,
     css: [
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -208,7 +212,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('aifc_create_enabled') && smartCardDiffStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    mediaStyles,
+    mediaStyles, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    mediaCaptionStyles,
     // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
     fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/extensionStyles.js

@@ -362,13 +362,12 @@ export var getExtensionStyles = function getExtensionStyles() {
     }
   });
 
-  // Dense content mode TOC styling fix - addresses EDITOR-1992
+  // Dense content mode extensions styling fix - addresses EDITOR-1992
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   var fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
-  // Fixes issue where TOC links fall back to default DST styles
-  var denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
+  var denseExtensionStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '.extension-container :not([data-inline-card-lozenge] *)': {
+    '.extension-container :not([data-inline-card-lozenge] *, [data-prosemirror-mark-name="code"])': {
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       fontSize: 'var(--ak-editor-base-font-size)'
     }
@@ -381,5 +380,5 @@ export var getExtensionStyles = function getExtensionStyles() {
   }) : css({});
 
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  return css(baseExtensionStyles, denseContentModeTocStyles);
+  return css(baseExtensionStyles, denseExtensionStyles);
 };

package/dist/esm/ui/EditorContentContainer/styles/mediaStyles.js

@@ -3,6 +3,7 @@ var _ProseMirror, _css;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
 import { INLINE_IMAGE_WRAPPER_CLASS_NAME } from '@atlaskit/editor-common/media-inline';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 import { MediaSharedClassNames, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { akEditorMediaResizeHandlerPadding, akEditorMediaResizeHandlerPaddingWide, akEditorSelectedBorderBoldSize, akEditorSelectedBoxShadow, akEditorSelectedNodeClassName, akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
 import { fileCardImageViewSelector, inlinePlayerClassName, newFileExperienceClassName } from '@atlaskit/media-card';
@@ -271,4 +272,14 @@ export var mediaAlignmentStyles = css({
       }
     }
   }
+});
+
+// When cleaning up platform_editor_content_mode_button_mvp, move this style into mediaStyles variable ⬆️
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var mediaCaptionStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.mediaSingleView-content-wrap': _defineProperty({}, "span#".concat(CAPTION_PLACEHOLDER_ID), {
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
+    fontSize: 'var(--ak-editor-base-font-size)'
+  })
 });

package/dist/esm/ui/EditorContentContainer/styles/resizerStyles.js

@@ -13,7 +13,7 @@ export var resizerHandleThumbWidth = 3;
 export var handleWrapperClass = 'resizer-handle-wrapper';
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766, Seems perfectly safe to autofix, but comments would be lost…
-export var resizerStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(resizerItemClassName), _defineProperty({
+export var resizerStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(resizerItemClassName), _defineProperty({
   willChange: 'width',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '&:hover, &.display-handle': _defineProperty({}, "& > .".concat(handleWrapperClass, " > .").concat(resizerHandleClassName), {
@@ -144,6 +144,8 @@ export var resizerStyles = css(_defineProperty(_defineProperty(_defineProperty(_
   background: "var(--ds-border-focused, #388BFF)"
 })), ".ak-editor-no-interaction .ak-editor-selected-node .".concat(resizerHandleClassName, ":not(:hover) .").concat(resizerHandleThumbClassName), {
   background: "var(--ds-border, #091E4224)"
+}), "&.resizer-hover-zone-cls-fix .".concat(resizerHoverZoneClassName), {
+  display: 'flow-root'
 }), ".".concat(resizerHoverZoneClassName), _defineProperty({
   position: 'relative',
   display: 'inline-block',

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "215.1.4";
+export var version = "215.1.6";

package/dist/types/ui/Appearance/Comment/CommentToolbar.d.ts

@@ -8,9 +8,12 @@ type CommentToolbarProps = {
     editorAPI?: PublicPluginAPI<ToolbarEditorPlugins>;
     editorAppearance: EditorAppearance;
     editorView?: EditorView;
+    popupsBoundariesElement?: HTMLElement;
+    popupsMountPoint?: HTMLElement;
+    popupsScrollableElement?: HTMLElement;
 };
 /**
  * Primary toolbar driven by components registered by `editor-plugin-toolbar`, introduced in `platform_editor_toolbar_aifc`.
  */
-export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, }: CommentToolbarProps) => React.JSX.Element | null;
+export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, }: CommentToolbarProps) => React.JSX.Element | null;
 export {};

package/dist/types/ui/EditorContentContainer/styles/mediaStyles.d.ts

@@ -3,3 +3,4 @@ export declare const mediaStyles: SerializedStyles;
 export declare const mediaDangerStyles: SerializedStyles;
 export declare const mediaGroupStyles: SerializedStyles;
 export declare const mediaAlignmentStyles: SerializedStyles;
+export declare const mediaCaptionStyles: SerializedStyles;

package/dist/types-ts4.5/ui/Appearance/Comment/CommentToolbar.d.ts

@@ -10,9 +10,12 @@ type CommentToolbarProps = {
     editorAPI?: PublicPluginAPI<ToolbarEditorPlugins>;
     editorAppearance: EditorAppearance;
     editorView?: EditorView;
+    popupsBoundariesElement?: HTMLElement;
+    popupsMountPoint?: HTMLElement;
+    popupsScrollableElement?: HTMLElement;
 };
 /**
  * Primary toolbar driven by components registered by `editor-plugin-toolbar`, introduced in `platform_editor_toolbar_aifc`.
  */
-export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, }: CommentToolbarProps) => React.JSX.Element | null;
+export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, }: CommentToolbarProps) => React.JSX.Element | null;
 export {};

package/dist/types-ts4.5/ui/EditorContentContainer/styles/mediaStyles.d.ts

@@ -3,3 +3,4 @@ export declare const mediaStyles: SerializedStyles;
 export declare const mediaDangerStyles: SerializedStyles;
 export declare const mediaGroupStyles: SerializedStyles;
 export declare const mediaAlignmentStyles: SerializedStyles;
+export declare const mediaCaptionStyles: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.1.5",
+	"version": "215.2.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -64,8 +64,8 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.12.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.11.0",
-		"@atlaskit/tokens": "^6.5.0",
+		"@atlaskit/tmp-editor-statsig": "^13.13.0",
+		"@atlaskit/tokens": "^7.0.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@atlaskit/width-detector": "^5.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -446,9 +446,6 @@
 		"platform_editor_resolve_hyperlinks_killswitch": {
 			"type": "boolean"
 		},
-		"platform_editor_a11y_macro_sidebar_dialog": {
-			"type": "boolean"
-		},
 		"platform_editor_blocktaskitem_patch_2": {
 			"type": "boolean",
 			"referenceOnly": true