@atlaskit/editor-plugin-block-menu 3.2.3 → 3.2.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 3.2.5
+
+### Patch Changes
+
+- [`f7bc2f60e0fc6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f7bc2f60e0fc6) -
+  [ux] Updates copy text for drag handle, copy block, copy link and updates order of items in Turn
+  into menu.
+- Updated dependencies
+
+## 3.2.4
+
+### Patch Changes
+
+- [`ef686b3cfdbff`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef686b3cfdbff) -
+  ED-29222: Make empty line experiment dependent on block menu
+- Updated dependencies
+
 ## 3.2.3
 
 ### Patch Changes

package/dist/cjs/editor-commands/formatNode.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.formatNode = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _selection = require("./selection");
 var _layoutTransforms = require("./transforms/layout-transforms");
 var _transformNodeToTargetType = require("./transforms/transformNodeToTargetType");
 /**
@@ -98,7 +100,11 @@ var formatNode = exports.formatNode = function formatNode(targetType) {
       nodePos = selection.$from.pos;
     }
     try {
-      return (0, _transformNodeToTargetType.transformNodeToTargetType)(tr, nodeToFormat, nodePos, targetType);
+      var newTr = (0, _transformNodeToTargetType.transformNodeToTargetType)(tr, nodeToFormat, nodePos, targetType);
+      if (newTr && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_selection_fix')) {
+        return (0, _selection.setSelectionAfterTransform)(newTr, nodePos, targetType);
+      }
+      return newTr;
     } catch (_unused) {
       return null;
     }

package/dist/cjs/editor-commands/selection.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setSelectionAfterTransform = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+/**
+ * Sets the appropriate selection after transforming a node to a target type
+ * @param newTr - The transaction containing the transformed node
+ * @param nodePos - The position of the transformed node
+ * @param targetType - The target type the node was transformed to
+ * @returns The transaction with the updated selection, or the original transaction if no selection change needed
+ */
+var setSelectionAfterTransform = exports.setSelectionAfterTransform = function setSelectionAfterTransform(newTr, nodePos, targetType) {
+  // Find the actual node that was transformed to get its positioning
+  var transformedNodePos = newTr.doc.resolve(nodePos);
+  var transformedNode = transformedNodePos.nodeAfter;
+  if (!transformedNode) {
+    return newTr;
+  }
+
+  // Check if target type is other than list, text, heading, blockquotes
+  var isListNode = targetType === 'bulletList' || targetType === 'orderedList' || targetType === 'taskList';
+  var isBlockquote = targetType === 'blockquote';
+  var isContainer = ['panel', 'expand', 'codeBlock', 'layoutSection'].includes(targetType);
+  if (isListNode || isBlockquote) {
+    // For taskList, select all content within the list
+    var textStart = transformedNodePos.pos + 1; // Inside the taskList
+    var textEnd = transformedNodePos.pos + transformedNode.nodeSize - 1; // End of taskList content
+    var textSelection = _state.TextSelection.between(newTr.doc.resolve(textStart), newTr.doc.resolve(textEnd));
+    return newTr.setSelection(textSelection);
+  } else if (isContainer) {
+    // Use NodeSelection for types other than list, text, heading, blockquotes
+    var nodeSelection = _state.NodeSelection.create(newTr.doc, transformedNodePos.pos);
+    return newTr.setSelection(nodeSelection);
+  }
+  return newTr;
+};

package/dist/cjs/ui/block-menu.js

@@ -80,11 +80,10 @@ var BlockMenu = function BlockMenu(_ref2) {
   var targetHandleRef = editorView === null || editorView === void 0 || (_editorView$dom = editorView.dom) === null || _editorView$dom === void 0 ? void 0 : _editorView$dom.querySelector(_styles.DRAG_HANDLE_SELECTOR);
   var hasFocus = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? (_ref3 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef) !== null && _ref3 !== void 0 ? _ref3 : false : (_editorView$hasFocus = editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) !== null && _editorView$hasFocus !== void 0 ? _editorView$hasFocus : false;
   var hasSelection = !!editorView && !editorView.state.selection.empty;
-  var emptyLineEnabled = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true);
 
   // hasSelection true, always show block menu
   // hasSelection false, only show block menu when empty line experiment is enabled
-  var shouldShowBlockMenuForEmptyLine = hasSelection || emptyLineEnabled && !hasSelection;
+  var shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true);
   (0, _react.useEffect)(function () {
     var _api$userIntent;
     if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {

package/dist/cjs/ui/copy-block.js

@@ -11,11 +11,13 @@ var _reactIntlNext = require("react-intl-next");
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _clipboard = require("@atlaskit/editor-common/clipboard");
 var _copyButton = require("@atlaskit/editor-common/copy-button");
+var _messages = require("@atlaskit/editor-common/messages");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var toDOMFromFragment = function toDOMFromFragment(fragment, schema) {
@@ -101,6 +103,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       api === null || api === void 0 || api.core.actions.focus();
     }
   };
+  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.copyContent) : formatMessage(_blockMenu.messages.copyBlock);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_copy.default, {
       label: ""
@@ -108,6 +111,6 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
     onClick: function onClick(e) {
       return copyHandler(e);
     }
-  }, formatMessage(_blockMenu.messages.copyBlock));
+  }, text);
 };
 var _default = exports.default = (0, _reactIntlNext.injectIntl)(CopyBlockMenuItem);

package/dist/cjs/ui/copy-link.js

@@ -48,11 +48,12 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') || checkIsNestedNode()) {
     return null;
   }
+  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.copyLinkToBlock) : formatMessage(_messages.blockMenuMessages.copyLink);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_link.default, {
       label: ""
     })
-  }, formatMessage(_messages.blockMenuMessages.copyLink));
+  }, text);
 };
 var CopyLinkDropdownItem = exports.CopyLinkDropdownItem = (0, _reactIntlNext.injectIntl)(CopyLinkDropdownItemContent);

package/dist/cjs/ui/delete-button.js

@@ -9,10 +9,12 @@ exports.DeleteDropdownItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
+var _messages = require("@atlaskit/editor-common/messages");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _box = require("@atlaskit/primitives/box");
 var _text = _interopRequireDefault(require("@atlaskit/primitives/text"));
 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); }
@@ -66,6 +68,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
     var _api$decorations2, _api$decorations2$rem;
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$decorations2 = api.decorations) === null || _api$decorations2 === void 0 || (_api$decorations2 = _api$decorations2.commands) === null || _api$decorations2 === void 0 || (_api$decorations2$rem = _api$decorations2.removeDecoration) === null || _api$decorations2$rem === void 0 ? void 0 : _api$decorations2$rem.call(_api$decorations2));
   };
+  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.deleteBlock) : formatMessage(_blockMenu.messages.deleteBlock);
   return /*#__PURE__*/_react.default.createElement(_box.Box, {
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave
@@ -78,6 +81,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_text.default, {
     as: "span",
     color: "color.text.danger"
-  }, formatMessage(_blockMenu.messages.deleteBlock))));
+  }, text)));
 };
 var DeleteDropdownItem = exports.DeleteDropdownItem = (0, _reactIntlNext.injectIntl)(DeleteDropdownItemContent);

package/dist/cjs/ui/format-menu-nested.js

@@ -8,15 +8,18 @@ exports.FormatMenuComponent = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
+var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _changes = _interopRequireDefault(require("@atlaskit/icon/core/changes"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuComponent(_ref) {
   var children = _ref.children;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
+  var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.turnInto) : formatMessage(_blockMenu.messages.turnInto);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
-    text: formatMessage(_blockMenu.messages.turnInto),
+    text: text,
     elemBefore: /*#__PURE__*/_react.default.createElement(_changes.default, {
       label: ""
     }),

package/dist/es2019/editor-commands/formatNode.js

@@ -1,5 +1,7 @@
 import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { setSelectionAfterTransform } from './selection';
 import { createDefaultLayoutSection } from './transforms/layout-transforms';
 import { transformNodeToTargetType } from './transforms/transformNodeToTargetType';
 /**
@@ -101,7 +103,11 @@ export const formatNode = targetType => {
       nodePos = selection.$from.pos;
     }
     try {
-      return transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
+      const newTr = transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
+      if (newTr && fg('platform_editor_block_menu_selection_fix')) {
+        return setSelectionAfterTransform(newTr, nodePos, targetType);
+      }
+      return newTr;
     } catch {
       return null;
     }

package/dist/es2019/editor-commands/selection.js

@@ -0,0 +1,33 @@
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Sets the appropriate selection after transforming a node to a target type
+ * @param newTr - The transaction containing the transformed node
+ * @param nodePos - The position of the transformed node
+ * @param targetType - The target type the node was transformed to
+ * @returns The transaction with the updated selection, or the original transaction if no selection change needed
+ */
+export const setSelectionAfterTransform = (newTr, nodePos, targetType) => {
+  // Find the actual node that was transformed to get its positioning
+  const transformedNodePos = newTr.doc.resolve(nodePos);
+  const transformedNode = transformedNodePos.nodeAfter;
+  if (!transformedNode) {
+    return newTr;
+  }
+
+  // Check if target type is other than list, text, heading, blockquotes
+  const isListNode = targetType === 'bulletList' || targetType === 'orderedList' || targetType === 'taskList';
+  const isBlockquote = targetType === 'blockquote';
+  const isContainer = ['panel', 'expand', 'codeBlock', 'layoutSection'].includes(targetType);
+  if (isListNode || isBlockquote) {
+    // For taskList, select all content within the list
+    const textStart = transformedNodePos.pos + 1; // Inside the taskList
+    const textEnd = transformedNodePos.pos + transformedNode.nodeSize - 1; // End of taskList content
+    const textSelection = TextSelection.between(newTr.doc.resolve(textStart), newTr.doc.resolve(textEnd));
+    return newTr.setSelection(textSelection);
+  } else if (isContainer) {
+    // Use NodeSelection for types other than list, text, heading, blockquotes
+    const nodeSelection = NodeSelection.create(newTr.doc, transformedNodePos.pos);
+    return newTr.setSelection(nodeSelection);
+  }
+  return newTr;
+};

package/dist/es2019/ui/block-menu.js

@@ -70,11 +70,10 @@ const BlockMenu = ({
   const targetHandleRef = editorView === null || editorView === void 0 ? void 0 : (_editorView$dom = editorView.dom) === null || _editorView$dom === void 0 ? void 0 : _editorView$dom.querySelector(DRAG_HANDLE_SELECTOR);
   const hasFocus = expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? (_ref = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef) !== null && _ref !== void 0 ? _ref : false : (_editorView$hasFocus = editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) !== null && _editorView$hasFocus !== void 0 ? _editorView$hasFocus : false;
   const hasSelection = !!editorView && !editorView.state.selection.empty;
-  const emptyLineEnabled = expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
 
   // hasSelection true, always show block menu
   // hasSelection false, only show block menu when empty line experiment is enabled
-  const shouldShowBlockMenuForEmptyLine = hasSelection || emptyLineEnabled && !hasSelection;
+  const shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
   useEffect(() => {
     var _api$userIntent;
     if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {

package/dist/es2019/ui/copy-block.js

@@ -3,11 +3,13 @@ import { injectIntl, useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
 import { copyHTMLToClipboard } from '@atlaskit/editor-common/clipboard';
 import { toDOM, copyDomNode } from '@atlaskit/editor-common/copy-button';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { Fragment, DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import CopyIcon from '@atlaskit/icon/core/copy';
+import { fg } from '@atlaskit/platform-feature-flags';
 const toDOMFromFragment = (fragment, schema) => {
   return DOMSerializer.fromSchema(schema).serializeFragment(fragment);
 };
@@ -94,11 +96,12 @@ const CopyBlockMenuItem = ({
       api === null || api === void 0 ? void 0 : api.core.actions.focus();
     }
   };
+  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.copyContent) : formatMessage(messages.copyBlock);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(CopyIcon, {
       label: ""
     }),
     onClick: e => copyHandler(e)
-  }, formatMessage(messages.copyBlock));
+  }, text);
 };
 export default injectIntl(CopyBlockMenuItem);

package/dist/es2019/ui/copy-link.js

@@ -42,11 +42,12 @@ const CopyLinkDropdownItemContent = ({
   if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
     return null;
   }
+  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(messages.copyLinkToBlock) : formatMessage(messages.copyLink);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: ""
     })
-  }, formatMessage(messages.copyLink));
+  }, text);
 };
 export const CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

package/dist/es2019/ui/delete-button.js

@@ -1,10 +1,12 @@
 import React, { useCallback } from 'react';
 import { useIntl, injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import DeleteIcon from '@atlaskit/icon/core/delete';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
 const DeleteDropdownItemContent = ({
@@ -61,6 +63,7 @@ const DeleteDropdownItemContent = ({
     var _api$decorations2, _api$decorations2$com, _api$decorations2$com2;
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$decorations2 = api.decorations) === null || _api$decorations2 === void 0 ? void 0 : (_api$decorations2$com = _api$decorations2.commands) === null || _api$decorations2$com === void 0 ? void 0 : (_api$decorations2$com2 = _api$decorations2$com.removeDecoration) === null || _api$decorations2$com2 === void 0 ? void 0 : _api$decorations2$com2.call(_api$decorations2$com));
   };
+  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.deleteBlock) : formatMessage(messages.deleteBlock);
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave
@@ -73,6 +76,6 @@ const DeleteDropdownItemContent = ({
   }, /*#__PURE__*/React.createElement(Text, {
     as: "span",
     color: "color.text.danger"
-  }, formatMessage(messages.deleteBlock))));
+  }, text)));
 };
 export const DeleteDropdownItem = injectIntl(DeleteDropdownItemContent);

package/dist/es2019/ui/format-menu-nested.js

@@ -1,17 +1,20 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const FormatMenuComponent = ({
   children
 }) => {
   const {
     formatMessage
   } = useIntl();
+  const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
-    text: formatMessage(messages.turnInto),
+    text: text,
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
       label: ""
     }),

package/dist/esm/editor-commands/formatNode.js

@@ -1,5 +1,7 @@
 import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { setSelectionAfterTransform } from './selection';
 import { createDefaultLayoutSection } from './transforms/layout-transforms';
 import { transformNodeToTargetType } from './transforms/transformNodeToTargetType';
 /**
@@ -92,7 +94,11 @@ export var formatNode = function formatNode(targetType) {
       nodePos = selection.$from.pos;
     }
     try {
-      return transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
+      var newTr = transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
+      if (newTr && fg('platform_editor_block_menu_selection_fix')) {
+        return setSelectionAfterTransform(newTr, nodePos, targetType);
+      }
+      return newTr;
     } catch (_unused) {
       return null;
     }

package/dist/esm/editor-commands/selection.js

@@ -0,0 +1,33 @@
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Sets the appropriate selection after transforming a node to a target type
+ * @param newTr - The transaction containing the transformed node
+ * @param nodePos - The position of the transformed node
+ * @param targetType - The target type the node was transformed to
+ * @returns The transaction with the updated selection, or the original transaction if no selection change needed
+ */
+export var setSelectionAfterTransform = function setSelectionAfterTransform(newTr, nodePos, targetType) {
+  // Find the actual node that was transformed to get its positioning
+  var transformedNodePos = newTr.doc.resolve(nodePos);
+  var transformedNode = transformedNodePos.nodeAfter;
+  if (!transformedNode) {
+    return newTr;
+  }
+
+  // Check if target type is other than list, text, heading, blockquotes
+  var isListNode = targetType === 'bulletList' || targetType === 'orderedList' || targetType === 'taskList';
+  var isBlockquote = targetType === 'blockquote';
+  var isContainer = ['panel', 'expand', 'codeBlock', 'layoutSection'].includes(targetType);
+  if (isListNode || isBlockquote) {
+    // For taskList, select all content within the list
+    var textStart = transformedNodePos.pos + 1; // Inside the taskList
+    var textEnd = transformedNodePos.pos + transformedNode.nodeSize - 1; // End of taskList content
+    var textSelection = TextSelection.between(newTr.doc.resolve(textStart), newTr.doc.resolve(textEnd));
+    return newTr.setSelection(textSelection);
+  } else if (isContainer) {
+    // Use NodeSelection for types other than list, text, heading, blockquotes
+    var nodeSelection = NodeSelection.create(newTr.doc, transformedNodePos.pos);
+    return newTr.setSelection(nodeSelection);
+  }
+  return newTr;
+};

package/dist/esm/ui/block-menu.js

@@ -72,11 +72,10 @@ var BlockMenu = function BlockMenu(_ref2) {
   var targetHandleRef = editorView === null || editorView === void 0 || (_editorView$dom = editorView.dom) === null || _editorView$dom === void 0 ? void 0 : _editorView$dom.querySelector(DRAG_HANDLE_SELECTOR);
   var hasFocus = expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? (_ref3 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef) !== null && _ref3 !== void 0 ? _ref3 : false : (_editorView$hasFocus = editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) !== null && _editorView$hasFocus !== void 0 ? _editorView$hasFocus : false;
   var hasSelection = !!editorView && !editorView.state.selection.empty;
-  var emptyLineEnabled = expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
 
   // hasSelection true, always show block menu
   // hasSelection false, only show block menu when empty line experiment is enabled
-  var shouldShowBlockMenuForEmptyLine = hasSelection || emptyLineEnabled && !hasSelection;
+  var shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
   useEffect(function () {
     var _api$userIntent;
     if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {

package/dist/esm/ui/copy-block.js

@@ -6,11 +6,13 @@ import { injectIntl, useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
 import { copyHTMLToClipboard } from '@atlaskit/editor-common/clipboard';
 import { toDOM, copyDomNode } from '@atlaskit/editor-common/copy-button';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { Fragment, DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import CopyIcon from '@atlaskit/icon/core/copy';
+import { fg } from '@atlaskit/platform-feature-flags';
 var toDOMFromFragment = function toDOMFromFragment(fragment, schema) {
   return DOMSerializer.fromSchema(schema).serializeFragment(fragment);
 };
@@ -94,6 +96,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
       api === null || api === void 0 || api.core.actions.focus();
     }
   };
+  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.copyContent) : formatMessage(messages.copyBlock);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(CopyIcon, {
       label: ""
@@ -101,6 +104,6 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
     onClick: function onClick(e) {
       return copyHandler(e);
     }
-  }, formatMessage(messages.copyBlock));
+  }, text);
 };
 export default injectIntl(CopyBlockMenuItem);

package/dist/esm/ui/copy-link.js

@@ -39,11 +39,12 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
     return null;
   }
+  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(messages.copyLinkToBlock) : formatMessage(messages.copyLink);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
       label: ""
     })
-  }, formatMessage(messages.copyLink));
+  }, text);
 };
 export var CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);

package/dist/esm/ui/delete-button.js

@@ -1,10 +1,12 @@
 import React, { useCallback } from 'react';
 import { useIntl, injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import DeleteIcon from '@atlaskit/icon/core/delete';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/box';
 import Text from '@atlaskit/primitives/text';
 var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
@@ -57,6 +59,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
     var _api$decorations2, _api$decorations2$rem;
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$decorations2 = api.decorations) === null || _api$decorations2 === void 0 || (_api$decorations2 = _api$decorations2.commands) === null || _api$decorations2 === void 0 || (_api$decorations2$rem = _api$decorations2.removeDecoration) === null || _api$decorations2$rem === void 0 ? void 0 : _api$decorations2$rem.call(_api$decorations2));
   };
+  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.deleteBlock) : formatMessage(messages.deleteBlock);
   return /*#__PURE__*/React.createElement(Box, {
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave
@@ -69,6 +72,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
   }, /*#__PURE__*/React.createElement(Text, {
     as: "span",
     color: "color.text.danger"
-  }, formatMessage(messages.deleteBlock))));
+  }, text)));
 };
 export var DeleteDropdownItem = injectIntl(DeleteDropdownItemContent);

package/dist/esm/ui/format-menu-nested.js

@@ -1,15 +1,18 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
+import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChangesIcon from '@atlaskit/icon/core/changes';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var FormatMenuComponent = function FormatMenuComponent(_ref) {
   var children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
-    text: formatMessage(messages.turnInto),
+    text: text,
     elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
       label: ""
     }),

package/dist/types/editor-commands/selection.d.ts

@@ -0,0 +1,10 @@
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { FormatNodeTargetType } from './transforms/types';
+/**
+ * Sets the appropriate selection after transforming a node to a target type
+ * @param newTr - The transaction containing the transformed node
+ * @param nodePos - The position of the transformed node
+ * @param targetType - The target type the node was transformed to
+ * @returns The transaction with the updated selection, or the original transaction if no selection change needed
+ */
+export declare const setSelectionAfterTransform: (newTr: Transaction, nodePos: number, targetType: FormatNodeTargetType) => Transaction;

package/dist/types-ts4.5/editor-commands/selection.d.ts

@@ -0,0 +1,10 @@
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { FormatNodeTargetType } from './transforms/types';
+/**
+ * Sets the appropriate selection after transforming a node to a target type
+ * @param newTr - The transaction containing the transformed node
+ * @param nodePos - The position of the transformed node
+ * @param targetType - The target type the node was transformed to
+ * @returns The transaction with the updated selection, or the original transaction if no selection change needed
+ */
+export declare const setSelectionAfterTransform: (newTr: Transaction, nodePos: number, targetType: FormatNodeTargetType) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "3.2.3",
+	"version": "3.2.5",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,12 +42,12 @@
 		"@atlaskit/icon-lab": "^5.7.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.15.0",
-		"@atlaskit/tmp-editor-statsig": "^12.27.0",
+		"@atlaskit/tmp-editor-statsig": "^12.29.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.11.0",
+		"@atlaskit/editor-common": "^109.14.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -90,6 +90,12 @@
 	"platform-feature-flags": {
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
+		},
+		"platform_editor_block_menu_selection_fix": {
+			"type": "boolean"
+		},
+		"platform_editor_block_menu_patch_1": {
+			"type": "boolean"
 		}
 	}
 }