@atlaskit/editor-core 219.7.2 → 219.7.4

package/dist/cjs/ui/EditorContentContainer/EditorContentContainer-compiled.js

@@ -175,7 +175,11 @@ var editorContentStyles = {
   expandStylesMixin_fg_platform_visual_refresh_icons: "_1ev7kb7n _1ocgttxp",
   expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes: "_1w8qq98m _omzvglyw _bqvk1osq _1h9p16ux _19lestnw _14j01n1a _1pm0idpf _1p3gidpf _1d9kt94y _113e1o8l",
   expandDenseStyles: "_18mb3mia _rrwb3mia",
-  extensionDiffStyles: "",
+  extensionStyles: "_1a64bimv _hdxx1gly _xxyv1rtt _1xxp1tmw _1yb8kb7n _1g5bglyw _15vp15s3 _s9d56x5g _efyrkb7n _bp3fglyw _1tfz1nu9 _14ao1nu9 _1hpkkb7n _1e6ukb7n _1wcvidpf _1pt1idpf _1iq2r4us _1j23bimv _17xs1rtt _7u261tmw _1oo0glyw _1sfk1j28 _z5jxclii _et601yvi _gwkf1j28 _ul13r4us _4kr1h2mm _1qyx1kdv _1clfstnw _pj5bb3bt _1q5aidpf _1mvvidpf _1r6qidpf _1o9tidpf _1g3g1osq _1mglglyw _1cx01ial _am787wq0 _11mi1j28 _bw1x1j28 _ucr81j28 _12mi1j28 _jn1o1osq _6bv41osq _1oxabimv _1qn21gly _f2dr1j28 _68b9clii _1wb01yvi _mwpb1j28 _yyxzr4us _1eah1j28 _thp91j28 _11vt1j28 _4t5m1j28 _lnnb1rtt _wwen1tmw _1uw8kb7n _1kckglyw _1y3y15s3 _w5kn6x5g _1nq1kb7n _1nl0glyw _itji1nu9 _1bby1nu9 _vy7vkb7n _1dtlkb7n _l3rpidpf _wwmdidpf _1r6wr4us _1we4bimv _1nx11rtt _iehe1tmw _7hj6glyw _1gw2oqnp _1nb7oqnp _1890oqnp _mxneidpf _nzqyidpf _1ey5idpf _10qboqnp _mkj8oqnp _1o70oqnp _1oaoidpf _d40vidpf _1xipidpf _pgy3idpf _1ft6idpf _1gfbidpf _fkv9idpf _18gqidpf _jchyidpf _16uk1j28 _1h9u1j28 _36v61j28 _gg19r4us _1g5dr4us _oackr4us _1jtp1j28 _1f311j28 _18rv1j28 _swvw1j28 _1j9x1j28 _1dva1j28 _1mnz1j28 _bq4v1j28 _hl5f1j28 _crev1j28 _1d631j28 _28m71j28 _vi00bimv _1b2sbimv _124rbimv _1hvp1gly _gu7z1gly _1otv1gly _vpzk1rtt _1cas1rtt _o16g1tmw _14ye1tmw _6bknkb7n _1u6pkb7n _1vx5glyw _b841glyw _1oek15s3 _cw2a15s3 _6qzd6x5g _1xbj6x5g _1oa1kb7n _14ookb7n _rst4glyw _31aeglyw _1mwo1nu9 _iahl1nu9 _1abbbimv _1td9bimv _61jobimv _pzvn1gly _1mqj1gly _11bn1gly _qyzc1sou _1cjx1sou _1ie21sou _11dk1nu9 _hle21nu9 _dtkmkb7n _jf2hkb7n _h7tgkb7n _dwq7kb7n _ujyhidpf _1upkidpf _1mrzidpf _1tsoidpf _ib8er4us _15wnr4us _ko3dbimv _v8pmbimv _1hux1rtt _10ke1rtt _a3hl1tmw _1yqx1tmw _1y96glyw _505cglyw _5l361j28 _1ryt1j28 _1n4tclii _1oztclii _qkq9clii _1n5a1yvi _jn3m1yvi _btw31yvi _13is15vq _8cmh15vq _1qmbewfl _14thewfl _190516cs _15z51osq _b4z71osq _1iizoqnp _1vsooqnp _o1s4idpf _1swgidpf _1oknoqnp _1bs5oqnp _13e0idpf _1mxyidpf _wwc7oqnp _8vqxoqnp _1wmeidpf _la9widpf _1yssoqnp _xxgeoqnp _mkvnidpf _1by3idpf _6yf3idpf _ibadidpf _oeksidpf _miq6idpf _9bm6idpf _1noyidpf _b6ceidpf _dlfnidpf",
+  extensionStylesDense: "_1s773mia _bqje3mia",
+  extensionStylesLegacyDense: "_1r7aqlaa",
+  extensionDiffStyles: "_ur7x49jj",
+  bodiedExtensionLayoutShiftFix: "_16ng1gkc _klqg1n1a _ptek1n1a _e1ae1n1a _13ey10ni _1bh8dik7 _1v7bia51 _1v3nfajl _1i6iidpf _gc15idpf _1utjidpf _csmsidpf _gogjidpf _gt60idpf _15kbidpf _sve5idpf _pmyyidpf _1jpsidpf _a3m4idpf _pfwgidpf _fo78glyw _1j2jidpf",
   findReplaceStyles: "_9laafajl _1trh7xuz _1h36j5v0 _1uddtdv8",
   findReplaceStylesNewWithA11Y: "_xph31b66 _rq281nka _1bk513ow _17vzi7uo _ar1b1b18 _1ybwjocv _1mni17v8 _tfy618hq _11gt15cr _1bx3vj2t _1j061dxm _oa091nka _1ybf1nka _u1hx1up9 _1rn91up9 _wn3j1up9 _1ydu1up9 _11wp1up9 _u12f1ypf _13q91ypf _or3e1s89 _gzgh1s89 _ipvl1s89 _15r21s89 _1cpz1s89 _1lh5kz84 _1pvf1xf3 _7pge1xf3 _1h271xf3 _1us91xf3 _mxi51xf3 _1o191dzh _b9gt1dzh _rdw3qlfy _11bbqlfy _v91uqlfy _1k4sqlfy _1ecxqlfy _7gsu17v8 _12xo17v8 _briz1wdg _1cis1wdg _midr1wdg _1kd91wdg _1t9u1wdg _1me2qxcq _r8mlqxcq _1im23ney _1r5e3ney _1oci3ney _13bv3ney _1kac3ney _h2391jcr _1r791fb9 _1ebn1fb9 _1s101fb9 _1p5e1fb9 _1bkc1fb9 _50231ph4 _1c101ph4 _1s5oiro1 _1w9miro1 _w8rkiro1 _u854iro1 _o9w6iro1 _1sch1b66 _ztqp1nka _4temv9ra _r79ei7uo _1e4d1b18 _hje11ckf _sopm17v8 _4q84eawv _1t2d15cr _12dfvj2t _cle21ok8",
   findReplaceStylesNewWithCodeblockColorContrastFix: "_64o84viv",
@@ -373,14 +377,7 @@ var EditorContentContainerCompiled = exports.EditorContentContainerCompiled = /*
     (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && editorContentStyles.mediaCaptionStyles, (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && editorContentStyles.firstWrappedMediaStyles, editorContentStyles.telepointerStyle, /* This needs to be after telepointer styles as some overlapping rules have equal specificity, and so the order is significant */
     editorContentStyles.telepointerColorAndCommonStyle, editorContentStyles.gapCursorStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) && editorContentStyles.gapCursorStylesVisibilityFix, editorContentStyles.panelStyles, editorContentStyles.nestedPanelBorderStylesMixin, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && editorContentStyles.panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, editorContentStyles.panelStylesMixin, editorContentStyles.mentionsStyles, editorContentStyles.tasksAndDecisionsStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && isDense && editorContentStyles.tasksAndDecisionsDenseStyles, editorContentStyles.gridStyles, editorContentStyles.blockMarksStyles, editorContentStyles.dateStyles,
