@atlaskit/editor-core 214.2.4 → 215.0.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/editor-core
 
+## 215.0.1
+
+### Patch Changes
+
+- [`8d49afb504f95`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8d49afb504f95) -
+  Cleanup cc_editor_abort_ufo_load_on_editor_scroll
+- [`8cfc5fed7dc74`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8cfc5fed7dc74) -
+  Cleanup annotations_defensive_node_name_calculations
+
+## 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

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

@@ -503,71 +503,67 @@ function ReactEditorView(props) {
   var possibleListeners = _react.default.useRef([]);
   _react.default.useEffect(function () {
     return function () {
-      if ((0, _platformFeatureFlags.fg)('cc_editor_abort_ufo_load_on_editor_scroll')) {
-        if (scrollElement.current) {
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-          var _iterator = _createForOfIteratorHelper(possibleListeners.current),
-            _step;
-          try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              var _scrollElement$curren;
-              var possibleListener = _step.value;
-              // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-              (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 || _scrollElement$curren.removeEventListener.apply(_scrollElement$curren, (0, _toConsumableArray2.default)(possibleListener));
-            }
-          } catch (err) {
-            _iterator.e(err);
-          } finally {
-            _iterator.f();
+      if (scrollElement.current) {
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        var _iterator = _createForOfIteratorHelper(possibleListeners.current),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var _scrollElement$curren;
+            var possibleListener = _step.value;
+            // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+            (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 || _scrollElement$curren.removeEventListener.apply(_scrollElement$curren, (0, _toConsumableArray2.default)(possibleListener));
           }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-        scrollElement.current = null;
       }
+      scrollElement.current = null;
     };
   }, []);
   var handleEditorViewRef = (0, _react.useCallback)(function (node) {
-    if ((0, _platformFeatureFlags.fg)('cc_editor_abort_ufo_load_on_editor_scroll')) {
-      if (node) {
-        scrollElement.current = document.querySelector('[data-editor-scroll-container]');
-        var cleanupListeners = function cleanupListeners() {
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-          var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
-            _step2;
-          try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var _scrollElement$curren2;
-              var possibleListener = _step2.value;
-              // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-              (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 || _scrollElement$curren2.removeEventListener.apply(_scrollElement$curren2, (0, _toConsumableArray2.default)(possibleListener));
-            }
-          } catch (err) {
-            _iterator2.e(err);
-          } finally {
-            _iterator2.f();
+    if (node) {
+      scrollElement.current = document.querySelector('[data-editor-scroll-container]');
+      var cleanupListeners = function cleanupListeners() {
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var _scrollElement$curren2;
+            var possibleListener = _step2.value;
+            // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+            (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 || _scrollElement$curren2.removeEventListener.apply(_scrollElement$curren2, (0, _toConsumableArray2.default)(possibleListener));
           }
-        };
-        if (scrollElement.current) {
-          var wheelAbortHandler = function wheelAbortHandler() {
-            var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
-            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
-              (0, _interactionMetrics.abortAll)('new_interaction', "wheel-on-editor-element");
-            }
-            cleanupListeners();
-          };
-          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-          scrollElement.current.addEventListener('wheel', wheelAbortHandler);
-          possibleListeners.current.push(['wheel', wheelAbortHandler]);
-          var scrollAbortHandler = function scrollAbortHandler() {
-            var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
-            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
-              (0, _interactionMetrics.abortAll)('new_interaction', "scroll-on-editor-element");
-            }
-            cleanupListeners();
-          };
-          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-          scrollElement.current.addEventListener('scroll', scrollAbortHandler);
-          possibleListeners.current.push(['scroll', scrollAbortHandler]);
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
         }
+      };
+      if (scrollElement.current) {
+        var wheelAbortHandler = function wheelAbortHandler() {
+          var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
+          if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+            (0, _interactionMetrics.abortAll)('new_interaction', "wheel-on-editor-element");
+          }
+          cleanupListeners();
+        };
+        // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+        scrollElement.current.addEventListener('wheel', wheelAbortHandler);
+        possibleListeners.current.push(['wheel', wheelAbortHandler]);
+        var scrollAbortHandler = function scrollAbortHandler() {
+          var activeInteraction = (0, _interactionMetrics.getActiveInteraction)();
+          if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+            (0, _interactionMetrics.abortAll)('new_interaction', "scroll-on-editor-element");
+          }
+          cleanupListeners();
+        };
+        // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+        scrollElement.current.addEventListener('scroll', scrollAbortHandler);
+        possibleListeners.current.push(['scroll', scrollAbortHandler]);
       }
     }
     if (!viewRef.current && node) {

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/Appearance/FullPage/FullPageToolbarNext.js

@@ -13,6 +13,7 @@ var _reactIntlNext = require("react-intl-next");
 var _contextPanel = require("@atlaskit/editor-common/context-panel");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _toolbar2 = require("../../../utils/toolbar");
 var _Toolbar = require("../../Toolbar/Toolbar");
@@ -114,7 +115,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
     }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/_react.default.createElement("div", {
       "data-testid": 'before-primary-toolbar-components-plugin',
       className: (0, _runtime.ax)([styles.beforePrimaryToolbarComponents])
-    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
+    }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/_react.default.createElement(_ToolbarPortal.ToolbarPortalMountPoint, null)) : toolbarDockingPosition !== 'none' && components && (0, _toolbar2.isToolbar)(toolbar) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
       toolbar: toolbar,
       components: components,
       editorView: editorView,

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 = "0.0.0-development";
+var version = exports.version = "215.0.0";

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

