@atlaskit/editor-common 114.16.0 → 114.17.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-common
 
+## 114.17.0
+
+### Minor Changes
+
+- [`9c750ab0192db`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9c750ab0192db) -
+  Add role=group and aria-label to expand content div so screen readers announce the body of an
+  expand node
+- [`09301dc1b0c55`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/09301dc1b0c55) -
+  [ux] Switches the order of the image generation tab in the media insert picker to the first
+  position and renames the tab to Create. All changes behind an experiment.
+
+### Patch Changes
+
+- [`42fa4f485424b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/42fa4f485424b) -
+  [ux] Fix Table of Contents extension becoming invisible after drag-and-drop or layout resize when
+  the platform_editor_hydration_skip_react_portal experiment is enabled (EDITOR-6613). The SSR
+  DOM-reuse optimization is now restricted to the very first ExtensionNode init for each
+  (extensionKey, localId) identity within an EditorView. Subsequent ExtensionNodes for the same
+  identity (e.g. those created when ProseMirror constructs the new node view before destroying the
+  old one during drag-and-drop or layout resize) take the normal React render path instead of
+  mistakenly reusing the previous instance's still-mounted React-rendered domRef as if it were SSR
+  output. Per-identity scoping preserves the optimization for pages with multiple TOC extensions.
+- Updated dependencies
+
 ## 114.16.0
 
 ### Minor Changes

package/dist/cjs/extensibility/extensionNodeView.js

@@ -23,6 +23,66 @@ var _ExtensionNodeWrapper = require("./ExtensionNodeWrapper");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+/**
+ * Allowlists of extension keys + layout
+ * Currently, only toc with default layout allows to skip React render.
+ * Extensions NOT in this list always follow the normal React render path.
+ */
+var ssrHydrationExtensionAllowlist = ['toc'];
+var ssrHydrationLayoutAllowlist = ['default'];
+var isSSRHydrationEligible = function isSSRHydrationEligible(node) {
+  var _node$attrs;
+  if (node.type.name !== 'extension') {
+    return false;
+  }
+  var _ref = (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 ? _node$attrs : {},
+    extensionKey = _ref.extensionKey,
+    layout = _ref.layout;
+  if (!ssrHydrationExtensionAllowlist.includes(extensionKey)) {
+    return false;
+  }
+  // Treat a missing layout attr as `default` (the schema default).
+  var effectiveLayout = layout !== null && layout !== void 0 ? layout : 'default';
+  return ssrHydrationLayoutAllowlist.includes(effectiveLayout);
+};
+
+/**
+ * Per-(EditorView, extensionKey + localId) record of which extension identities
+ * have already had their initial-hydration init pass. SSR DOM reuse is only valid
+ * the very first time an ExtensionNode init runs for a given identity in a given
+ * editor — that is the only moment a real SSR-rendered element for that identity
+ * can exist in the editor DOM.
+ *
+ * After the first init, any element matching the SSR selector is the previous
+ * node view's React-rendered domRef that ProseMirror has not yet detached (e.g.
+ * during DnD / layout resize, where ProseMirror constructs the new node view
+ * BEFORE destroying the old one). Reusing it as if it were SSR DOM causes the
+ * new node view to skip React rendering and leaves the extension invisible
+ * (EDITOR-6613).
+ */
+var consumedHydrationIdentitiesByEditor = new WeakMap();
+var _getHydrationIdentityKey = function getHydrationIdentityKey(extensionKey, localId) {
+  if (typeof extensionKey !== 'string' || typeof localId !== 'string') {
+    return null;
+  }
+  if (extensionKey === '' || localId === '') {
+    return null;
+  }
+  return "".concat(extensionKey, "::").concat(localId);
+};
+var hasHydrationIdentityBeenConsumed = function hasHydrationIdentityBeenConsumed(view, identityKey) {
+  var consumed = consumedHydrationIdentitiesByEditor.get(view);
+  return consumed ? consumed.has(identityKey) : false;
+};
+var markHydrationIdentityAsConsumed = function markHydrationIdentityAsConsumed(view, identityKey) {
+  var consumed = consumedHydrationIdentitiesByEditor.get(view);
+  if (!consumed) {
+    consumed = new Set();
+    consumedHydrationIdentitiesByEditor.set(view, consumed);
+  }
+  consumed.add(identityKey);
+};
+
 // getInlineNodeViewProducer is a new api to use instead of ReactNodeView
 // when creating inline node views, however, it is difficult to test the impact
 // on selections when migrating inlineExtension to use the new api.
@@ -36,16 +96,8 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, ExtensionNode, [].concat(args));
-    /**
-     * Track whether we found and are reusing SSR'd DOM.
-     * When true, we skip React Portal rendering on first init to preserve SSR content.
-     */
+    /** True between SSR DOM adoption in `createDomRef` and the SSR→React handoff in `update`. */
     (0, _defineProperty2.default)(_this, "didReuseSsrDom", false);
-    /**
-     * Track whether this is the first init call.
-     * SSR content preservation only happens on the very first init.
-     */
-    (0, _defineProperty2.default)(_this, "isFirstInit", true);
     return _this;
   }
   (0, _inherits2.default)(ExtensionNode, _ReactNodeView);
@@ -59,14 +111,32 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
       return this.node.type.isAtom || mutation.type !== 'selection' && mutation.attributeName !== 'data-layout';
     }
 
+    /** See {@link consumedHydrationIdentitiesByEditor}. Null when attrs are missing → SSR reuse skipped. */
+  }, {
+    key: "getHydrationIdentityKey",
+    value: function getHydrationIdentityKey() {
+      var _this$node$attrs, _this$node$attrs2;
+      return _getHydrationIdentityKey((_this$node$attrs = this.node.attrs) === null || _this$node$attrs === void 0 ? void 0 : _this$node$attrs.extensionKey, (_this$node$attrs2 = this.node.attrs) === null || _this$node$attrs2 === void 0 ? void 0 : _this$node$attrs2.localId);
+    }
+
+    /** True only for the first ExtensionNode of this identity in this editor. See {@link consumedHydrationIdentitiesByEditor}. */
+  }, {
+    key: "isInInitialHydrationWindow",
+    value: function isInInitialHydrationWindow() {
+      var identityKey = this.getHydrationIdentityKey();
+      if (identityKey === null) {
+        return false;
+      }
+      return !hasHydrationIdentityBeenConsumed(this.view, identityKey);
+    }
+
     // Reserve height by setting a minimum height for the extension node view element
   }, {
     key: "createDomRef",
     value: function createDomRef() {
       if (!(0, _platformFeatureFlags.fg)('confluence_connect_macro_preset_height')) {
-        // Try to reuse SSR'd DOM node on first init only
-        // This preserves SSR content and avoids TTVC mutations during hydration
-        if (!(0, _coreUtils.isSSR)() && this.isFirstInit && this.node.type.name === 'extension' && this.node.attrs.extensionKey === 'toc' && (0, _expValEquals.expValEquals)('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
+        // SSR DOM reuse — see {@link consumedHydrationIdentitiesByEditor}.
+        if (!(0, _coreUtils.isSSR)() && isSSRHydrationEligible(this.node) && this.isInInitialHydrationWindow() && (0, _expValEquals.expValEquals)('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
           var ssrElement = this.findSSRElement();
           if (ssrElement) {
             this.didReuseSsrDom = true;
@@ -121,22 +191,22 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
       return null;
     }
 
-    /**
-     * Override init() to skip React Portal rendering on first init if we're reusing SSR'd DOM.
-     * This preserves the SSR content without React unnecessarily re-rendering it.
-     */
+    /** Skip React Portal render on first init when reusing SSR DOM. See {@link consumedHydrationIdentitiesByEditor}. */
   }, {
     key: "init",
     value: function init() {
       if (!(0, _expValEquals.expValEquals)('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
         _superPropGet(ExtensionNode, "init", this, 3)([]);
       } else {
-        if (!(0, _coreUtils.isSSR)() && this.node.type.name === 'extension' && this.node.attrs.extensionKey === 'toc') {
+        var isEligibleForSsrReuse = !(0, _coreUtils.isSSR)() && isSSRHydrationEligible(this.node);
+        if (isEligibleForSsrReuse && this.isInInitialHydrationWindow()) {
           var ssrElement = this.findSSRElement();
           var shouldSkipInitRender = ssrElement !== null;
           _superPropGet(ExtensionNode, "init", this, 3)([shouldSkipInitRender]);
-          if (shouldSkipInitRender) {
-            this.isFirstInit = false;
+          var identityKey = this.getHydrationIdentityKey();
+          if (identityKey !== null) {
+            // Close the hydration window — see {@link consumedHydrationIdentitiesByEditor}.
+            markHydrationIdentityAsConsumed(this.view, identityKey);
           }
         } else {
           _superPropGet(ExtensionNode, "init", this, 3)([]);
@@ -218,9 +288,8 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
     key: "render",
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
-      // If we reused SSR'd DOM on first init, don't render React Portal
-      // The SSR content is already perfect and doesn't need re-rendering
-      if (this.didReuseSsrDom && this.isFirstInit) {
+      // While sitting on SSR DOM, skip the React portal — see {@link didReuseSsrDom}.
+      if (this.didReuseSsrDom) {
         return null;
       }
       return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {

package/dist/cjs/messages/media-insert.js

@@ -68,7 +68,7 @@ var mediaInsertMessages = exports.mediaInsertMessages = (0, _reactIntl.defineMes
   },
   generateTabTitle: {
     id: 'fabric.editor.media.insert.generateTabTitle',
-    defaultMessage: 'Generate with AI',
+    defaultMessage: 'Create',
     description: 'Title of the navigation tab that allows users to generate an image through AI'
   },
   mediaPickerPopupAriaLabel: {

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 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 = "114.15.0";
+var packageVersion = "114.16.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "114.15.0";
+var packageVersion = "114.16.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

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

@@ -50,6 +50,11 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
     id: 'fabric.editor.expandAriaLabel',
     defaultMessage: 'Give this expand a title',
     description: 'aria label for an expand node title input field'
+  },
+  expandBodyAriaLabel: {
+    id: 'fabric.editor.expandBodyAriaLabel',
+    defaultMessage: 'Expand body content',
+    description: 'Aria label for the body content of an expand node'
   }
 });
 var ExpandIconWrapper = exports.ExpandIconWrapper = function ExpandIconWrapper(_ref) {

package/dist/es2019/extensibility/extensionNodeView.js

@@ -6,6 +6,67 @@ import { isSSR } from '../core-utils';
 import ReactNodeView from '../react-node-view';
 import { Extension } from './Extension';
 import { ExtensionNodeWrapper } from './ExtensionNodeWrapper';
+/**
+ * Allowlists of extension keys + layout
+ * Currently, only toc with default layout allows to skip React render.
+ * Extensions NOT in this list always follow the normal React render path.
+ */
+const ssrHydrationExtensionAllowlist = ['toc'];
+const ssrHydrationLayoutAllowlist = ['default'];
+const isSSRHydrationEligible = node => {
+  var _node$attrs;
+  if (node.type.name !== 'extension') {
+    return false;
+  }
+  const {
+    extensionKey,
+    layout
+  } = (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 ? _node$attrs : {};
+  if (!ssrHydrationExtensionAllowlist.includes(extensionKey)) {
+    return false;
+  }
+  // Treat a missing layout attr as `default` (the schema default).
+  const effectiveLayout = layout !== null && layout !== void 0 ? layout : 'default';
+  return ssrHydrationLayoutAllowlist.includes(effectiveLayout);
+};
+
+/**
+ * Per-(EditorView, extensionKey + localId) record of which extension identities
+ * have already had their initial-hydration init pass. SSR DOM reuse is only valid
+ * the very first time an ExtensionNode init runs for a given identity in a given
+ * editor — that is the only moment a real SSR-rendered element for that identity
+ * can exist in the editor DOM.
+ *
+ * After the first init, any element matching the SSR selector is the previous
+ * node view's React-rendered domRef that ProseMirror has not yet detached (e.g.
+ * during DnD / layout resize, where ProseMirror constructs the new node view
+ * BEFORE destroying the old one). Reusing it as if it were SSR DOM causes the
+ * new node view to skip React rendering and leaves the extension invisible
+ * (EDITOR-6613).
+ */
+const consumedHydrationIdentitiesByEditor = new WeakMap();
+const getHydrationIdentityKey = (extensionKey, localId) => {
+  if (typeof extensionKey !== 'string' || typeof localId !== 'string') {
+    return null;
+  }
+  if (extensionKey === '' || localId === '') {
+    return null;
+  }
+  return `${extensionKey}::${localId}`;
+};
+const hasHydrationIdentityBeenConsumed = (view, identityKey) => {
+  const consumed = consumedHydrationIdentitiesByEditor.get(view);
+  return consumed ? consumed.has(identityKey) : false;
+};
+const markHydrationIdentityAsConsumed = (view, identityKey) => {
+  let consumed = consumedHydrationIdentitiesByEditor.get(view);
+  if (!consumed) {
+    consumed = new Set();
+    consumedHydrationIdentitiesByEditor.set(view, consumed);
+  }
+  consumed.add(identityKey);
+};
+
 // getInlineNodeViewProducer is a new api to use instead of ReactNodeView
 // when creating inline node views, however, it is difficult to test the impact
 // on selections when migrating inlineExtension to use the new api.
@@ -14,16 +75,8 @@ import { ExtensionNodeWrapper } from './ExtensionNodeWrapper';
 export class ExtensionNode extends ReactNodeView {
   constructor(...args) {
     super(...args);
-    /**
-     * Track whether we found and are reusing SSR'd DOM.
-     * When true, we skip React Portal rendering on first init to preserve SSR content.
-     */
+    /** True between SSR DOM adoption in `createDomRef` and the SSR→React handoff in `update`. */
     _defineProperty(this, "didReuseSsrDom", false);
-    /**
-     * Track whether this is the first init call.
-     * SSR content preservation only happens on the very first init.
-     */
-    _defineProperty(this, "isFirstInit", true);
   }
   ignoreMutation(mutation) {
     // Extensions can perform async operations that will change the DOM.
@@ -33,12 +86,26 @@ export class ExtensionNode extends ReactNodeView {
     return this.node.type.isAtom || mutation.type !== 'selection' && mutation.attributeName !== 'data-layout';
   }
 
+  /** See {@link consumedHydrationIdentitiesByEditor}. Null when attrs are missing → SSR reuse skipped. */
+  getHydrationIdentityKey() {
+    var _this$node$attrs, _this$node$attrs2;
+    return getHydrationIdentityKey((_this$node$attrs = this.node.attrs) === null || _this$node$attrs === void 0 ? void 0 : _this$node$attrs.extensionKey, (_this$node$attrs2 = this.node.attrs) === null || _this$node$attrs2 === void 0 ? void 0 : _this$node$attrs2.localId);
+  }
+
+  /** True only for the first ExtensionNode of this identity in this editor. See {@link consumedHydrationIdentitiesByEditor}. */
+  isInInitialHydrationWindow() {
+    const identityKey = this.getHydrationIdentityKey();
+    if (identityKey === null) {
+      return false;
+    }
+    return !hasHydrationIdentityBeenConsumed(this.view, identityKey);
+  }
+
   // Reserve height by setting a minimum height for the extension node view element
   createDomRef() {
     if (!fg('confluence_connect_macro_preset_height')) {
-      // Try to reuse SSR'd DOM node on first init only
-      // This preserves SSR content and avoids TTVC mutations during hydration
-      if (!isSSR() && this.isFirstInit && this.node.type.name === 'extension' && this.node.attrs.extensionKey === 'toc' && expValEquals('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
+      // SSR DOM reuse — see {@link consumedHydrationIdentitiesByEditor}.
+      if (!isSSR() && isSSRHydrationEligible(this.node) && this.isInInitialHydrationWindow() && expValEquals('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
         const ssrElement = this.findSSRElement();
         if (ssrElement) {
           this.didReuseSsrDom = true;
@@ -91,20 +158,20 @@ export class ExtensionNode extends ReactNodeView {
     return null;
   }
 
-  /**
-   * Override init() to skip React Portal rendering on first init if we're reusing SSR'd DOM.
-   * This preserves the SSR content without React unnecessarily re-rendering it.
-   */
+  /** Skip React Portal render on first init when reusing SSR DOM. See {@link consumedHydrationIdentitiesByEditor}. */
   init() {
     if (!expValEquals('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
       super.init();
     } else {
-      if (!isSSR() && this.node.type.name === 'extension' && this.node.attrs.extensionKey === 'toc') {
+      const isEligibleForSsrReuse = !isSSR() && isSSRHydrationEligible(this.node);
+      if (isEligibleForSsrReuse && this.isInInitialHydrationWindow()) {
         const ssrElement = this.findSSRElement();
         const shouldSkipInitRender = ssrElement !== null;
         super.init(shouldSkipInitRender);
-        if (shouldSkipInitRender) {
-          this.isFirstInit = false;
+        const identityKey = this.getHydrationIdentityKey();
+        if (identityKey !== null) {
+          // Close the hydration window — see {@link consumedHydrationIdentitiesByEditor}.
+          markHydrationIdentityAsConsumed(this.view, identityKey);
         }
       } else {
         super.init();
@@ -175,9 +242,8 @@ export class ExtensionNode extends ReactNodeView {
   }
   render(props, forwardRef) {
     var _props$extensionNodeV;
-    // If we reused SSR'd DOM on first init, don't render React Portal
-    // The SSR content is already perfect and doesn't need re-rendering
-    if (this.didReuseSsrDom && this.isFirstInit) {
+    // While sitting on SSR DOM, skip the React portal — see {@link didReuseSsrDom}.
+    if (this.didReuseSsrDom) {
       return null;
     }
     return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {

package/dist/es2019/messages/media-insert.js

@@ -62,7 +62,7 @@ export const mediaInsertMessages = defineMessages({
   },
   generateTabTitle: {
     id: 'fabric.editor.media.insert.generateTabTitle',
-    defaultMessage: 'Generate with AI',
+    defaultMessage: 'Create',
     description: 'Title of the navigation tab that allows users to generate an image through AI'
   },
   mediaPickerPopupAriaLabel: {

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 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 = "114.15.0";
+const packageVersion = "114.16.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "114.15.0";
+const packageVersion = "114.16.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

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

@@ -41,6 +41,11 @@ export const messages = defineMessages({
     id: 'fabric.editor.expandAriaLabel',
     defaultMessage: 'Give this expand a title',
     description: 'aria label for an expand node title input field'
+  },
+  expandBodyAriaLabel: {
+    id: 'fabric.editor.expandBodyAriaLabel',
+    defaultMessage: 'Expand body content',
+    description: 'Aria label for the body content of an expand node'
   }
 });
 export const ExpandIconWrapper = ({

package/dist/esm/extensibility/extensionNodeView.js

@@ -15,6 +15,66 @@ import { isSSR } from '../core-utils';
 import ReactNodeView from '../react-node-view';
 import { Extension } from './Extension';
 import { ExtensionNodeWrapper } from './ExtensionNodeWrapper';
+/**
+ * Allowlists of extension keys + layout
+ * Currently, only toc with default layout allows to skip React render.
+ * Extensions NOT in this list always follow the normal React render path.
+ */
+var ssrHydrationExtensionAllowlist = ['toc'];
+var ssrHydrationLayoutAllowlist = ['default'];
+var isSSRHydrationEligible = function isSSRHydrationEligible(node) {
+  var _node$attrs;
+  if (node.type.name !== 'extension') {
+    return false;
+  }
+  var _ref = (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 ? _node$attrs : {},
+    extensionKey = _ref.extensionKey,
+    layout = _ref.layout;
+  if (!ssrHydrationExtensionAllowlist.includes(extensionKey)) {
+    return false;
+  }
+  // Treat a missing layout attr as `default` (the schema default).
+  var effectiveLayout = layout !== null && layout !== void 0 ? layout : 'default';
+  return ssrHydrationLayoutAllowlist.includes(effectiveLayout);
+};
+
+/**
+ * Per-(EditorView, extensionKey + localId) record of which extension identities
+ * have already had their initial-hydration init pass. SSR DOM reuse is only valid
+ * the very first time an ExtensionNode init runs for a given identity in a given
+ * editor — that is the only moment a real SSR-rendered element for that identity
+ * can exist in the editor DOM.
+ *
+ * After the first init, any element matching the SSR selector is the previous
+ * node view's React-rendered domRef that ProseMirror has not yet detached (e.g.
+ * during DnD / layout resize, where ProseMirror constructs the new node view
+ * BEFORE destroying the old one). Reusing it as if it were SSR DOM causes the
+ * new node view to skip React rendering and leaves the extension invisible
+ * (EDITOR-6613).
+ */
+var consumedHydrationIdentitiesByEditor = new WeakMap();
+var _getHydrationIdentityKey = function getHydrationIdentityKey(extensionKey, localId) {
+  if (typeof extensionKey !== 'string' || typeof localId !== 'string') {
+    return null;
+  }
+  if (extensionKey === '' || localId === '') {
+    return null;
+  }
+  return "".concat(extensionKey, "::").concat(localId);
+};
+var hasHydrationIdentityBeenConsumed = function hasHydrationIdentityBeenConsumed(view, identityKey) {
+  var consumed = consumedHydrationIdentitiesByEditor.get(view);
+  return consumed ? consumed.has(identityKey) : false;
+};
+var markHydrationIdentityAsConsumed = function markHydrationIdentityAsConsumed(view, identityKey) {
+  var consumed = consumedHydrationIdentitiesByEditor.get(view);
+  if (!consumed) {
+    consumed = new Set();
+    consumedHydrationIdentitiesByEditor.set(view, consumed);
+  }
+  consumed.add(identityKey);
+};
+
 // getInlineNodeViewProducer is a new api to use instead of ReactNodeView
 // when creating inline node views, however, it is difficult to test the impact
 // on selections when migrating inlineExtension to use the new api.
@@ -28,16 +88,8 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, ExtensionNode, [].concat(args));
-    /**
-     * Track whether we found and are reusing SSR'd DOM.
-     * When true, we skip React Portal rendering on first init to preserve SSR content.
-     */
+    /** True between SSR DOM adoption in `createDomRef` and the SSR→React handoff in `update`. */
     _defineProperty(_this, "didReuseSsrDom", false);
-    /**
-     * Track whether this is the first init call.
-     * SSR content preservation only happens on the very first init.
-     */
-    _defineProperty(_this, "isFirstInit", true);
     return _this;
   }
   _inherits(ExtensionNode, _ReactNodeView);
@@ -51,14 +103,32 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
       return this.node.type.isAtom || mutation.type !== 'selection' && mutation.attributeName !== 'data-layout';
     }
 
+    /** See {@link consumedHydrationIdentitiesByEditor}. Null when attrs are missing → SSR reuse skipped. */
+  }, {
+    key: "getHydrationIdentityKey",
+    value: function getHydrationIdentityKey() {
+      var _this$node$attrs, _this$node$attrs2;
+      return _getHydrationIdentityKey((_this$node$attrs = this.node.attrs) === null || _this$node$attrs === void 0 ? void 0 : _this$node$attrs.extensionKey, (_this$node$attrs2 = this.node.attrs) === null || _this$node$attrs2 === void 0 ? void 0 : _this$node$attrs2.localId);
+    }
+
+    /** True only for the first ExtensionNode of this identity in this editor. See {@link consumedHydrationIdentitiesByEditor}. */
+  }, {
+    key: "isInInitialHydrationWindow",
+    value: function isInInitialHydrationWindow() {
+      var identityKey = this.getHydrationIdentityKey();
+      if (identityKey === null) {
+        return false;
+      }
+      return !hasHydrationIdentityBeenConsumed(this.view, identityKey);
+    }
+
     // Reserve height by setting a minimum height for the extension node view element
   }, {
     key: "createDomRef",
     value: function createDomRef() {
       if (!fg('confluence_connect_macro_preset_height')) {
-        // Try to reuse SSR'd DOM node on first init only
-        // This preserves SSR content and avoids TTVC mutations during hydration
-        if (!isSSR() && this.isFirstInit && this.node.type.name === 'extension' && this.node.attrs.extensionKey === 'toc' && expValEquals('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
+        // SSR DOM reuse — see {@link consumedHydrationIdentitiesByEditor}.
+        if (!isSSR() && isSSRHydrationEligible(this.node) && this.isInInitialHydrationWindow() && expValEquals('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
           var ssrElement = this.findSSRElement();
           if (ssrElement) {
             this.didReuseSsrDom = true;
@@ -113,22 +183,22 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
       return null;
     }
 
-    /**
-     * Override init() to skip React Portal rendering on first init if we're reusing SSR'd DOM.
-     * This preserves the SSR content without React unnecessarily re-rendering it.
-     */
+    /** Skip React Portal render on first init when reusing SSR DOM. See {@link consumedHydrationIdentitiesByEditor}. */
   }, {
     key: "init",
     value: function init() {
       if (!expValEquals('platform_editor_hydration_skip_react_portal', 'isEnabled', true)) {
         _superPropGet(ExtensionNode, "init", this, 3)([]);
       } else {
-        if (!isSSR() && this.node.type.name === 'extension' && this.node.attrs.extensionKey === 'toc') {
+        var isEligibleForSsrReuse = !isSSR() && isSSRHydrationEligible(this.node);
+        if (isEligibleForSsrReuse && this.isInInitialHydrationWindow()) {
           var ssrElement = this.findSSRElement();
           var shouldSkipInitRender = ssrElement !== null;
           _superPropGet(ExtensionNode, "init", this, 3)([shouldSkipInitRender]);
-          if (shouldSkipInitRender) {
-            this.isFirstInit = false;
+          var identityKey = this.getHydrationIdentityKey();
+          if (identityKey !== null) {
+            // Close the hydration window — see {@link consumedHydrationIdentitiesByEditor}.
+            markHydrationIdentityAsConsumed(this.view, identityKey);
           }
         } else {
           _superPropGet(ExtensionNode, "init", this, 3)([]);
@@ -210,9 +280,8 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
     key: "render",
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
-      // If we reused SSR'd DOM on first init, don't render React Portal
-      // The SSR content is already perfect and doesn't need re-rendering
-      if (this.didReuseSsrDom && this.isFirstInit) {
+      // While sitting on SSR DOM, skip the React portal — see {@link didReuseSsrDom}.
+      if (this.didReuseSsrDom) {
         return null;
       }
       return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {

package/dist/esm/messages/media-insert.js

@@ -62,7 +62,7 @@ export var mediaInsertMessages = defineMessages({
   },
   generateTabTitle: {
     id: 'fabric.editor.media.insert.generateTabTitle',
-    defaultMessage: 'Generate with AI',
+    defaultMessage: 'Create',
     description: 'Title of the navigation tab that allows users to generate an image through AI'
   },
   mediaPickerPopupAriaLabel: {

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 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 = "114.15.0";
+var packageVersion = "114.16.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "114.15.0";
+var packageVersion = "114.16.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

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

@@ -43,6 +43,11 @@ export var messages = defineMessages({
     id: 'fabric.editor.expandAriaLabel',
     defaultMessage: 'Give this expand a title',
     description: 'aria label for an expand node title input field'
+  },
+  expandBodyAriaLabel: {
+    id: 'fabric.editor.expandBodyAriaLabel',
+    defaultMessage: 'Expand body content',
+    description: 'Aria label for the body content of an expand node'
   }
 });
 export var ExpandIconWrapper = function ExpandIconWrapper(_ref) {

package/dist/types/extensibility/extensionNodeView.d.ts

@@ -25,20 +25,16 @@ interface ReactExtensionNodeProps {
     showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
 }
 export declare class ExtensionNode<AdditionalParams = unknown> extends ReactNodeView<ReactExtensionNodeProps & AdditionalParams> {
-    /**
-     * Track whether we found and are reusing SSR'd DOM.
-     * When true, we skip React Portal rendering on first init to preserve SSR content.
-     */
+    /** True between SSR DOM adoption in `createDomRef` and the SSR→React handoff in `update`. */
     private didReuseSsrDom;
-    /**
-     * Track whether this is the first init call.
-     * SSR content preservation only happens on the very first init.
-     */
-    private isFirstInit;
     ignoreMutation(mutation: MutationRecord | {
         target: Node;
         type: 'selection';
     }): boolean;
+    /** See {@link consumedHydrationIdentitiesByEditor}. Null when attrs are missing → SSR reuse skipped. */
+    private getHydrationIdentityKey;
+    /** True only for the first ExtensionNode of this identity in this editor. See {@link consumedHydrationIdentitiesByEditor}. */
+    private isInInitialHydrationWindow;
     createDomRef(): HTMLElement;
     /**
      * Cache for SSR element lookup to avoid repeated DOM queries.
@@ -53,10 +49,7 @@ export declare class ExtensionNode<AdditionalParams = unknown> extends ReactNode
      * @returns The SSR'd element if found, otherwise null
      */
     private findSSRElement;
-    /**
-     * Override init() to skip React Portal rendering on first init if we're reusing SSR'd DOM.
-     * This preserves the SSR content without React unnecessarily re-rendering it.
-     */
+    /** Skip React Portal render on first init when reusing SSR DOM. See {@link consumedHydrationIdentitiesByEditor}. */
     init(): this;
     update(node: PmNode, decorations: ReadonlyArray<Decoration>, _innerDecorations?: DecorationSource, validUpdate?: (currentNode: PmNode, newNode: PmNode) => boolean): boolean;
     /**

package/dist/types/ui/Expand/index.d.ts

@@ -2,35 +2,40 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import type { SerializedStyles } from '@emotion/react';
 export declare const messages: {
-    loading: {
-        id: string;
+    collapseNode: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
-    collapseNode: {
+    expandArialabel: {
+        defaultMessage: string;
+        description: string;
         id: string;
+    };
+    expandBodyAriaLabel: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
     expandDefaultTitle: {
-        id: string;
         defaultMessage: string;
         description: string;
+        id: string;
     };
     expandNode: {
-        id: string;
         defaultMessage: string;
         description: string;
+        id: string;
     };
     expandPlaceholderText: {
-        id: string;
         defaultMessage: string;
         description: string;
-    };
-    expandArialabel: {
         id: string;
+    };
+    loading: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
 };
 export declare const ExpandIconWrapper: ({ children, expanded, }: React.HTMLAttributes<HTMLDivElement> & {

package/dist/types-ts4.5/extensibility/extensionNodeView.d.ts

@@ -25,20 +25,16 @@ interface ReactExtensionNodeProps {
     showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
 }
 export declare class ExtensionNode<AdditionalParams = unknown> extends ReactNodeView<ReactExtensionNodeProps & AdditionalParams> {
-    /**
-     * Track whether we found and are reusing SSR'd DOM.
-     * When true, we skip React Portal rendering on first init to preserve SSR content.
-     */
+    /** True between SSR DOM adoption in `createDomRef` and the SSR→React handoff in `update`. */
     private didReuseSsrDom;
-    /**
-     * Track whether this is the first init call.
-     * SSR content preservation only happens on the very first init.
-     */
-    private isFirstInit;
     ignoreMutation(mutation: MutationRecord | {
         target: Node;
         type: 'selection';
     }): boolean;
+    /** See {@link consumedHydrationIdentitiesByEditor}. Null when attrs are missing → SSR reuse skipped. */
+    private getHydrationIdentityKey;
+    /** True only for the first ExtensionNode of this identity in this editor. See {@link consumedHydrationIdentitiesByEditor}. */
+    private isInInitialHydrationWindow;
     createDomRef(): HTMLElement;
     /**
      * Cache for SSR element lookup to avoid repeated DOM queries.
@@ -53,10 +49,7 @@ export declare class ExtensionNode<AdditionalParams = unknown> extends ReactNode
      * @returns The SSR'd element if found, otherwise null
      */
     private findSSRElement;
-    /**
-     * Override init() to skip React Portal rendering on first init if we're reusing SSR'd DOM.
-     * This preserves the SSR content without React unnecessarily re-rendering it.
-     */
+    /** Skip React Portal render on first init when reusing SSR DOM. See {@link consumedHydrationIdentitiesByEditor}. */
     init(): this;
     update(node: PmNode, decorations: ReadonlyArray<Decoration>, _innerDecorations?: DecorationSource, validUpdate?: (currentNode: PmNode, newNode: PmNode) => boolean): boolean;
     /**

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

@@ -2,35 +2,40 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import type { SerializedStyles } from '@emotion/react';
 export declare const messages: {
-    loading: {
-        id: string;
+    collapseNode: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
-    collapseNode: {
+    expandArialabel: {
+        defaultMessage: string;
+        description: string;
         id: string;
+    };
+    expandBodyAriaLabel: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
     expandDefaultTitle: {
-        id: string;
         defaultMessage: string;
         description: string;
+        id: string;
     };
     expandNode: {
-        id: string;
         defaultMessage: string;
         description: string;
+        id: string;
     };
     expandPlaceholderText: {
-        id: string;
         defaultMessage: string;
         description: string;
-    };
-    expandArialabel: {
         id: string;
+    };
+    loading: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
 };
 export declare const ExpandIconWrapper: ({ children, expanded, }: React.HTMLAttributes<HTMLDivElement> & {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "114.16.0",
+	"version": "114.17.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"