@atlaskit/editor-core 219.7.2 → 219.7.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-core
 
+## 219.7.3
+
+### Patch Changes
+
+- [`911ea1f065d0f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/911ea1f065d0f) -
+  [EDITOR-6965] Rebuild the schema in `ReactEditorView.reconfigureState` when toggling presets under
+  the `cc-markdown-mode` experiment, so each preset declares its honest schema (rather than sharing
+  the schema from first mount via `state.reconfigure`). Skips the existing plugin-availability
+  filter (which would evaluate against the OLD schema and drop e.g. `extensionPlugin` on a
+  markdown→rich toggle), and re-seeds `collabInitialised: true` on the new state because the
+  Confluence NCS provider does not implement `getInitPayload` (so the rebind path in
+  `editor-plugin-collab-edit/initialize.ts` is skipped). Also makes
+  `extensionProviderToQuickInsertProvider.getItems` schema-aware so the `/` menu does not surface
+  extension items when the live schema cannot accept them.
+
 ## 219.7.2
 
 ### Patch Changes

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

@@ -28,6 +28,7 @@ var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
 var _document = require("@atlaskit/editor-common/utils/document");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSsrRenderer = require("@atlaskit/editor-ssr-renderer");
@@ -57,14 +58,45 @@ var _handleEditorFocus = require("./ReactEditorView/handleEditorFocus");
 var _useDispatchTransaction = require("./ReactEditorView/useDispatchTransaction");
 var _useFireFullWidthEvent = require("./ReactEditorView/useFireFullWidthEvent");
 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); }
+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) { (0, _defineProperty2.default)(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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-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) { (0, _defineProperty2.default)(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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var EDIT_AREA_ID = 'ak-editor-textarea';
 var SSR_TRACE_SEGMENT_NAME = 'reactEditorView';
 var bootStartTime = (0, _isPerformanceApiAvailable.isPerformanceAPIAvailable)() ? performance.now() : undefined;
+// `markdown↔rich` toggles drop different node/mark sets, so the unique
+// name set is enough to detect when a destructive rebuild is needed.
+function sameNames(a, b) {
+  var setA = new Set(a);
+  var setB = new Set(b);
+  if (setA.size !== setB.size) {
+    return false;
+  }
+  var _iterator = _createForOfIteratorHelper(setA),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var name = _step.value;
+      if (!setB.has(name)) {
+        return false;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return true;
+}
+function schemaShapeChanged(current, next) {
+  return !sameNames(Object.keys(current.nodes), next.nodes.map(function (n) {
+    return n.name;
+  })) || !sameNames(Object.keys(current.marks), next.marks.map(function (m) {
+    return m.name;
+  }));
+}
 function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _media, _linking, _document$querySelect, _props$render, _props$render2;
   // Should be always the first statement in the component
@@ -364,9 +396,10 @@ function ReactEditorView(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     bumpConfigVersion = _useState2[1];
 
-  // Preset reference last processed by the schema/API reconciliation below.
-  // Used to skip that work when reconfigure is called with the same preset.
-  var lastFilteredPresetRef = (0, _react.useRef)(null);
+  // Preset reference last processed by reconfigureState. Used to skip the
+  // destructive work (plugin filter, schema rebuild) when reconfigure is
+  // called with the same preset.
+  var lastProcessedPresetRef = (0, _react.useRef)(null);
   var reconfigureState = (0, _react.useCallback)(function (props) {
     if (!viewRef.current) {
       return;
@@ -383,6 +416,35 @@ function ReactEditorView(props) {
     var previousPluginNames = new Set(pluginInjectionAPI.current.getRegisteredPluginNames());
     var editorPlugins = (0, _createPluginsList.default)(props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current);
 
+    // Capture once, before either downstream block updates the ref —
+    // both the filter and the schema rebuild are destructive and only
+    // want to run when the preset has actually changed.
+    var presetChanged = lastProcessedPresetRef.current !== props.preset;
+
+    // Build a candidate config from the *unfiltered* plugin list so we can
+    // decide whether the schema rebuild path will run. Both the rebuild
+    // decision and the drop-filter decision below depend on this answer,
+    // so it has to be computed up-front.
+    var buildConfig = function buildConfig(plugins) {
+      var c = (0, _createEditor.processPluginsList)(plugins);
+      if ((0, _expValEquals.expValEquals)('platform_editor_appearance_shared_state', 'isEnabled', true)) {
+        var _c$pmPlugins;
+        (_c$pmPlugins = c.pmPlugins).push.apply(_c$pmPlugins, (0, _toConsumableArray2.default)(pluginInjectionAPI.current.getInternalPMPlugins()));
+      }
+      return c;
+    };
+    var nextConfig = buildConfig(editorPlugins);
+
+    // `state.reconfigure` preserves the original schema, so a preset
+    // toggle that should change schema (markdown↔rich) needs a fresh
+    // `EditorState`. Resets all plugin state including undo history.
+    //
+    // Compare schema *shape* (node + mark name sets) rather than preset
+    // identity: consumers commonly recreate the preset object on every
+    // parent re-render, and a destructive rebuild on a no-op identity
+    // change tears down all plugin state (e.g. unmounts the AI palette).
+    var shouldRebuildSchema = presetChanged && schemaShapeChanged(viewRef.current.state.schema, nextConfig) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc-markdown-mode', 'isEnabled', true);
+
     // `state.reconfigure` keeps the original schema, so switching presets
     // can leave the editor inconsistent in two ways:
     //   1. The new preset may add plugins that reference schema nodes or
@@ -391,17 +453,26 @@ function ReactEditorView(props) {
     //      injection API even when the new preset doesn't re-register
     //      them, so listeners still fire against a state that no longer
     //      has their pmPlugin.
-    if (lastFilteredPresetRef.current !== props.preset && (0, _platformFeatureFlags.fg)('platform_editor_reconfigure_filter_plugins')) {
-      var _filterPluginsForReco = (0, _filterPluginsForReconfigure.filterPluginsForReconfigure)(editorPlugins, viewRef.current.state.schema, previousPluginNames),
-        kept = _filterPluginsForReco.kept,
-        dropped = _filterPluginsForReco.dropped;
-      editorPlugins = kept;
-
-      // Reconcile the injection API with the post-filter plugin set.
-      // This evicts both the plugins we just dropped above (re-registered
-      // by createPluginsList but no longer in editorPlugins) AND any
-      // plugin from a previous preset that the new preset doesn't
-      // re-register.
+    //
+    // When the schema is being rebuilt below, the new schema is built
+    // from the *unfiltered* plugin list — so dropping plugins whose
+    // nodes/marks the OLD schema lacks would wrongly remove the very
+    // plugins the rebuild is meant to admit. Skip the drop step in that
+    // case (purpose 1) but always reconcile the injection API
+    // (purpose 2). When NOT rebuilding, run both — even under the
+    // `cc-markdown-mode` experiment, otherwise no-op preset identity
+    // changes would silently leave a broken plugin/schema mismatch.
+    if (presetChanged && (0, _platformFeatureFlags.fg)('platform_editor_reconfigure_filter_plugins')) {
+      var dropped = [];
+      if (!shouldRebuildSchema) {
+        var _result = (0, _filterPluginsForReconfigure.filterPluginsForReconfigure)(editorPlugins, viewRef.current.state.schema, previousPluginNames);
+        if (_result.dropped.length > 0) {
+          editorPlugins = _result.kept;
+          // Plugin list changed — rebuild candidate config to match.
+          nextConfig = buildConfig(editorPlugins);
+        }
+        dropped = _result.dropped;
+      }
       var keptPluginNames = new Set(editorPlugins.map(function (p) {
         return p === null || p === void 0 ? void 0 : p.name;
       }).filter(function (n) {
@@ -415,33 +486,77 @@ function ReactEditorView(props) {
           evictedFromApi: evictedFromApi
         });
       }
-      lastFilteredPresetRef.current = props.preset;
-    }
-    config.current = (0, _createEditor.processPluginsList)(editorPlugins);
-    if ((0, _expValEquals.expValEquals)('platform_editor_appearance_shared_state', 'isEnabled', true)) {
-      var _config$current$pmPlu2;
-      (_config$current$pmPlu2 = config.current.pmPlugins).push.apply(_config$current$pmPlu2, (0, _toConsumableArray2.default)(pluginInjectionAPI.current.getInternalPMPlugins()));
     }
+    config.current = nextConfig;
     var state = viewRef.current.state;
-    var plugins = (0, _createEditor.createPMPlugins)({
-      schema: state.schema,
-      dispatch: dispatch,
-      errorReporter: errorReporter,
-      editorConfig: config.current,
-      eventDispatcher: eventDispatcher,
-      providerFactory: props.providerFactory,
-      portalProviderAPI: props.portalProviderAPI,
-      nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      featureFlags: featureFlags,
-      getIntl: function getIntl() {
-        return props.intl;
-      },
-      onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
-    });
-    var newState = state.reconfigure({
-      plugins: plugins
-    });
+    var newState;
+    if (shouldRebuildSchema) {
+      var newSchema = (0, _createSchema.createSchema)(config.current);
+      var newDoc;
+      try {
+        newDoc = _model.Node.fromJSON(newSchema, state.doc.toJSON());
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error('[reconfigureState] Failed to migrate doc to new schema; resetting to empty doc', e);
+        var empty = newSchema.topNodeType.createAndFill();
+        if (!empty) {
+          throw new Error('reconfigureState: doc migration failed and new schema cannot create an empty top node');
+        }
+        newDoc = empty;
+      }
+      var newSelection;
+      try {
+        newSelection = _state2.Selection.fromJSON(newDoc, state.selection.toJSON());
+      } catch (_unused) {
+        // Old selection's positions / node types may not map onto the new schema.
+        newSelection = _state2.Selection.atStart(newDoc);
+      }
+      var plugins = (0, _createEditor.createPMPlugins)({
+        schema: newSchema,
+        dispatch: dispatch,
+        errorReporter: errorReporter,
+        editorConfig: config.current,
+        eventDispatcher: eventDispatcher,
+        providerFactory: props.providerFactory,
+        portalProviderAPI: props.portalProviderAPI,
+        nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        featureFlags: featureFlags,
+        getIntl: function getIntl() {
+          return props.intl;
+        },
+        onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
+      });
+      newState = _state2.EditorState.create({
+        schema: newSchema,
+        doc: newDoc,
+        selection: newSelection,
+        plugins: plugins
+      });
+    } else {
+      var _plugins = (0, _createEditor.createPMPlugins)({
+        schema: state.schema,
+        dispatch: dispatch,
+        errorReporter: errorReporter,
+        editorConfig: config.current,
+        eventDispatcher: eventDispatcher,
+        providerFactory: props.providerFactory,
+        portalProviderAPI: props.portalProviderAPI,
+        nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        featureFlags: featureFlags,
+        getIntl: function getIntl() {
+          return props.intl;
+        },
+        onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
+      });
+      newState = state.reconfigure({
+        plugins: _plugins
+      });
+    }
+    if (presetChanged) {
+      lastProcessedPresetRef.current = props.preset;
+    }
 
     // need to update the state first so when the view builds the nodeviews it is
     // using the latest plugins
@@ -450,9 +565,32 @@ function ReactEditorView(props) {
       state: newState
     }));
 
+    // The new collab-edit plugin instance starts with `isReady=false`.
+    // The rebind path in editor-plugin-collab-edit's initialize.ts is
+    // gated on `provider.getInitPayload`, which the Confluence NCS
+    // provider does not implement, so the placeholder spinner would
+    // never clear. Re-seeding here is safe: the prior state must have
+    // had `isReady=true` for the user to have triggered the toggle.
+    //
+    // Must run AFTER `view.update({ state: newState })`: that call resets
+    // the view's state to the captured `newState` reference, so a
+    // dispatch placed before it would advance `view.state` to a value
+    // that `update` then silently overwrites — discarding the meta and
+    // leaving `isReady=false`.
+    if (shouldRebuildSchema) {
+      // `state.collabEditPlugin$` is the property PM derives from the
+      // collab plugin's PluginKey; cast through `unknown` to read it.
+      var collabState = viewRef.current.state.collabEditPlugin$;
+      if (collabState && collabState.isReady !== true) {
+        viewRef.current.dispatch(viewRef.current.state.tr.setMeta('collabInitialised', true));
+      }
+    }
+
     // EDITOR-6702: gated until we have a broader gate; reconfigure is a
     // low-level path so use NoExposure.
     if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc-markdown-mode', 'isEnabled', true)) {
+      // Force a render so PluginSlot picks up the new preset's content
+      // components against the new state.
       bumpConfigVersion(function (v) {
         return v + 1;
       });
@@ -695,19 +833,19 @@ function ReactEditorView(props) {
     return function () {
       if (scrollElement.current) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        var _iterator = _createForOfIteratorHelper(possibleListeners.current),
-          _step;
+        var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
+          _step2;
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var _scrollElement$curren;
-            var possibleListener = _step.value;
+            var possibleListener = _step2.value;
             // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
             (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 || _scrollElement$curren.removeEventListener.apply(_scrollElement$curren, (0, _toConsumableArray2.default)(possibleListener));
           }
         } catch (err) {
-          _iterator.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator.f();
+          _iterator2.f();
         }
       }
       scrollElement.current = null;
@@ -719,19 +857,19 @@ function ReactEditorView(props) {
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       var cleanupListeners = function cleanupListeners() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
-          _step2;
+        var _iterator3 = _createForOfIteratorHelper(possibleListeners.current),
+          _step3;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var _scrollElement$curren2;
-            var possibleListener = _step2.value;
+            var possibleListener = _step3.value;
             // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
             (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 || _scrollElement$curren2.removeEventListener.apply(_scrollElement$curren2, (0, _toConsumableArray2.default)(possibleListener));
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator2.f();
+          _iterator3.f();
         }
       };
       if (scrollElement.current) {

package/dist/cjs/utils/extensions.js

@@ -18,6 +18,11 @@ var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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) { (0, _defineProperty2.default)(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; }
+// Structural shape of the markdown-mode plugin's slice of the injection API.
+// Used to read `isMarkdownMode` without importing the `MarkdownModePlugin`
+// type — that would pull editor-plugin-markdown-mode into editor-core's
+// dependency graph and force every consuming product to rebuild.
+
 /**
  * Utils to send analytics event when a extension is inserted using quickInsert
  */
@@ -89,6 +94,15 @@ function _extensionProviderToQuickInsertProvider() {
           extensions = _context.sent;
           return _context.abrupt("return", {
             getItems: function getItems() {
+              var _apiRef$current;
+              // `extensionProvider` is supplied independently of the preset, so
+              // suppress its items in markdown mode where rich-only content cannot
+              // be inserted. See `MarkdownModeReader` above for why this is read
+              // via a structural cast rather than the typed plugin API.
+              var isMarkdownMode = (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.markdownMode) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.sharedState.currentState()) === null || _apiRef$current === void 0 ? void 0 : _apiRef$current.isMarkdownMode;
+              if (isMarkdownMode) {
+                return Promise.resolve([]);
+              }
               var quickInsertItems = (0, _extensions.getQuickInsertItemsFromModule)(extensions, function (item) {
                 var Icon = (0, _reactLoadable.default)({
                   loader: item.icon,
@@ -120,8 +134,8 @@ function _extensionProviderToQuickInsertProvider() {
                   isDisabledOffline: true,
                   action: function action(insert, state, source) {
                     if (typeof item.node === 'function') {
-                      var _apiRef$current;
-                      var extensionAPI = apiRef === null || apiRef === void 0 || (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.extension) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.actions) === null || _apiRef$current === void 0 ? void 0 : _apiRef$current.api();
+                      var _apiRef$current2;
+                      var extensionAPI = apiRef === null || apiRef === void 0 || (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || (_apiRef$current2 = _apiRef$current2.extension) === null || _apiRef$current2 === void 0 || (_apiRef$current2 = _apiRef$current2.actions) === null || _apiRef$current2 === void 0 ? void 0 : _apiRef$current2.api();
                       // While this should only run when the extension some setups of editor
                       // may not have the extension API
                       if (extensionAPI) {

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "219.7.1";
+var version = exports.version = "219.7.2";

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

@@ -17,6 +17,7 @@ import { processRawValue, processRawValueWithoutValidation } from '@atlaskit/edi
 import { ReactEditorViewContext } from '@atlaskit/editor-common/ui-react';
 import { analyticsEventKey, getAnalyticsEventSeverity } from '@atlaskit/editor-common/utils/analytics';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { EditorSSRRenderer } from '@atlaskit/editor-ssr-renderer';
@@ -48,6 +49,24 @@ import { useFireFullWidthEvent } from './ReactEditorView/useFireFullWidthEvent';
 const EDIT_AREA_ID = 'ak-editor-textarea';
 const SSR_TRACE_SEGMENT_NAME = 'reactEditorView';
 const bootStartTime = isPerformanceAPIAvailable() ? performance.now() : undefined;
+// `markdown↔rich` toggles drop different node/mark sets, so the unique
+// name set is enough to detect when a destructive rebuild is needed.
+function sameNames(a, b) {
+  const setA = new Set(a);
+  const setB = new Set(b);
+  if (setA.size !== setB.size) {
+    return false;
+  }
+  for (const name of setA) {
+    if (!setB.has(name)) {
+      return false;
+    }
+  }
+  return true;
+}
+function schemaShapeChanged(current, next) {
+  return !sameNames(Object.keys(current.nodes), next.nodes.map(n => n.name)) || !sameNames(Object.keys(current.marks), next.marks.map(m => m.name));
+}
 export function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _pluginInjectionAPI$c2, _pluginInjectionAPI$c3, _media, _linking, _linking$smartLinks, _document$querySelect, _props$render, _props$render2;
   // Should be always the first statement in the component
@@ -338,9 +357,10 @@ export function ReactEditorView(props) {
   // components from the rebuilt preset).
   const [, bumpConfigVersion] = useState(0);
 
-  // Preset reference last processed by the schema/API reconciliation below.
-  // Used to skip that work when reconfigure is called with the same preset.
-  const lastFilteredPresetRef = useRef(null);
+  // Preset reference last processed by reconfigureState. Used to skip the
+  // destructive work (plugin filter, schema rebuild) when reconfigure is
+  // called with the same preset.
+  const lastProcessedPresetRef = useRef(null);
   const reconfigureState = useCallback(props => {
     if (!viewRef.current) {
       return;
@@ -357,6 +377,34 @@ export function ReactEditorView(props) {
     const previousPluginNames = new Set(pluginInjectionAPI.current.getRegisteredPluginNames());
     let editorPlugins = createPluginsList(props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current);
 
+    // Capture once, before either downstream block updates the ref —
+    // both the filter and the schema rebuild are destructive and only
+    // want to run when the preset has actually changed.
+    const presetChanged = lastProcessedPresetRef.current !== props.preset;
+
+    // Build a candidate config from the *unfiltered* plugin list so we can
+    // decide whether the schema rebuild path will run. Both the rebuild
+    // decision and the drop-filter decision below depend on this answer,
+    // so it has to be computed up-front.
+    const buildConfig = plugins => {
+      const c = processPluginsList(plugins);
+      if (expValEquals('platform_editor_appearance_shared_state', 'isEnabled', true)) {
+        c.pmPlugins.push(...pluginInjectionAPI.current.getInternalPMPlugins());
+      }
+      return c;
+    };
+    let nextConfig = buildConfig(editorPlugins);
+
+    // `state.reconfigure` preserves the original schema, so a preset
+    // toggle that should change schema (markdown↔rich) needs a fresh
+    // `EditorState`. Resets all plugin state including undo history.
+    //
+    // Compare schema *shape* (node + mark name sets) rather than preset
+    // identity: consumers commonly recreate the preset object on every
+    // parent re-render, and a destructive rebuild on a no-op identity
+    // change tears down all plugin state (e.g. unmounts the AI palette).
+    const shouldRebuildSchema = presetChanged && schemaShapeChanged(viewRef.current.state.schema, nextConfig) && expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true);
+
     // `state.reconfigure` keeps the original schema, so switching presets
     // can leave the editor inconsistent in two ways:
     //   1. The new preset may add plugins that reference schema nodes or
@@ -365,18 +413,26 @@ export function ReactEditorView(props) {
     //      injection API even when the new preset doesn't re-register
     //      them, so listeners still fire against a state that no longer
     //      has their pmPlugin.
-    if (lastFilteredPresetRef.current !== props.preset && fg('platform_editor_reconfigure_filter_plugins')) {
-      const {
-        kept,
-        dropped
-      } = filterPluginsForReconfigure(editorPlugins, viewRef.current.state.schema, previousPluginNames);
-      editorPlugins = kept;
-
-      // Reconcile the injection API with the post-filter plugin set.
-      // This evicts both the plugins we just dropped above (re-registered
-      // by createPluginsList but no longer in editorPlugins) AND any
-      // plugin from a previous preset that the new preset doesn't
-      // re-register.
+    //
+    // When the schema is being rebuilt below, the new schema is built
+    // from the *unfiltered* plugin list — so dropping plugins whose
+    // nodes/marks the OLD schema lacks would wrongly remove the very
+    // plugins the rebuild is meant to admit. Skip the drop step in that
+    // case (purpose 1) but always reconcile the injection API
+    // (purpose 2). When NOT rebuilding, run both — even under the
+    // `cc-markdown-mode` experiment, otherwise no-op preset identity
+    // changes would silently leave a broken plugin/schema mismatch.
+    if (presetChanged && fg('platform_editor_reconfigure_filter_plugins')) {
+      let dropped = [];
+      if (!shouldRebuildSchema) {
+        const result = filterPluginsForReconfigure(editorPlugins, viewRef.current.state.schema, previousPluginNames);
+        if (result.dropped.length > 0) {
+          editorPlugins = result.kept;
+          // Plugin list changed — rebuild candidate config to match.
+          nextConfig = buildConfig(editorPlugins);
+        }
+        dropped = result.dropped;
+      }
       const keptPluginNames = new Set(editorPlugins.map(p => p === null || p === void 0 ? void 0 : p.name).filter(n => Boolean(n)));
       const evictedFromApi = pluginInjectionAPI.current.retainPlugins(keptPluginNames);
       if (dropped.length > 0 || evictedFromApi.length > 0) {
@@ -386,30 +442,73 @@ export function ReactEditorView(props) {
           evictedFromApi
         });
       }
-      lastFilteredPresetRef.current = props.preset;
-    }
-    config.current = processPluginsList(editorPlugins);
-    if (expValEquals('platform_editor_appearance_shared_state', 'isEnabled', true)) {
-      config.current.pmPlugins.push(...pluginInjectionAPI.current.getInternalPMPlugins());
     }
+    config.current = nextConfig;
     const state = viewRef.current.state;
-    const plugins = createPMPlugins({
-      schema: state.schema,
-      dispatch: dispatch,
-      errorReporter: errorReporter,
-      editorConfig: config.current,
-      eventDispatcher: eventDispatcher,
-      providerFactory: props.providerFactory,
-      portalProviderAPI: props.portalProviderAPI,
-      nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      featureFlags,
-      getIntl: () => props.intl,
-      onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
-    });
-    const newState = state.reconfigure({
-      plugins: plugins
-    });
+    let newState;
+    if (shouldRebuildSchema) {
+      const newSchema = createSchema(config.current);
+      let newDoc;
+      try {
+        newDoc = PMNode.fromJSON(newSchema, state.doc.toJSON());
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error('[reconfigureState] Failed to migrate doc to new schema; resetting to empty doc', e);
+        const empty = newSchema.topNodeType.createAndFill();
+        if (!empty) {
+          throw new Error('reconfigureState: doc migration failed and new schema cannot create an empty top node');
+        }
+        newDoc = empty;
+      }
+      let newSelection;
+      try {
+        newSelection = Selection.fromJSON(newDoc, state.selection.toJSON());
+      } catch {
+        // Old selection's positions / node types may not map onto the new schema.
+        newSelection = Selection.atStart(newDoc);
+      }
+      const plugins = createPMPlugins({
+        schema: newSchema,
+        dispatch: dispatch,
+        errorReporter: errorReporter,
+        editorConfig: config.current,
+        eventDispatcher: eventDispatcher,
+        providerFactory: props.providerFactory,
+        portalProviderAPI: props.portalProviderAPI,
+        nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        featureFlags,
+        getIntl: () => props.intl,
+        onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
+      });
+      newState = EditorState.create({
+        schema: newSchema,
+        doc: newDoc,
+        selection: newSelection,
+        plugins: plugins
+      });
+    } else {
+      const plugins = createPMPlugins({
+        schema: state.schema,
+        dispatch: dispatch,
+        errorReporter: errorReporter,
+        editorConfig: config.current,
+        eventDispatcher: eventDispatcher,
+        providerFactory: props.providerFactory,
+        portalProviderAPI: props.portalProviderAPI,
+        nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        featureFlags,
+        getIntl: () => props.intl,
+        onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
+      });
+      newState = state.reconfigure({
+        plugins: plugins
+      });
+    }
+    if (presetChanged) {
+      lastProcessedPresetRef.current = props.preset;
+    }
 
     // need to update the state first so when the view builds the nodeviews it is
     // using the latest plugins
@@ -419,9 +518,32 @@ export function ReactEditorView(props) {
       state: newState
     });
 
+    // The new collab-edit plugin instance starts with `isReady=false`.
+    // The rebind path in editor-plugin-collab-edit's initialize.ts is
+    // gated on `provider.getInitPayload`, which the Confluence NCS
+    // provider does not implement, so the placeholder spinner would
+    // never clear. Re-seeding here is safe: the prior state must have
+    // had `isReady=true` for the user to have triggered the toggle.
+    //
+    // Must run AFTER `view.update({ state: newState })`: that call resets
+    // the view's state to the captured `newState` reference, so a
+    // dispatch placed before it would advance `view.state` to a value
+    // that `update` then silently overwrites — discarding the meta and
+    // leaving `isReady=false`.
+    if (shouldRebuildSchema) {
+      // `state.collabEditPlugin$` is the property PM derives from the
+      // collab plugin's PluginKey; cast through `unknown` to read it.
+      const collabState = viewRef.current.state.collabEditPlugin$;
+      if (collabState && collabState.isReady !== true) {
+        viewRef.current.dispatch(viewRef.current.state.tr.setMeta('collabInitialised', true));
+      }
+    }
+
     // EDITOR-6702: gated until we have a broader gate; reconfigure is a
     // low-level path so use NoExposure.
     if (expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true)) {
+      // Force a render so PluginSlot picks up the new preset's content
+      // components against the new state.
       bumpConfigVersion(v => v + 1);
     }
     return result;

package/dist/es2019/utils/extensions.js

@@ -5,6 +5,12 @@ import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-c
 import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
 import { findInsertLocation } from '@atlaskit/editor-common/utils/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
+
+// Structural shape of the markdown-mode plugin's slice of the injection API.
+// Used to read `isMarkdownMode` without importing the `MarkdownModePlugin`
+// type — that would pull editor-plugin-markdown-mode into editor-core's
+// dependency graph and force every consuming product to rebuild.
+
 /**
  * Utils to send analytics event when a extension is inserted using quickInsert
  */
@@ -54,6 +60,15 @@ export async function extensionProviderToQuickInsertProvider(extensionProvider,
   const extensions = await extensionProvider.getExtensions();
   return {
     getItems: () => {
+      var _apiRef$current, _apiRef$current$markd, _apiRef$current$markd2;
+      // `extensionProvider` is supplied independently of the preset, so
+      // suppress its items in markdown mode where rich-only content cannot
+      // be inserted. See `MarkdownModeReader` above for why this is read
+      // via a structural cast rather than the typed plugin API.
+      const isMarkdownMode = (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 ? void 0 : (_apiRef$current$markd = _apiRef$current.markdownMode) === null || _apiRef$current$markd === void 0 ? void 0 : (_apiRef$current$markd2 = _apiRef$current$markd.sharedState.currentState()) === null || _apiRef$current$markd2 === void 0 ? void 0 : _apiRef$current$markd2.isMarkdownMode;
+      if (isMarkdownMode) {
+        return Promise.resolve([]);
+      }
       const quickInsertItems = getQuickInsertItemsFromModule(extensions, item => {
         const Icon = Loadable({
           loader: item.icon,
@@ -81,8 +96,8 @@ export async function extensionProviderToQuickInsertProvider(extensionProvider,
           isDisabledOffline: true,
           action: (insert, state, source) => {
             if (typeof item.node === 'function') {
-              var _apiRef$current, _apiRef$current$exten, _apiRef$current$exten2;
-              const extensionAPI = apiRef === null || apiRef === void 0 ? void 0 : (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 ? void 0 : (_apiRef$current$exten = _apiRef$current.extension) === null || _apiRef$current$exten === void 0 ? void 0 : (_apiRef$current$exten2 = _apiRef$current$exten.actions) === null || _apiRef$current$exten2 === void 0 ? void 0 : _apiRef$current$exten2.api();
+              var _apiRef$current2, _apiRef$current2$exte, _apiRef$current2$exte2;
+              const extensionAPI = apiRef === null || apiRef === void 0 ? void 0 : (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 ? void 0 : (_apiRef$current2$exte = _apiRef$current2.extension) === null || _apiRef$current2$exte === void 0 ? void 0 : (_apiRef$current2$exte2 = _apiRef$current2$exte.actions) === null || _apiRef$current2$exte2 === void 0 ? void 0 : _apiRef$current2$exte2.api();
               // While this should only run when the extension some setups of editor
               // may not have the extension API
               if (extensionAPI) {

package/dist/es2019/version-wrapper.js

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

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

@@ -1,11 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-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 React, { useCallback, useLayoutEffect, useMemo, useRef, useState, useEffect } from 'react';
 import { injectIntl } from 'react-intl';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
@@ -25,6 +25,7 @@ import { processRawValue, processRawValueWithoutValidation } from '@atlaskit/edi
 import { ReactEditorViewContext } from '@atlaskit/editor-common/ui-react';
 import { analyticsEventKey, getAnalyticsEventSeverity } from '@atlaskit/editor-common/utils/analytics';
 import { isEmptyDocument } from '@atlaskit/editor-common/utils/document';
+import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { EditorSSRRenderer } from '@atlaskit/editor-ssr-renderer';
@@ -56,6 +57,37 @@ import { useFireFullWidthEvent } from './ReactEditorView/useFireFullWidthEvent';
 var EDIT_AREA_ID = 'ak-editor-textarea';
 var SSR_TRACE_SEGMENT_NAME = 'reactEditorView';
 var bootStartTime = isPerformanceAPIAvailable() ? performance.now() : undefined;
+// `markdown↔rich` toggles drop different node/mark sets, so the unique
+// name set is enough to detect when a destructive rebuild is needed.
+function sameNames(a, b) {
+  var setA = new Set(a);
+  var setB = new Set(b);
+  if (setA.size !== setB.size) {
+    return false;
+  }
+  var _iterator = _createForOfIteratorHelper(setA),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var name = _step.value;
+      if (!setB.has(name)) {
+        return false;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return true;
+}
+function schemaShapeChanged(current, next) {
+  return !sameNames(Object.keys(current.nodes), next.nodes.map(function (n) {
+    return n.name;
+  })) || !sameNames(Object.keys(current.marks), next.marks.map(function (m) {
+    return m.name;
+  }));
+}
 export function ReactEditorView(props) {
   var _pluginInjectionAPI$c, _media, _linking, _document$querySelect, _props$render, _props$render2;
   // Should be always the first statement in the component
@@ -355,9 +387,10 @@ export function ReactEditorView(props) {
     _useState2 = _slicedToArray(_useState, 2),
     bumpConfigVersion = _useState2[1];
 
-  // Preset reference last processed by the schema/API reconciliation below.
-  // Used to skip that work when reconfigure is called with the same preset.
-  var lastFilteredPresetRef = useRef(null);
+  // Preset reference last processed by reconfigureState. Used to skip the
+  // destructive work (plugin filter, schema rebuild) when reconfigure is
+  // called with the same preset.
+  var lastProcessedPresetRef = useRef(null);
   var reconfigureState = useCallback(function (props) {
     if (!viewRef.current) {
       return;
@@ -374,6 +407,35 @@ export function ReactEditorView(props) {
     var previousPluginNames = new Set(pluginInjectionAPI.current.getRegisteredPluginNames());
     var editorPlugins = createPluginsList(props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current);
 
+    // Capture once, before either downstream block updates the ref —
+    // both the filter and the schema rebuild are destructive and only
+    // want to run when the preset has actually changed.
+    var presetChanged = lastProcessedPresetRef.current !== props.preset;
+
+    // Build a candidate config from the *unfiltered* plugin list so we can
+    // decide whether the schema rebuild path will run. Both the rebuild
+    // decision and the drop-filter decision below depend on this answer,
+    // so it has to be computed up-front.
+    var buildConfig = function buildConfig(plugins) {
+      var c = processPluginsList(plugins);
+      if (expValEquals('platform_editor_appearance_shared_state', 'isEnabled', true)) {
+        var _c$pmPlugins;
+        (_c$pmPlugins = c.pmPlugins).push.apply(_c$pmPlugins, _toConsumableArray(pluginInjectionAPI.current.getInternalPMPlugins()));
+      }
+      return c;
+    };
+    var nextConfig = buildConfig(editorPlugins);
+
+    // `state.reconfigure` preserves the original schema, so a preset
+    // toggle that should change schema (markdown↔rich) needs a fresh
+    // `EditorState`. Resets all plugin state including undo history.
+    //
+    // Compare schema *shape* (node + mark name sets) rather than preset
+    // identity: consumers commonly recreate the preset object on every
+    // parent re-render, and a destructive rebuild on a no-op identity
+    // change tears down all plugin state (e.g. unmounts the AI palette).
+    var shouldRebuildSchema = presetChanged && schemaShapeChanged(viewRef.current.state.schema, nextConfig) && expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true);
+
     // `state.reconfigure` keeps the original schema, so switching presets
     // can leave the editor inconsistent in two ways:
     //   1. The new preset may add plugins that reference schema nodes or
@@ -382,17 +444,26 @@ export function ReactEditorView(props) {
     //      injection API even when the new preset doesn't re-register
     //      them, so listeners still fire against a state that no longer
     //      has their pmPlugin.
-    if (lastFilteredPresetRef.current !== props.preset && fg('platform_editor_reconfigure_filter_plugins')) {
-      var _filterPluginsForReco = filterPluginsForReconfigure(editorPlugins, viewRef.current.state.schema, previousPluginNames),
-        kept = _filterPluginsForReco.kept,
-        dropped = _filterPluginsForReco.dropped;
-      editorPlugins = kept;
-
-      // Reconcile the injection API with the post-filter plugin set.
-      // This evicts both the plugins we just dropped above (re-registered
-      // by createPluginsList but no longer in editorPlugins) AND any
-      // plugin from a previous preset that the new preset doesn't
-      // re-register.
+    //
+    // When the schema is being rebuilt below, the new schema is built
+    // from the *unfiltered* plugin list — so dropping plugins whose
+    // nodes/marks the OLD schema lacks would wrongly remove the very
+    // plugins the rebuild is meant to admit. Skip the drop step in that
+    // case (purpose 1) but always reconcile the injection API
+    // (purpose 2). When NOT rebuilding, run both — even under the
+    // `cc-markdown-mode` experiment, otherwise no-op preset identity
+    // changes would silently leave a broken plugin/schema mismatch.
+    if (presetChanged && fg('platform_editor_reconfigure_filter_plugins')) {
+      var dropped = [];
+      if (!shouldRebuildSchema) {
+        var _result = filterPluginsForReconfigure(editorPlugins, viewRef.current.state.schema, previousPluginNames);
+        if (_result.dropped.length > 0) {
+          editorPlugins = _result.kept;
+          // Plugin list changed — rebuild candidate config to match.
+          nextConfig = buildConfig(editorPlugins);
+        }
+        dropped = _result.dropped;
+      }
       var keptPluginNames = new Set(editorPlugins.map(function (p) {
         return p === null || p === void 0 ? void 0 : p.name;
       }).filter(function (n) {
@@ -406,33 +477,77 @@ export function ReactEditorView(props) {
           evictedFromApi: evictedFromApi
         });
       }
-      lastFilteredPresetRef.current = props.preset;
-    }
-    config.current = processPluginsList(editorPlugins);
-    if (expValEquals('platform_editor_appearance_shared_state', 'isEnabled', true)) {
-      var _config$current$pmPlu2;
-      (_config$current$pmPlu2 = config.current.pmPlugins).push.apply(_config$current$pmPlu2, _toConsumableArray(pluginInjectionAPI.current.getInternalPMPlugins()));
     }
+    config.current = nextConfig;
     var state = viewRef.current.state;
-    var plugins = createPMPlugins({
-      schema: state.schema,
-      dispatch: dispatch,
-      errorReporter: errorReporter,
-      editorConfig: config.current,
-      eventDispatcher: eventDispatcher,
-      providerFactory: props.providerFactory,
-      portalProviderAPI: props.portalProviderAPI,
-      nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
-      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      featureFlags: featureFlags,
-      getIntl: function getIntl() {
-        return props.intl;
-      },
-      onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
-    });
-    var newState = state.reconfigure({
-      plugins: plugins
-    });
+    var newState;
+    if (shouldRebuildSchema) {
+      var newSchema = createSchema(config.current);
+      var newDoc;
+      try {
+        newDoc = PMNode.fromJSON(newSchema, state.doc.toJSON());
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error('[reconfigureState] Failed to migrate doc to new schema; resetting to empty doc', e);
+        var empty = newSchema.topNodeType.createAndFill();
+        if (!empty) {
+          throw new Error('reconfigureState: doc migration failed and new schema cannot create an empty top node');
+        }
+        newDoc = empty;
+      }
+      var newSelection;
+      try {
+        newSelection = Selection.fromJSON(newDoc, state.selection.toJSON());
+      } catch (_unused) {
+        // Old selection's positions / node types may not map onto the new schema.
+        newSelection = Selection.atStart(newDoc);
+      }
+      var plugins = createPMPlugins({
+        schema: newSchema,
+        dispatch: dispatch,
+        errorReporter: errorReporter,
+        editorConfig: config.current,
+        eventDispatcher: eventDispatcher,
+        providerFactory: props.providerFactory,
+        portalProviderAPI: props.portalProviderAPI,
+        nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        featureFlags: featureFlags,
+        getIntl: function getIntl() {
+          return props.intl;
+        },
+        onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
+      });
+      newState = EditorState.create({
+        schema: newSchema,
+        doc: newDoc,
+        selection: newSelection,
+        plugins: plugins
+      });
+    } else {
+      var _plugins = createPMPlugins({
+        schema: state.schema,
+        dispatch: dispatch,
+        errorReporter: errorReporter,
+        editorConfig: config.current,
+        eventDispatcher: eventDispatcher,
+        providerFactory: props.providerFactory,
+        portalProviderAPI: props.portalProviderAPI,
+        nodeViewPortalProviderAPI: props.nodeViewPortalProviderAPI,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        featureFlags: featureFlags,
+        getIntl: function getIntl() {
+          return props.intl;
+        },
+        onEditorStateUpdated: pluginInjectionAPI.current.onEditorViewUpdated
+      });
+      newState = state.reconfigure({
+        plugins: _plugins
+      });
+    }
+    if (presetChanged) {
+      lastProcessedPresetRef.current = props.preset;
+    }
 
     // need to update the state first so when the view builds the nodeviews it is
     // using the latest plugins
@@ -441,9 +556,32 @@ export function ReactEditorView(props) {
       state: newState
     }));
 
+    // The new collab-edit plugin instance starts with `isReady=false`.
+    // The rebind path in editor-plugin-collab-edit's initialize.ts is
+    // gated on `provider.getInitPayload`, which the Confluence NCS
+    // provider does not implement, so the placeholder spinner would
+    // never clear. Re-seeding here is safe: the prior state must have
+    // had `isReady=true` for the user to have triggered the toggle.
+    //
+    // Must run AFTER `view.update({ state: newState })`: that call resets
+    // the view's state to the captured `newState` reference, so a
+    // dispatch placed before it would advance `view.state` to a value
+    // that `update` then silently overwrites — discarding the meta and
+    // leaving `isReady=false`.
+    if (shouldRebuildSchema) {
+      // `state.collabEditPlugin$` is the property PM derives from the
+      // collab plugin's PluginKey; cast through `unknown` to read it.
+      var collabState = viewRef.current.state.collabEditPlugin$;
+      if (collabState && collabState.isReady !== true) {
+        viewRef.current.dispatch(viewRef.current.state.tr.setMeta('collabInitialised', true));
+      }
+    }
+
     // EDITOR-6702: gated until we have a broader gate; reconfigure is a
     // low-level path so use NoExposure.
     if (expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true)) {
+      // Force a render so PluginSlot picks up the new preset's content
+      // components against the new state.
       bumpConfigVersion(function (v) {
         return v + 1;
       });
@@ -686,19 +824,19 @@ export function ReactEditorView(props) {
     return function () {
       if (scrollElement.current) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        var _iterator = _createForOfIteratorHelper(possibleListeners.current),
-          _step;
+        var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
+          _step2;
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var _scrollElement$curren;
-            var possibleListener = _step.value;
+            var possibleListener = _step2.value;
             // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
             (_scrollElement$curren = scrollElement.current) === null || _scrollElement$curren === void 0 || _scrollElement$curren.removeEventListener.apply(_scrollElement$curren, _toConsumableArray(possibleListener));
           }
         } catch (err) {
-          _iterator.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator.f();
+          _iterator2.f();
         }
       }
       scrollElement.current = null;
@@ -710,19 +848,19 @@ export function ReactEditorView(props) {
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       var cleanupListeners = function cleanupListeners() {
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        var _iterator2 = _createForOfIteratorHelper(possibleListeners.current),
-          _step2;
+        var _iterator3 = _createForOfIteratorHelper(possibleListeners.current),
+          _step3;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var _scrollElement$curren2;
-            var possibleListener = _step2.value;
+            var possibleListener = _step3.value;
             // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
             (_scrollElement$curren2 = scrollElement.current) === null || _scrollElement$curren2 === void 0 || _scrollElement$curren2.removeEventListener.apply(_scrollElement$curren2, _toConsumableArray(possibleListener));
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator2.f();
+          _iterator3.f();
         }
       };
       if (scrollElement.current) {

package/dist/esm/utils/extensions.js

@@ -10,6 +10,12 @@ import { getQuickInsertItemsFromModule, resolveImport } from '@atlaskit/editor-c
 import { combineProviders } from '@atlaskit/editor-common/provider-helpers';
 import { findInsertLocation } from '@atlaskit/editor-common/utils/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
+
+// Structural shape of the markdown-mode plugin's slice of the injection API.
+// Used to read `isMarkdownMode` without importing the `MarkdownModePlugin`
+// type — that would pull editor-plugin-markdown-mode into editor-core's
+// dependency graph and force every consuming product to rebuild.
+
 /**
  * Utils to send analytics event when a extension is inserted using quickInsert
  */
@@ -81,6 +87,15 @@ function _extensionProviderToQuickInsertProvider() {
           extensions = _context.sent;
           return _context.abrupt("return", {
             getItems: function getItems() {
+              var _apiRef$current;
+              // `extensionProvider` is supplied independently of the preset, so
+              // suppress its items in markdown mode where rich-only content cannot
+              // be inserted. See `MarkdownModeReader` above for why this is read
+              // via a structural cast rather than the typed plugin API.
+              var isMarkdownMode = (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.markdownMode) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.sharedState.currentState()) === null || _apiRef$current === void 0 ? void 0 : _apiRef$current.isMarkdownMode;
+              if (isMarkdownMode) {
+                return Promise.resolve([]);
+              }
               var quickInsertItems = getQuickInsertItemsFromModule(extensions, function (item) {
                 var Icon = Loadable({
                   loader: item.icon,
@@ -112,8 +127,8 @@ function _extensionProviderToQuickInsertProvider() {
                   isDisabledOffline: true,
                   action: function action(insert, state, source) {
                     if (typeof item.node === 'function') {
-                      var _apiRef$current;
-                      var extensionAPI = apiRef === null || apiRef === void 0 || (_apiRef$current = apiRef.current) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.extension) === null || _apiRef$current === void 0 || (_apiRef$current = _apiRef$current.actions) === null || _apiRef$current === void 0 ? void 0 : _apiRef$current.api();
+                      var _apiRef$current2;
+                      var extensionAPI = apiRef === null || apiRef === void 0 || (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || (_apiRef$current2 = _apiRef$current2.extension) === null || _apiRef$current2 === void 0 || (_apiRef$current2 = _apiRef$current2.actions) === null || _apiRef$current2 === void 0 ? void 0 : _apiRef$current2.api();
                       // While this should only run when the extension some setups of editor
                       // may not have the extension API
                       if (extensionAPI) {

package/dist/esm/version-wrapper.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "219.7.2",
+	"version": "219.7.3",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-performance-metrics": "^2.1.0",
-		"@atlaskit/editor-plugin-connectivity": "^10.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^10.1.0",
 		"@atlaskit/editor-plugin-quick-insert": "^10.4.0",
 		"@atlaskit/editor-plugin-user-preferences": "^8.2.0",
 		"@atlaskit/editor-plugins": "^13.1.0",
@@ -74,7 +74,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.5.0",
 		"@atlaskit/react-ufo": "^5.20.0",
 		"@atlaskit/task-decision": "^20.1.0",
-		"@atlaskit/tmp-editor-statsig": "^80.2.0",
+		"@atlaskit/tmp-editor-statsig": "^80.3.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^22.2.0",
 		"@atlaskit/width-detector": "^5.1.0",
@@ -92,7 +92,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.30.0",
+		"@atlaskit/editor-common": "^114.31.0",
 		"@atlaskit/link-provider": "^4.4.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -105,9 +105,10 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/adf-utils": "^19.29.0",
 		"@atlaskit/analytics-listeners": "^10.1.0",
+		"@atlaskit/code": "^17.5.0",
 		"@atlaskit/collab-provider": "^18.2.0",
 		"@atlaskit/editor-plugin-annotation": "^10.3.0",
-		"@atlaskit/editor-plugin-card": "^16.7.0",
+		"@atlaskit/editor-plugin-card": "^16.8.0",
 		"@atlaskit/editor-plugin-list": "^12.1.0",
 		"@atlaskit/editor-plugin-paste": "^11.2.0",
 		"@atlaskit/editor-test-helpers": "workspace:^",
@@ -118,6 +119,8 @@
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
 		"@atlaskit/media-test-helpers": "^41.0.0",
 		"@atlaskit/modal-dialog": "^15.0.0",
+		"@atlaskit/popper": "^7.2.0",
+		"@atlaskit/portal": "^5.5.0",
 		"@atlaskit/renderer": "^130.6.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
@@ -132,6 +135,7 @@
 		"@atlassian/search-client": "^1.7.0",
 		"@atlassian/search-provider": "^11.1.0",
 		"@atlassian/structured-docs-types": "workspace:^",
+		"@atlassian/user-profile-card": "^1.4.0",
 		"@emotion/jest": "^11.8.0",
 		"@testing-library/react": "^16.3.0",
 		"@types/diff": "^5.0.2",
@@ -174,6 +178,10 @@
 			"type": "boolean",
 			"referenceOnly": "true"
 		},
+		"people-teams_migrate-user-profile-card": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean",
 			"referenceOnly": "true"