@atlaskit/editor-core 215.24.0 → 215.25.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-core
 
+## 215.25.0
+
+### Minor Changes
+
+- [`4d73a0f30526b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4d73a0f30526b) -
+  Cleanup platform_editor_react_18_autofocus_fix
+
+### Patch Changes
+
+- [`b10f0252621b0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b10f0252621b0) -
+  Set padding top and bottom on blockquote to avoid batch.css overrides
+- [`342bed74cf6e9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/342bed74cf6e9) -
+  EDITOR-4037 Block menu selection extension click handling
+- Updated dependencies
+
+## 215.24.1
+
+### Patch Changes
+
+- [`d5e222a3c15bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d5e222a3c15bc) -
+  [ux] EDITOR-3945 Blockquote NodeSelection support
+- Updated dependencies
+
 ## 215.24.0
 
 ### Minor Changes

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

@@ -1,68 +1,59 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleEditorFocus = handleEditorFocus;
-var _react = _interopRequireDefault(require("react"));
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function handleEditorFocus(view) {
+  var _domSelection$getRang;
   if (view !== null && view !== void 0 && view.hasFocus()) {
     return;
   }
 
-  /**
-   * If startTransition is available (in React 18),
-   * don't use setTimeout as startTransition will be used in ReactEditorViewNext.
-   * setTimeout(fn, 0) will not defer the focus reliably in React 18 with
-   * concurrent rendering.
-   */
-  var react16OnlySetTimeout = _react.default !== null && _react.default !== void 0 && _react.default.startTransition && (0, _platformFeatureFlags.fg)('platform_editor_react_18_autofocus_fix') ? function (fn) {
-    return fn();
-  } : function (fn) {
-    return window.setTimeout(fn, 0);
-  };
-  return react16OnlySetTimeout(function () {
-    // Due to race conditions during editor lifecycle transitions (e.g. SPA route changes during opening or closing)
-    // where the view (and its internal docView) may have been destroyed, the timeout callback may fire on a stale view.
-    // Bail out in that scenario to prevent operating on an unmounted view.
-    if (view !== null && view !== void 0 && view.isDestroyed) {
-      return;
-    }
-    if (view !== null && view !== void 0 && view.hasFocus()) {
-      return;
-    }
-    if (!window.getSelection) {
-      view === null || view === void 0 || view.focus();
-      return;
-    }
-    var domSelection = window.getSelection();
-    if (!domSelection || domSelection.rangeCount === 0) {
-      view === null || view === void 0 || view.focus();
-      return;
-    }
-    var range = domSelection.getRangeAt(0);
-    // if selection is outside editor focus and exit
-    if (view && range.startContainer.contains(view.dom)) {
-      view.focus();
-      return;
-    }
+  // Due to race conditions during editor lifecycle transitions (e.g. SPA route changes during opening or closing)
+  // where the view (and its internal docView) may have been destroyed, the timeout callback may fire on a stale view.
+  // Bail out in that scenario to prevent operating on an unmounted view.
+  if (view !== null && view !== void 0 && view.isDestroyed) {
+    return;
+  }
+  if (view !== null && view !== void 0 && view.hasFocus()) {
+    return;
+  }
+  if (!window.getSelection) {
+    view === null || view === void 0 || view.focus();
+    return;
+  }
+  var domSelection = window.getSelection();
+  if (!domSelection || domSelection.rangeCount === 0) {
+    view === null || view === void 0 || view.focus();
+    return;
+  }
 
-    // set cursor/selection and focus
-    var anchor = view === null || view === void 0 ? void 0 : view.posAtDOM(range.startContainer, range.startOffset);
-    var head = view === null || view === void 0 ? void 0 : view.posAtDOM(range.endContainer, range.endOffset);
-    // if anchor or head < 0 focus and exit
-    if (anchor && anchor < 0 || head && head < 0) {
-      view === null || view === void 0 || view.focus();
-      return;
-    }
-    if (view && anchor) {
-      var selection = _state.TextSelection.create(view.state.doc, anchor, head);
-      var tr = view.state.tr.setSelection(selection);
-      view.dispatch(tr);
-      view.focus();
-    }
-  });
+  // If not mocked properly in tests, getRangeAt may not exist.
+  var range = (_domSelection$getRang = domSelection.getRangeAt) === null || _domSelection$getRang === void 0 ? void 0 : _domSelection$getRang.call(domSelection, 0);
+  if (!range) {
+    return;
+  }
+
+  // if selection is outside editor focus and exit
+  if (view && range !== null && range !== void 0 && range.startContainer.contains(view.dom)) {
+    view.focus();
+    return;
+  }
+
+  // set cursor/selection and focus
+  var anchor = view === null || view === void 0 ? void 0 : view.posAtDOM(range.startContainer, range.startOffset);
+  var head = view === null || view === void 0 ? void 0 : view.posAtDOM(range.endContainer, range.endOffset);
+  // if anchor or head < 0 focus and exit
+  if (anchor && anchor < 0 || head && head < 0) {
+    view === null || view === void 0 || view.focus();
+    return;
+  }
+  if (view && anchor) {
+    var selection = _state.TextSelection.create(view.state.doc, anchor, head);
+    var tr = view.state.tr.setSelection(selection);
+    view.dispatch(tr);
+    view.focus();
+  }
 }

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

