@atlaskit/editor-common 114.16.0 → 114.18.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @atlaskit/editor-common
 
+## 114.18.0
+
+### Minor Changes
+
+- [`a759f33417d9b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a759f33417d9b) -
+  [PIRA-1311](https://opsj.atlassian.net/browse/PIRA-1311) - clean up platform_editor_media_vc_fixes
+
+### Patch Changes
+
+- [`7043ace1c45f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7043ace1c45f2) -
+  [ux] reduces slipperiness and improves clarity of inline invites for editor mentions
+- Updated dependencies
+
+## 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/markdown-mode.js

@@ -22,18 +22,18 @@ var markdownModeMessages = exports.markdownModeMessages = (0, _reactIntl.defineM
   },
   source: {
     id: 'fabric.editor.markdownMode.viewToggle.source',
-    defaultMessage: 'Markdown source',
-    description: 'Tooltip and accessible label for the toggle button that switches the editor into raw markdown source view.'
+    defaultMessage: 'Syntax editor',
+    description: 'Tooltip and accessible label for the toggle button that switches the editor into raw markdown source (syntax) view.'
   },
   wysiwyg: {
     id: 'fabric.editor.markdownMode.viewToggle.wysiwyg',
-    defaultMessage: 'WYSIWYG',
+    defaultMessage: 'WYSIWYG editor',
     description: 'Tooltip and accessible label for the toggle button that switches the editor into the WYSIWYG markdown editing view (the default).'
   },
   preview: {
     id: 'fabric.editor.markdownMode.viewToggle.preview',
-    defaultMessage: 'Preview',
-    description: 'Tooltip and accessible label for the toggle button that switches the editor into a read-only rendered markdown preview.'
+    defaultMessage: 'Split view (coming soon)',
+    description: 'Tooltip and accessible label for the toggle button that will switch the editor into a split view. This feature is not yet available.'
   },
   sourceAriaLabel: {
     id: 'fabric.editor.markdownMode.sourceView.ariaLabel',

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/messages/mentions.js

@@ -40,5 +40,10 @@ var mentionMessages = exports.mentionMessages = (0, _reactIntl.defineMessages)({
     id: 'fabric.editor.inviteItem.sendInvite',
     defaultMessage: 'Send request to invite teammate',
     description: 'By line text for send request to invite teammate option shown in mentions.'
+  },
+  inviteButton: {
+    id: 'fabric.editor.inviteItem.inviteButton',
+    defaultMessage: 'Invite',
+    description: 'Label for the invite button shown in the mention typeahead invite item.'
   }
 });

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.17.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.17.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/cjs/ui/MediaSingle/grid.js

@@ -11,7 +11,6 @@ exports.calcPxFromColumns = calcPxFromColumns;
 exports.calcPxFromPct = calcPxFromPct;
 exports.wrappedLayouts = exports.snapToGrid = exports.layoutSupportsWidth = void 0;
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _constants = require("../../media-single/constants");
 var validWidthModes = ['center', 'wrap-left', 'wrap-right', 'align-start', 'align-end'];
 var layoutSupportsWidth = exports.layoutSupportsWidth = function layoutSupportsWidth(layout) {
@@ -67,10 +66,7 @@ var calcMediaPxWidth = exports.calcMediaPxWidth = function calcMediaPxWidth(opts
         }
         return calculatedPctWidth;
       }
