@atlaskit/editor-core 208.3.5 → 208.3.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-core
 
+## 208.3.6
+
+### Patch Changes
+
+- [#165932](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/165932)
+  [`993d95ad7a45c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/993d95ad7a45c) -
+  migrated toolbar off dynamic styles to static styles behind experiment
+
 ## 208.3.5
 
 ### Patch Changes

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

@@ -0,0 +1,119 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MainToolbarForSecondChildWrapper = exports.MainToolbarForFirstChildWrapper = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _MainToolbar = require("./MainToolbar");
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+// Pre-computed static styles for first- and second-child wrappers.
+// These contain no runtime logic and are safe for static-emotion mode.
+
+var firstChildStaticBase = (0, _react2.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 = (0, _react2.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 = (0, _react2.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 = (0, _react2.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 (0, _react2.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 (0, _react2.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: (0, _MainToolbar.mainToolbarFirstChildStyle)(twoLineEditorToolbar),
+    role: role,
+    "aria-label": ariaLabel,
+    "data-testid": testId
+  }, children);
+};
+var MainToolbarForFirstChildWrapper = exports.MainToolbarForFirstChildWrapper = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
+  return (0, _expValEquals.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 (0, _react2.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 (0, _react2.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: (0, _MainToolbar.mainToolbarSecondChildStyle)(twoLineEditorToolbar),
+    role: role,
+    "aria-label": ariaLabel,
+    "data-testid": testId
+  }, children);
+};
+var MainToolbarForSecondChildWrapper = exports.MainToolbarForSecondChildWrapper = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
+  return (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
+}, SecondChildWrapperStatic, SecondChildWrapperDynamic);

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

@@ -13,6 +13,7 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _getPrimaryToolbarComponents = require("../../Toolbar/getPrimaryToolbarComponents");
@@ -163,7 +164,11 @@ var FullPageEditor = exports.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': (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)()
+    }
   }, !isEditorToolbarHidden && (0, _react2.jsx)(_FullPageToolbar.FullPageToolbar, {
     appearance: props.appearance,
     editorAPI: editorAPI,

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

@@ -17,7 +17,9 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _ToolbarPortal = require("../../Toolbar/ToolbarPortal");
 var _ToolbarWithSizeDetector = require("../../Toolbar/ToolbarWithSizeDetector");
 var _BeforeWrapper = require("./BeforeWrapper");
+var _CustomToolbarWrapper = require("./CustomToolbarWrapper");
 var _MainToolbar = require("./MainToolbar");
+var _MainToolbarWrapper = require("./MainToolbarWrapper");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic
@@ -130,18 +132,16 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
       isShortcutToFocusToolbar: isShortcutToFocusToolbar,
       handleEscape: handleEscape,
       intl: props.intl
-    }, (0, _react2.jsx)(ToolbarPortal, null, (0, _react2.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: (0, _MainToolbar.mainToolbarStyle)(props.showKeyline || contextPanelWidth > 0, twoLineEditorToolbar),
+    }, (0, _react2.jsx)(ToolbarPortal, null, (0, _react2.jsx)(_MainToolbarWrapper.MainToolbarWrapper, {
+      showKeyline: props.showKeyline || contextPanelWidth > 0,
+      twoLineEditorToolbar: twoLineEditorToolbar,
       "data-testid": "ak-editor-main-toolbar"
-    }, (0, _react2.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: (0, _MainToolbar.mainToolbarFirstChildStyle)(twoLineEditorToolbar),
+    }, (0, _react2.jsx)(_CustomToolbarWrapper.MainToolbarForFirstChildWrapper, {
+      twoLineEditorToolbar: twoLineEditorToolbar,
       role: "toolbar",
       "aria-label": props.intl.formatMessage(_messages.fullPageMessages.toolbarLabel)
-    }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.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: (0, _MainToolbar.mainToolbarSecondChildStyle)(twoLineEditorToolbar),
+    }, shouldSplitToolbar ? customToolbar : nonCustomToolbar), (0, _react2.jsx)(_CustomToolbarWrapper.MainToolbarForSecondChildWrapper, {
+      twoLineEditorToolbar: twoLineEditorToolbar,
       "data-testid": "avatar-group-outside-plugin",
       role: "region",
       "aria-label": props.intl.formatMessage(_messages.fullPageMessages.pageActionsLabel)

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

@@ -0,0 +1,97 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MainToolbarWrapper = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _MainToolbar = require("./MainToolbar");
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+// Base styles that don't depend on feature flags
+var baseToolbarStyles = (0, _react2.css)({
+  position: 'relative',
+  alignItems: 'center',
+  boxShadow: 'none',
+  borderBottom: "1px solid ".concat("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 ".concat(_editorSharedStyles.akEditorSwoopCubicBezier),
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
+  zIndex: _editorSharedStyles.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'
+  }
+});
+var flexibleIconSize = (0, _react2.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '& span svg': {
+    maxWidth: '100%'
+  }
+});
+// box-shadow is overriden by the mainToolbar
+var mainToolbarWithKeyline = (0, _react2.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)"
+});
+var mainToolbarTwoLineStyle = (0, _react2.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(_MainToolbar.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)"
+}));
+var MainToolbarWrapperNext = function MainToolbarWrapperNext(_ref) {
+  var showKeyline = _ref.showKeyline,
+    twoLineEditorToolbar = _ref.twoLineEditorToolbar,
+    children = _ref.children,
+    testId = _ref['data-testid'];
+  return (0, _react2.jsx)("div", {
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+    css: [baseToolbarStyles, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && flexibleIconSize, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle],
+    "data-testid": testId
+  }, children);
+};
+
+/**
+ * Original version of the toolbar wrapper using dynamic styles
+ */
+var MainToolbarWrapperOld = function MainToolbarWrapperOld(_ref2) {
+  var showKeyline = _ref2.showKeyline,
+    twoLineEditorToolbar = _ref2.twoLineEditorToolbar,
+    children = _ref2.children,
+    testId = _ref2['data-testid'];
+  return (0, _react2.jsx)("div", {
+    css:
+    // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
+    (0, _MainToolbar.mainToolbarStyle)(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>
+ */
+var MainToolbarWrapper = exports.MainToolbarWrapper = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
+  return (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
+}, MainToolbarWrapperNext, MainToolbarWrapperOld);

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

@@ -126,11 +126,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _codeBlockStyles.codeBlockStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _editorUGCTokenStyles.editorUGCTokensDefault, ((0, _platformFeatureFlags.fg)('platform-dst-jira-web-fonts') || (0, _platformFeatureFlags.fg)('confluence_typography_refreshed') || (0, _platformFeatureFlags.fg)('atlas_editor_typography_refreshed')) && (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') &&
+    !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _editorUGCTokenStyles.editorUGCTokensDefault, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _editorUGCTokenStyles.editorUGCTokensRefreshed, !((0, _platformFeatureFlags.fg)('platform-dst-jira-web-fonts') || (0, _platformFeatureFlags.fg)('confluence_typography_refreshed') || (0, _platformFeatureFlags.fg)('atlas_editor_typography_refreshed')) && (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') &&
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _editorUGCTokenStyles.editorUGCTokensModernized,
+    _editorUGCTokenStyles.editorUGCTokensRefreshed,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _blockTypeStyles.blocktypeStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -268,12 +266,10 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _smartCardStyles.linkingVisualRefreshV1Styles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _dateStyles.dateVanillaStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? (0, _platformFeatureFlags.fg)('platform-dst-jira-web-fonts') || (0, _platformFeatureFlags.fg)('confluence_typography_refreshed') || (0, _platformFeatureFlags.fg)('atlas_editor_typography_refreshed') ?
+    _dateStyles.dateVanillaStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _paragraphStyles.paragraphStylesUGCRefreshed :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _paragraphStyles.paragraphStylesUGCModernized :
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _paragraphStyles.paragraphStylesOld,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     (0, _platformFeatureFlags.fg)('platform_editor_hyperlink_underline') ? _link.linkStyles : _link.linkStylesOld,

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 = "208.3.4";
+var version = exports.version = "208.3.5";

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

@@ -0,0 +1,103 @@
+/**
+ * @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.
+
+const 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
+const 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'
+  }
+});
+const 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
+const 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 ----------------
+const FirstChildWrapperStatic = ({
+  twoLineEditorToolbar,
+  children,
+  role,
+  'aria-label': ariaLabel,
+  'data-testid': testId
+}) => jsx("div", {
+  css: [firstChildStaticBase, twoLineEditorToolbar && firstChildStaticTwoLine],
+  role: role,
+  "aria-label": ariaLabel,
+  "data-testid": testId
+}, children);
+const FirstChildWrapperDynamic = ({
+  twoLineEditorToolbar,
+  children,
+  role,
+  'aria-label': ariaLabel,
+  'data-testid': testId
+}) => 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 const MainToolbarForFirstChildWrapper = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), FirstChildWrapperStatic, FirstChildWrapperDynamic);
+
+// ---------------- Second child wrapper ----------------
+const SecondChildWrapperStatic = ({
+  twoLineEditorToolbar,
+  children,
+  role,
+  'aria-label': ariaLabel,
+  'data-testid': testId
+}) => jsx("div", {
+  css: [secondChildStaticBase, twoLineEditorToolbar && secondChildStaticTwoLine],
+  role: role,
+  "aria-label": ariaLabel,
+  "data-testid": testId
+}, children);
+const SecondChildWrapperDynamic = ({
+  twoLineEditorToolbar,
+  children,
+  role,
+  'aria-label': ariaLabel,
+  'data-testid': testId
+}) => 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 const MainToolbarForSecondChildWrapper = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), SecondChildWrapperStatic, SecondChildWrapperDynamic);

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/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/version-wrapper.js

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

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,

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

@@ -16,7 +16,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 var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
   var _props$primaryToolbar, _useToolbarPortal, _props$customPrimaryT;
   var _useState = useState(false),
@@ -121,18 +123,16 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (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/esm/ui/Appearance/FullPage/MainToolbarWrapper.js

@@ -0,0 +1,90 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/**
+ * @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
+var baseToolbarStyles = css({
+  position: 'relative',
+  alignItems: 'center',
+  boxShadow: 'none',
+  borderBottom: "1px solid ".concat("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 ".concat(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'
+  }
+});
+var flexibleIconSize = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '& span svg': {
+    maxWidth: '100%'
+  }
+});
+// box-shadow is overriden by the mainToolbar
+var 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)"
+});
+var mainToolbarTwoLineStyle = css(_defineProperty({}, "@media (max-width: ".concat(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)"
+}));
+var MainToolbarWrapperNext = function MainToolbarWrapperNext(_ref) {
+  var showKeyline = _ref.showKeyline,
+    twoLineEditorToolbar = _ref.twoLineEditorToolbar,
+    children = _ref.children,
+    testId = _ref['data-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
+ */
+var MainToolbarWrapperOld = function MainToolbarWrapperOld(_ref2) {
+  var showKeyline = _ref2.showKeyline,
+    twoLineEditorToolbar = _ref2.twoLineEditorToolbar,
+    children = _ref2.children,
+    testId = _ref2['data-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 var MainToolbarWrapper = componentWithCondition(function () {
+  return expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
+}, MainToolbarWrapperNext, MainToolbarWrapperOld);

package/dist/esm/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';
@@ -118,11 +118,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (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
@@ -260,12 +258,10 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (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/esm/version-wrapper.js

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

package/dist/types/ui/Appearance/FullPage/CustomToolbarWrapper.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import React from 'react';
+interface ChildWrapperProps {
+    twoLineEditorToolbar: boolean;
+    children: React.ReactNode;
+    role?: string;
+    'aria-label'?: string;
+    'data-testid'?: string;
+}
+export declare const MainToolbarForFirstChildWrapper: React.FC<ChildWrapperProps>;
+export declare const MainToolbarForSecondChildWrapper: React.FC<ChildWrapperProps>;
+export {};

package/dist/types/ui/Appearance/FullPage/MainToolbarWrapper.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import React from 'react';
+interface MainToolbarWrapperProps {
+    showKeyline: boolean;
+    twoLineEditorToolbar: boolean;
+    children: React.ReactNode;
+    'data-testid'?: string;
+}
+/**
+ * Wrapper component for the main toolbar that handles feature flag based styling
+ * @example
+ * <MainToolbarWrapper showKeyline={true} twoLineEditorToolbar={false}>
+ *   <ToolbarContent />
+ * </MainToolbarWrapper>
+ */
+export declare const MainToolbarWrapper: React.FC<MainToolbarWrapperProps>;
+export {};

package/dist/types-ts4.5/ui/Appearance/FullPage/CustomToolbarWrapper.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import React from 'react';
+interface ChildWrapperProps {
+    twoLineEditorToolbar: boolean;
+    children: React.ReactNode;
+    role?: string;
+    'aria-label'?: string;
+    'data-testid'?: string;
+}
+export declare const MainToolbarForFirstChildWrapper: React.FC<ChildWrapperProps>;
+export declare const MainToolbarForSecondChildWrapper: React.FC<ChildWrapperProps>;
+export {};

package/dist/types-ts4.5/ui/Appearance/FullPage/MainToolbarWrapper.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import React from 'react';
+interface MainToolbarWrapperProps {
+    showKeyline: boolean;
+    twoLineEditorToolbar: boolean;
+    children: React.ReactNode;
+    'data-testid'?: string;
+}
+/**
+ * Wrapper component for the main toolbar that handles feature flag based styling
+ * @example
+ * <MainToolbarWrapper showKeyline={true} twoLineEditorToolbar={false}>
+ *   <ToolbarContent />
+ * </MainToolbarWrapper>
+ */
+export declare const MainToolbarWrapper: React.FC<MainToolbarWrapperProps>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "208.3.5",
+	"version": "208.3.6",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -97,7 +97,7 @@
 		"@atlaskit/editor-plugin-list": "^4.2.0",
 		"@atlaskit/editor-plugin-paste": "^3.3.0",
 		"@atlaskit/link-provider": "^3.3.0",
-		"@atlaskit/logo": "^19.2.0",
+		"@atlaskit/logo": "^19.3.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
 		"@atlaskit/media-test-helpers": "^37.0.0",
@@ -105,7 +105,7 @@
 		"@atlaskit/primitives": "^14.9.0",
 		"@atlaskit/renderer": "^119.0.0",
 		"@atlaskit/section-message": "^8.2.0",
-		"@atlaskit/smart-card": "^38.14.0",
+		"@atlaskit/smart-card": "^38.15.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.0.0",
 		"@atlaskit/util-data-test": "^18.0.0",
@@ -567,9 +567,6 @@
 		"platform_editor_breakout_resizing_hello_release": {
 			"type": "boolean"
 		},
-		"confluence_typography_refreshed": {
-			"type": "boolean"
-		},
 		"atlas_editor_typography_refreshed": {
 			"type": "boolean"
 		},