@atlaskit/editor-core 214.2.3 → 215.0.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-core
 
+## 215.0.0
+
+### Major Changes
+
+- [`be54c7e850cd3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/be54c7e850cd3) -
+  remove deprecated legacy content styles for editor
+
+### Patch Changes
+
+- [`925eb6478e9a5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/925eb6478e9a5) -
+  Remove overflowY on tables to prevent Y axis scroll bar showing on Windows.
+- [`30bb04cd8a8e9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/30bb04cd8a8e9) -
+  [ux] [ED-29292] Fix 2 issues with wrapped images in editor and renderer
+
+  1. There is a gap between the first and the second wrapped images
+  2. For wrapped images in layout, if image is the first node, it not horizontally aligned with the
+     following wrapped images
+
+- Updated dependencies
+
+## 214.2.4
+
+### Patch Changes
+
+- [`8807cdcfe7132`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8807cdcfe7132) -
+  Cleanup platform_editor_keep_focus_on_content_comp_clicks
+- Updated dependencies
+
 ## 214.2.3
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -64,12 +64,6 @@ Object.defineProperty(exports, "WithHelpTrigger", {
     return _WithHelpTrigger.default;
   }
 });
-Object.defineProperty(exports, "createEditorContentStyle", {
-  enumerable: true,
-  get: function get() {
-    return _ContentStyles.createEditorContentStyle;
-  }
-});
 Object.defineProperty(exports, "createFeatureFlagsFromProps", {
   enumerable: true,
   get: function get() {
@@ -125,6 +119,5 @@ var _getNodesCount = require("./utils/getNodesCount");
 var _measureEnum = _interopRequireDefault(require("./utils/performance/measure-enum"));
 var _featureFlagsFromProps = require("./utils/feature-flags-from-props");
 var _actions = _interopRequireDefault(require("./actions"));
-var _ContentStyles = require("./ui/ContentStyles");
 var _createPluginsList = require("./create-editor/create-plugins-list");
 var _ReactEditorView = require("./create-editor/ReactEditorView");

package/dist/cjs/ui/Addon/click-area-helper.js

@@ -8,7 +8,6 @@ var _collab = require("@atlaskit/editor-common/collab");
 var _commands = require("@atlaskit/editor-common/commands");
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _contentComponentWrapper = require("./ClickAreaBlock/contentComponentWrapper");
 // we ignore all of the clicks made inside <div class="ak-editor-content-area" /> (but not clicks on the node itself)
@@ -83,7 +82,7 @@ var clickAreaClickHandler = exports.clickAreaClickHandler = function clickAreaCl
   (0, _utils.closestElement)(selection === null || selection === void 0 ? void 0 : selection.anchorNode, '[data-editor-popup]');
 
   // For clicks directly on the content component -- they should not be ignored
-  var isContentComponent = (0, _platformFeatureFlags.fg)('platform_editor_keep_focus_on_content_comp_clicks') ? target === null || target === void 0 || (_target$parentElement = target.parentElement) === null || _target$parentElement === void 0 ? void 0 : _target$parentElement.closest("[".concat(_contentComponentWrapper.ignoreAttribute, "]")) : !!(0, _utils.closestElement)(target, "[".concat(_contentComponentWrapper.ignoreAttribute, "]")) || (target === null || target === void 0 ? void 0 : target.getAttribute(_contentComponentWrapper.ignoreAttribute)) === 'true';
+  var isContentComponent = target === null || target === void 0 || (_target$parentElement = target.parentElement) === null || _target$parentElement === void 0 ? void 0 : _target$parentElement.closest("[".concat(_contentComponentWrapper.ignoreAttribute, "]"));
 
   // This is a super workaround to find when events are coming from Confluence InlineComment modal
   // We don't own those components, so we can't change them

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

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _browser = require("@atlaskit/editor-common/browser");
+var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -74,6 +76,34 @@ var _whitespaceStyles = require("./styles/whitespaceStyles");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 var isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+var alignMultipleWrappedImageInLayoutStyles = {
+  '.ProseMirror [data-layout-section] [data-layout-column] > div': {
+    // apply marginTop to wrapped mediaSingle that has preceding wrapped mediaSingle (even when there's gap cursor in between them)
+    // Given the first wrapped mediaSingle in layout has 0 marginTop, this is needed to make sure fellow wrapped mediaSingle align with it horizontally
+    '.mediaSingleView-content-wrap[layout^=wrap] + .mediaSingleView-content-wrap[layout^=wrap], .mediaSingleView-content-wrap[layout^=wrap] + .ProseMirror-gapcursor + .mediaSingleView-content-wrap[layout^=wrap]': {
+      '.rich-media-item': {
+        marginTop: 0
+      }
+    },
+    // Due to the above rule, wrapped mediaSingle (not the first node in layout) that are followed by wrapped mediaSingle should also have 0 marginTop
+    // so it's aligned with the following wrapped mediaSingle
+    '.mediaSingleView-content-wrap[layout^=wrap]:has( + .mediaSingleView-content-wrap[layout^=wrap])': {
+      '.rich-media-item': {
+        marginTop: 0
+      }
+    }
+  }
+};
+var firstWrappedMediaStyles = {
+  '.ProseMirror': {
+    // Remove gap between first wrapped mediaSingle and its fellow wrapped mediaSingle
+    "& [layout^='wrap-']:has(+ [layout^='wrap-']), & [layout^='wrap-']:has(+ .ProseMirror-gapcursor + [layout^='wrap-'])": (0, _defineProperty2.default)({}, "& .".concat(_styles.richMediaClassName), {
+      marginLeft: 0,
+      marginRight: 0
+    })
+  }
+};
+
 /**
  * EditorContentStyles is a wrapper component that applies styles to its children
  * based on the provided feature flags, view mode, and other props.
@@ -183,6 +213,8 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     _rule.ruleStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _mediaStyles.mediaStyles,
+    // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
+    (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _telepointerStyles.telepointerStyle, /* This needs to be after telepointer styles as some overlapping rules have equal specificity, and so the order is significant */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -264,7 +296,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _resizerStyles.resizerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _layout.layoutBaseStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_synced_block', 'isEnabled', true) &&
+    _layout.layoutBaseStyles,
+    // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
+    (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_synced_block', 'isEnabled', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _syncBlockStyles.syncBlockStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -366,10 +400,12 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _mediaStyles.mediaAlignmentStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _tableStyles.tableLayoutFixes, (0, _expValEquals.expValEquals)('platform_editor_table_container_width_fix', 'isEnabled', true) &&
+    _tableStyles.tableLayoutFixes,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _tableStyles.tableContainerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    !(0, _platformFeatureFlags.fg)('platform_editor_table_container_y_overflow_fix') && _tableStyles.tableContainerOverflowY,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _link.hyperLinkFloatingToolbarStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _link.linkLegacyIconStylesFix,

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tableLayoutFixes = exports.tableContainerStyles = exports.tableCommentEditorStyles = exports.tableCommentEditorMarginOverride = void 0;
+exports.tableLayoutFixes = exports.tableContainerStyles = exports.tableContainerOverflowY = exports.tableCommentEditorStyles = exports.tableCommentEditorMarginOverride = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _scrollbarStyles = require("./scrollbarStyles");
@@ -41,7 +41,6 @@ var tableContainerStyles = exports.tableContainerStyles = (0, _react.css)({
   '.ProseMirror .pm-table-wrapper': {
     maxWidth: '100%',
     overflowX: 'auto',
-    overflowY: 'visible',
     // Ensure the wrapper doesn't grow beyond its container
     width: '100%',
     boxSizing: 'border-box'
@@ -55,4 +54,13 @@ var tableContainerStyles = exports.tableContainerStyles = (0, _react.css)({
     // Ensure tables can be scrolled horizontally if needed
     minWidth: 'auto'
   }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var tableContainerOverflowY = exports.tableContainerOverflowY = (0, _react.css)({
+  /* Fix for HOT-119925: Ensure table containers have proper width constraints and overflow handling */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper': {
+    overflowY: 'visible'
+  }
 });

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

package/dist/es2019/index.js

@@ -36,13 +36,5 @@ export { getNodesCount } from './utils/getNodesCount';
 export { default as measurements } from './utils/performance/measure-enum';
 export { createFeatureFlagsFromProps } from './utils/feature-flags-from-props';
 export { default as EditorActions } from './actions';
-export {
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
-/**
- * @deprecated
- * DO NOT USE THIS WILL BE REMOVED SOON.
- * use this instead: packages/editor/editor-core/src/ui/EditorContentContainer.tsx
- */
-createEditorContentStyle } from './ui/ContentStyles';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor/create-plugins-list';
 export { ReactEditorView } from './create-editor/ReactEditorView';

package/dist/es2019/ui/Addon/click-area-helper.js

@@ -2,7 +2,6 @@ import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 import { addParagraphAtEnd } from '@atlaskit/editor-common/commands';
 import { setSelectionTopLevelBlocks } from '@atlaskit/editor-common/selection';
 import { closestElement } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ignoreAttribute } from './ClickAreaBlock/contentComponentWrapper';
 
@@ -78,7 +77,7 @@ const clickAreaClickHandler = (view, event) => {
   closestElement(selection === null || selection === void 0 ? void 0 : selection.anchorNode, '[data-editor-popup]');
 
   // For clicks directly on the content component -- they should not be ignored
-  const isContentComponent = fg('platform_editor_keep_focus_on_content_comp_clicks') ? target === null || target === void 0 ? void 0 : (_target$parentElement = target.parentElement) === null || _target$parentElement === void 0 ? void 0 : _target$parentElement.closest(`[${ignoreAttribute}]`) : !!closestElement(target, `[${ignoreAttribute}]`) || (target === null || target === void 0 ? void 0 : target.getAttribute(ignoreAttribute)) === 'true';
+  const isContentComponent = target === null || target === void 0 ? void 0 : (_target$parentElement = target.parentElement) === null || _target$parentElement === void 0 ? void 0 : _target$parentElement.closest(`[${ignoreAttribute}]`);
 
   // This is a super workaround to find when events are coming from Confluence InlineComment modal
   // We don't own those components, so we can't change them

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

@@ -9,6 +9,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx, useTheme } from '@emotion/react';
 import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { richMediaClassName } from '@atlaskit/editor-common/styles';
 import { akEditorGutterPaddingDynamic, editorFontSize } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -58,7 +59,7 @@ import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, 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 { tableCommentEditorStyles, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
+import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionStyles, tasksAndDecisionsStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, taskItemStyles, taskItemStylesWithBlockTaskItem, decisionDangerStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
@@ -66,6 +67,36 @@ import { textHighlightStyle } from './styles/textHighlightStyles';
 import { unsupportedStyles } from './styles/unsupportedStyles';
 import { whitespaceStyles } from './styles/whitespaceStyles';
 const isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+const alignMultipleWrappedImageInLayoutStyles = {
+  '.ProseMirror [data-layout-section] [data-layout-column] > div': {
+    // apply marginTop to wrapped mediaSingle that has preceding wrapped mediaSingle (even when there's gap cursor in between them)
+    // Given the first wrapped mediaSingle in layout has 0 marginTop, this is needed to make sure fellow wrapped mediaSingle align with it horizontally
+    '.mediaSingleView-content-wrap[layout^=wrap] + .mediaSingleView-content-wrap[layout^=wrap], .mediaSingleView-content-wrap[layout^=wrap] + .ProseMirror-gapcursor + .mediaSingleView-content-wrap[layout^=wrap]': {
+      '.rich-media-item': {
+        marginTop: 0
+      }
+    },
+    // Due to the above rule, wrapped mediaSingle (not the first node in layout) that are followed by wrapped mediaSingle should also have 0 marginTop
+    // so it's aligned with the following wrapped mediaSingle
+    '.mediaSingleView-content-wrap[layout^=wrap]:has( + .mediaSingleView-content-wrap[layout^=wrap])': {
+      '.rich-media-item': {
+        marginTop: 0
+      }
+    }
+  }
+};
+const firstWrappedMediaStyles = {
+  '.ProseMirror': {
+    // Remove gap between first wrapped mediaSingle and its fellow wrapped mediaSingle
+    "& [layout^='wrap-']:has(+ [layout^='wrap-']), & [layout^='wrap-']:has(+ .ProseMirror-gapcursor + [layout^='wrap-'])": {
+      [`& .${richMediaClassName}`]: {
+        marginLeft: 0,
+        marginRight: 0
+      }
+    }
+  }
+};
+
 /**
  * EditorContentStyles is a wrapper component that applies styles to its children
  * based on the provided feature flags, view mode, and other props.
@@ -178,6 +209,8 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     ruleStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaStyles,
+    // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
+    fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     telepointerStyle, /* This needs to be after telepointer styles as some overlapping rules have equal specificity, and so the order is significant */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -259,7 +292,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     resizerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    layoutBaseStyles, expValEqualsNoExposure('platform_synced_block', 'isEnabled', true) &&
+    layoutBaseStyles,
+    // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
+    fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, expValEqualsNoExposure('platform_synced_block', 'isEnabled', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     syncBlockStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -361,10 +396,12 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaAlignmentStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    tableLayoutFixes, expValEquals('platform_editor_table_container_width_fix', 'isEnabled', true) &&
+    tableLayoutFixes,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     tableContainerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    !fg('platform_editor_table_container_y_overflow_fix') && tableContainerOverflowY,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     hyperLinkFloatingToolbarStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     !fg('platform-visual-refresh-icons') && linkLegacyIconStylesFix,

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

@@ -37,7 +37,6 @@ export const tableContainerStyles = css({
   '.ProseMirror .pm-table-wrapper': {
     maxWidth: '100%',
     overflowX: 'auto',
-    overflowY: 'visible',
     // Ensure the wrapper doesn't grow beyond its container
     width: '100%',
     boxSizing: 'border-box'
@@ -51,4 +50,13 @@ export const tableContainerStyles = css({
     // Ensure tables can be scrolled horizontally if needed
     minWidth: 'auto'
   }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const tableContainerOverflowY = css({
+  /* Fix for HOT-119925: Ensure table containers have proper width constraints and overflow handling */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper': {
+    overflowY: 'visible'
+  }
 });

package/dist/es2019/version-wrapper.js

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

package/dist/esm/index.js

@@ -36,13 +36,5 @@ export { getNodesCount } from './utils/getNodesCount';
 export { default as measurements } from './utils/performance/measure-enum';
 export { createFeatureFlagsFromProps } from './utils/feature-flags-from-props';
 export { default as EditorActions } from './actions';
-export {
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required
-/**
- * @deprecated
- * DO NOT USE THIS WILL BE REMOVED SOON.
- * use this instead: packages/editor/editor-core/src/ui/EditorContentContainer.tsx
- */
-createEditorContentStyle } from './ui/ContentStyles';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor/create-plugins-list';
 export { ReactEditorView } from './create-editor/ReactEditorView';

package/dist/esm/ui/Addon/click-area-helper.js

@@ -2,7 +2,6 @@ import { tintDirtyTransaction } from '@atlaskit/editor-common/collab';
 import { addParagraphAtEnd } from '@atlaskit/editor-common/commands';
 import { setSelectionTopLevelBlocks } from '@atlaskit/editor-common/selection';
 import { closestElement } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ignoreAttribute } from './ClickAreaBlock/contentComponentWrapper';
 
@@ -78,7 +77,7 @@ var clickAreaClickHandler = function clickAreaClickHandler(view, event) {
   closestElement(selection === null || selection === void 0 ? void 0 : selection.anchorNode, '[data-editor-popup]');
 
   // For clicks directly on the content component -- they should not be ignored
-  var isContentComponent = fg('platform_editor_keep_focus_on_content_comp_clicks') ? target === null || target === void 0 || (_target$parentElement = target.parentElement) === null || _target$parentElement === void 0 ? void 0 : _target$parentElement.closest("[".concat(ignoreAttribute, "]")) : !!closestElement(target, "[".concat(ignoreAttribute, "]")) || (target === null || target === void 0 ? void 0 : target.getAttribute(ignoreAttribute)) === 'true';
+  var isContentComponent = target === null || target === void 0 || (_target$parentElement = target.parentElement) === null || _target$parentElement === void 0 ? void 0 : _target$parentElement.closest("[".concat(ignoreAttribute, "]"));
 
   // This is a super workaround to find when events are coming from Confluence InlineComment modal
   // We don't own those components, so we can't change them

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

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
 /**
@@ -9,6 +10,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx, useTheme } from '@emotion/react';
 import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { richMediaClassName } from '@atlaskit/editor-common/styles';
 import { akEditorGutterPaddingDynamic, editorFontSize } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -58,7 +60,7 @@ import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, 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 { tableCommentEditorStyles, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
+import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionStyles, tasksAndDecisionsStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, taskItemStyles, taskItemStylesWithBlockTaskItem, decisionDangerStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
@@ -66,6 +68,34 @@ import { textHighlightStyle } from './styles/textHighlightStyles';
 import { unsupportedStyles } from './styles/unsupportedStyles';
 import { whitespaceStyles } from './styles/whitespaceStyles';
 var isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+var alignMultipleWrappedImageInLayoutStyles = {
+  '.ProseMirror [data-layout-section] [data-layout-column] > div': {
+    // apply marginTop to wrapped mediaSingle that has preceding wrapped mediaSingle (even when there's gap cursor in between them)
+    // Given the first wrapped mediaSingle in layout has 0 marginTop, this is needed to make sure fellow wrapped mediaSingle align with it horizontally
+    '.mediaSingleView-content-wrap[layout^=wrap] + .mediaSingleView-content-wrap[layout^=wrap], .mediaSingleView-content-wrap[layout^=wrap] + .ProseMirror-gapcursor + .mediaSingleView-content-wrap[layout^=wrap]': {
+      '.rich-media-item': {
+        marginTop: 0
+      }
+    },
+    // Due to the above rule, wrapped mediaSingle (not the first node in layout) that are followed by wrapped mediaSingle should also have 0 marginTop
+    // so it's aligned with the following wrapped mediaSingle
+    '.mediaSingleView-content-wrap[layout^=wrap]:has( + .mediaSingleView-content-wrap[layout^=wrap])': {
+      '.rich-media-item': {
+        marginTop: 0
+      }
+    }
+  }
+};
+var firstWrappedMediaStyles = {
+  '.ProseMirror': {
+    // Remove gap between first wrapped mediaSingle and its fellow wrapped mediaSingle
+    "& [layout^='wrap-']:has(+ [layout^='wrap-']), & [layout^='wrap-']:has(+ .ProseMirror-gapcursor + [layout^='wrap-'])": _defineProperty({}, "& .".concat(richMediaClassName), {
+      marginLeft: 0,
+      marginRight: 0
+    })
+  }
+};
+
 /**
  * EditorContentStyles is a wrapper component that applies styles to its children
  * based on the provided feature flags, view mode, and other props.
@@ -175,6 +205,8 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     ruleStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaStyles,
+    // merge firstWrappedMediaStyles with mediaStyles when clean up platform_editor_fix_media_in_renderer
+    fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     telepointerStyle, /* This needs to be after telepointer styles as some overlapping rules have equal specificity, and so the order is significant */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -256,7 +288,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     resizerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    layoutBaseStyles, expValEqualsNoExposure('platform_synced_block', 'isEnabled', true) &&
+    layoutBaseStyles,
+    // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
+    fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, expValEqualsNoExposure('platform_synced_block', 'isEnabled', true) &&
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     syncBlockStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -358,10 +392,12 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaAlignmentStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    tableLayoutFixes, expValEquals('platform_editor_table_container_width_fix', 'isEnabled', true) &&
+    tableLayoutFixes,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     tableContainerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    !fg('platform_editor_table_container_y_overflow_fix') && tableContainerOverflowY,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     hyperLinkFloatingToolbarStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     !fg('platform-visual-refresh-icons') && linkLegacyIconStylesFix,

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

@@ -34,7 +34,6 @@ export var tableContainerStyles = css({
   '.ProseMirror .pm-table-wrapper': {
     maxWidth: '100%',
     overflowX: 'auto',
-    overflowY: 'visible',
     // Ensure the wrapper doesn't grow beyond its container
     width: '100%',
     boxSizing: 'border-box'
@@ -48,4 +47,13 @@ export var tableContainerStyles = css({
     // Ensure tables can be scrolled horizontally if needed
     minWidth: 'auto'
   }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var tableContainerOverflowY = css({
+  /* Fix for HOT-119925: Ensure table containers have proper width constraints and overflow handling */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper': {
+    overflowY: 'visible'
+  }
 });

package/dist/esm/version-wrapper.js

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

package/dist/types/index.d.ts

@@ -28,12 +28,5 @@ export { default as measurements } from './utils/performance/measure-enum';
 export { createFeatureFlagsFromProps } from './utils/feature-flags-from-props';
 export type { Command, EditorProps, EditorInstance, CommandDispatch } from './types';
 export { default as EditorActions } from './actions';
-export { 
-/**
- * @deprecated
- * DO NOT USE THIS WILL BE REMOVED SOON.
- * use this instead: packages/editor/editor-core/src/ui/EditorContentContainer.tsx
- */
-createEditorContentStyle, } from './ui/ContentStyles';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor/create-plugins-list';
 export { ReactEditorView } from './create-editor/ReactEditorView';

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

@@ -3,3 +3,4 @@ export declare const tableLayoutFixes: SerializedStyles;
 export declare const tableCommentEditorMarginOverride: SerializedStyles;
 export declare const tableCommentEditorStyles: SerializedStyles;
 export declare const tableContainerStyles: SerializedStyles;
+export declare const tableContainerOverflowY: SerializedStyles;

package/dist/types-ts4.5/index.d.ts

@@ -28,12 +28,5 @@ export { default as measurements } from './utils/performance/measure-enum';
 export { createFeatureFlagsFromProps } from './utils/feature-flags-from-props';
 export type { Command, EditorProps, EditorInstance, CommandDispatch } from './types';
 export { default as EditorActions } from './actions';
-export { 
-/**
- * @deprecated
- * DO NOT USE THIS WILL BE REMOVED SOON.
- * use this instead: packages/editor/editor-core/src/ui/EditorContentContainer.tsx
- */
-createEditorContentStyle, } from './ui/ContentStyles';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor/create-plugins-list';
 export { ReactEditorView } from './create-editor/ReactEditorView';

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

@@ -3,3 +3,4 @@ export declare const tableLayoutFixes: SerializedStyles;
 export declare const tableCommentEditorMarginOverride: SerializedStyles;
 export declare const tableCommentEditorStyles: SerializedStyles;
 export declare const tableContainerStyles: SerializedStyles;
+export declare const tableContainerOverflowY: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "214.2.3",
+	"version": "215.0.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -50,7 +50,7 @@
 		"@atlaskit/editor-performance-metrics": "^2.1.0",
 		"@atlaskit/editor-plugin-quick-insert": "^6.0.0",
 		"@atlaskit/editor-plugin-user-preferences": "^4.0.0",
-		"@atlaskit/editor-plugins": "^10.6.0",
+		"@atlaskit/editor-plugins": "^11.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-toolbar": "^0.14.0",
@@ -64,7 +64,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.11.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.5.0",
+		"@atlaskit/tmp-editor-statsig": "^13.6.0",
 		"@atlaskit/tokens": "^6.4.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -81,7 +81,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.8.0",
+		"@atlaskit/editor-common": "^110.9.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -97,7 +97,7 @@
 		"@atlaskit/editor-plugin-annotation": "^6.1.0",
 		"@atlaskit/editor-plugin-card": "^11.2.0",
 		"@atlaskit/editor-plugin-list": "^8.0.0",
-		"@atlaskit/editor-plugin-paste": "^7.0.0",
+		"@atlaskit/editor-plugin-paste": "^7.2.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/logo": "^19.9.0",
 		"@atlaskit/media-core": "^37.0.0",
@@ -261,6 +261,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_fix_media_in_renderer": {
+			"type": "boolean"
+		},
 		"platform_editor_react_18_autofocus_fix": {
 			"type": "boolean"
 		},
@@ -317,9 +320,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_keep_focus_on_content_comp_clicks": {
-			"type": "boolean"
-		},
 		"platform_editor_cmd_y_mac_redo_shortcut": {
 			"type": "boolean",
 			"referenceOnly": true
@@ -478,6 +478,9 @@
 		},
 		"platform_editor_text_highlight_padding": {
 			"type": "boolean"
+		},
+		"platform_editor_table_container_y_overflow_fix": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {

package/create-editor-content-style/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "@atlaskit/editor-core/create-editor-content-style",
-  "main": "../dist/cjs/ui/ContentStyles/index.js",
-  "module": "../dist/esm/ui/ContentStyles/index.js",
-  "module:es2019": "../dist/es2019/ui/ContentStyles/index.js",
-  "sideEffects": [
-    "*.compiled.css"
-  ],
-  "types": "../dist/types/ui/ContentStyles/index.d.ts",
-  "typesVersions": {
-    ">=4.5 <5.9": {
-      "*": [
-        "../dist/types-ts4.5/ui/ContentStyles/index.d.ts"
-      ]
-    }
-  }
-}