@atlaskit/editor-core 216.7.12 → 216.7.14

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 216.7.14
+
+### Patch Changes
+
+- [`653c0c803b286`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/653c0c803b286) -
+  EDITOR-4620 Clean up platform_editor_toolbar_aifc_patch_6
+- Updated dependencies
+
+## 216.7.13
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 216.7.12
 
 ### Patch Changes

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

@@ -20,7 +20,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _ClickAreaBlock = _interopRequireDefault(require("../../Addon/ClickAreaBlock"));
 var _contentComponentWrapper = require("../../Addon/ClickAreaBlock/contentComponentWrapper");
 var _EditorContentContainer = _interopRequireDefault(require("../../EditorContentContainer/EditorContentContainer"));
@@ -177,7 +176,6 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
   var customToolbarSlot = (0, _react2.jsx)("div", {
     css: [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew, isToolbarAIFCEnabled && (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_responsive_improve') && mainToolbarCustomComponentsSlotStylePaddingOverride]
   }, customPrimaryToolbarComponents);
-  var patch6Enabled = (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
   return (0, _react2.jsx)(_WithFlash.default, {
     animate: maxContentSizeReached
   }, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
@@ -207,7 +205,7 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined,
+    disabled: !!disabled,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,
     popupsMountPoint: popupsMountPoint

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

@@ -13,7 +13,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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" != _typeof3(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
@@ -93,7 +92,6 @@ var StickyToolbar = function StickyToolbar(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     top = _useState2[0],
     setTop = _useState2[1];
-  var toolbarPatch6Enabled = (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
 
   // ED-15802: if externalToolbarRef is passed in, set top to externalToolbarRef?.current?.clientHeight
   // else if offsetTop is a number set top to offsetTop
@@ -109,7 +107,7 @@ var StickyToolbar = function StickyToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     (0, _react2.jsx)("div", {
-      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
+      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding]
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       ,
       style: {

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

@@ -359,7 +359,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
     (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _syncBlockStyles.syncBlockStyles,
+    _syncBlockStyles.syncBlockStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _syncBlockStyles.syncBlockOverflowStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     (0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutBaseStylesAdvanced, (0, _experiments.editorExperiment)('advanced_layouts', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.syncBlockStyles = void 0;
+exports.syncBlockStyles = exports.syncBlockOverflowStyles = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
@@ -127,4 +127,16 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _definePrope
   right: "var(--ds-space-150, 12px)",
   backgroundColor: "var(--ds-surface, #FFFFFF)",
   maxWidth: '140px'
-}));
+}));
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var syncBlockOverflowStyles = exports.syncBlockOverflowStyles = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.content), {
+    // Contain floated elements (wrap-left/wrap-right) within synced block borders
+    overflow: 'hidden'
+  }), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
+    // Contain floated elements (wrap-left/wrap-right) within synced block borders
+    overflow: 'hidden'
+  })
+});

package/dist/cjs/ui/Toolbar/Toolbar.js

