@atlaskit/editor-core 208.3.5 → 208.4.0

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

@@ -10,6 +10,7 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPrimaryToolbarComponents } from '../../Toolbar/getPrimaryToolbarComponents';
@@ -148,7 +149,11 @@ export const FullPageEditor = props => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: "akEditor",
-    ref: wrapperElementRef
+    ref: wrapperElementRef,
+    style: {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+      '--ak-editor-fullpage-toolbar-height': FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()
+    }
   }, !isEditorToolbarHidden && jsx(FullPageToolbar, {
     appearance: props.appearance,
     editorAPI: editorAPI,

package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js

@@ -12,7 +12,7 @@ import { injectIntl } from 'react-intl-next';
 import { decisionListSelector, taskListSelector } from '@atlaskit/adf-schema';
 import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
 import { tableFullPageEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
-import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT as FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_OLD, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
@@ -34,8 +34,6 @@ const tableMarginFullWidthMode = 2;
 const akLayoutGutterOffset = 12;
 const SWOOP_ANIMATION = `0.5s ${akEditorSwoopCubicBezier}`;
 const AK_NESTED_DND_GUTTER_OFFSET = 8;
-const FULL_PAGE_EDITOR_TOOLBAR_HEIGHT = "var(--ds-space-500, 40px)";
-const FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE = '2.188rem';
 const getTotalPadding = () => akEditorGutterPaddingDynamic() * 2;
 
 // old styles - to be deleted when cleaning up experiment `platform_editor_core_static_emotion_non_central`
@@ -114,7 +112,7 @@ const editorContentArea = css({
     // When the toolbar is hidden, we don't want content to jump up
     // the extra 1px is to account for the border on the toolbar
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,  @atlaskit/ui-styling-standard/no-unsafe-values
-    paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_OLD()} + 1px)`
+    paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} + 1px)`
   },
   paddingBottom: "var(--ds-space-600, 48px)",
   height: 'calc( 100% - 105px )',
@@ -203,18 +201,6 @@ const editorContentGutterStyle = () => {
 };
 
 // new styles
-const editorContentAreaNoToolbarLivePageJumpMitigation = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-  '.ak-editor-content-area-no-toolbar &': {
-    paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE} + 1px)`
-  }
-});
-const editorContentAreaNoToolbarControls = css({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-  '.ak-editor-content-area-no-toolbar &': {
-    paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT} + 1px)`
-  }
-});
 const editorContentAreaNew = css({
   // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: '24px',
@@ -223,7 +209,7 @@ const editorContentAreaNew = css({
   '.ak-editor-content-area-no-toolbar &': {
     // When the toolbar is hidden, we don't want content to jump up
     // the extra 1px is to account for the border on the toolbar
-    paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT} + 1px)`
+    paddingTop: `calc(${"var(--ds-space-600, 48px)"} + var(--ak-editor-fullpage-toolbar-height) + 1px)`
   },
   paddingBottom: "var(--ds-space-600, 48px)",
   height: 'calc( 100% - 105px )',
@@ -313,7 +299,7 @@ const editorContentGutterStyles = css({
 const contentAreaNew = css({
   display: 'flex',
   flexDirection: 'row',
-  height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT})`,
+  height: `calc(100% - var(--ak-editor-fullpage-toolbar-height))`,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
   '&.ak-editor-content-area-no-toolbar': {
     // The editor toolbar height is 1px off (from the border) -- so we need to add 1px to the height
@@ -325,12 +311,6 @@ const contentAreaNew = css({
   padding: 0,
   transition: `padding 0ms ${akEditorSwoopCubicBezier}`
 });
-const contentAreaHeightLivePageJumpMitigation = css({
-  height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE})`
-});
-const contentAreaHeightControls = css({
-  height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT})`
-});
 const contentAreaHeightNoToolbar = css({
   height: '100%'
 });
@@ -383,9 +363,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
     return editorExperiment('platform_editor_controls', 'variant1');
   };
   return jsx("div", {
-    css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew, fg('live_pages_content_jump_mitigation') && contentAreaHeightLivePageJumpMitigation, editorExperiment('platform_editor_controls', 'variant1', {
-      exposure: true
-    }) && contentAreaHeightControls, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
+    css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     contentArea,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -411,9 +389,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
     editorView: props.editorView,
     editorDisabled: props.disabled
   }, jsx("div", {
-    css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fg('live_pages_content_jump_mitigation') && editorContentAreaNoToolbarLivePageJumpMitigation, editorExperiment('platform_editor_controls', 'variant1', {
-      exposure: true
-    }) && editorContentAreaNoToolbarControls, fg('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
+    css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fg('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
     // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
     expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace] : [
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766

package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js

@@ -15,7 +15,9 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ToolbarPortalMountPoint, useToolbarPortal } from '../../Toolbar/ToolbarPortal';
 import { ToolbarWithSizeDetector as Toolbar } from '../../Toolbar/ToolbarWithSizeDetector';
 import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
-import { customToolbarWrapperStyle, mainToolbarFirstChildStyle, mainToolbarIconBeforeStyle, mainToolbarSecondChildStyle, mainToolbarStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, nonCustomToolbarWrapperStyle } from './MainToolbar';
+import { MainToolbarForFirstChildWrapper, MainToolbarForSecondChildWrapper } from './CustomToolbarWrapper';
+import { customToolbarWrapperStyle, mainToolbarIconBeforeStyle, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, nonCustomToolbarWrapperStyle } from './MainToolbar';
+import { MainToolbarWrapper } from './MainToolbarWrapper';
 export const EditorToolbar = /*#__PURE__*/React.memo(props => {
   var _props$primaryToolbar, _useToolbarPortal, _props$customPrimaryT;
   const [shouldSplitToolbar, setShouldSplitToolbar] = useState(false);
@@ -118,18 +120,16 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
     isShortcutToFocusToolbar: isShortcutToFocusToolbar,
     handleEscape: handleEscape,
     intl: props.intl
-  }, jsx(ToolbarPortal, null, jsx("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    css: mainToolbarStyle(props.showKeyline || contextPanelWidth > 0, twoLineEditorToolbar),
+  }, jsx(ToolbarPortal, null, jsx(MainToolbarWrapper, {
+    showKeyline: props.showKeyline || contextPanelWidth > 0,
+    twoLineEditorToolbar: twoLineEditorToolbar,
     "data-testid": "ak-editor-main-toolbar"
-  }, jsx("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    css: mainToolbarFirstChildStyle(twoLineEditorToolbar),
+  }, jsx(MainToolbarForFirstChildWrapper, {
+    twoLineEditorToolbar: twoLineEditorToolbar,
     role: "toolbar",
     "aria-label": props.intl.formatMessage(messages.toolbarLabel)
-  }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx("div", {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    css: mainToolbarSecondChildStyle(twoLineEditorToolbar),
+  }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), jsx(MainToolbarForSecondChildWrapper, {
+    twoLineEditorToolbar: twoLineEditorToolbar,
     "data-testid": "avatar-group-outside-plugin",
     role: "region",
     "aria-label": props.intl.formatMessage(messages.pageActionsLabel)

package/dist/es2019/ui/Appearance/FullPage/MainToolbarWrapper.js

@@ -0,0 +1,92 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+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 { akEditorFloatingDialogZIndex, akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { mainToolbarStyle as mainToolbarStyleDynamic, MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT } from './MainToolbar';
+
+// Base styles that don't depend on feature flags
+const baseToolbarStyles = css({
+  position: 'relative',
+  alignItems: 'center',
+  boxShadow: 'none',
+  borderBottom: `1px solid ${"var(--ds-border, #091E4224)"}`,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
+  transition: `box-shadow 200ms ${akEditorSwoopCubicBezier}`,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  zIndex: akEditorFloatingDialogZIndex,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  display: 'flex',
+  height: 'var(--ak-editor-fullpage-toolbar-height)',
+  flexShrink: 0,
+  backgroundColor: "var(--ds-surface, #FFFFFF)",
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '& object': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+    height: '0 !important'
+  }
+});
+const flexibleIconSize = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '& span svg': {
+    maxWidth: '100%'
+  }
+});
+// box-shadow is overriden by the mainToolbar
+const mainToolbarWithKeyline = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  boxShadow: `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}`
+});
+const mainToolbarTwoLineStyle = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
+    flexWrap: 'wrap',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: `calc(var(--ak-editor-fullpage-toolbar-height) * 2)`
+  }
+});
+const MainToolbarWrapperNext = ({
+  showKeyline,
+  twoLineEditorToolbar,
+  children,
+  'data-testid': testId
+}) => {
+  return jsx("div", {
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    css: [baseToolbarStyles, fg('platform-visual-refresh-icons') && flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
+    "data-testid": testId
+  }, children);
+};
+
+/**
+ * Original version of the toolbar wrapper using dynamic styles
+ */
+const MainToolbarWrapperOld = ({
+  showKeyline,
+  twoLineEditorToolbar,
+  children,
+  'data-testid': testId
+}) => {
+  return jsx("div", {
+    css:
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
+    mainToolbarStyleDynamic(showKeyline, twoLineEditorToolbar),
+    "data-testid": testId
+  }, children);
+};
+
+/**
+ * Wrapper component for the main toolbar that handles feature flag based styling
+ * @example
+ * <MainToolbarWrapper showKeyline={true} twoLineEditorToolbar={false}>
+ *   <ToolbarContent />
+ * </MainToolbarWrapper>
+ */
+export const MainToolbarWrapper = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), MainToolbarWrapperNext, MainToolbarWrapperOld);

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

@@ -25,7 +25,7 @@ import { codeMarkStyles } from './styles/codeMarkStyles';
 import { commentEditorStyles } from './styles/commentEditorStyles';
 import { cursorStyles } from './styles/cursorStyles';
 import { dateStyles, dateVanillaStyles } from './styles/dateStyles';
-import { editorUGCTokensDefault, editorUGCTokensModernized, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
+import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
 import { embedCardStyles } from './styles/embedCardStyles';
 import { reactEmojiStyles, vanillaEmojiStyles } from './styles/emoji';
 import { expandStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
@@ -44,7 +44,7 @@ import { listsStyles, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
 import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles } from './styles/mentions';
 import { panelStyles, panelStylesMixin, panelStylesMixin_fg_platform_editor_add_border_for_nested_panel, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles } from './styles/panelStyles';
-import { paragraphStylesOld, paragraphStylesUGCModernized, paragraphStylesUGCRefreshed } from './styles/paragraphStyles';
+import { paragraphStylesOld, paragraphStylesUGCRefreshed } from './styles/paragraphStyles';
 import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderTextStylesMixin_fg_platform_editor_system_fake_text_highlight_colour, placeholderWrapStyles } from './styles/placeholderStyles';
 import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, resizerStyles } from './styles/resizerStyles';
 import { ruleStyles } from './styles/rule';
@@ -121,11 +121,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     codeBlockStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    !fg('platform_editor_typography_ugc') && editorUGCTokensDefault, (fg('platform-dst-jira-web-fonts') || fg('confluence_typography_refreshed') || fg('atlas_editor_typography_refreshed')) && fg('platform_editor_typography_ugc') &&
+    !fg('platform_editor_typography_ugc') && editorUGCTokensDefault, fg('platform_editor_typography_ugc') &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    editorUGCTokensRefreshed, !(fg('platform-dst-jira-web-fonts') || fg('confluence_typography_refreshed') || fg('atlas_editor_typography_refreshed')) && fg('platform_editor_typography_ugc') &&
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    editorUGCTokensModernized,
+    editorUGCTokensRefreshed,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     blocktypeStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -263,12 +261,10 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     linkingVisualRefreshV1Styles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    dateVanillaStyles, fg('platform_editor_typography_ugc') ? fg('platform-dst-jira-web-fonts') || fg('confluence_typography_refreshed') || fg('atlas_editor_typography_refreshed') ?
+    dateVanillaStyles, fg('platform_editor_typography_ugc') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     paragraphStylesUGCRefreshed :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    paragraphStylesUGCModernized :
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     paragraphStylesOld,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('platform_editor_hyperlink_underline') ? linkStyles : linkStylesOld,

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

@@ -40,16 +40,26 @@ export const findReplaceStylesNew = css({
 			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
 			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
+      boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"}`,
+      borderRadius: '3px'
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.search-match-selected.search-match-block': {
+  '.search-match-block.search-match-block-selected': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '[data-smart-link-container="true"], .loader-wrapper>div::after': {
       boxShadow: `
 			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
 			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
+      boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"}`,
+      borderRadius: '3px'
     }
   },
   /** With node selection */
@@ -62,10 +72,15 @@ export const findReplaceStylesNew = css({
 			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"},
 			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"} !important`
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.search-match-selected.search-match-block.ak-editor-selected-node': {
+  '.search-match-block.search-match-block-selected.ak-editor-selected-node': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '[data-smart-link-container="true"], .loader-wrapper>div::after': {
       boxShadow: `
@@ -73,10 +88,14 @@ export const findReplaceStylesNew = css({
 			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"},
 			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"} !important`
     }
   },
   /** Dark mode */
-
   /** Without node selection */
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.search-match-block.search-match-dark': {
@@ -86,16 +105,26 @@ export const findReplaceStylesNew = css({
 			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
 			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
+      boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"}`,
+      borderRadius: '3px'
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.search-match-selected.search-match-block.search-match-dark': {
+  '.search-match-block.search-match-block-selected.search-match-dark': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '[data-smart-link-container="true"], .loader-wrapper>div::after': {
       boxShadow: `
 			inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
 			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
+      boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"}`,
+      borderRadius: '3px'
     }
   },
   /** With node selection */
@@ -108,10 +137,15 @@ export const findReplaceStylesNew = css({
 			inset 0 0 0 5px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"},
 			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"} !important`
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
-  '.search-match-selected.search-match-block.search-match-dark.ak-editor-selected-node': {
+  '.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
     '[data-smart-link-container="true"], .loader-wrapper>div::after': {
       boxShadow: `
@@ -119,6 +153,11 @@ export const findReplaceStylesNew = css({
 			inset 0 0 0 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"},
 			0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
 			`
+    },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '.loader-wrapper>a, .lozenge-wrapper': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
+      boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"} !important`
     }
   }
 });

package/dist/es2019/version-wrapper.js

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

package/dist/esm/ui/Appearance/FullPage/CustomToolbarWrapper.js

@@ -0,0 +1,111 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+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 { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { mainToolbarFirstChildStyle, mainToolbarSecondChildStyle } from './MainToolbar';
+// Pre-computed static styles for first- and second-child wrappers.
+// These contain no runtime logic and are safe for static-emotion mode.
+
+var firstChildStaticBase = css({
+  display: 'flex',
+  flexGrow: 1
+});
+
+// we can't avoid some kind of function call here, so we need to disable the rule
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+var firstChildStaticTwoLine = css({
+  '@media (max-width: 868px)': {
+    flex: '1 1 100%',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: 'var(--ak-editor-fullpage-toolbar-height)',
+    justifyContent: 'flex-end',
+    minWidth: 'fit-content'
+  }
+});
+var secondChildStaticBase = css({
+  minWidth: 'fit-content'
+});
+
+// we can't avoid some kind of function call here, so we need to disable the rule
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+var secondChildStaticTwoLine = css({
+  '@media (max-width: 868px)': {
+    display: 'flex',
+    flexGrow: 1,
+    flex: '1 1 100%',
+    margin: 'auto',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    height: 'var(--ak-editor-fullpage-toolbar-height)',
+    minWidth: 0
+  }
+});
+
+// ---------------- First child wrapper ----------------
+var FirstChildWrapperStatic = function FirstChildWrapperStatic(_ref) {
+  var twoLineEditorToolbar = _ref.twoLineEditorToolbar,
+    children = _ref.children,
+    role = _ref.role,
+    ariaLabel = _ref['aria-label'],
+    testId = _ref['data-testid'];
+  return jsx("div", {
+    css: [firstChildStaticBase, twoLineEditorToolbar && firstChildStaticTwoLine],
+    role: role,
+    "aria-label": ariaLabel,
+    "data-testid": testId
+  }, children);
+};
+var FirstChildWrapperDynamic = function FirstChildWrapperDynamic(_ref2) {
+  var twoLineEditorToolbar = _ref2.twoLineEditorToolbar,
+    children = _ref2.children,
+    role = _ref2.role,
+    ariaLabel = _ref2['aria-label'],
+    testId = _ref2['data-testid'];
+  return jsx("div", {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/design-system/consistent-css-prop-usage
+    css: mainToolbarFirstChildStyle(twoLineEditorToolbar),
+    role: role,
+    "aria-label": ariaLabel,
+    "data-testid": testId
+  }, children);
+};
+export var MainToolbarForFirstChildWrapper = componentWithCondition(function () {
+  return expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
+}, FirstChildWrapperStatic, FirstChildWrapperDynamic);
+
+// ---------------- Second child wrapper ----------------
+var SecondChildWrapperStatic = function SecondChildWrapperStatic(_ref3) {
+  var twoLineEditorToolbar = _ref3.twoLineEditorToolbar,
+    children = _ref3.children,
+    role = _ref3.role,
+    ariaLabel = _ref3['aria-label'],
+    testId = _ref3['data-testid'];
+  return jsx("div", {
+    css: [secondChildStaticBase, twoLineEditorToolbar && secondChildStaticTwoLine],
+    role: role,
+    "aria-label": ariaLabel,
+    "data-testid": testId
+  }, children);
+};
+var SecondChildWrapperDynamic = function SecondChildWrapperDynamic(_ref4) {
+  var twoLineEditorToolbar = _ref4.twoLineEditorToolbar,
+    children = _ref4.children,
+    role = _ref4.role,
+    ariaLabel = _ref4['aria-label'],
+    testId = _ref4['data-testid'];
+  return jsx("div", {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/design-system/consistent-css-prop-usage
+    css: mainToolbarSecondChildStyle(twoLineEditorToolbar),
+    role: role,
+    "aria-label": ariaLabel,
+    "data-testid": testId
+  }, children);
+};
+export var MainToolbarForSecondChildWrapper = componentWithCondition(function () {
+  return expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
+}, SecondChildWrapperStatic, SecondChildWrapperDynamic);

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

@@ -11,6 +11,7 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
+import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPrimaryToolbarComponents } from '../../Toolbar/getPrimaryToolbarComponents';
@@ -153,7 +154,11 @@ export var FullPageEditor = function FullPageEditor(props) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: "akEditor",
-    ref: wrapperElementRef
+    ref: wrapperElementRef,
+    style: {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+      '--ak-editor-fullpage-toolbar-height': FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()
+    }
   }, !isEditorToolbarHidden && jsx(FullPageToolbar, {
     appearance: props.appearance,
     editorAPI: editorAPI,