@atlaskit/editor-common 119.2.1 → 119.5.0

package/CHANGELOG.md

@@ -1,5 +1,99 @@
 # @atlaskit/editor-common
 
+## 119.5.0
+
+### Minor Changes
+
+- [`b5b6cb8261481`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b5b6cb8261481) -
+  [CCI-18813] Fix the Post Stream Review modal anchoring far from the real edit (e.g. at an
+  unrelated panel) during backend AI streaming, when the only change to that node was a layout
+  `breakout` mark (e.g. a width change). The collab-edit segment producer recorded it as a
+  reviewable segment while the AI-plugin filter dropped it, leaving the modal anchored to a node
+  with no visible diff.
+
+  The layout-mark-aware slice comparison is now shared from `@atlaskit/editor-common` (new
+  `./collab-agent-review-slice-compare` entry point exporting `slicesEqualIgnoringLocalId`) and used
+  by both sides, so a `localId`-only or `breakout`-only difference is consistently treated as no
+  change. Real content and formatting edits are still recorded.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 119.4.0
+
+### Minor Changes
+
+- [`710e3d9ec4c65`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/710e3d9ec4c65) -
+  Allow a table nested inside a panel, but only at the document root, inside a synced block, or
+  inside a layout column (the `panel_c1` variant).
+
+  `panel_c1` is now marked `stage0` and emitted as a standalone JSON Schema definition (via
+  `noExtend`), so table-in-panel validates in the stage-0 schema at those positions only — a plain
+  `panel` elsewhere still rejects a table.
+
+  The runtime `@atlaskit/adf-utils` validator can now accept table-in-panel via the `panel_c1` spec
+  directly, gated behind the `platform_editor_table_in_panel_patch_1` feature gate. Three validator
+  fixes make this work (all gated — when the gate is off, the validator behaves exactly as before):
+  1. A variant tuple's overridden content-item names are resolved to their base specs the same way
+     base-spec content is (e.g. `paragraph_with_no_marks` → `paragraph`). Previously they stayed
+     raw, so `panel_c1` matched only plainly-named children (`table`) and rejected variant-named
+     ones (a normal `paragraph`).
+  2. `createSpec` retains a variant whose overridden content is a nested `$or` list (e.g.
+     `panel_c1`) when the validator is built from an explicit node list (as `validateADFEntity`
+     does).
+  3. When a stored node matches several candidate specs, the multi-branch matcher prefers a branch
+     that validates cleanly over one that only "succeeds" by wrapping otherwise-valid content as
+     `unsupportedBlock` — so `panel_c1` is chosen instead of the base `panel` repairing the table
+     away.
+
+  The `allowTableInPanel` override in `@atlaskit/editor-common` is retained but gated by the same
+  feature gate: when `platform_editor_table_in_panel_patch_1` is on the override is skipped (the
+  validator fixes handle table-in-panel); when it is off the override runs as before. So the single
+  gate flips between the new validator behaviour (on) and the previous override behaviour (off).
+
+  Also adds `panel-with-nested-table` validation fixtures.
+
+  **BREAKING (`@atlaskit/adf-schema`):** marking `panel_c1` as `stage0` (correcting an earlier
+  omission) renames its generated `schema-next` exports: `panelC1` → `panelC1Stage0`, `PanelC1Node`
+  → `PanelC1Stage0Node`, `PanelC1Definition` → `PanelC1Stage0Definition`.
+
+  Migration — update imports from `@atlaskit/adf-schema/schema-next`:
+
+  ```ts
+  // Before
+  import {
+  	panelC1,
+  	type PanelC1Node,
+  	type PanelC1Definition,
+  } from '@atlaskit/adf-schema/schema-next';
+
+  // After
+  import {
+  	panelC1Stage0,
+  	type PanelC1Stage0Node,
+  	type PanelC1Stage0Definition,
+  } from '@atlaskit/adf-schema/schema-next';
+  ```
+
+### Patch Changes
+
+- [`eec66a5b383e5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eec66a5b383e5) -
+  Scope selection toolbar interactions and dropdown refocus behavior to their owning editor behind
+  the `platform_editor_toolbar_multi_editor_fix` experiment.
+- [`07a24b62d9f86`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/07a24b62d9f86) -
+  Fix MBE empty frame placeholder styling to tolerate ProseMirror selection marker elements.
+- Updated dependencies
+
+## 119.3.0
+
+### Minor Changes
+
+- [`47b2ae576b031`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/47b2ae576b031) -
+  [ux] Under the `cc_maui_remix_button_hover_corridor` experiment, replace the Remix button's
+  rendered hover corridor and fixed right-margin exclusion with the existing click-wrapper hover
+  tracking. Hide block controls over the marked object sidebar container and its control surfaces.
+
 ## 119.2.1
 
 ### Patch Changes

package/block-controls-suppression/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/editor-common/block-controls-suppression",
+  "main": "../dist/cjs/block-controls-suppression.js",
+  "module": "../dist/esm/block-controls-suppression.js",
+  "module:es2019": "../dist/es2019/block-controls-suppression.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../dist/types/block-controls-suppression.d.ts"
+}

package/collab-agent-review-slice-compare/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/editor-common/collab-agent-review-slice-compare",
+  "main": "../dist/cjs/collab/agent-review-slice-compare.js",
+  "module": "../dist/esm/collab/agent-review-slice-compare.js",
+  "module:es2019": "../dist/es2019/collab/agent-review-slice-compare.js",
+  "sideEffects": [
+    "**/*.compiled.css"
+  ],
+  "types": "../dist/types/collab/agent-review-slice-compare.d.ts"
+}

package/dist/cjs/block-controls-suppression.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isBlockControlsSuppressionTarget = exports.blockControlsSuppressionProps = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE = 'data-block-controls-suppression';
+var BLOCK_CONTROLS_SUPPRESSION_SELECTOR = "[".concat(BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE, "]");
+
+/**
+ * Marks external control surfaces where editor or renderer block controls must be hidden. This
+ * prevents controls such as Remix and comment buttons from appearing underneath Rovo or the object
+ * sidebar while those controls are being used.
+ */
+var blockControlsSuppressionProps = exports.blockControlsSuppressionProps = (0, _defineProperty2.default)({}, BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE, 'true');
+var isBlockControlsSuppressionTarget = exports.isBlockControlsSuppressionTarget = function isBlockControlsSuppressionTarget(target) {
+  return target instanceof Element && target.closest(BLOCK_CONTROLS_SUPPRESSION_SELECTOR) !== null;
+};

package/dist/cjs/collab/agent-review-slice-compare.js

@@ -0,0 +1,99 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.slicesEqualIgnoringLocalId = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+/**
+ * ADF mark types ignored when deciding whether agent-edited content changed:
+ *
+ *   - `breakout` — a layout-width mark (`mode: wide | full-width`) that a
+ *     whole-node/whole-doc replace (e.g. `replaceDoc`) can drop, re-add or
+ *     re-value without the reviewable *content* changing.
+ *
+ * Module-private (not exported) so this file has a single public runtime export
+ * (Volt strict-mode rule), and so callers cannot diverge from the one comparison
+ * definition below.
+ */
+var IGNORED_MARK_TYPES = new Set(['breakout']);
+
+/**
+ * Deep-normalise ADF JSON for change comparison so two structures that differ
+ * ONLY by ignorable metadata compare equal. Specifically it:
+ *
+ *   - strips every `localId` (at any nesting): an ephemeral, per-node identity
+ *     stamp that lives both as a node attribute (`attrs.localId`) and as a
+ *     `fragment` mark attribute. A whole-node/whole-doc replace (e.g.
+ *     `replaceDoc`) re-emits content with FRESH localIds, so content that is
+ *     otherwise identical legitimately carries different localIds.
+ *   - drops ignorable marks (`IGNORED_MARK_TYPES`, e.g. `breakout`) from every
+ *     `marks` array, and removes a `marks` key that becomes empty so `marks: []`
+ *     and an absent `marks` compare equal.
+ *
+ * Removing these regardless of nesting handles all carriers without needing to
+ * know the schema.
+ */
+var _normaliseForChangeCompare = function normaliseForChangeCompare(value) {
+  if (Array.isArray(value)) {
+    return value.map(_normaliseForChangeCompare);
+  }
+  if (value && (0, _typeof2.default)(value) === 'object') {
+    var result = {};
+    for (var _i = 0, _Object$entries = Object.entries(value); _i < _Object$entries.length; _i++) {
+      var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
+        key = _Object$entries$_i[0],
+        child = _Object$entries$_i[1];
+      if (key === 'localId') {
+        continue;
+      }
+      if (key === 'marks' && Array.isArray(child)) {
+        var kept = child.filter(function (mark) {
+          return !(mark && (0, _typeof2.default)(mark) === 'object' && IGNORED_MARK_TYPES.has(mark.type));
+        });
+        // Drop an empty `marks` array so `marks: []` == absent `marks`.
+        if (kept.length > 0) {
+          result[key] = kept.map(_normaliseForChangeCompare);
+        }
+        continue;
+      }
+      result[key] = _normaliseForChangeCompare(child);
+    }
+    return result;
+  }
+  return value;
+};
+
+/**
+ * We cannot use `Slice.eq` here: it delegates to `Node.eq` → `Node.sameMarkup`,
+ * which `compareDeep`s ALL attributes and marks — so two paragraphs with
+ * identical text but different `localId`s (or a dropped/re-valued `breakout`) are
+ * reported as different. That would leak unchanged segments into the review
+ * whenever the AI re-stamps localIds or re-flows layout (the `replaceDoc` case).
+ * We instead compare the normalised JSON, plus the open depths (`openStart` /
+ * `openEnd`) that `Slice.eq` also considers.
+ *
+ * Shared here in `@atlaskit/editor-common` so the two sides of the Review
+ * pipeline agree on what counts as a change: the collab-edit COARSE segment
+ * producer (`getAgentEditSegments`) and the AI-plugin FINE filter
+ * (`entryHasNoChange`). If they disagreed, an edit whose only delta is a
+ * `breakout` change could be recorded as a segment (anchoring the modal) yet
+ * dropped by the filter (no diff). A breakout-only difference is not reviewable;
+ * both sides consume this to honour that consistently.
+ */
+var slicesEqualIgnoringLocalId = exports.slicesEqualIgnoringLocalId = function slicesEqualIgnoringLocalId(a, b) {
+  var _a$content$toJSON, _b$content$toJSON;
+  if (a === b) {
+    return true;
+  }
+  if (a.openStart !== b.openStart || a.openEnd !== b.openEnd) {
+    return false;
+  }
+  // `Fragment.toJSON()` returns `null` for empty content; normalise so two
+  // empty slices (whatever their provenance) still compare equal.
+  var aContent = _normaliseForChangeCompare((_a$content$toJSON = a.content.toJSON()) !== null && _a$content$toJSON !== void 0 ? _a$content$toJSON : null);
+  var bContent = _normaliseForChangeCompare((_b$content$toJSON = b.content.toJSON()) !== null && _b$content$toJSON !== void 0 ? _b$content$toJSON : null);
+  return JSON.stringify(aContent) === JSON.stringify(bContent);
+};

package/dist/cjs/extensibility/MultiBodiedExtension/index.js

@@ -53,7 +53,7 @@ var getContainerCssExtendedStyles = function getContainerCssExtendedStyles(activ
 var getEmptyFramePlaceholderStyles = function getEmptyFramePlaceholderStyles(activeChildIndex, placeholderText) {
   return (0, _react2.css)((0, _defineProperty2.default)({}, "& .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(".concat(activeChildIndex + 1
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  , ") > p:only-child:has(.ProseMirror-trailingBreak:only-child)::before"), {
+  , ") > p:only-child:has(> .ProseMirror-trailingBreak):not(:has(> :not(.ProseMirror-widget):not(.ProseMirror-separator):not(.ProseMirror-trailingBreak)))::before"), {
     color: "var(--ds-text-subtlest, #6B6E76)",
     // JSON.stringify produces a quoted and escaped CSS string.
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

package/dist/cjs/monitoring/error.js

@@ -28,7 +28,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "119.2.0";
+var packageVersion = "119.4.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/toolbar/EditorToolbarUIProvider.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.EditorToolbarUIProvider = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var EditorToolbarUIProvider = exports.EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
   var children = _ref.children,
@@ -26,6 +27,9 @@ var EditorToolbarUIProvider = exports.EditorToolbarUIProvider = function EditorT
       // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
       var isKeyboardEscape = event instanceof KeyboardEvent && event.key === 'Escape';
       var shouldFocusEditor = !isKeyboardEscape;
+      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_toolbar_multi_editor_fix') && event instanceof MouseEvent && event.target instanceof Element && !event.target.closest('[role="menu"]')) {
+        return;
+      }
       if (shouldFocusEditor) {
         // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
         // Hence, `.focus()` should also be called in requestAnimationFrame

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "119.2.0";
+var packageVersion = "119.4.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/utils/validate-using-spec.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "wrapWithUnsupported", {
 });
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _validator = require("@atlaskit/adf-utils/validator");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _analytics = require("../analytics");
 var _trackUnsupportedContent = require("./track-unsupported-content");
 var _wrapWithUnsupported = require("./wrapWithUnsupported");
@@ -94,9 +95,11 @@ var validationErrorHandler = exports.validationErrorHandler = function validatio
 
   // panel_c1 is a ProseMirror-only variant: on save, table-in-panel documents are stored as
   // plain ADF `panel` nodes containing a `table`. The base validator-spec does not permit
-  // `table` inside `panel` (it's gated behind the experiment), so we suppress the
-  // INVALID_CONTENT error when the experiment is active.
-  if (options.allowTableInPanel) {
+  // `table` inside `panel`, so suppress the INVALID_CONTENT error when the experiment is active.
+  // Only while platform_editor_table_in_panel_patch_1 is OFF: with the patch on, the adf-utils
+  // validator accepts table-in-panel positionally (doc / layout column / synced block only), and
+  // this blunt suppression would wrongly allow it in every panel.
+  if (options.allowTableInPanel && !(0, _fg.fg)('platform_editor_table_in_panel_patch_1')) {
     var _meta = error.meta;
     if ((_meta === null || _meta === void 0 ? void 0 : _meta.parentType) === 'panel' && error.code === 'INVALID_CONTENT' && entity.type === 'table') {
       return entity;

package/dist/es2019/block-controls-suppression.js

@@ -0,0 +1,12 @@
+const BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE = 'data-block-controls-suppression';
+const BLOCK_CONTROLS_SUPPRESSION_SELECTOR = `[${BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE}]`;
+
+/**
+ * Marks external control surfaces where editor or renderer block controls must be hidden. This
+ * prevents controls such as Remix and comment buttons from appearing underneath Rovo or the object
+ * sidebar while those controls are being used.
+ */
+export const blockControlsSuppressionProps = {
+  [BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE]: 'true'
+};
+export const isBlockControlsSuppressionTarget = target => target instanceof Element && target.closest(BLOCK_CONTROLS_SUPPRESSION_SELECTOR) !== null;

package/dist/es2019/collab/agent-review-slice-compare.js

@@ -0,0 +1,85 @@
+/**
+ * ADF mark types ignored when deciding whether agent-edited content changed:
+ *
+ *   - `breakout` — a layout-width mark (`mode: wide | full-width`) that a
+ *     whole-node/whole-doc replace (e.g. `replaceDoc`) can drop, re-add or
+ *     re-value without the reviewable *content* changing.
+ *
+ * Module-private (not exported) so this file has a single public runtime export
+ * (Volt strict-mode rule), and so callers cannot diverge from the one comparison
+ * definition below.
+ */
+const IGNORED_MARK_TYPES = new Set(['breakout']);
+
+/**
+ * Deep-normalise ADF JSON for change comparison so two structures that differ
+ * ONLY by ignorable metadata compare equal. Specifically it:
+ *
+ *   - strips every `localId` (at any nesting): an ephemeral, per-node identity
+ *     stamp that lives both as a node attribute (`attrs.localId`) and as a
+ *     `fragment` mark attribute. A whole-node/whole-doc replace (e.g.
+ *     `replaceDoc`) re-emits content with FRESH localIds, so content that is
+ *     otherwise identical legitimately carries different localIds.
+ *   - drops ignorable marks (`IGNORED_MARK_TYPES`, e.g. `breakout`) from every
+ *     `marks` array, and removes a `marks` key that becomes empty so `marks: []`
+ *     and an absent `marks` compare equal.
+ *
+ * Removing these regardless of nesting handles all carriers without needing to
+ * know the schema.
+ */
+const normaliseForChangeCompare = value => {
+  if (Array.isArray(value)) {
+    return value.map(normaliseForChangeCompare);
+  }
+  if (value && typeof value === 'object') {
+    const result = {};
+    for (const [key, child] of Object.entries(value)) {
+      if (key === 'localId') {
+        continue;
+      }
+      if (key === 'marks' && Array.isArray(child)) {
+        const kept = child.filter(mark => !(mark && typeof mark === 'object' && IGNORED_MARK_TYPES.has(mark.type)));
+        // Drop an empty `marks` array so `marks: []` == absent `marks`.
+        if (kept.length > 0) {
+          result[key] = kept.map(normaliseForChangeCompare);
+        }
+        continue;
+      }
+      result[key] = normaliseForChangeCompare(child);
+    }
+    return result;
+  }
+  return value;
+};
+
+/**
+ * We cannot use `Slice.eq` here: it delegates to `Node.eq` → `Node.sameMarkup`,
+ * which `compareDeep`s ALL attributes and marks — so two paragraphs with
+ * identical text but different `localId`s (or a dropped/re-valued `breakout`) are
+ * reported as different. That would leak unchanged segments into the review
+ * whenever the AI re-stamps localIds or re-flows layout (the `replaceDoc` case).
+ * We instead compare the normalised JSON, plus the open depths (`openStart` /
+ * `openEnd`) that `Slice.eq` also considers.
+ *
+ * Shared here in `@atlaskit/editor-common` so the two sides of the Review
+ * pipeline agree on what counts as a change: the collab-edit COARSE segment
+ * producer (`getAgentEditSegments`) and the AI-plugin FINE filter
+ * (`entryHasNoChange`). If they disagreed, an edit whose only delta is a
+ * `breakout` change could be recorded as a segment (anchoring the modal) yet
+ * dropped by the filter (no diff). A breakout-only difference is not reviewable;
+ * both sides consume this to honour that consistently.
+ */
+export const slicesEqualIgnoringLocalId = (a, b) => {
+  var _a$content$toJSON, _b$content$toJSON;
+  if (a === b) {
+    return true;
+  }
+  if (a.openStart !== b.openStart || a.openEnd !== b.openEnd) {
+    return false;
+  }
+  // `Fragment.toJSON()` returns `null` for empty content; normalise so two
+  // empty slices (whatever their provenance) still compare equal.
+  const aContent = normaliseForChangeCompare((_a$content$toJSON = a.content.toJSON()) !== null && _a$content$toJSON !== void 0 ? _a$content$toJSON : null);
+  const bContent = normaliseForChangeCompare((_b$content$toJSON = b.content.toJSON()) !== null && _b$content$toJSON !== void 0 ? _b$content$toJSON : null);
+  return JSON.stringify(aContent) === JSON.stringify(bContent);
+};

package/dist/es2019/extensibility/MultiBodiedExtension/index.js

@@ -42,7 +42,7 @@ const getEmptyFramePlaceholderStyles = (activeChildIndex, placeholderText) => cs
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   [`& .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(${activeChildIndex + 1
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  }) > p:only-child:has(.ProseMirror-trailingBreak:only-child)::before`]: {
+  }) > p:only-child:has(> .ProseMirror-trailingBreak):not(:has(> :not(.ProseMirror-widget):not(.ProseMirror-separator):not(.ProseMirror-trailingBreak)))::before`]: {
     color: "var(--ds-text-subtlest, #6B6E76)",
     // JSON.stringify produces a quoted and escaped CSS string.
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

package/dist/es2019/monitoring/error.js

@@ -14,7 +14,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "119.2.0";
+const packageVersion = "119.4.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/toolbar/EditorToolbarUIProvider.js

@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react';
 import { ToolbarUIProvider } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export const EditorToolbarUIProvider = ({
   children,
   api,
@@ -20,6 +21,9 @@ export const EditorToolbarUIProvider = ({
       // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
       const isKeyboardEscape = event instanceof KeyboardEvent && event.key === 'Escape';
       const shouldFocusEditor = !isKeyboardEscape;
+      if (isExperimentEnabled('platform_editor_toolbar_multi_editor_fix') && event instanceof MouseEvent && event.target instanceof Element && !event.target.closest('[role="menu"]')) {
+        return;
+      }
       if (shouldFocusEditor) {
         // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
         // Hence, `.focus()` should also be called in requestAnimationFrame

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "119.2.0";
+const packageVersion = "119.4.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/utils/validate-using-spec.js

@@ -1,4 +1,5 @@
 import { validator } from '@atlaskit/adf-utils/validator';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ACTION_SUBJECT_ID } from '../analytics';
 export const UNSUPPORTED_NODE_ATTRIBUTE = 'unsupportedNodeAttribute';
 import { fireUnsupportedEvent } from './track-unsupported-content';
@@ -79,9 +80,11 @@ export const validationErrorHandler = (entity, error, options, marks, validate,
 
   // panel_c1 is a ProseMirror-only variant: on save, table-in-panel documents are stored as
   // plain ADF `panel` nodes containing a `table`. The base validator-spec does not permit
-  // `table` inside `panel` (it's gated behind the experiment), so we suppress the
-  // INVALID_CONTENT error when the experiment is active.
-  if (options.allowTableInPanel) {
+  // `table` inside `panel`, so suppress the INVALID_CONTENT error when the experiment is active.
+  // Only while platform_editor_table_in_panel_patch_1 is OFF: with the patch on, the adf-utils
+  // validator accepts table-in-panel positionally (doc / layout column / synced block only), and
+  // this blunt suppression would wrongly allow it in every panel.
+  if (options.allowTableInPanel && !fg('platform_editor_table_in_panel_patch_1')) {
     const meta = error.meta;
     if ((meta === null || meta === void 0 ? void 0 : meta.parentType) === 'panel' && error.code === 'INVALID_CONTENT' && entity.type === 'table') {
       return entity;

package/dist/esm/block-controls-suppression.js

@@ -0,0 +1,13 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE = 'data-block-controls-suppression';
+var BLOCK_CONTROLS_SUPPRESSION_SELECTOR = "[".concat(BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE, "]");
+
+/**
+ * Marks external control surfaces where editor or renderer block controls must be hidden. This
+ * prevents controls such as Remix and comment buttons from appearing underneath Rovo or the object
+ * sidebar while those controls are being used.
+ */
+export var blockControlsSuppressionProps = _defineProperty({}, BLOCK_CONTROLS_SUPPRESSION_ATTRIBUTE, 'true');
+export var isBlockControlsSuppressionTarget = function isBlockControlsSuppressionTarget(target) {
+  return target instanceof Element && target.closest(BLOCK_CONTROLS_SUPPRESSION_SELECTOR) !== null;
+};

package/dist/esm/collab/agent-review-slice-compare.js

@@ -0,0 +1,92 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _typeof from "@babel/runtime/helpers/typeof";
+/**
+ * ADF mark types ignored when deciding whether agent-edited content changed:
+ *
+ *   - `breakout` — a layout-width mark (`mode: wide | full-width`) that a
+ *     whole-node/whole-doc replace (e.g. `replaceDoc`) can drop, re-add or
+ *     re-value without the reviewable *content* changing.
+ *
+ * Module-private (not exported) so this file has a single public runtime export
+ * (Volt strict-mode rule), and so callers cannot diverge from the one comparison
+ * definition below.
+ */
+var IGNORED_MARK_TYPES = new Set(['breakout']);
+
+/**
+ * Deep-normalise ADF JSON for change comparison so two structures that differ
+ * ONLY by ignorable metadata compare equal. Specifically it:
+ *
+ *   - strips every `localId` (at any nesting): an ephemeral, per-node identity
+ *     stamp that lives both as a node attribute (`attrs.localId`) and as a
+ *     `fragment` mark attribute. A whole-node/whole-doc replace (e.g.
+ *     `replaceDoc`) re-emits content with FRESH localIds, so content that is
+ *     otherwise identical legitimately carries different localIds.
+ *   - drops ignorable marks (`IGNORED_MARK_TYPES`, e.g. `breakout`) from every
+ *     `marks` array, and removes a `marks` key that becomes empty so `marks: []`
+ *     and an absent `marks` compare equal.
+ *
+ * Removing these regardless of nesting handles all carriers without needing to
+ * know the schema.
+ */
+var _normaliseForChangeCompare = function normaliseForChangeCompare(value) {
+  if (Array.isArray(value)) {
+    return value.map(_normaliseForChangeCompare);
+  }
+  if (value && _typeof(value) === 'object') {
+    var result = {};
+    for (var _i = 0, _Object$entries = Object.entries(value); _i < _Object$entries.length; _i++) {
+      var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+        key = _Object$entries$_i[0],
+        child = _Object$entries$_i[1];
+      if (key === 'localId') {
+        continue;
+      }
+      if (key === 'marks' && Array.isArray(child)) {
+        var kept = child.filter(function (mark) {
+          return !(mark && _typeof(mark) === 'object' && IGNORED_MARK_TYPES.has(mark.type));
+        });
+        // Drop an empty `marks` array so `marks: []` == absent `marks`.
+        if (kept.length > 0) {
+          result[key] = kept.map(_normaliseForChangeCompare);
+        }
+        continue;
+      }
+      result[key] = _normaliseForChangeCompare(child);
+    }
+    return result;
+  }
+  return value;
+};
+
+/**
+ * We cannot use `Slice.eq` here: it delegates to `Node.eq` → `Node.sameMarkup`,
+ * which `compareDeep`s ALL attributes and marks — so two paragraphs with
+ * identical text but different `localId`s (or a dropped/re-valued `breakout`) are
+ * reported as different. That would leak unchanged segments into the review
+ * whenever the AI re-stamps localIds or re-flows layout (the `replaceDoc` case).
+ * We instead compare the normalised JSON, plus the open depths (`openStart` /
+ * `openEnd`) that `Slice.eq` also considers.
+ *
+ * Shared here in `@atlaskit/editor-common` so the two sides of the Review
+ * pipeline agree on what counts as a change: the collab-edit COARSE segment
+ * producer (`getAgentEditSegments`) and the AI-plugin FINE filter
+ * (`entryHasNoChange`). If they disagreed, an edit whose only delta is a
+ * `breakout` change could be recorded as a segment (anchoring the modal) yet
+ * dropped by the filter (no diff). A breakout-only difference is not reviewable;
+ * both sides consume this to honour that consistently.
+ */
+export var slicesEqualIgnoringLocalId = function slicesEqualIgnoringLocalId(a, b) {
+  var _a$content$toJSON, _b$content$toJSON;
+  if (a === b) {
+    return true;
+  }
+  if (a.openStart !== b.openStart || a.openEnd !== b.openEnd) {
+    return false;
+  }
+  // `Fragment.toJSON()` returns `null` for empty content; normalise so two
+  // empty slices (whatever their provenance) still compare equal.
+  var aContent = _normaliseForChangeCompare((_a$content$toJSON = a.content.toJSON()) !== null && _a$content$toJSON !== void 0 ? _a$content$toJSON : null);
+  var bContent = _normaliseForChangeCompare((_b$content$toJSON = b.content.toJSON()) !== null && _b$content$toJSON !== void 0 ? _b$content$toJSON : null);
+  return JSON.stringify(aContent) === JSON.stringify(bContent);
+};

package/dist/esm/extensibility/MultiBodiedExtension/index.js

@@ -46,7 +46,7 @@ var getContainerCssExtendedStyles = function getContainerCssExtendedStyles(activ
 var getEmptyFramePlaceholderStyles = function getEmptyFramePlaceholderStyles(activeChildIndex, placeholderText) {
   return css(_defineProperty({}, "& .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true']:nth-of-type(".concat(activeChildIndex + 1
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-  , ") > p:only-child:has(.ProseMirror-trailingBreak:only-child)::before"), {
+  , ") > p:only-child:has(> .ProseMirror-trailingBreak):not(:has(> :not(.ProseMirror-widget):not(.ProseMirror-separator):not(.ProseMirror-trailingBreak)))::before"), {
     color: "var(--ds-text-subtlest, #6B6E76)",
     // JSON.stringify produces a quoted and escaped CSS string.
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766

package/dist/esm/monitoring/error.js

@@ -20,7 +20,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "119.2.0";
+var packageVersion = "119.4.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/toolbar/EditorToolbarUIProvider.js

@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react';
 import { ToolbarUIProvider } from '@atlaskit/editor-toolbar';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 export var EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
   var children = _ref.children,
     api = _ref.api,
@@ -18,6 +19,9 @@ export var EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
       // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
       var isKeyboardEscape = event instanceof KeyboardEvent && event.key === 'Escape';
       var shouldFocusEditor = !isKeyboardEscape;
+      if (isExperimentEnabled('platform_editor_toolbar_multi_editor_fix') && event instanceof MouseEvent && event.target instanceof Element && !event.target.closest('[role="menu"]')) {
+        return;
+      }
       if (shouldFocusEditor) {
         // On Dropdown closed, focus is returned to trigger button by default in requestAnimationFrame
         // Hence, `.focus()` should also be called in requestAnimationFrame

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "119.2.0";
+var packageVersion = "119.4.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/utils/validate-using-spec.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { validator } from '@atlaskit/adf-utils/validator';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ACTION_SUBJECT_ID } from '../analytics';
 export var UNSUPPORTED_NODE_ATTRIBUTE = 'unsupportedNodeAttribute';
 import { fireUnsupportedEvent } from './track-unsupported-content';
@@ -81,9 +82,11 @@ export var validationErrorHandler = function validationErrorHandler(entity, erro
 
   // panel_c1 is a ProseMirror-only variant: on save, table-in-panel documents are stored as
   // plain ADF `panel` nodes containing a `table`. The base validator-spec does not permit
-  // `table` inside `panel` (it's gated behind the experiment), so we suppress the
-  // INVALID_CONTENT error when the experiment is active.
-  if (options.allowTableInPanel) {
+  // `table` inside `panel`, so suppress the INVALID_CONTENT error when the experiment is active.
+  // Only while platform_editor_table_in_panel_patch_1 is OFF: with the patch on, the adf-utils
+  // validator accepts table-in-panel positionally (doc / layout column / synced block only), and
+  // this blunt suppression would wrongly allow it in every panel.
+  if (options.allowTableInPanel && !fg('platform_editor_table_in_panel_patch_1')) {
     var _meta = error.meta;
     if ((_meta === null || _meta === void 0 ? void 0 : _meta.parentType) === 'panel' && error.code === 'INVALID_CONTENT' && entity.type === 'table') {
       return entity;

package/dist/types/block-controls-suppression.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Marks external control surfaces where editor or renderer block controls must be hidden. This
+ * prevents controls such as Remix and comment buttons from appearing underneath Rovo or the object
+ * sidebar while those controls are being used.
+ */
+export declare const blockControlsSuppressionProps: {
+    readonly 'data-block-controls-suppression': 'true';
+};
+export declare const isBlockControlsSuppressionTarget: (target: EventTarget | null) => boolean;

package/dist/types/collab/agent-review-slice-compare.d.ts

@@ -0,0 +1,19 @@
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
+/**
+ * We cannot use `Slice.eq` here: it delegates to `Node.eq` → `Node.sameMarkup`,
+ * which `compareDeep`s ALL attributes and marks — so two paragraphs with
+ * identical text but different `localId`s (or a dropped/re-valued `breakout`) are
+ * reported as different. That would leak unchanged segments into the review
+ * whenever the AI re-stamps localIds or re-flows layout (the `replaceDoc` case).
+ * We instead compare the normalised JSON, plus the open depths (`openStart` /
+ * `openEnd`) that `Slice.eq` also considers.
+ *
+ * Shared here in `@atlaskit/editor-common` so the two sides of the Review
+ * pipeline agree on what counts as a change: the collab-edit COARSE segment
+ * producer (`getAgentEditSegments`) and the AI-plugin FINE filter
+ * (`entryHasNoChange`). If they disagreed, an edit whose only delta is a
+ * `breakout` change could be recorded as a segment (anchoring the modal) yet
+ * dropped by the filter (no diff). A breakout-only difference is not reviewable;
+ * both sides consume this to honour that consistently.
+ */
+export declare const slicesEqualIgnoringLocalId: (a: Slice, b: Slice) => boolean;

package/dist/types/utils/validate-using-spec.d.ts

@@ -11,8 +11,8 @@ export declare const validationErrorHandler: (entity: ADFEntity, error: Validati
     type: string;
 } | undefined;
 export declare const validateADFEntity: (schema: Schema, node: ADFEntity, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, validationOverrides?: {
+    allowExpandInPanel?: boolean;
     allowNestedTables?: boolean;
     allowTableInPanel?: boolean;
-    allowExpandInPanel?: boolean;
 }) => ADFEntity;
 export { wrapWithUnsupported } from './wrapWithUnsupported';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "119.2.1",
+	"version": "119.5.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,8 +29,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^3.0.0",
-		"@atlaskit/adf-schema": "^56.7.0",
-		"@atlaskit/adf-utils": "^20.5.0",
+		"@atlaskit/adf-schema": "^57.0.0",
+		"@atlaskit/adf-utils": "^20.6.0",
 		"@atlaskit/afm-i18n-platform-editor-editor-common": "2.200.0",
 		"@atlaskit/analytics-listeners": "^11.1.0",
 		"@atlaskit/analytics-namespaced-context": "^8.1.0",
@@ -42,14 +42,14 @@
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/custom-steps": "^1.0.0",
 		"@atlaskit/dropdown-menu": "^18.0.0",
-		"@atlaskit/editor-json-transformer": "^9.3.0",
+		"@atlaskit/editor-json-transformer": "^9.4.0",
 		"@atlaskit/editor-palette": "^3.4.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/editor-toolbar": "^2.4.0",
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
-		"@atlaskit/editor-ui-control-model": "^2.6.0",
+		"@atlaskit/editor-ui-control-model": "^2.7.0",
 		"@atlaskit/emoji": "^71.17.0",
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
 		"@atlaskit/icon": "^37.3.0",
@@ -84,7 +84,7 @@
 		"@atlaskit/task-decision": "^21.8.0",
 		"@atlaskit/teams-app-config": "^2.2.0",
 		"@atlaskit/textfield": "^10.0.0",
-		"@atlaskit/tmp-editor-statsig": "^147.1.0",
+		"@atlaskit/tmp-editor-statsig": "^148.0.0",
 		"@atlaskit/tokens": "^16.7.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@atlaskit/width-detector": "^7.0.0",
@@ -168,6 +168,10 @@
 		"platform_editor_use_new_experiments_api": {
 			"type": "boolean"
 		},
+		"platform_editor_table_in_panel_patch_1": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform-dst-popper-consolidation": {
 			"type": "boolean",
 			"referenceOnly": true