@@ -12,7 +12,6 @@ var _types = require("@atlaskit/editor-common/types");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _ToolbarInner = require("./ToolbarInner");
 /**
  * *Warning:* With `platform_editor_toolbar_aifc` enabled this component is no longer used and is replaced with `<ToolbarNext />`.
@@ -70,7 +69,6 @@ var ToolbarNext = exports.ToolbarNext = function ToolbarNext(_ref) {
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference;
   // remove offline check when patch6Enabled is cleaned up
   var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(connectivityStateMode);
-  var patch6Enabled = (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
   return /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
     editorAppearance: editorAppearance,
@@ -79,7 +77,7 @@ var ToolbarNext = exports.ToolbarNext = function ToolbarNext(_ref) {
     isOffline: isOffline
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarUIProvider, {
     api: editorAPI,
-    isDisabled: patch6Enabled ? isDisabled : isOffline || isDisabled,
+    isDisabled: isDisabled,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,

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

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

@@ -16,7 +16,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ClickAreaBlock from '../../Addon/ClickAreaBlock';
@@ -165,7 +164,6 @@ export const CommentEditorWithIntl = props => {
   const customToolbarSlot = jsx("div", {
     css: [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew, isToolbarAIFCEnabled && fg('platform_editor_toolbar_aifc_responsive_improve') && mainToolbarCustomComponentsSlotStylePaddingOverride]
   }, customPrimaryToolbarComponents);
-  const patch6Enabled = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
   return jsx(WithFlash, {
     animate: maxContentSizeReached
   }, jsx(WidthProvider, null, jsx("div", {
@@ -195,7 +193,7 @@ export const CommentEditorWithIntl = props => {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined,
+    disabled: !!disabled,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,
     popupsMountPoint: popupsMountPoint

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

@@ -9,7 +9,6 @@ import React, { useEffect, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
 const akEditorMenuZIndex = 500;
 const akEditorToolbarKeylineHeight = 2;
@@ -87,7 +86,6 @@ const stickyToolbarWrapperStyleNew = css({
 });
 const StickyToolbar = props => {
   const [top, setTop] = useState(0);
-  const toolbarPatch6Enabled = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
 
   // ED-15802: if externalToolbarRef is passed in, set top to externalToolbarRef?.current?.clientHeight
   // else if offsetTop is a number set top to offsetTop
@@ -103,7 +101,7 @@ const StickyToolbar = props => {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     jsx("div", {
-      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
+      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding]
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       ,
       style: {

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

@@ -58,7 +58,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
 import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
-import { syncBlockStyles } from './styles/syncBlockStyles';
+import { syncBlockStyles, syncBlockOverflowStyles } from './styles/syncBlockStyles';
 import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemCheckboxStyles, taskItemCheckboxStylesWithBlockTaskItem, taskItemNextCheckboxStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
@@ -355,7 +355,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
     fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, editorExperiment('platform_synced_block', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    syncBlockStyles,
+    syncBlockStyles, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_dogfooding') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    syncBlockOverflowStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     editorExperiment('advanced_layouts', true) && layoutBaseStylesAdvanced, editorExperiment('advanced_layouts', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -166,4 +166,21 @@ export const syncBlockStyles = css({
     backgroundColor: "var(--ds-surface, #FFFFFF)",
     maxWidth: '140px'
   }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const syncBlockOverflowStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // 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
+    [`.${BodiedSyncBlockSharedCssClassName.content}`]: {
+      // Contain floated elements (wrap-left/wrap-right) within synced block borders
+      overflow: 'hidden'
+    },
+    // 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
+    [`.${SyncBlockSharedCssClassName.renderer}`]: {
+      // Contain floated elements (wrap-left/wrap-right) within synced block borders
+      overflow: 'hidden'
+    }
+  }
 });

package/dist/es2019/ui/Toolbar/Toolbar.js

@@ -5,7 +5,6 @@ import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { ToolbarButtonGroup, ToolbarDropdownItemSection, ToolbarSection } from '@atlaskit/editor-toolbar';
 import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ToolbarInner } from './ToolbarInner';
 
 /**
@@ -66,7 +65,6 @@ export const ToolbarNext = ({
   } = usePluginState(editorAPI);
   // remove offline check when patch6Enabled is cleaned up
   const isOffline = isOfflineMode(connectivityStateMode);
-  const patch6Enabled = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
   return /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
     editorAppearance: editorAppearance,
@@ -75,7 +73,7 @@ export const ToolbarNext = ({
     isOffline: isOffline
   }, /*#__PURE__*/React.createElement(EditorToolbarUIProvider, {
     api: editorAPI,
-    isDisabled: patch6Enabled ? isDisabled : isOffline || isDisabled,
+    isDisabled: isDisabled,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,

package/dist/es2019/version-wrapper.js

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

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

@@ -18,7 +18,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default
 import ClickAreaBlock from '../../Addon/ClickAreaBlock';
@@ -166,7 +165,6 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
   var customToolbarSlot = jsx("div", {
     css: [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew, isToolbarAIFCEnabled && fg('platform_editor_toolbar_aifc_responsive_improve') && mainToolbarCustomComponentsSlotStylePaddingOverride]
   }, customPrimaryToolbarComponents);
-  var patch6Enabled = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
   return jsx(WithFlash, {
     animate: maxContentSizeReached
   }, jsx(WidthProvider, null, jsx("div", {
@@ -196,7 +194,7 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined,
+    disabled: !!disabled,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,
     popupsMountPoint: popupsMountPoint

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

@@ -12,7 +12,6 @@ import React, { useEffect, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
 var akEditorMenuZIndex = 500;
 var akEditorToolbarKeylineHeight = 2;
@@ -84,7 +83,6 @@ var StickyToolbar = function StickyToolbar(props) {
     _useState2 = _slicedToArray(_useState, 2),
     top = _useState2[0],
     setTop = _useState2[1];
-  var toolbarPatch6Enabled = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
 
   // ED-15802: if externalToolbarRef is passed in, set top to externalToolbarRef?.current?.clientHeight
   // else if offsetTop is a number set top to offsetTop
@@ -100,7 +98,7 @@ var StickyToolbar = function StickyToolbar(props) {
   return (
     // eslint-disable-next-line @atlaskit/design-system/prefer-primitives
     jsx("div", {
-      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && !toolbarPatch6Enabled && mainToolbarWithoutLeftPadding, props.isNewToolbarEnabled && toolbarPatch6Enabled && mainToolbarWithPadding]
+      css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding]
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       ,
       style: {

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

@@ -59,7 +59,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
 import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
-import { syncBlockStyles } from './styles/syncBlockStyles';
+import { syncBlockStyles, syncBlockOverflowStyles } from './styles/syncBlockStyles';
 import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemCheckboxStyles, taskItemCheckboxStylesWithBlockTaskItem, taskItemNextCheckboxStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
@@ -351,7 +351,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
     fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, editorExperiment('platform_synced_block', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    syncBlockStyles,
+    syncBlockStyles, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_dogfooding') &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    syncBlockOverflowStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     editorExperiment('advanced_layouts', true) && layoutBaseStylesAdvanced, editorExperiment('advanced_layouts', true) ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

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

@@ -119,4 +119,16 @@ export var syncBlockStyles = css(_defineProperty({
   right: "var(--ds-space-150, 12px)",
   backgroundColor: "var(--ds-surface, #FFFFFF)",
   maxWidth: '140px'
-}));
+}));
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var syncBlockOverflowStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': _defineProperty(_defineProperty({}, ".".concat(BodiedSyncBlockSharedCssClassName.content), {
+    // Contain floated elements (wrap-left/wrap-right) within synced block borders
+    overflow: 'hidden'
+  }), ".".concat(SyncBlockSharedCssClassName.renderer), {
+    // Contain floated elements (wrap-left/wrap-right) within synced block borders
+    overflow: 'hidden'
+  })
+});

package/dist/esm/ui/Toolbar/Toolbar.js

@@ -5,7 +5,6 @@ import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { ToolbarButtonGroup, ToolbarDropdownItemSection, ToolbarSection } from '@atlaskit/editor-toolbar';
 import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ToolbarInner } from './ToolbarInner';
 
 /**
@@ -64,7 +63,6 @@ export var ToolbarNext = function ToolbarNext(_ref) {
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference;
   // remove offline check when patch6Enabled is cleaned up
   var isOffline = isOfflineMode(connectivityStateMode);
-  var patch6Enabled = expValEquals('platform_editor_toolbar_aifc_patch_6', 'isEnabled', true);
   return /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
     editorAppearance: editorAppearance,
@@ -73,7 +71,7 @@ export var ToolbarNext = function ToolbarNext(_ref) {
     isOffline: isOffline
   }, /*#__PURE__*/React.createElement(EditorToolbarUIProvider, {
     api: editorAPI,
-    isDisabled: patch6Enabled ? isDisabled : isOffline || isDisabled,
+    isDisabled: isDisabled,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement,

package/dist/esm/version-wrapper.js

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

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

@@ -1,2 +1,3 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const syncBlockStyles: SerializedStyles;
+export declare const syncBlockOverflowStyles: SerializedStyles;

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

@@ -1,2 +1,3 @@
 import { type SerializedStyles } from '@emotion/react';
 export declare const syncBlockStyles: SerializedStyles;
+export declare const syncBlockOverflowStyles: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.7.12",
+	"version": "216.7.14",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^5.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.36.0",
+		"@atlaskit/tmp-editor-statsig": "^17.1.0",
 		"@atlaskit/tokens": "^10.1.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",