-      if ((0, _expValEquals.expValEquals)('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-        return calculatedPctWidth;
-      }
-      return Math.min(calculatedPctWidth, origWidth);
+      return calculatedPctWidth;
     }
     if (calculatedResizedPctWidth) {
       return calculatedResizedPctWidth;
@@ -84,11 +80,7 @@ var calcMediaPxWidth = exports.calcMediaPxWidth = function calcMediaPxWidth(opts
   } else if (layout && wrappedLayouts.indexOf(layout) !== -1) {
     // when layout is wrap-left, wrap-right, align-start, align-end
     // but no pctWidth is defined
-    if ((0, _expValEquals.expValEquals)('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-      return Math.min(calcPxFromPct(0.5, lineLength || width), origWidth);
-    }
-    var halfLineLength = Math.ceil((lineLength || width) / 2);
-    return origWidth <= halfLineLength ? origWidth : halfLineLength;
+    return Math.min(calcPxFromPct(0.5, lineLength || width), origWidth);
   }
   return origWidth;
 };

package/dist/cjs/ui/MediaSingle/styled.js

@@ -16,7 +16,6 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _utils = require("../../utils");
 var _breakout = require("../../utils/breakout");
 var _excluded = ["children"];
@@ -137,16 +136,6 @@ function calcResizedWidth(layout, width) {
       return "".concat(width, "px");
   }
 }