-    // eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
-    // TODO: uncomment and remove dynamic styles from getExtensionStyles
-    // migrate this with packages/editor/editor-core/src/ui/EditorContentContainer/styles/extensionStyles.ts
-    // suggest creating a new cssMap for the variant use case from the guide below
-    // reference: https://atlassian.design/components/eslint-plugin-ui-styling-standard/no-dynamic-styles/usage
-    // getExtensionStyles(contentMode),
-    editorContentStyles.extensionDiffStyles, editorContentStyles.expandStylesBase, !useStandardNodeWidth && editorContentStyles.expandStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
+    (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && isDense && editorContentStyles.tasksAndDecisionsDenseStyles, editorContentStyles.gridStyles, editorContentStyles.blockMarksStyles, editorContentStyles.dateStyles, editorContentStyles.extensionStyles, (contentMode === 'compact' && (0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && editorContentStyles.extensionStylesDense, contentMode === 'compact' && (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && !(0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) && !(0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') && editorContentStyles.extensionStylesLegacyDense, (0, _expValEquals.expValEquals)('platform_editor_bodiedextension_layoutshift_fix', 'isEnabled', true) && editorContentStyles.bodiedExtensionLayoutShiftFix, editorContentStyles.extensionDiffStyles, editorContentStyles.expandStylesBase, !useStandardNodeWidth && editorContentStyles.expandStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
     // eslint-disable-next-line @atlaskit/platform/no-preconditioning
     (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && isDense && editorContentStyles.expandDenseStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ? editorContentStyles.expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes : editorContentStyles.expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes, editorContentStyles.expandStylesMixin_fg_platform_visual_refresh_icons, isChromeless && (0, _expValEquals.expValEquals)('platform_editor_chromeless_expand_fix', 'isEnabled', true) && editorContentStyles.expandStylesMixin_experiment_platform_editor_chromeless_expand_fix, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? editorContentStyles.findReplaceStylesNewWithA11Y : editorContentStyles.findReplaceStyles, (0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && editorContentStyles.findReplaceStylesNewWithCodeblockColorContrastFix, !(0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && editorContentStyles.findReplaceStylesWithCodeblockColorContrastFix, editorContentStyles.textHighlightStyle, editorContentStyles.decisionStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_blocktaskitem_node_tenantid', 'isEnabled', true) ? editorContentStyles.taskItemStylesWithBlockTaskItem : editorContentStyles.taskItemStyles, editorContentStyles.taskItemCheckboxStyles, editorContentStyles.decisionIconWithVisualRefresh, editorContentStyles.statusStyles, (0, _platformFeatureFlags.fg)('platform-dst-lozenge-tag-badge-visual-uplifts') ? editorContentStyles.statusStylesTeam26 : (0, _platformFeatureFlags.fg)('platform-component-visual-refresh') ? (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? editorContentStyles.statusStylesMixin_fg_platform_component_visual_refresh_with_search_match : editorContentStyles.statusStylesMixin_fg_platform_component_visual_refresh : (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? editorContentStyles.statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match : editorContentStyles.statusStylesMixin_without_fg_platform_component_visual_refresh, editorContentStyles.annotationStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? (0, _experiments.editorExperiment)('platform_editor_block_menu', true) ? editorContentStyles.smartCardStylesWithSearchMatchAndBlockMenuDangerStyles : editorContentStyles.smartCardStylesWithSearchMatch : editorContentStyles.smartCardStyles, (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true) && editorContentStyles.smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') || (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true)) && editorContentStyles.editorControlsSmartCardStyles, editorContentStyles.embedCardStyles, editorContentStyles.unsupportedStyles, editorContentStyles.resizerStyles, editorContentStyles.layoutBaseStyles, (0, _expValEquals.expValEquals)('platform_editor_table_excerpts_fix', 'isEnabled', true) && editorContentStyles.layoutBaseStylesWithTableExcerptsFix, (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && editorContentStyles.alignMultipleWrappedImageInLayoutStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) && editorContentStyles.syncBlockStylesBase, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
     // Apply sync block delta styles conditionally based on useStandardNodeWidth (negative margins or not)

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.3";

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;