@@ -546,7 +546,7 @@ function ReactEditorView(props) {
       // We don't need to focus anything in SSR.
       return;
     }
-    if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state) && (0, _platformFeatureFlags.fg)('platform_editor_react_18_autofocus_fix')) {
+    if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state)) {
       if (!mitigateScrollJump) {
         var liveDocWithContent = (__livePage || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !(0, _document.isEmptyDocument)(editorView.state.doc);
         if (!liveDocWithContent) {
@@ -648,38 +648,10 @@ function ReactEditorView(props) {
         eventDispatcher: eventDispatcher,
         transformer: contentTransformer.current
       });
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_autofocus_fix')) {
-        var _startTransition;
-        /**
-         * Defer using startTransition when it is available (in React 18) to fix
-         * autofocus bug where React 18's concurrent rendering mode interferes with
-         * setTimeout used in handleEditorFocus, causing autofocus to break.
-         */
-        var react18OnlyStartTransition = (_startTransition = _react.default === null || _react.default === void 0 ? void 0 : _react.default.startTransition) !== null && _startTransition !== void 0 ? _startTransition : function (fn) {
-          return fn();
-        };
-        react18OnlyStartTransition(function () {
-          // Force React to re-render so consumers get a reference to the editor view
-          setEditorView(view);
-        });
-      } else {
-        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          if (!mitigateScrollJump) {
-            var isLivePageWithContent = (__livePage || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !(0, _document.isEmptyDocument)(view.state.doc);
-            if (!isLivePageWithContent && shouldFocus && view.props.editable && view.props.editable(view.state)) {
-              focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(view);
-            }
-            if ((0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('cc_editor_focus_before_editor_on_load')) {
-              if (shouldFocus && view.props.editable && view.props.editable(view.state) && !(0, _document.isEmptyDocument)(view.state.doc)) {
-                (0, _focusEditorElement.focusEditorElement)(editorId.current);
-              }
-            }
-          }
-        }
-
+      _react.default.startTransition(function () {
         // Force React to re-render so consumers get a reference to the editor view
         setEditorView(view);
-      }
+      });
     } else if (viewRef.current && !node) {
       // When the appearance is changed, React will call handleEditorViewRef with node === null
       // to destroy the old EditorView, before calling this method again with node === div to
@@ -703,7 +675,7 @@ function ReactEditorView(props) {
       (0, _nodeVisibility.nodeVisibilityManager)(viewRef.current.dom).disconnect();
       viewRef.current = undefined;
     }
-  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
   var createEditor = (0, _react.useCallback)(function (assistiveLabel, assistiveDescribedBy) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _platformFeatureFlags.fg)('cc_editor_focus_before_editor_on_load') && /*#__PURE__*/_react.default.createElement("div", {
       tabIndex: -1,

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

@@ -198,7 +198,11 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _editorUGCTokenStyles.editorUGCTokensRefreshed,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _blockTypeStyles.blocktypeStyles,
+    _blockTypeStyles.blocktypeStyles, (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _blockTypeStyles.blockquoteSelectedNodeStyles, (0, _expVal.expVal)('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    _blockTypeStyles.blockquoteZeroPadding : null,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -3,10 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.blocktypeStyles = void 0;
+exports.blocktypeStyles_without_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes = exports.blocktypeStyles = exports.blockquoteZeroPadding = exports.blockquoteSelectedNodeStyles = void 0;
 var _react = require("@emotion/react");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 
+// This style is needed to avoid Confluence's batch.css overrides that expand blockquote with extra padding after SSR.
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var blockquoteZeroPadding = exports.blockquoteZeroPadding = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& blockquote': {
+      paddingTop: 0,
+      paddingBottom: 0
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var blocktypeStyles = exports.blocktypeStyles = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -104,6 +117,30 @@ var blocktypeStyles = exports.blocktypeStyles = (0, _react.css)({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var blockquoteSelectedNodeStyles = exports.blockquoteSelectedNodeStyles = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& blockquote': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+      '&.ak-editor-selected-node': {
+        background: "var(--ds-blanket-selected, #388BFF14)",
+        borderLeftColor: "var(--ds-border-selected, #1868DB)",
+        WebkitUserSelect: 'text',
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+        '&::selection, *::selection': {
+          backgroundColor: 'transparent'
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+        '&::-moz-selection, *::-moz-selection': {
+          backgroundColor: 'transparent'
+        }
+      }
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 var blocktypeStyles_fg_platform_editor_typography_ugc = exports.blocktypeStyles_fg_platform_editor_typography_ugc = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors

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 = "215.23.9";
+var version = exports.version = "215.24.1";

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

@@ -1,57 +1,53 @@
-import React from 'react';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 export function handleEditorFocus(view) {
+  var _domSelection$getRang;
   if (view !== null && view !== void 0 && view.hasFocus()) {
     return;
   }
 
-  /**
-   * If startTransition is available (in React 18),
-   * don't use setTimeout as startTransition will be used in ReactEditorViewNext.
-   * setTimeout(fn, 0) will not defer the focus reliably in React 18 with
-   * concurrent rendering.
-   */
-  const react16OnlySetTimeout = React !== null && React !== void 0 && React.startTransition && fg('platform_editor_react_18_autofocus_fix') ? fn => fn() : fn => window.setTimeout(fn, 0);
-  return react16OnlySetTimeout(() => {
-    // Due to race conditions during editor lifecycle transitions (e.g. SPA route changes during opening or closing)
-    // where the view (and its internal docView) may have been destroyed, the timeout callback may fire on a stale view.
-    // Bail out in that scenario to prevent operating on an unmounted view.
-    if (view !== null && view !== void 0 && view.isDestroyed) {
-      return;
-    }
-    if (view !== null && view !== void 0 && view.hasFocus()) {
-      return;
-    }
-    if (!window.getSelection) {
-      view === null || view === void 0 ? void 0 : view.focus();
-      return;
-    }
-    const domSelection = window.getSelection();
-    if (!domSelection || domSelection.rangeCount === 0) {
-      view === null || view === void 0 ? void 0 : view.focus();
-      return;
-    }
-    const range = domSelection.getRangeAt(0);
-    // if selection is outside editor focus and exit
-    if (view && range.startContainer.contains(view.dom)) {
-      view.focus();
-      return;
-    }
+  // Due to race conditions during editor lifecycle transitions (e.g. SPA route changes during opening or closing)
+  // where the view (and its internal docView) may have been destroyed, the timeout callback may fire on a stale view.
+  // Bail out in that scenario to prevent operating on an unmounted view.
+  if (view !== null && view !== void 0 && view.isDestroyed) {
+    return;
+  }
+  if (view !== null && view !== void 0 && view.hasFocus()) {
+    return;
+  }
+  if (!window.getSelection) {
+    view === null || view === void 0 ? void 0 : view.focus();
+    return;
+  }
+  const domSelection = window.getSelection();
+  if (!domSelection || domSelection.rangeCount === 0) {
+    view === null || view === void 0 ? void 0 : view.focus();
+    return;
+  }
 
-    // set cursor/selection and focus
-    const anchor = view === null || view === void 0 ? void 0 : view.posAtDOM(range.startContainer, range.startOffset);
-    const head = view === null || view === void 0 ? void 0 : view.posAtDOM(range.endContainer, range.endOffset);
-    // if anchor or head < 0 focus and exit
-    if (anchor && anchor < 0 || head && head < 0) {
-      view === null || view === void 0 ? void 0 : view.focus();
-      return;
-    }
-    if (view && anchor) {
-      const selection = TextSelection.create(view.state.doc, anchor, head);
-      const tr = view.state.tr.setSelection(selection);
-      view.dispatch(tr);
-      view.focus();
-    }
-  });
+  // If not mocked properly in tests, getRangeAt may not exist.
+  const range = (_domSelection$getRang = domSelection.getRangeAt) === null || _domSelection$getRang === void 0 ? void 0 : _domSelection$getRang.call(domSelection, 0);
+  if (!range) {
+    return;
+  }
+
+  // if selection is outside editor focus and exit
+  if (view && range !== null && range !== void 0 && range.startContainer.contains(view.dom)) {
+    view.focus();
+    return;
+  }
+
+  // set cursor/selection and focus
+  const anchor = view === null || view === void 0 ? void 0 : view.posAtDOM(range.startContainer, range.startOffset);
+  const head = view === null || view === void 0 ? void 0 : view.posAtDOM(range.endContainer, range.endOffset);
+  // if anchor or head < 0 focus and exit
+  if (anchor && anchor < 0 || head && head < 0) {
+    view === null || view === void 0 ? void 0 : view.focus();
+    return;
+  }
+  if (view && anchor) {
+    const selection = TextSelection.create(view.state.doc, anchor, head);
+    const tr = view.state.tr.setSelection(selection);
+    view.dispatch(tr);
+    view.focus();
+  }
 }

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

@@ -515,7 +515,7 @@ export function ReactEditorView(props) {
       // We don't need to focus anything in SSR.
       return;
     }
-    if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state) && fg('platform_editor_react_18_autofocus_fix')) {
+    if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state)) {
       if (!mitigateScrollJump) {
         const liveDocWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(editorView.state.doc);
         if (!liveDocWithContent) {
@@ -599,36 +599,10 @@ export function ReactEditorView(props) {
         eventDispatcher: eventDispatcher,
         transformer: contentTransformer.current
       });
-      if (fg('platform_editor_react_18_autofocus_fix')) {
-        var _startTransition;
-        /**
-         * Defer using startTransition when it is available (in React 18) to fix
-         * autofocus bug where React 18's concurrent rendering mode interferes with
-         * setTimeout used in handleEditorFocus, causing autofocus to break.
-         */
-        const react18OnlyStartTransition = (_startTransition = React === null || React === void 0 ? void 0 : React.startTransition) !== null && _startTransition !== void 0 ? _startTransition : fn => fn();
-        react18OnlyStartTransition(() => {
-          // Force React to re-render so consumers get a reference to the editor view
-          setEditorView(view);
-        });
-      } else {
-        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          if (!mitigateScrollJump) {
-            const isLivePageWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(view.state.doc);
-            if (!isLivePageWithContent && shouldFocus && view.props.editable && view.props.editable(view.state)) {
-              focusTimeoutId.current = handleEditorFocus(view);
-            }
-            if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
-              if (shouldFocus && view.props.editable && view.props.editable(view.state) && !isEmptyDocument(view.state.doc)) {
-                focusEditorElement(editorId.current);
-              }
-            }
-          }
-        }
-
+      React.startTransition(() => {
         // Force React to re-render so consumers get a reference to the editor view
         setEditorView(view);
-      }
+      });
     } else if (viewRef.current && !node) {
       // When the appearance is changed, React will call handleEditorViewRef with node === null
       // to destroy the old EditorView, before calling this method again with node === div to
@@ -652,7 +626,7 @@ export function ReactEditorView(props) {
       nodeVisibilityManager(viewRef.current.dom).disconnect();
       viewRef.current = undefined;
     }
-  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
   const createEditor = useCallback((assistiveLabel, assistiveDescribedBy) => {
     return /*#__PURE__*/React.createElement(React.Fragment, null, fg('cc_editor_focus_before_editor_on_load') && /*#__PURE__*/React.createElement("div", {
       tabIndex: -1,

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -14,7 +14,7 @@ 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
+import { expVal, expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useThemeObserver } from '@atlaskit/tokens';
 import { getBaseFontSize } from '../../composable-editor/utils/getBaseFontSize';
 import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
@@ -22,19 +22,19 @@ import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
 import { baseStyles, baseStylesMaxContainerWidthFixes, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
 import { blockMarksStyles } from './styles/blockMarksStyles';
-import { blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
+import { blockquoteSelectedNodeStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
 import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
-import { codeBlockStyles, codeBlockStylesWithEmUnits, codeBgColorStyles, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
+import { codeBgColorStyles, codeBlockStyles, codeBlockStylesWithEmUnits, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
 import { codeMarkStyles } from './styles/codeMarkStyles';
 import { commentEditorStyles } from './styles/commentEditorStyles';
 import { cursorStyles } from './styles/cursorStyles';
 import { dangerDateStyles, dateStyles, dateVanillaStyles } from './styles/dateStyles';
 import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
 import { embedCardStyles } from './styles/embedCardStyles';
-import { emojiDangerStyles, emojiStyles, scaledEmojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles } from './styles/emoji';
-import { expandStyles, getDenseExpandTitleStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
-import { getExtensionStyles, extensionDiffStyles } from './styles/extensionStyles';
-import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix, findReplaceStylesNewWithA11Y } from './styles/findReplaceStyles';
+import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles, scaledEmojiStyles } from './styles/emoji';
+import { expandStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes, getDenseExpandTitleStyles } from './styles/expandStyles';
+import { extensionDiffStyles, getExtensionStyles } from './styles/extensionStyles';
+import { findReplaceStyles, findReplaceStylesNew, findReplaceStylesNewWithA11Y, findReplaceStylesNewWithCodeblockColorContrastFix, findReplaceStylesWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
@@ -44,23 +44,23 @@ import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
-import { getDenseListStyles, listsStyles, diffListStyles, listsStylesSafariFix, listsStylesMarginLayoutShiftFix } from './styles/list';
+import { diffListStyles, getDenseListStyles, listsStyles, listsStylesMarginLayoutShiftFix, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
-import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
-import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
+import { mentionDangerStyles, mentionNodeStyles, mentionsSelectionStyles, mentionsSelectionStylesWithSearchMatch, mentionsStyles } from './styles/mentions';
+import { nestedPanelBorderStylesMixin, nestedPanelDangerStyles, panelStyles, panelStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles } from './styles/panelStyles';
 import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
 import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderWrapStyles } from './styles/placeholderStyles';
-import { pragmaticResizerStyles, pragmaticResizerStylesSyncedBlock, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
+import { pragmaticResizerStyles, pragmaticResizerStylesForTooltip, pragmaticResizerStylesSyncedBlock, pragmaticResizerStylesWithReducedEditorGutter, pragmaticStylesLayoutFirstNodeResizeHandleFix, resizerStyles } from './styles/resizerStyles';
 import { dangerRuleStyles, ruleStyles } from './styles/rule';
 import { scrollbarStyles } from './styles/scrollbarStyles';
 import { hideCursorWhenHideSelectionStyles, hideSelectionStyles, selectedNodeStyles } from './styles/selectionStyles';
 import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles';
 import { shadowStyles } from './styles/shadowStyles';
-import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles, smartCardDiffStyles, showDiffDeletedNodeStyles } from './styles/smartCardStyles';
+import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
 import { syncBlockStyles } from './styles/syncBlockStyles';
 import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
-import { decisionStyles, tasksAndDecisionsStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, taskItemStyles, taskItemStylesWithBlockTaskItem, decisionDangerStyles, getDenseTasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
+import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
 import { textHighlightStyle } from './styles/textHighlightStyles';
@@ -194,7 +194,11 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     editorUGCTokensRefreshed,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    blocktypeStyles,
+    blocktypeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    blockquoteSelectedNodeStyles, expVal('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    blockquoteZeroPadding : null,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('platform_editor_typography_ugc') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -1,5 +1,18 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
+// This style is needed to avoid Confluence's batch.css overrides that expand blockquote with extra padding after SSR.
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const blockquoteZeroPadding = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& blockquote': {
+      paddingTop: 0,
+      paddingBottom: 0
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const blocktypeStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -97,6 +110,30 @@ export const blocktypeStyles = css({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const blockquoteSelectedNodeStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& blockquote': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+      '&.ak-editor-selected-node': {
+        background: "var(--ds-blanket-selected, #388BFF14)",
+        borderLeftColor: "var(--ds-border-selected, #1868DB)",
+        WebkitUserSelect: 'text',
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+        '&::selection, *::selection': {
+          backgroundColor: 'transparent'
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+        '&::-moz-selection, *::-moz-selection': {
+          backgroundColor: 'transparent'
+        }
+      }
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export const blocktypeStyles_fg_platform_editor_typography_ugc = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors

package/dist/es2019/version-wrapper.js

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

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

@@ -1,61 +1,53 @@
-import React from 'react';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 export function handleEditorFocus(view) {
+  var _domSelection$getRang;
   if (view !== null && view !== void 0 && view.hasFocus()) {
     return;
   }
 
-  /**
-   * If startTransition is available (in React 18),
-   * don't use setTimeout as startTransition will be used in ReactEditorViewNext.
-   * setTimeout(fn, 0) will not defer the focus reliably in React 18 with
-   * concurrent rendering.
-   */
-  var react16OnlySetTimeout = React !== null && React !== void 0 && React.startTransition && fg('platform_editor_react_18_autofocus_fix') ? function (fn) {
-    return fn();
-  } : function (fn) {
-    return window.setTimeout(fn, 0);
-  };
-  return react16OnlySetTimeout(function () {
-    // Due to race conditions during editor lifecycle transitions (e.g. SPA route changes during opening or closing)
-    // where the view (and its internal docView) may have been destroyed, the timeout callback may fire on a stale view.
-    // Bail out in that scenario to prevent operating on an unmounted view.
-    if (view !== null && view !== void 0 && view.isDestroyed) {
-      return;
-    }
-    if (view !== null && view !== void 0 && view.hasFocus()) {
-      return;
-    }
-    if (!window.getSelection) {
-      view === null || view === void 0 || view.focus();
-      return;
-    }
-    var domSelection = window.getSelection();
-    if (!domSelection || domSelection.rangeCount === 0) {
-      view === null || view === void 0 || view.focus();
-      return;
-    }
-    var range = domSelection.getRangeAt(0);
-    // if selection is outside editor focus and exit
-    if (view && range.startContainer.contains(view.dom)) {
-      view.focus();
-      return;
-    }
+  // Due to race conditions during editor lifecycle transitions (e.g. SPA route changes during opening or closing)
+  // where the view (and its internal docView) may have been destroyed, the timeout callback may fire on a stale view.
+  // Bail out in that scenario to prevent operating on an unmounted view.
+  if (view !== null && view !== void 0 && view.isDestroyed) {
+    return;
+  }
+  if (view !== null && view !== void 0 && view.hasFocus()) {
+    return;
+  }
+  if (!window.getSelection) {
+    view === null || view === void 0 || view.focus();
+    return;
+  }
+  var domSelection = window.getSelection();
+  if (!domSelection || domSelection.rangeCount === 0) {
+    view === null || view === void 0 || view.focus();
+    return;
+  }
 
-    // set cursor/selection and focus
-    var anchor = view === null || view === void 0 ? void 0 : view.posAtDOM(range.startContainer, range.startOffset);
-    var head = view === null || view === void 0 ? void 0 : view.posAtDOM(range.endContainer, range.endOffset);
-    // if anchor or head < 0 focus and exit
-    if (anchor && anchor < 0 || head && head < 0) {
-      view === null || view === void 0 || view.focus();
-      return;
-    }
-    if (view && anchor) {
-      var selection = TextSelection.create(view.state.doc, anchor, head);
-      var tr = view.state.tr.setSelection(selection);
-      view.dispatch(tr);
-      view.focus();
-    }
-  });
+  // If not mocked properly in tests, getRangeAt may not exist.
+  var range = (_domSelection$getRang = domSelection.getRangeAt) === null || _domSelection$getRang === void 0 ? void 0 : _domSelection$getRang.call(domSelection, 0);
+  if (!range) {
+    return;
+  }
+
+  // if selection is outside editor focus and exit
+  if (view && range !== null && range !== void 0 && range.startContainer.contains(view.dom)) {
+    view.focus();
+    return;
+  }
+
+  // set cursor/selection and focus
+  var anchor = view === null || view === void 0 ? void 0 : view.posAtDOM(range.startContainer, range.startOffset);
+  var head = view === null || view === void 0 ? void 0 : view.posAtDOM(range.endContainer, range.endOffset);
+  // if anchor or head < 0 focus and exit
+  if (anchor && anchor < 0 || head && head < 0) {
+    view === null || view === void 0 || view.focus();
+    return;
+  }
+  if (view && anchor) {
+    var selection = TextSelection.create(view.state.doc, anchor, head);
+    var tr = view.state.tr.setSelection(selection);
+    view.dispatch(tr);
+    view.focus();
+  }
 }

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

@@ -537,7 +537,7 @@ export function ReactEditorView(props) {
       // We don't need to focus anything in SSR.
       return;
     }
-    if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state) && fg('platform_editor_react_18_autofocus_fix')) {
+    if (shouldFocus && editorView !== null && editorView !== void 0 && (_editorView$props$edi = (_editorView$props = editorView.props).editable) !== null && _editorView$props$edi !== void 0 && _editorView$props$edi.call(_editorView$props, editorView.state)) {
       if (!mitigateScrollJump) {
         var liveDocWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(editorView.state.doc);
         if (!liveDocWithContent) {
@@ -639,38 +639,10 @@ export function ReactEditorView(props) {
         eventDispatcher: eventDispatcher,
         transformer: contentTransformer.current
       });
-      if (fg('platform_editor_react_18_autofocus_fix')) {
-        var _startTransition;
-        /**
-         * Defer using startTransition when it is available (in React 18) to fix
-         * autofocus bug where React 18's concurrent rendering mode interferes with
-         * setTimeout used in handleEditorFocus, causing autofocus to break.
-         */
-        var react18OnlyStartTransition = (_startTransition = React === null || React === void 0 ? void 0 : React.startTransition) !== null && _startTransition !== void 0 ? _startTransition : function (fn) {
-          return fn();
-        };
-        react18OnlyStartTransition(function () {
-          // Force React to re-render so consumers get a reference to the editor view
-          setEditorView(view);
-        });
-      } else {
-        if (shouldFocus && view.props.editable && view.props.editable(view.state)) {
-          if (!mitigateScrollJump) {
-            var isLivePageWithContent = (__livePage || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)) && !isEmptyDocument(view.state.doc);
-            if (!isLivePageWithContent && shouldFocus && view.props.editable && view.props.editable(view.state)) {
-              focusTimeoutId.current = handleEditorFocus(view);
-            }
-            if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
-              if (shouldFocus && view.props.editable && view.props.editable(view.state) && !isEmptyDocument(view.state.doc)) {
-                focusEditorElement(editorId.current);
-              }
-            }
-          }
-        }
-
+      React.startTransition(function () {
         // Force React to re-render so consumers get a reference to the editor view
         setEditorView(view);
-      }
+      });
     } else if (viewRef.current && !node) {
       // When the appearance is changed, React will call handleEditorViewRef with node === null
       // to destroy the old EditorView, before calling this method again with node === div to
@@ -694,7 +666,7 @@ export function ReactEditorView(props) {
       nodeVisibilityManager(viewRef.current.dom).disconnect();
       viewRef.current = undefined;
     }
-  }, [createEditorView, onEditorCreated, eventDispatcher, shouldFocus, __livePage, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
+  }, [createEditorView, onEditorCreated, eventDispatcher, onEditorDestroyed, handleAnalyticsEvent, mitigateScrollJump]);
   var createEditor = useCallback(function (assistiveLabel, assistiveDescribedBy) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, fg('cc_editor_focus_before_editor_on_load') && /*#__PURE__*/React.createElement("div", {
       tabIndex: -1,

package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js

@@ -15,7 +15,7 @@ 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
+import { expVal, expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useThemeObserver } from '@atlaskit/tokens';
 import { getBaseFontSize } from '../../composable-editor/utils/getBaseFontSize';
 import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
@@ -23,19 +23,19 @@ import { annotationStyles } from './styles/annotationStyles';
 import { backgroundColorStyles, textHighlightPaddingStyles } from './styles/backgroundColorStyles';
 import { baseStyles, baseStylesMaxContainerWidthFixes, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
 import { blockMarksStyles } from './styles/blockMarksStyles';
-import { blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
+import { blockquoteSelectedNodeStyles, blocktypeStyles, blockquoteZeroPadding, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
 import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
-import { codeBlockStyles, codeBlockStylesWithEmUnits, codeBgColorStyles, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
+import { codeBgColorStyles, codeBlockStyles, codeBlockStylesWithEmUnits, firstCodeBlockWithNoMargin, firstCodeBlockWithNoMarginOld } from './styles/codeBlockStyles';
 import { codeMarkStyles } from './styles/codeMarkStyles';
 import { commentEditorStyles } from './styles/commentEditorStyles';
 import { cursorStyles } from './styles/cursorStyles';
 import { dangerDateStyles, dateStyles, dateVanillaStyles } from './styles/dateStyles';
 import { editorUGCTokensDefault, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
 import { embedCardStyles } from './styles/embedCardStyles';
-import { emojiDangerStyles, emojiStyles, scaledEmojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles } from './styles/emoji';
-import { expandStyles, getDenseExpandTitleStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes } from './styles/expandStyles';
-import { getExtensionStyles, extensionDiffStyles } from './styles/extensionStyles';
-import { findReplaceStyles, findReplaceStylesWithCodeblockColorContrastFix, findReplaceStylesNew, findReplaceStylesNewWithCodeblockColorContrastFix, findReplaceStylesNewWithA11Y } from './styles/findReplaceStyles';
+import { emojiDangerStyles, emojiStyles, getDenseEmojiStyles, getScaledDenseEmojiStyles, scaledEmojiStyles } from './styles/emoji';
+import { expandStyles, expandStylesMixin_fg_platform_editor_nested_dnd_styles_changes, expandStylesMixin_fg_platform_visual_refresh_icons, expandStylesMixin_without_fg_platform_editor_nested_dnd_styles_changes, getDenseExpandTitleStyles } from './styles/expandStyles';
+import { extensionDiffStyles, getExtensionStyles } from './styles/extensionStyles';
+import { findReplaceStyles, findReplaceStylesNew, findReplaceStylesNewWithA11Y, findReplaceStylesNewWithCodeblockColorContrastFix, findReplaceStylesWithCodeblockColorContrastFix } from './styles/findReplaceStyles';
 import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
 import { firstFloatingToolbarButtonStyles } from './styles/floatingToolbarStyles';
 import { fullPageEditorStyles } from './styles/fullPageEditorStyles';
@@ -45,23 +45,23 @@ import { indentationStyles } from './styles/indentationStyles';
 import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
 import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
 import { hyperLinkFloatingToolbarStyles, linkLegacyIconStylesFix, linkStyles } from './styles/link';
-import { getDenseListStyles, listsStyles, diffListStyles, listsStylesSafariFix, listsStylesMarginLayoutShiftFix } from './styles/list';
+import { diffListStyles, getDenseListStyles, listsStyles, listsStylesMarginLayoutShiftFix, listsStylesSafariFix } from './styles/list';
 import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
-import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsSelectionStylesWithSearchMatch, mentionDangerStyles } from './styles/mentions';
-import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
+import { mentionDangerStyles, mentionNodeStyles, mentionsSelectionStyles, mentionsSelectionStylesWithSearchMatch, mentionsStyles } from './styles/mentions';
+import { nestedPanelBorderStylesMixin, nestedPanelDangerStyles, panelStyles, panelStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles } from './styles/panelStyles';
 import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
 import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderWrapStyles } from './styles/placeholderStyles';
-import { pragmaticResizerStyles, pragmaticResizerStylesSyncedBlock, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
+import { pragmaticResizerStyles, pragmaticResizerStylesForTooltip, pragmaticResizerStylesSyncedBlock, pragmaticResizerStylesWithReducedEditorGutter, pragmaticStylesLayoutFirstNodeResizeHandleFix, resizerStyles } from './styles/resizerStyles';
 import { dangerRuleStyles, ruleStyles } from './styles/rule';
 import { scrollbarStyles } from './styles/scrollbarStyles';
 import { hideCursorWhenHideSelectionStyles, hideSelectionStyles, selectedNodeStyles } from './styles/selectionStyles';
 import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles';
 import { shadowStyles } from './styles/shadowStyles';
-import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles, smartCardDiffStyles, showDiffDeletedNodeStyles } from './styles/smartCardStyles';
+import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
 import { syncBlockStyles } from './styles/syncBlockStyles';
 import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
-import { decisionStyles, tasksAndDecisionsStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, taskItemStyles, taskItemStylesWithBlockTaskItem, decisionDangerStyles, getDenseTasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
+import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
 import { textHighlightStyle } from './styles/textHighlightStyles';
@@ -190,7 +190,11 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     editorUGCTokensRefreshed,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    blocktypeStyles,
+    blocktypeStyles, expValEquals('platform_editor_block_menu', 'isEnabled', true) &&
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    blockquoteSelectedNodeStyles, expVal('platform_editor_blockquote_zero_padding', 'isEnabled', false) ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    blockquoteZeroPadding : null,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     fg('platform_editor_typography_ugc') ?
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -1,5 +1,18 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css } from '@emotion/react';
+// This style is needed to avoid Confluence's batch.css overrides that expand blockquote with extra padding after SSR.
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var blockquoteZeroPadding = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& blockquote': {
+      paddingTop: 0,
+      paddingBottom: 0
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var blocktypeStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -97,6 +110,30 @@ export var blocktypeStyles = css({
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var blockquoteSelectedNodeStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+    '& blockquote': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+      '&.ak-editor-selected-node': {
+        background: "var(--ds-blanket-selected, #388BFF14)",
+        borderLeftColor: "var(--ds-border-selected, #1868DB)",
+        WebkitUserSelect: 'text',
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
+        '&::selection, *::selection': {
+          backgroundColor: 'transparent'
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+        '&::-moz-selection, *::-moz-selection': {
+          backgroundColor: 'transparent'
+        }
+      }
+    }
+  }
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
 export var blocktypeStyles_fg_platform_editor_typography_ugc = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors

package/dist/esm/version-wrapper.js

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

package/dist/types/create-editor/create-universal-preset.d.ts

@@ -399,6 +399,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
     }, import("@atlaskit/editor-plugins/editor-viewmode").EditorViewModePluginOptions | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockMenu", {
         actions: {
             getBlockMenuComponents: () => Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>;
+            isTransformOptionDisabled: (optionNodeTypeName: string, optionNodeTypeAttrs?: Record<string, unknown>) => boolean;
             registerBlockMenuComponents: (blockMenuComponents: Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>) => void;
         };
         commands: {

package/dist/types/presets/universal.d.ts

@@ -472,6 +472,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
     }, import("@atlaskit/editor-plugins/editor-viewmode").EditorViewModePluginOptions | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockMenu", {
         actions: {
             getBlockMenuComponents: () => Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>;
+            isTransformOptionDisabled: (optionNodeTypeName: string, optionNodeTypeAttrs?: Record<string, unknown>) => boolean;
             registerBlockMenuComponents: (blockMenuComponents: Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>) => void;
         };
         commands: {

package/dist/types/presets/useUniversalPreset.d.ts

@@ -399,6 +399,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
     }, import("@atlaskit/editor-plugins/editor-viewmode").EditorViewModePluginOptions | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockMenu", {
         actions: {
             getBlockMenuComponents: () => Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>;
+            isTransformOptionDisabled: (optionNodeTypeName: string, optionNodeTypeAttrs?: Record<string, unknown>) => boolean;
             registerBlockMenuComponents: (blockMenuComponents: Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>) => void;
         };
         commands: {

package/dist/types/ui/EditorContentContainer/styles/blockTypeStyles.d.ts

@@ -1,5 +1,7 @@
 import { type SerializedStyles } from '@emotion/react';
+export declare const blockquoteZeroPadding: SerializedStyles;
 export declare const blocktypeStyles: SerializedStyles;
+export declare const blockquoteSelectedNodeStyles: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_without_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes: SerializedStyles;

package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts

@@ -564,6 +564,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockMenu", {
                 actions: {
                     getBlockMenuComponents: () => Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>;
+                    isTransformOptionDisabled: (optionNodeTypeName: string, optionNodeTypeAttrs?: Record<string, unknown>) => boolean;
                     registerBlockMenuComponents: (blockMenuComponents: Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>) => void;
                 };
                 commands: {

package/dist/types-ts4.5/presets/universal.d.ts

@@ -637,6 +637,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockMenu", {
                 actions: {
                     getBlockMenuComponents: () => Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>;
+                    isTransformOptionDisabled: (optionNodeTypeName: string, optionNodeTypeAttrs?: Record<string, unknown>) => boolean;
                     registerBlockMenuComponents: (blockMenuComponents: Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>) => void;
                 };
                 commands: {

package/dist/types-ts4.5/presets/useUniversalPreset.d.ts

@@ -564,6 +564,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
             import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"blockMenu", {
                 actions: {
                     getBlockMenuComponents: () => Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>;
+                    isTransformOptionDisabled: (optionNodeTypeName: string, optionNodeTypeAttrs?: Record<string, unknown>) => boolean;
                     registerBlockMenuComponents: (blockMenuComponents: Array<import("@atlaskit/editor-plugins/block-menu").RegisterBlockMenuComponent>) => void;
                 };
                 commands: {

package/dist/types-ts4.5/ui/EditorContentContainer/styles/blockTypeStyles.d.ts

@@ -1,5 +1,7 @@
 import { type SerializedStyles } from '@emotion/react';
+export declare const blockquoteZeroPadding: SerializedStyles;
 export declare const blocktypeStyles: SerializedStyles;
+export declare const blockquoteSelectedNodeStyles: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_without_fg_platform_editor_typography_ugc: SerializedStyles;
 export declare const blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.24.0",
+	"version": "215.25.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^4.16.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.0.0",
+		"@atlaskit/tmp-editor-statsig": "^16.2.0",
 		"@atlaskit/tokens": "^9.0.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -83,7 +83,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.46.0",
+		"@atlaskit/editor-common": "^110.48.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",