-function calcMaxWidth(layout, containerWidth) {
-  switch (layout) {
-    case 'wide':
-      return (0, _breakout.calcWideWidth)(containerWidth);
-    case 'full-width':
-      return (0, _breakout.calcBreakoutWidth)(layout, containerWidth);
-    default:
-      return '100%';
-  }
-}
 function calcMargin(layout) {
   switch (layout) {
     case 'wrap-right':
@@ -231,7 +220,6 @@ var MediaSingleDimensionHelper = exports.MediaSingleDimensionHelper = function M
     _ref$isInRenderer = _ref.isInRenderer,
     isInRenderer = _ref$isInRenderer === void 0 ? false : _ref$isInRenderer;
   var calculatedWidth = roundToClosestEvenPxValue(isExtendedResizeExperienceOn ? "".concat(mediaSingleWidth || width, "px") : mediaSingleWidth ? calcResizedWidth(layout, width || 0, containerWidth) : calcLegacyWidth(layout, width || 0, containerWidth, fullWidthMode, isResized, isInsideOfInlineExtension));
-  var calculatedMaxWidth = roundToClosestEvenPxValue(isExtendedResizeExperienceOn ? "".concat(containerWidth, "px") : calcMaxWidth(layout, containerWidth));
   var cssMaxWidth = isExtendedResizeExperienceOn ? 'var(--ak-editor-max-container-width)' : calcMaxCssForPercentageTypeMedia(layout);
 
   // jest warning: JSDOM version (22) doesn't support the new @container CSS rule
@@ -247,7 +235,7 @@ var MediaSingleDimensionHelper = exports.MediaSingleDimensionHelper = function M
     '@container ak-renderer-wrapper (min-width: 1px)': {
       maxWidth: '100cqw'
     }
-  }) : (0, _expValEquals.expValEquals)('platform_editor_media_vc_fixes', 'isEnabled', true) ? "max-width: ".concat(cssMaxWidth, ";") : "max-width: ".concat(calculatedMaxWidth, ";"), isExtendedResizeExperienceOn && "&[class*='is-resizing'] {\n    .new-file-experience-wrapper {\n      box-shadow: none !important;\n    }\n\n    ".concat(!isNestedNode && _utils.nonWrappedLayouts.includes(layout) && "margin-left: 50%;\n      transform: translateX(-50%);", "\n  }"), float(layout), calcMargin(layout), isNestedNode ? /* Make nested node appear responsive when resizing table cell */"max-width: 100%;" : _utils.nonWrappedLayouts.includes(layout) && "margin-left: 50%;\n        transform: translateX(-50%);", isImageAligned(layout));
+  }) : "max-width: ".concat(cssMaxWidth, ";"), isExtendedResizeExperienceOn && "&[class*='is-resizing'] {\n    .new-file-experience-wrapper {\n      box-shadow: none !important;\n    }\n\n    ".concat(!isNestedNode && _utils.nonWrappedLayouts.includes(layout) && "margin-left: 50%;\n      transform: translateX(-50%);", "\n  }"), float(layout), calcMargin(layout), isNestedNode ? /* Make nested node appear responsive when resizing table cell */"max-width: 100%;" : _utils.nonWrappedLayouts.includes(layout) && "margin-left: 50%;\n        transform: translateX(-50%);", isImageAligned(layout));
 };
 var RenderFallbackContainer = function RenderFallbackContainer(_ref2) {
   var hasFallbackContainer = _ref2.hasFallbackContainer,

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/markdown-mode.js

@@ -17,18 +17,18 @@ export const markdownModeMessages = defineMessages({
   },
   source: {
     id: 'fabric.editor.markdownMode.viewToggle.source',
-    defaultMessage: 'Markdown source',
-    description: 'Tooltip and accessible label for the toggle button that switches the editor into raw markdown source view.'
+    defaultMessage: 'Syntax editor',
+    description: 'Tooltip and accessible label for the toggle button that switches the editor into raw markdown source (syntax) view.'
   },
   wysiwyg: {
     id: 'fabric.editor.markdownMode.viewToggle.wysiwyg',
-    defaultMessage: 'WYSIWYG',
+    defaultMessage: 'WYSIWYG editor',
     description: 'Tooltip and accessible label for the toggle button that switches the editor into the WYSIWYG markdown editing view (the default).'
   },
   preview: {
     id: 'fabric.editor.markdownMode.viewToggle.preview',
-    defaultMessage: 'Preview',
-    description: 'Tooltip and accessible label for the toggle button that switches the editor into a read-only rendered markdown preview.'
+    defaultMessage: 'Split view (coming soon)',
+    description: 'Tooltip and accessible label for the toggle button that will switch the editor into a split view. This feature is not yet available.'
   },
   sourceAriaLabel: {
     id: 'fabric.editor.markdownMode.sourceView.ariaLabel',

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/messages/mentions.js

@@ -34,5 +34,10 @@ export const mentionMessages = defineMessages({
     id: 'fabric.editor.inviteItem.sendInvite',
     defaultMessage: 'Send request to invite teammate',
     description: 'By line text for send request to invite teammate option shown in mentions.'
+  },
+  inviteButton: {
+    id: 'fabric.editor.inviteItem.inviteButton',
+    defaultMessage: 'Invite',
+    description: 'Label for the invite button shown in the mention typeahead invite item.'
   }
 });

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.17.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.17.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/es2019/ui/MediaSingle/grid.js

@@ -1,5 +1,4 @@
 import { akEditorBreakoutPadding, breakoutWideScaleRatio } from '@atlaskit/editor-shared-styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MEDIA_SINGLE_GUTTER_SIZE } from '../../media-single/constants';
 const validWidthModes = ['center', 'wrap-left', 'wrap-right', 'align-start', 'align-end'];
 export const layoutSupportsWidth = layout => validWidthModes.indexOf(layout) > -1;
@@ -55,10 +54,7 @@ export const calcMediaPxWidth = opts => {
         }
         return calculatedPctWidth;
       }
-      if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-        return calculatedPctWidth;
-      }
-      return Math.min(calculatedPctWidth, origWidth);
+      return calculatedPctWidth;
     }
     if (calculatedResizedPctWidth) {
       return calculatedResizedPctWidth;
@@ -72,11 +68,7 @@ export const calcMediaPxWidth = opts => {
   } else if (layout && wrappedLayouts.indexOf(layout) !== -1) {
     // when layout is wrap-left, wrap-right, align-start, align-end
     // but no pctWidth is defined
-    if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-      return Math.min(calcPxFromPct(0.5, lineLength || width), origWidth);
-    }
-    const halfLineLength = Math.ceil((lineLength || width) / 2);
-    return origWidth <= halfLineLength ? origWidth : halfLineLength;
+    return Math.min(calcPxFromPct(0.5, lineLength || width), origWidth);
   }
   return origWidth;
 };