@@ -470,53 +470,49 @@ export function ReactEditorView(props) {
   const possibleListeners = React.useRef([]);
   React.useEffect(() => {
     return () => {
-      if (fg('cc_editor_abort_ufo_load_on_editor_scroll')) {
-        if (scrollElement.current) {
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-          for (const possibleListener of possibleListeners.current) {
-            var _scrollElement$curren;
-            // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-            (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 ? void 0 : _scrollElement$curren.removeEventListener(...possibleListener);
-          }
+      if (scrollElement.current) {
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        for (const possibleListener of possibleListeners.current) {
+          var _scrollElement$curren;
+          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+          (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 ? void 0 : _scrollElement$curren.removeEventListener(...possibleListener);
         }
-        scrollElement.current = null;
       }
+      scrollElement.current = null;
     };
   }, []);
   const handleEditorViewRef = useCallback(node => {
-    if (fg('cc_editor_abort_ufo_load_on_editor_scroll')) {
-      if (node) {
-        scrollElement.current = document.querySelector('[data-editor-scroll-container]');
-        const cleanupListeners = () => {
-          // eslint-disable-next-line react-hooks/exhaustive-deps
-          for (const possibleListener of possibleListeners.current) {
-            var _scrollElement$curren2;
-            // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-            (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 ? void 0 : _scrollElement$curren2.removeEventListener(...possibleListener);
-          }
-        };
-        if (scrollElement.current) {
-          const wheelAbortHandler = () => {
-            const activeInteraction = getActiveInteraction();
-            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
-              abortAll('new_interaction', `wheel-on-editor-element`);
-            }
-            cleanupListeners();
-          };
+    if (node) {
+      scrollElement.current = document.querySelector('[data-editor-scroll-container]');
+      const cleanupListeners = () => {
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        for (const possibleListener of possibleListeners.current) {
+          var _scrollElement$curren2;
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-          scrollElement.current.addEventListener('wheel', wheelAbortHandler);
-          possibleListeners.current.push(['wheel', wheelAbortHandler]);
-          const scrollAbortHandler = () => {
-            const activeInteraction = getActiveInteraction();
-            if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
-              abortAll('new_interaction', `scroll-on-editor-element`);
-            }
-            cleanupListeners();
-          };
-          // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
-          scrollElement.current.addEventListener('scroll', scrollAbortHandler);
-          possibleListeners.current.push(['scroll', scrollAbortHandler]);
+          (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 ? void 0 : _scrollElement$curren2.removeEventListener(...possibleListener);
         }
+      };
+      if (scrollElement.current) {
+        const wheelAbortHandler = () => {
+          const activeInteraction = getActiveInteraction();
+          if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+            abortAll('new_interaction', `wheel-on-editor-element`);
+          }
+          cleanupListeners();
+        };
+        // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+        scrollElement.current.addEventListener('wheel', wheelAbortHandler);
+        possibleListeners.current.push(['wheel', wheelAbortHandler]);
+        const scrollAbortHandler = () => {
+          const activeInteraction = getActiveInteraction();
+          if (activeInteraction && ['edit-page', 'live-edit'].includes(activeInteraction.ufoName)) {
+            abortAll('new_interaction', `scroll-on-editor-element`);
+          }
+          cleanupListeners();
+        };
+        // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
+        scrollElement.current.addEventListener('scroll', scrollAbortHandler);
+        possibleListeners.current.push(['scroll', scrollAbortHandler]);
       }
     }
     if (!viewRef.current && node) {

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/Appearance/FullPage/FullPageToolbarNext.js

@@ -6,10 +6,11 @@ import { useIntl } from 'react-intl-next';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
 import { TOOLBARS } from '@atlaskit/editor-common/toolbar';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isToolbar } from '../../../utils/toolbar';
 import { ToolbarNext } from '../../Toolbar/Toolbar';
-import { useToolbarPortal } from '../../Toolbar/ToolbarPortal';
+import { ToolbarPortalMountPoint, useToolbarPortal } from '../../Toolbar/ToolbarPortal';
 const styles = {
   mainToolbarIconBefore: "_19pkpxbi _2hwxpxbi _otyrpxbi",
   mainToolbarIconBeforeNew: "_4cvr1h6o _1e0c1txw",
@@ -109,7 +110,7 @@ export const FullPageToolbarNext = ({
   }, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
     "data-testid": 'before-primary-toolbar-components-plugin',
     className: ax([styles.beforePrimaryToolbarComponents])
-  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/React.createElement(ToolbarNext, {
+  }, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents)), fg('platform_editor_toolbar_aifc_patch_7') && /*#__PURE__*/React.createElement(ToolbarPortalMountPoint, null)) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && (!expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true) || editorView) && /*#__PURE__*/React.createElement(ToolbarNext, {
     toolbar: toolbar,
     components: components,
     editorView: editorView,

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 = "0.0.0-development";
+export const version = "215.0.0";