@atlaskit/editor-plugin-block-type 14.1.7 → 14.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-block-type
 
+## 14.2.0
+
+### Minor Changes
+
+- [`1f36a5ab4e9ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f36a5ab4e9ae) -
+  Support markdown source view heading and quote toolbar actions
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.1.7
 
 ### Patch Changes

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -13,12 +13,15 @@ var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _ugcTokens = require("@atlaskit/editor-common/ugc-tokens");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _utils = require("../../utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var smallTextStyle = null;
@@ -115,6 +118,16 @@ var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
     formatMessage = _useIntl.formatMessage;
   var currentBlockType = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.currentBlockType');
   var availableBlockTypesInDropdown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.availableBlockTypesInDropdown');
+  var isMarkdownBridgeEnabled = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc-markdown-mode', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_markdown_compatible_toolbar');
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['markdownMode'], function (states) {
+      var _states$markdownModeS, _states$markdownModeS2;
+      return {
+        markdownView: isMarkdownBridgeEnabled ? (_states$markdownModeS = states.markdownModeState) === null || _states$markdownModeS === void 0 ? void 0 : _states$markdownModeS.view : undefined,
+        sourceFormatState: isMarkdownBridgeEnabled ? (_states$markdownModeS2 = states.markdownModeState) === null || _states$markdownModeS2 === void 0 ? void 0 : _states$markdownModeS2.sourceBlockFormatState : null
+      };
+    }),
+    markdownView = _useSharedPluginState.markdownView,
+    sourceFormatState = _useSharedPluginState.sourceFormatState;
   var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
@@ -122,17 +135,59 @@ var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
   }))) {
     return null;
   }
-  var isDisabled = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
+
+  // When in source view and the bridge is enabled, read heading level from
+  // the CM6 Lezer-tree-derived format state rather than the PM block type state.
+  // markdownView is authoritative for "in source view" — it flips synchronously
+  // on setView. sourceFormatState is null between the view switch and the
+  // first CM6 update listener fire, so we can't rely on it as the sentinel.
+  var isMarkdownBridgeActive = markdownView === 'syntax';
+
+  // Extract the numeric level from the block type name (e.g. 'heading1' → 1).
+  var headingLevel = blockType.name.startsWith('heading') ? parseInt(blockType.name.replace('heading', ''), 10) : null;
+  var isDisabled = isMarkdownBridgeActive ? Boolean(sourceFormatState === null || sourceFormatState === void 0 ? void 0 : sourceFormatState.inCodeBlock) : (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
   var fromBlockQuote = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === 'blockquote';
   var onClick = function onClick() {
     var _api$core, _api$blockType;
     if (isDisabled) {
       return;
     }
+
+    // Route to CM6 when in source view.
+    //
+    // - heading1..6: apply/replace via toggleSourceHeading(targetLevel).
+    // - normal (paragraph): if the cursor is currently on a heading line,
+    //   call toggleSourceHeading with the *current* level — toggleHeading
+    //   removes the prefix when invoked with the matching level, so this
+    //   downgrades the heading back to a plain paragraph. No-op when not
+    //   on a heading (already normal) or when smallText is selected (no
+    //   markdown equivalent).
+    if (isMarkdownBridgeActive) {
+      var _sourceFormatState$he;
+      var targetLevel = blockType.name === 'normal' ? (_sourceFormatState$he = sourceFormatState === null || sourceFormatState === void 0 ? void 0 : sourceFormatState.headingLevel) !== null && _sourceFormatState$he !== void 0 ? _sourceFormatState$he : null : headingLevel;
+      if (targetLevel !== null && targetLevel >= 1 && targetLevel <= 6) {
+        var _api$markdownMode;
+        api === null || api === void 0 || (_api$markdownMode = api.markdownMode) === null || _api$markdownMode === void 0 || _api$markdownMode.actions.toggleSourceHeading(targetLevel);
+      }
+      return;
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(blockType.name, _analytics.INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   var shortcut = (0, _keymaps.formatShortcut)(shortcuts[blockType.name]);
-  var isSelected = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
+
+  // In source view, derive isSelected from the Lezer heading level.
+  // In WYSIWYG, use the existing PM block type comparison.
+  //
+  // Branches in source view:
+  // - heading1..6: select when the source heading level matches.
+  // - normal (paragraph): select when the source has no heading and is not
+  //   inside a blockquote — i.e. cursor is on a plain markdown paragraph.
+  // - smallText: no markdown equivalent, so never selected in source view.
+  //
+  // Guard on `sourceFormatState != null` up-front so the body can read the
+  // fields directly — clearer than nested optional chains and not fragile to
+  // future reordering of the conditions.
+  var isSelected = isMarkdownBridgeActive ? sourceFormatState != null ? headingLevel !== null ? sourceFormatState.headingLevel === headingLevel : blockType.name === 'normal' ? sourceFormatState.headingLevel === null && !sourceFormatState.inBlockquote : false : false : (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
   return /*#__PURE__*/React.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: blockType.icon,
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -8,11 +8,14 @@ exports.QuoteButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _utils = require("../../utils");
 var shouldDisableQuoteButton = function shouldDisableQuoteButton(state) {
   if (!state) {
@@ -29,27 +32,48 @@ var QuoteButton = exports.QuoteButton = function QuoteButton(_ref) {
   var currentBlockType = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.currentBlockType');
   var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
+  var isMarkdownBridgeEnabled = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc-markdown-mode', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_markdown_compatible_toolbar');
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['markdownMode'], function (states) {
+      var _states$markdownModeS, _states$markdownModeS2;
+      return {
+        markdownView: isMarkdownBridgeEnabled ? (_states$markdownModeS = states.markdownModeState) === null || _states$markdownModeS === void 0 ? void 0 : _states$markdownModeS.view : undefined,
+        sourceBlockFormatState: isMarkdownBridgeEnabled ? (_states$markdownModeS2 = states.markdownModeState) === null || _states$markdownModeS2 === void 0 ? void 0 : _states$markdownModeS2.sourceBlockFormatState : null
+      };
+    }),
+    markdownView = _useSharedPluginState.markdownView,
+    sourceBlockFormatState = _useSharedPluginState.sourceBlockFormatState;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
   }))) {
     return null;
   }
-  var isDisabled = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
+
+  // markdownView is authoritative for "in source view" — it flips synchronously
+  // on setView. sourceBlockFormatState is null between the view switch and the
+  // first CM6 update listener fire, so we can't rely on it as the sentinel.
+  var isMarkdownBridgeActive = markdownView === 'syntax';
+  var isDisabled = isMarkdownBridgeActive ? Boolean(sourceBlockFormatState === null || sourceBlockFormatState === void 0 ? void 0 : sourceBlockFormatState.inCodeBlock) : (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
   var onClick = function onClick() {
     var _api$core, _api$blockType;
     if (isDisabled) {
       return;
     }
+    if (isMarkdownBridgeActive) {
+      var _api$markdownMode;
+      api === null || api === void 0 || (_api$markdownMode = api.markdownMode) === null || _api$markdownMode === void 0 || _api$markdownMode.actions.toggleSourceBlockquote();
+      return;
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.insertBlockQuote(_analytics.INPUT_METHOD.TOOLBAR));
   };
   var shortcut = (0, _keymaps.formatShortcut)(_keymaps.toggleBlockQuote);
+  var isSelected = isMarkdownBridgeActive ? Boolean(sourceBlockFormatState === null || sourceBlockFormatState === void 0 ? void 0 : sourceBlockFormatState.inBlockquote) : currentBlockType === blockType;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: blockType.icon,
     elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     onClick: onClick,
-    isSelected: currentBlockType === blockType,
+    isSelected: isSelected,
     isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, formatMessage(blockType.title));

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -11,17 +11,56 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _blockTypes = require("../../block-types");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var usePluginState = function usePluginState(api) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType', 'interaction'], function (state) {
-    var _state$blockTypeState, _state$interactionSta, _state$blockTypeState2;
+  // Memoized inside the hook (rather than at module scope) so the gate read
+  // inside `toolbarBlockTypesWithRank` doesn't run at module import time —
+  // that breaks downstream tests that import preset-default without
+  // initializing the FeatureGates client.
+  var sourceViewBlockTypeValues = (0, _react.useMemo)(function () {
+    return Object.values((0, _blockTypes.toolbarBlockTypesWithRank)({}));
+  }, []);
+  var selectPluginState = (0, _react.useCallback)(function (state) {
+    var _state$interactionSta, _state$blockTypeState, _state$markdownModeSt, _state$markdownModeSt2, _sourceViewBlockTypeV, _sourceViewBlockTypeV2, _sourceViewBlockTypeV3, _state$blockTypeState2;
+    var pmCurrentBlockType = ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && (0, _expValEquals.expValEquals)('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.currentBlockType;
+
+    // When the markdown bridge is active and the source view is mounted,
+    // derive currentBlockType from the CM6 Lezer heading level rather than
+    // PM block type state (which reflects the last WYSIWYG cursor position).
+    var isMarkdownBridgeEnabled = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc-markdown-mode', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_markdown_compatible_toolbar');
+    var sourceFormatState = isMarkdownBridgeEnabled ? (_state$markdownModeSt = state.markdownModeState) === null || _state$markdownModeSt === void 0 ? void 0 : _state$markdownModeSt.sourceBlockFormatState : null;
+    // markdownView is authoritative for "in source view" — it flips synchronously
+    // on setView. sourceFormatState is null between the view switch and the first
+    // CM6 update listener fire, so we can't rely on it as the sentinel.
+    var isSourceViewActive = isMarkdownBridgeEnabled && ((_state$markdownModeSt2 = state.markdownModeState) === null || _state$markdownModeSt2 === void 0 ? void 0 : _state$markdownModeSt2.view) === 'syntax';
+
+    // When in source view, derive currentBlockType from CM6 Lezer state
+    // (heading level or blockquote) rather than PM block type state.
+    // Guard on sourceFormatState being available — during the race window
+    // after switching to source view but before CM6 fires its first update,
+    // sourceFormatState is null even though isSourceViewActive is true.
+    var currentBlockType = isSourceViewActive && sourceFormatState ? sourceFormatState.headingLevel !== null ? // In a heading, look up the full BlockType by name.
+    (_sourceViewBlockTypeV = sourceViewBlockTypeValues.find(function (bt) {
+      return bt.name === "heading".concat(sourceFormatState.headingLevel);
+    })) !== null && _sourceViewBlockTypeV !== void 0 ? _sourceViewBlockTypeV : null : sourceFormatState.inBlockquote ? // In a blockquote, look up the blockquote BlockType.
+    (_sourceViewBlockTypeV2 = sourceViewBlockTypeValues.find(function (bt) {
+      return bt.name === 'blockquote';
+    })) !== null && _sourceViewBlockTypeV2 !== void 0 ? _sourceViewBlockTypeV2 : null : // Plain paragraph — look up the 'normal' BlockType so the trigger
+    // shows "Normal text" (matches WYSIWYG and HeadingButton's
+    // Normal-in-source-view selection logic).
+    (_sourceViewBlockTypeV3 = sourceViewBlockTypeValues.find(function (bt) {
+      return bt.name === 'normal';
+    })) !== null && _sourceViewBlockTypeV3 !== void 0 ? _sourceViewBlockTypeV3 : null : isSourceViewActive ? null : pmCurrentBlockType;
     return {
-      blockTypesDisabled: (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.blockTypesDisabled,
-      currentBlockType: ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && (0, _expValEquals.expValEquals)('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
+      blockTypesDisabled: isSourceViewActive && sourceFormatState ? Boolean(sourceFormatState.inCodeBlock) : isSourceViewActive ? false : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.blockTypesDisabled,
+      currentBlockType: currentBlockType
     };
-  });
+  }, [sourceViewBlockTypeValues]);
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType', 'interaction', 'markdownMode'], selectPluginState);
 };
 var TextStylesMenuButton = exports.TextStylesMenuButton = function TextStylesMenuButton(_ref) {
   var _Object$values$find;

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -6,12 +6,15 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { formatShortcut, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleSmallText } from '@atlaskit/editor-common/keymaps';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { editorUGCToken } from '@atlaskit/editor-common/ugc-tokens';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isSelectionInsideListNode } from '../../utils';
 const smallTextStyle = null;
 const normalStyle = null;
@@ -110,23 +113,76 @@ export const HeadingButton = ({
   } = useIntl();
   const currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
   const availableBlockTypesInDropdown = useSharedPluginStateSelector(api, 'blockType.availableBlockTypesInDropdown');
+  const isMarkdownBridgeEnabled = expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_markdown_compatible_toolbar');
+  const {
+    markdownView,
+    sourceFormatState
+  } = useSharedPluginStateWithSelector(api, ['markdownMode'], states => {
+    var _states$markdownModeS, _states$markdownModeS2;
+    return {
+      markdownView: isMarkdownBridgeEnabled ? (_states$markdownModeS = states.markdownModeState) === null || _states$markdownModeS === void 0 ? void 0 : _states$markdownModeS.view : undefined,
+      sourceFormatState: isMarkdownBridgeEnabled ? (_states$markdownModeS2 = states.markdownModeState) === null || _states$markdownModeS2 === void 0 ? void 0 : _states$markdownModeS2.sourceBlockFormatState : null
+    };
+  });
   const {
     editorView
   } = useEditorToolbar();
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(availableBlockType => availableBlockType.name === blockType.name))) {
     return null;
   }
-  const isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
+
+  // When in source view and the bridge is enabled, read heading level from
+  // the CM6 Lezer-tree-derived format state rather than the PM block type state.
+  // markdownView is authoritative for "in source view" — it flips synchronously
+  // on setView. sourceFormatState is null between the view switch and the
+  // first CM6 update listener fire, so we can't rely on it as the sentinel.
+  const isMarkdownBridgeActive = markdownView === 'syntax';
+
+  // Extract the numeric level from the block type name (e.g. 'heading1' → 1).
+  const headingLevel = blockType.name.startsWith('heading') ? parseInt(blockType.name.replace('heading', ''), 10) : null;
+  const isDisabled = isMarkdownBridgeActive ? Boolean(sourceFormatState === null || sourceFormatState === void 0 ? void 0 : sourceFormatState.inCodeBlock) : expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
   const fromBlockQuote = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === 'blockquote';
   const onClick = () => {
     var _api$core, _api$blockType, _api$blockType$comman;
     if (isDisabled) {
       return;
     }
+
+    // Route to CM6 when in source view.
+    //
+    // - heading1..6: apply/replace via toggleSourceHeading(targetLevel).
+    // - normal (paragraph): if the cursor is currently on a heading line,
+    //   call toggleSourceHeading with the *current* level — toggleHeading
+    //   removes the prefix when invoked with the matching level, so this
+    //   downgrades the heading back to a plain paragraph. No-op when not
+    //   on a heading (already normal) or when smallText is selected (no
+    //   markdown equivalent).
+    if (isMarkdownBridgeActive) {
+      var _sourceFormatState$he;
+      const targetLevel = blockType.name === 'normal' ? (_sourceFormatState$he = sourceFormatState === null || sourceFormatState === void 0 ? void 0 : sourceFormatState.headingLevel) !== null && _sourceFormatState$he !== void 0 ? _sourceFormatState$he : null : headingLevel;
+      if (targetLevel !== null && targetLevel >= 1 && targetLevel <= 6) {
+        var _api$markdownMode;
+        api === null || api === void 0 ? void 0 : (_api$markdownMode = api.markdownMode) === null || _api$markdownMode === void 0 ? void 0 : _api$markdownMode.actions.toggleSourceHeading(targetLevel);
+      }
+      return;
+    }
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : (_api$blockType$comman = _api$blockType.commands) === null || _api$blockType$comman === void 0 ? void 0 : _api$blockType$comman.setTextLevel(blockType.name, INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   const shortcut = formatShortcut(shortcuts[blockType.name]);
-  const isSelected = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
+
+  // In source view, derive isSelected from the Lezer heading level.
+  // In WYSIWYG, use the existing PM block type comparison.
+  //
+  // Branches in source view:
+  // - heading1..6: select when the source heading level matches.
+  // - normal (paragraph): select when the source has no heading and is not
+  //   inside a blockquote — i.e. cursor is on a plain markdown paragraph.
+  // - smallText: no markdown equivalent, so never selected in source view.
+  //
+  // Guard on `sourceFormatState != null` up-front so the body can read the
+  // fields directly — clearer than nested optional chains and not fragile to
+  // future reordering of the conditions.
+  const isSelected = isMarkdownBridgeActive ? sourceFormatState != null ? headingLevel !== null ? sourceFormatState.headingLevel === headingLevel : blockType.name === 'normal' ? sourceFormatState.headingLevel === null && !sourceFormatState.inBlockquote : false : false : (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: blockType.icon,
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -1,11 +1,14 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { formatShortcut, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isSelectionInsideListNode } from '../../utils';
 const shouldDisableQuoteButton = state => {
   if (!state) {
@@ -25,25 +28,47 @@ export const QuoteButton = ({
   const {
     editorView
   } = useEditorToolbar();
+  const isMarkdownBridgeEnabled = expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_markdown_compatible_toolbar');
+  const {
+    markdownView,
+    sourceBlockFormatState
+  } = useSharedPluginStateWithSelector(api, ['markdownMode'], states => {
+    var _states$markdownModeS, _states$markdownModeS2;
+    return {
+      markdownView: isMarkdownBridgeEnabled ? (_states$markdownModeS = states.markdownModeState) === null || _states$markdownModeS === void 0 ? void 0 : _states$markdownModeS.view : undefined,
+      sourceBlockFormatState: isMarkdownBridgeEnabled ? (_states$markdownModeS2 = states.markdownModeState) === null || _states$markdownModeS2 === void 0 ? void 0 : _states$markdownModeS2.sourceBlockFormatState : null
+    };
+  });
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(availableBlockType => availableBlockType.name === blockType.name))) {
     return null;
   }
-  const isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
+
+  // markdownView is authoritative for "in source view" — it flips synchronously
+  // on setView. sourceBlockFormatState is null between the view switch and the
+  // first CM6 update listener fire, so we can't rely on it as the sentinel.
+  const isMarkdownBridgeActive = markdownView === 'syntax';
+  const isDisabled = isMarkdownBridgeActive ? Boolean(sourceBlockFormatState === null || sourceBlockFormatState === void 0 ? void 0 : sourceBlockFormatState.inCodeBlock) : expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
   const onClick = () => {
     var _api$core, _api$blockType, _api$blockType$comman;
     if (isDisabled) {
       return;
     }
+    if (isMarkdownBridgeActive) {
+      var _api$markdownMode;
+      api === null || api === void 0 ? void 0 : (_api$markdownMode = api.markdownMode) === null || _api$markdownMode === void 0 ? void 0 : _api$markdownMode.actions.toggleSourceBlockquote();
+      return;
+    }
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : (_api$blockType$comman = _api$blockType.commands) === null || _api$blockType$comman === void 0 ? void 0 : _api$blockType$comman.insertBlockQuote(INPUT_METHOD.TOOLBAR));
   };
   const shortcut = formatShortcut(toggleBlockQuote);
+  const isSelected = isMarkdownBridgeActive ? Boolean(sourceBlockFormatState === null || sourceBlockFormatState === void 0 ? void 0 : sourceBlockFormatState.inBlockquote) : currentBlockType === blockType;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: blockType.icon,
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     onClick: onClick,
-    isSelected: currentBlockType === blockType,
+    isSelected: isSelected,
     isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, formatMessage(blockType.title));

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -1,19 +1,50 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { toolbarBlockTypesWithRank } from '../../block-types';
 const usePluginState = api => {
-  return useSharedPluginStateWithSelector(api, ['blockType', 'interaction'], state => {
-    var _state$blockTypeState, _state$interactionSta, _state$blockTypeState2;
+  // Memoized inside the hook (rather than at module scope) so the gate read
+  // inside `toolbarBlockTypesWithRank` doesn't run at module import time —
+  // that breaks downstream tests that import preset-default without
+  // initializing the FeatureGates client.
+  const sourceViewBlockTypeValues = useMemo(() => Object.values(toolbarBlockTypesWithRank({})), []);
+  const selectPluginState = useCallback(state => {
+    var _state$interactionSta, _state$blockTypeState, _state$markdownModeSt, _state$markdownModeSt2, _sourceViewBlockTypeV, _sourceViewBlockTypeV2, _sourceViewBlockTypeV3, _state$blockTypeState2;
+    const pmCurrentBlockType = ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && expValEquals('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.currentBlockType;
+
+    // When the markdown bridge is active and the source view is mounted,
+    // derive currentBlockType from the CM6 Lezer heading level rather than
+    // PM block type state (which reflects the last WYSIWYG cursor position).
+    const isMarkdownBridgeEnabled = expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_markdown_compatible_toolbar');
+    const sourceFormatState = isMarkdownBridgeEnabled ? (_state$markdownModeSt = state.markdownModeState) === null || _state$markdownModeSt === void 0 ? void 0 : _state$markdownModeSt.sourceBlockFormatState : null;
+    // markdownView is authoritative for "in source view" — it flips synchronously
+    // on setView. sourceFormatState is null between the view switch and the first
+    // CM6 update listener fire, so we can't rely on it as the sentinel.
+    const isSourceViewActive = isMarkdownBridgeEnabled && ((_state$markdownModeSt2 = state.markdownModeState) === null || _state$markdownModeSt2 === void 0 ? void 0 : _state$markdownModeSt2.view) === 'syntax';
+
+    // When in source view, derive currentBlockType from CM6 Lezer state
+    // (heading level or blockquote) rather than PM block type state.
+    // Guard on sourceFormatState being available — during the race window
+    // after switching to source view but before CM6 fires its first update,
+    // sourceFormatState is null even though isSourceViewActive is true.
+    const currentBlockType = isSourceViewActive && sourceFormatState ? sourceFormatState.headingLevel !== null ? // In a heading, look up the full BlockType by name.
+    (_sourceViewBlockTypeV = sourceViewBlockTypeValues.find(bt => bt.name === `heading${sourceFormatState.headingLevel}`)) !== null && _sourceViewBlockTypeV !== void 0 ? _sourceViewBlockTypeV : null : sourceFormatState.inBlockquote ? // In a blockquote, look up the blockquote BlockType.
+    (_sourceViewBlockTypeV2 = sourceViewBlockTypeValues.find(bt => bt.name === 'blockquote')) !== null && _sourceViewBlockTypeV2 !== void 0 ? _sourceViewBlockTypeV2 : null : // Plain paragraph — look up the 'normal' BlockType so the trigger
+    // shows "Normal text" (matches WYSIWYG and HeadingButton's
+    // Normal-in-source-view selection logic).
+    (_sourceViewBlockTypeV3 = sourceViewBlockTypeValues.find(bt => bt.name === 'normal')) !== null && _sourceViewBlockTypeV3 !== void 0 ? _sourceViewBlockTypeV3 : null : isSourceViewActive ? null : pmCurrentBlockType;
     return {
-      blockTypesDisabled: (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.blockTypesDisabled,
-      currentBlockType: ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && expValEquals('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
+      blockTypesDisabled: isSourceViewActive && sourceFormatState ? Boolean(sourceFormatState.inCodeBlock) : isSourceViewActive ? false : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.blockTypesDisabled,
+      currentBlockType
     };
-  });
+  }, [sourceViewBlockTypeValues]);
+  return useSharedPluginStateWithSelector(api, ['blockType', 'interaction', 'markdownMode'], selectPluginState);
 };
 export const TextStylesMenuButton = ({
   allowFontSize,

package/dist/esm/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -6,12 +6,15 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { formatShortcut, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleSmallText } from '@atlaskit/editor-common/keymaps';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { editorUGCToken } from '@atlaskit/editor-common/ugc-tokens';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isSelectionInsideListNode } from '../../utils';
 var smallTextStyle = null;
 var normalStyle = null;
@@ -107,6 +110,16 @@ export var HeadingButton = function HeadingButton(_ref2) {
     formatMessage = _useIntl.formatMessage;
   var currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
   var availableBlockTypesInDropdown = useSharedPluginStateSelector(api, 'blockType.availableBlockTypesInDropdown');
+  var isMarkdownBridgeEnabled = expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_markdown_compatible_toolbar');
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['markdownMode'], function (states) {
+      var _states$markdownModeS, _states$markdownModeS2;
+      return {
+        markdownView: isMarkdownBridgeEnabled ? (_states$markdownModeS = states.markdownModeState) === null || _states$markdownModeS === void 0 ? void 0 : _states$markdownModeS.view : undefined,
+        sourceFormatState: isMarkdownBridgeEnabled ? (_states$markdownModeS2 = states.markdownModeState) === null || _states$markdownModeS2 === void 0 ? void 0 : _states$markdownModeS2.sourceBlockFormatState : null
+      };
+    }),
+    markdownView = _useSharedPluginState.markdownView,
+    sourceFormatState = _useSharedPluginState.sourceFormatState;
   var _useEditorToolbar = useEditorToolbar(),
     editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
@@ -114,17 +127,59 @@ export var HeadingButton = function HeadingButton(_ref2) {
   }))) {
     return null;
   }
-  var isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
+
+  // When in source view and the bridge is enabled, read heading level from
+  // the CM6 Lezer-tree-derived format state rather than the PM block type state.
+  // markdownView is authoritative for "in source view" — it flips synchronously
+  // on setView. sourceFormatState is null between the view switch and the
+  // first CM6 update listener fire, so we can't rely on it as the sentinel.
+  var isMarkdownBridgeActive = markdownView === 'syntax';
+
+  // Extract the numeric level from the block type name (e.g. 'heading1' → 1).
+  var headingLevel = blockType.name.startsWith('heading') ? parseInt(blockType.name.replace('heading', ''), 10) : null;
+  var isDisabled = isMarkdownBridgeActive ? Boolean(sourceFormatState === null || sourceFormatState === void 0 ? void 0 : sourceFormatState.inCodeBlock) : expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
   var fromBlockQuote = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === 'blockquote';
   var onClick = function onClick() {
     var _api$core, _api$blockType;
     if (isDisabled) {
       return;
     }
+
+    // Route to CM6 when in source view.
+    //
+    // - heading1..6: apply/replace via toggleSourceHeading(targetLevel).
+    // - normal (paragraph): if the cursor is currently on a heading line,
+    //   call toggleSourceHeading with the *current* level — toggleHeading
+    //   removes the prefix when invoked with the matching level, so this
+    //   downgrades the heading back to a plain paragraph. No-op when not
+    //   on a heading (already normal) or when smallText is selected (no
+    //   markdown equivalent).
+    if (isMarkdownBridgeActive) {
+      var _sourceFormatState$he;
+      var targetLevel = blockType.name === 'normal' ? (_sourceFormatState$he = sourceFormatState === null || sourceFormatState === void 0 ? void 0 : sourceFormatState.headingLevel) !== null && _sourceFormatState$he !== void 0 ? _sourceFormatState$he : null : headingLevel;
+      if (targetLevel !== null && targetLevel >= 1 && targetLevel <= 6) {
+        var _api$markdownMode;
+        api === null || api === void 0 || (_api$markdownMode = api.markdownMode) === null || _api$markdownMode === void 0 || _api$markdownMode.actions.toggleSourceHeading(targetLevel);
+      }
+      return;
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(blockType.name, INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   var shortcut = formatShortcut(shortcuts[blockType.name]);
-  var isSelected = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
+
+  // In source view, derive isSelected from the Lezer heading level.
+  // In WYSIWYG, use the existing PM block type comparison.
+  //
+  // Branches in source view:
+  // - heading1..6: select when the source heading level matches.
+  // - normal (paragraph): select when the source has no heading and is not
+  //   inside a blockquote — i.e. cursor is on a plain markdown paragraph.
+  // - smallText: no markdown equivalent, so never selected in source view.
+  //
+  // Guard on `sourceFormatState != null` up-front so the body can read the
+  // fields directly — clearer than nested optional chains and not fragile to
+  // future reordering of the conditions.
+  var isSelected = isMarkdownBridgeActive ? sourceFormatState != null ? headingLevel !== null ? sourceFormatState.headingLevel === headingLevel : blockType.name === 'normal' ? sourceFormatState.headingLevel === null && !sourceFormatState.inBlockquote : false : false : (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: blockType.icon,
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {

package/dist/esm/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -1,11 +1,14 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { formatShortcut, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isSelectionInsideListNode } from '../../utils';
 var shouldDisableQuoteButton = function shouldDisableQuoteButton(state) {
   if (!state) {
@@ -22,27 +25,48 @@ export var QuoteButton = function QuoteButton(_ref) {
   var currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
   var _useEditorToolbar = useEditorToolbar(),
     editorView = _useEditorToolbar.editorView;
+  var isMarkdownBridgeEnabled = expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_markdown_compatible_toolbar');
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['markdownMode'], function (states) {
+      var _states$markdownModeS, _states$markdownModeS2;
+      return {
+        markdownView: isMarkdownBridgeEnabled ? (_states$markdownModeS = states.markdownModeState) === null || _states$markdownModeS === void 0 ? void 0 : _states$markdownModeS.view : undefined,
+        sourceBlockFormatState: isMarkdownBridgeEnabled ? (_states$markdownModeS2 = states.markdownModeState) === null || _states$markdownModeS2 === void 0 ? void 0 : _states$markdownModeS2.sourceBlockFormatState : null
+      };
+    }),
+    markdownView = _useSharedPluginState.markdownView,
+    sourceBlockFormatState = _useSharedPluginState.sourceBlockFormatState;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
   }))) {
     return null;
   }
-  var isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
+
+  // markdownView is authoritative for "in source view" — it flips synchronously
+  // on setView. sourceBlockFormatState is null between the view switch and the
+  // first CM6 update listener fire, so we can't rely on it as the sentinel.
+  var isMarkdownBridgeActive = markdownView === 'syntax';
+  var isDisabled = isMarkdownBridgeActive ? Boolean(sourceBlockFormatState === null || sourceBlockFormatState === void 0 ? void 0 : sourceBlockFormatState.inCodeBlock) : expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
   var onClick = function onClick() {
     var _api$core, _api$blockType;
     if (isDisabled) {
       return;
     }
+    if (isMarkdownBridgeActive) {
+      var _api$markdownMode;
+      api === null || api === void 0 || (_api$markdownMode = api.markdownMode) === null || _api$markdownMode === void 0 || _api$markdownMode.actions.toggleSourceBlockquote();
+      return;
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.insertBlockQuote(INPUT_METHOD.TOOLBAR));
   };
   var shortcut = formatShortcut(toggleBlockQuote);
+  var isSelected = isMarkdownBridgeActive ? Boolean(sourceBlockFormatState === null || sourceBlockFormatState === void 0 ? void 0 : sourceBlockFormatState.inBlockquote) : currentBlockType === blockType;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: blockType.icon,
     elemAfter: shortcut ? /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     onClick: onClick,
-    isSelected: currentBlockType === blockType,
+    isSelected: isSelected,
     isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, formatMessage(blockType.title));

package/dist/esm/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -1,19 +1,58 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { toolbarBlockTypesWithRank } from '../../block-types';
 var usePluginState = function usePluginState(api) {
-  return useSharedPluginStateWithSelector(api, ['blockType', 'interaction'], function (state) {
-    var _state$blockTypeState, _state$interactionSta, _state$blockTypeState2;
+  // Memoized inside the hook (rather than at module scope) so the gate read
+  // inside `toolbarBlockTypesWithRank` doesn't run at module import time —
+  // that breaks downstream tests that import preset-default without
+  // initializing the FeatureGates client.
+  var sourceViewBlockTypeValues = useMemo(function () {
+    return Object.values(toolbarBlockTypesWithRank({}));
+  }, []);
+  var selectPluginState = useCallback(function (state) {
+    var _state$interactionSta, _state$blockTypeState, _state$markdownModeSt, _state$markdownModeSt2, _sourceViewBlockTypeV, _sourceViewBlockTypeV2, _sourceViewBlockTypeV3, _state$blockTypeState2;
+    var pmCurrentBlockType = ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && expValEquals('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.currentBlockType;
+
+    // When the markdown bridge is active and the source view is mounted,
+    // derive currentBlockType from the CM6 Lezer heading level rather than
+    // PM block type state (which reflects the last WYSIWYG cursor position).
+    var isMarkdownBridgeEnabled = expValEqualsNoExposure('cc-markdown-mode', 'isEnabled', true) && fg('platform_editor_markdown_compatible_toolbar');
+    var sourceFormatState = isMarkdownBridgeEnabled ? (_state$markdownModeSt = state.markdownModeState) === null || _state$markdownModeSt === void 0 ? void 0 : _state$markdownModeSt.sourceBlockFormatState : null;
+    // markdownView is authoritative for "in source view" — it flips synchronously
+    // on setView. sourceFormatState is null between the view switch and the first
+    // CM6 update listener fire, so we can't rely on it as the sentinel.
+    var isSourceViewActive = isMarkdownBridgeEnabled && ((_state$markdownModeSt2 = state.markdownModeState) === null || _state$markdownModeSt2 === void 0 ? void 0 : _state$markdownModeSt2.view) === 'syntax';
+
+    // When in source view, derive currentBlockType from CM6 Lezer state
+    // (heading level or blockquote) rather than PM block type state.
+    // Guard on sourceFormatState being available — during the race window
+    // after switching to source view but before CM6 fires its first update,
+    // sourceFormatState is null even though isSourceViewActive is true.
+    var currentBlockType = isSourceViewActive && sourceFormatState ? sourceFormatState.headingLevel !== null ? // In a heading, look up the full BlockType by name.
+    (_sourceViewBlockTypeV = sourceViewBlockTypeValues.find(function (bt) {
+      return bt.name === "heading".concat(sourceFormatState.headingLevel);
+    })) !== null && _sourceViewBlockTypeV !== void 0 ? _sourceViewBlockTypeV : null : sourceFormatState.inBlockquote ? // In a blockquote, look up the blockquote BlockType.
+    (_sourceViewBlockTypeV2 = sourceViewBlockTypeValues.find(function (bt) {
+      return bt.name === 'blockquote';
+    })) !== null && _sourceViewBlockTypeV2 !== void 0 ? _sourceViewBlockTypeV2 : null : // Plain paragraph — look up the 'normal' BlockType so the trigger
+    // shows "Normal text" (matches WYSIWYG and HeadingButton's
+    // Normal-in-source-view selection logic).
+    (_sourceViewBlockTypeV3 = sourceViewBlockTypeValues.find(function (bt) {
+      return bt.name === 'normal';
+    })) !== null && _sourceViewBlockTypeV3 !== void 0 ? _sourceViewBlockTypeV3 : null : isSourceViewActive ? null : pmCurrentBlockType;
     return {
-      blockTypesDisabled: (_state$blockTypeState = state.blockTypeState) === null || _state$blockTypeState === void 0 ? void 0 : _state$blockTypeState.blockTypesDisabled,
-      currentBlockType: ((_state$interactionSta = state.interactionState) === null || _state$interactionSta === void 0 ? void 0 : _state$interactionSta.interactionState) === 'hasNotHadInteraction' && expValEquals('platform_editor_default_toolbar_state', 'isEnabled', true) ? undefined : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.currentBlockType
+      blockTypesDisabled: isSourceViewActive && sourceFormatState ? Boolean(sourceFormatState.inCodeBlock) : isSourceViewActive ? false : (_state$blockTypeState2 = state.blockTypeState) === null || _state$blockTypeState2 === void 0 ? void 0 : _state$blockTypeState2.blockTypesDisabled,
+      currentBlockType: currentBlockType
     };
-  });
+  }, [sourceViewBlockTypeValues]);
+  return useSharedPluginStateWithSelector(api, ['blockType', 'interaction', 'markdownMode'], selectPluginState);
 };
 export var TextStylesMenuButton = function TextStylesMenuButton(_ref) {
   var _Object$values$find;

package/dist/types/blockTypePluginType.d.ts

@@ -12,6 +12,26 @@ import type { TextBlockTypes } from './pm-plugins/block-types';
 import type { ClearFormattingInputMethod, InputMethod } from './pm-plugins/commands/block-type';
 import type { BlockTypeState } from './pm-plugins/main';
 import type { BlockTypePluginOptions } from './pm-plugins/types';
+/**
+ * Minimal duck-typed slice of `@atlassian/editor-plugin-markdown-mode`'s
+ * `MarkdownModePlugin` covering only the block-level surface this plugin uses.
+ * See `editor-plugin-text-formatting/textFormattingPluginType.ts` for the
+ * rationale for not importing the real type.
+ */
+type _MarkdownModePluginStub = NextEditorPlugin<'markdownMode', {
+    actions: {
+        toggleSourceBlockquote: () => boolean;
+        toggleSourceHeading: (level: 1 | 2 | 3 | 4 | 5 | 6) => boolean;
+    };
+    sharedState: {
+        sourceBlockFormatState: {
+            headingLevel: number | null;
+            inBlockquote: boolean;
+            inCodeBlock: boolean;
+        } | null;
+        view: 'syntax' | 'split-view' | 'preview';
+    } | undefined;
+}>;
 export type BlockTypePlugin = NextEditorPlugin<'blockType', {
     actions: {
         insertBlockQuote: (inputMethod: InputMethod) => Command;
@@ -30,8 +50,10 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
         OptionalPlugin<BlockMenuPlugin>,
         OptionalPlugin<ListPlugin>,
         OptionalPlugin<SelectionPlugin>,
-        OptionalPlugin<InteractionPlugin>
+        OptionalPlugin<InteractionPlugin>,
+        OptionalPlugin<_MarkdownModePluginStub>
     ];
     pluginConfiguration: BlockTypePluginOptions | undefined;
     sharedState: BlockTypeState | undefined;
 }>;
+export {};

package/dist/types-ts4.5/blockTypePluginType.d.ts

@@ -12,6 +12,26 @@ import type { TextBlockTypes } from './pm-plugins/block-types';
 import type { ClearFormattingInputMethod, InputMethod } from './pm-plugins/commands/block-type';
 import type { BlockTypeState } from './pm-plugins/main';
 import type { BlockTypePluginOptions } from './pm-plugins/types';
+/**
+ * Minimal duck-typed slice of `@atlassian/editor-plugin-markdown-mode`'s
+ * `MarkdownModePlugin` covering only the block-level surface this plugin uses.
+ * See `editor-plugin-text-formatting/textFormattingPluginType.ts` for the
+ * rationale for not importing the real type.
+ */
+type _MarkdownModePluginStub = NextEditorPlugin<'markdownMode', {
+    actions: {
+        toggleSourceBlockquote: () => boolean;
+        toggleSourceHeading: (level: 1 | 2 | 3 | 4 | 5 | 6) => boolean;
+    };
+    sharedState: {
+        sourceBlockFormatState: {
+            headingLevel: number | null;
+            inBlockquote: boolean;
+            inCodeBlock: boolean;
+        } | null;
+        view: 'syntax' | 'split-view' | 'preview';
+    } | undefined;
+}>;
 export type BlockTypePlugin = NextEditorPlugin<'blockType', {
     actions: {
         insertBlockQuote: (inputMethod: InputMethod) => Command;
@@ -30,8 +50,10 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
         OptionalPlugin<BlockMenuPlugin>,
         OptionalPlugin<ListPlugin>,
         OptionalPlugin<SelectionPlugin>,
-        OptionalPlugin<InteractionPlugin>
+        OptionalPlugin<InteractionPlugin>,
+        OptionalPlugin<_MarkdownModePluginStub>
     ];
     pluginConfiguration: BlockTypePluginOptions | undefined;
     sharedState: BlockTypeState | undefined;
 }>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "14.1.7",
+	"version": "14.2.0",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,7 +29,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.14.0",
+		"@atlaskit/adf-schema": "^52.15.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-plugin-analytics": "^10.1.0",
 		"@atlaskit/editor-plugin-block-menu": "^9.2.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.11.0",
 		"@atlaskit/editor-tables": "^2.10.0",
-		"@atlaskit/editor-toolbar": "^1.7.0",
+		"@atlaskit/editor-toolbar": "^1.8.0",
 		"@atlaskit/editor-toolbar-model": "^0.5.0",
 		"@atlaskit/icon": "^35.3.0",
 		"@atlaskit/icon-lab": "^6.12.0",
@@ -50,14 +50,14 @@
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.7.0",
-		"@atlaskit/tmp-editor-statsig": "^84.0.0",
+		"@atlaskit/tmp-editor-statsig": "^84.3.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.47.0",
+		"@atlaskit/editor-common": "^114.49.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -125,6 +125,9 @@
 		"platform_editor_use_preferences_plugin": {
 			"type": "boolean"
 		},
+		"platform_editor_markdown_compatible_toolbar": {
+			"type": "boolean"
+		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		}