@atlaskit/editor-plugin-block-menu 4.0.1 → 4.0.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 4.0.3
+
+### Patch Changes
+
+- [`c158b1ba4f0fd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c158b1ba4f0fd) -
+  ED-29388: fix converting empty list
+- Updated dependencies
+
+## 4.0.2
+
+### Patch Changes
+
+- [`9cf29da7572b3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9cf29da7572b3) -
+  [ux] Fires Element converted event when Turn into menu is used to transform a node from one node
+  type to another.
+- Updated dependencies
+
 ## 4.0.1
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-cc/tsconfig.json"
 		},

package/afm-dev-agents/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-dev-agents/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-dev-agents/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-dev-agents/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-jira/tsconfig.json"
 		},

package/afm-passionfruit/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-passionfruit/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-passionfruit/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-passionfruit/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-post-office/tsconfig.json"
 		},

package/afm-rovo-extension/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-rovo-extension/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-rovo-extension/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-rovo-extension/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -23,6 +23,9 @@
 		{
 			"path": "../../../design-system/dropdown-menu/afm-townsquare/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-block-controls/afm-townsquare/tsconfig.json"
 		},

package/dist/cjs/blockMenuPlugin.js

@@ -38,7 +38,7 @@ var blockMenuPlugin = exports.blockMenuPlugin = function blockMenuPlugin(_ref) {
     },
     commands: {
       formatNode: function formatNode(targetType) {
-        return (0, _formatNode2.formatNode)(targetType);
+        return (0, _formatNode2.formatNode)(api)(targetType);
       }
     },
     getSharedState: function getSharedState(editorState) {

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

@@ -3,13 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatNode = void 0;
+exports.formatNodeSelectEmptyList = exports.formatNode = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _state = require("@atlaskit/editor-prosemirror/state");
 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");
+var _utils2 = require("./transforms/utils");
 /**
  * Handles formatting when selection is empty by inserting a new target node
  */
@@ -49,64 +52,140 @@ var formatNodeWhenSelectionEmpty = function formatNodeWhenSelectionEmpty(tr, tar
   return tr;
 };
 
+/**
+ * Handles formatting when an empty list is selected
+ * Converting an empty list to a target node, will remove the list and replace with an empty target node
+ */
+var formatNodeSelectEmptyList = exports.formatNodeSelectEmptyList = function formatNodeSelectEmptyList(tr, targetType, listNode, schema) {
+  var nodes = schema.nodes;
+  var headingLevel = 1;
+  var finalTargetType = targetType;
+  if (targetType.startsWith('heading')) {
+    var levelString = targetType.slice(-1);
+    var level = parseInt(levelString, 10);
+    if (!isNaN(level) && level >= 1 && level <= 6) {
+      headingLevel = level;
+      finalTargetType = 'heading';
+    }
+  }
+  var replaceNode = null;
+  if (finalTargetType === 'layoutSection') {
+    var emptyPara = nodes.paragraph.createAndFill();
+    if (emptyPara) {
+      replaceNode = (0, _layoutTransforms.createDefaultLayoutSection)(schema, emptyPara);
+    }
+  } else if (finalTargetType === 'heading') {
+    replaceNode = nodes.heading.createAndFill({
+      level: headingLevel
+    });
+  } else {
+    replaceNode = nodes[finalTargetType].createAndFill();
+  }
+  if (replaceNode) {
+    tr.replaceWith(listNode.pos, listNode.pos + listNode.node.nodeSize, replaceNode);
+    tr.setSelection(new _state.TextSelection(tr.doc.resolve(listNode.pos)));
+  }
+  return tr;
+};
+
 /**
  * Formats the current node or selection to the specified target type
+ * @param api - The editor API injection that provides access to analytics and other plugin actions
  * @param targetType - The target node type to convert to
  */
-var formatNode = exports.formatNode = function formatNode(targetType) {
-  return function (_ref) {
-    var tr = _ref.tr;
-    var selection = tr.selection;
-    var schema = tr.doc.type.schema;
-    var nodes = schema.nodes;
+var formatNode = exports.formatNode = function formatNode(api) {
+  return function (targetType) {
+    return function (_ref) {
+      var tr = _ref.tr;
+      var selection = tr.selection;
+      var schema = tr.doc.type.schema;
+      var nodes = schema.nodes;
 
-    // Find the node to format from the current selection
-    var nodeToFormat;
-    var nodePos = selection.from;
+      // Find the node to format from the current selection
+      var nodeToFormat;
+      var nodePos = selection.from;
 
-    // when selection is empty, we insert a empty target node
-    if (selection.empty && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
-      return formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
-    }
+      // when selection is empty, we insert a empty target node
+      if (selection.empty && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
+        var listNodes = [];
+        // need to find if there is any list node in the current selection
+        // As when select a empty list, selection is empty, but we want to convert the list instead of inserting a target node
+        // findSelectedNodeOfType does not work when selection is empty, so we use nodesBetween
+        tr.doc.nodesBetween(selection.from, selection.to, function (node, pos) {
+          if ((0, _utils2.isListNodeType)(node.type)) {
+            listNodes.push({
+              node: node,
+              pos: pos
+            });
+          }
+        });
+        //	get the first list node as when click on drag handle if there are list node
+        //  can only select one list at a time, so we just need to find the first one
+        if (listNodes.length > 0 && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_2')) {
+          var firstChild = listNodes[0];
+          return formatNodeSelectEmptyList(tr, targetType, firstChild, schema);
+        } else {
+          return formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
+        }
+      }
 
-    // Try to find the current node from selection
-    var selectedNode = (0, _utils.findSelectedNodeOfType)([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection])(selection);
-    if (selectedNode) {
-      nodeToFormat = selectedNode.node;
-      nodePos = selectedNode.pos;
-    } else {
-      // Try to find parent node (including list parents)
-      var parentNode = (0, _utils.findParentNodeOfType)([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
-      if (parentNode) {
-        nodeToFormat = parentNode.node;
-        nodePos = parentNode.pos;
-        var paragraphOrHeadingNode = (0, _utils.findParentNodeOfType)([nodes.paragraph, nodes.heading])(selection);
-        // Special case: if we found a listItem, check if we need the parent list instead
-        if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
-          var listParent = (0, _utils.findParentNodeOfType)([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
-          if (listParent) {
-            // For list transformations, we want the list parent, not the listItem
-            nodeToFormat = listParent.node;
-            nodePos = listParent.pos;
+      // Try to find the current node from selection
+      var selectedNode = (0, _utils.findSelectedNodeOfType)([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection])(selection);
+      if (selectedNode) {
+        nodeToFormat = selectedNode.node;
+        nodePos = selectedNode.pos;
+      } else {
+        // Try to find parent node (including list parents)
+        var parentNode = (0, _utils.findParentNodeOfType)([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
+        if (parentNode) {
+          nodeToFormat = parentNode.node;
+          nodePos = parentNode.pos;
+          var paragraphOrHeadingNode = (0, _utils.findParentNodeOfType)([nodes.paragraph, nodes.heading])(selection);
+          // Special case: if we found a listItem, check if we need the parent list instead
+          if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
+            var listParent = (0, _utils.findParentNodeOfType)([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
+            if (listParent) {
+              // For list transformations, we want the list parent, not the listItem
+              nodeToFormat = listParent.node;
+              nodePos = listParent.pos;
+            }
+          } else if (parentNode.node.type !== nodes.blockquote && paragraphOrHeadingNode) {
+            nodeToFormat = paragraphOrHeadingNode.node;
+            nodePos = paragraphOrHeadingNode.pos;
           }
-        } else if (parentNode.node.type !== nodes.blockquote && paragraphOrHeadingNode) {
-          nodeToFormat = paragraphOrHeadingNode.node;
-          nodePos = paragraphOrHeadingNode.pos;
         }
       }
-    }
-    if (!nodeToFormat) {
-      nodeToFormat = selection.$from.node();
-      nodePos = selection.$from.pos;
-    }
-    try {
-      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);
+      if (!nodeToFormat) {
+        nodeToFormat = selection.$from.node();
+        nodePos = selection.$from.pos;
       }
-      return newTr;
-    } catch (_unused) {
-      return null;
-    }
+      try {
+        var _nodeToFormat$attrs;
+        var newTr = (0, _transformNodeToTargetType.transformNodeToTargetType)(tr, nodeToFormat, nodePos, targetType);
+        var sourceTypeName = nodeToFormat.type.name;
+        if (sourceTypeName === 'heading' && (_nodeToFormat$attrs = nodeToFormat.attrs) !== null && _nodeToFormat$attrs !== void 0 && _nodeToFormat$attrs.level) {
+          sourceTypeName = "heading".concat(nodeToFormat.attrs.level);
+        }
+        if (newTr && sourceTypeName !== targetType) {
+          var _api$analytics;
+          api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
+            action: _analytics.ACTION.CONVERTED,
+            actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
+            eventType: _analytics.EVENT_TYPE.TRACK,
+            attributes: {
+              from: sourceTypeName,
+              to: targetType,
+              inputMethod: _analytics.INPUT_METHOD.BLOCK_MENU
+            }
+          })(newTr);
+        }
+        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/es2019/blockMenuPlugin.js

@@ -32,7 +32,7 @@ export const blockMenuPlugin = ({
     },
     commands: {
       formatNode: targetType => {
-        return formatNode(targetType);
+        return formatNode(api)(targetType);
       }
     },
     getSharedState(editorState) {

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

@@ -1,9 +1,13 @@
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 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';
+import { isListNodeType } from './transforms/utils';
+
 /**
  * Handles formatting when selection is empty by inserting a new target node
  */
@@ -47,11 +51,50 @@ const formatNodeWhenSelectionEmpty = (tr, targetType, nodePos, schema) => {
   return tr;
 };
 
+/**
+ * Handles formatting when an empty list is selected
+ * Converting an empty list to a target node, will remove the list and replace with an empty target node
+ */
+export const formatNodeSelectEmptyList = (tr, targetType, listNode, schema) => {
+  const {
+    nodes
+  } = schema;
+  let headingLevel = 1;
+  let finalTargetType = targetType;
+  if (targetType.startsWith('heading')) {
+    const levelString = targetType.slice(-1);
+    const level = parseInt(levelString, 10);
+    if (!isNaN(level) && level >= 1 && level <= 6) {
+      headingLevel = level;
+      finalTargetType = 'heading';
+    }
+  }
+  let replaceNode = null;
+  if (finalTargetType === 'layoutSection') {
+    const emptyPara = nodes.paragraph.createAndFill();
+    if (emptyPara) {
+      replaceNode = createDefaultLayoutSection(schema, emptyPara);
+    }
+  } else if (finalTargetType === 'heading') {
+    replaceNode = nodes.heading.createAndFill({
+      level: headingLevel
+    });
+  } else {
+    replaceNode = nodes[finalTargetType].createAndFill();
+  }
+  if (replaceNode) {
+    tr.replaceWith(listNode.pos, listNode.pos + listNode.node.nodeSize, replaceNode);
+    tr.setSelection(new TextSelection(tr.doc.resolve(listNode.pos)));
+  }
+  return tr;
+};
+
 /**
  * Formats the current node or selection to the specified target type
+ * @param api - The editor API injection that provides access to analytics and other plugin actions
  * @param targetType - The target node type to convert to
  */
-export const formatNode = targetType => {
+export const formatNode = api => targetType => {
   return ({
     tr
   }) => {
@@ -69,7 +112,26 @@ export const formatNode = targetType => {
 
     // when selection is empty, we insert a empty target node
     if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
-      return formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
+      const listNodes = [];
+      // need to find if there is any list node in the current selection
+      // As when select a empty list, selection is empty, but we want to convert the list instead of inserting a target node
+      // findSelectedNodeOfType does not work when selection is empty, so we use nodesBetween
+      tr.doc.nodesBetween(selection.from, selection.to, (node, pos) => {
+        if (isListNodeType(node.type)) {
+          listNodes.push({
+            node,
+            pos
+          });
+        }
+      });
+      //	get the first list node as when click on drag handle if there are list node
+      //  can only select one list at a time, so we just need to find the first one
+      if (listNodes.length > 0 && fg('platform_editor_block_menu_patch_2')) {
+        const firstChild = listNodes[0];
+        return formatNodeSelectEmptyList(tr, targetType, firstChild, schema);
+      } else {
+        return formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
+      }
     }
 
     // Try to find the current node from selection
@@ -103,7 +165,25 @@ export const formatNode = targetType => {
       nodePos = selection.$from.pos;
     }
     try {
+      var _nodeToFormat$attrs;
       const newTr = transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
+      let sourceTypeName = nodeToFormat.type.name;
+      if (sourceTypeName === 'heading' && (_nodeToFormat$attrs = nodeToFormat.attrs) !== null && _nodeToFormat$attrs !== void 0 && _nodeToFormat$attrs.level) {
+        sourceTypeName = `heading${nodeToFormat.attrs.level}`;
+      }
+      if (newTr && sourceTypeName !== targetType) {
+        var _api$analytics, _api$analytics$action;
+        api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.attachAnalyticsEvent({
+          action: ACTION.CONVERTED,
+          actionSubject: ACTION_SUBJECT.ELEMENT,
+          eventType: EVENT_TYPE.TRACK,
+          attributes: {
+            from: sourceTypeName,
+            to: targetType,
+            inputMethod: INPUT_METHOD.BLOCK_MENU
+          }
+        })(newTr);
+      }
       if (newTr && fg('platform_editor_block_menu_selection_fix')) {
         return setSelectionAfterTransform(newTr, nodePos, targetType);
       }

package/dist/esm/blockMenuPlugin.js

@@ -31,7 +31,7 @@ export var blockMenuPlugin = function blockMenuPlugin(_ref) {
     },
     commands: {
       formatNode: function formatNode(targetType) {
-        return _formatNode(targetType);
+        return _formatNode(api)(targetType);
       }
     },
     getSharedState: function getSharedState(editorState) {

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

@@ -1,9 +1,13 @@
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 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';
+import { isListNodeType } from './transforms/utils';
+
 /**
  * Handles formatting when selection is empty by inserting a new target node
  */
@@ -43,64 +47,140 @@ var formatNodeWhenSelectionEmpty = function formatNodeWhenSelectionEmpty(tr, tar
   return tr;
 };
 
+/**
+ * Handles formatting when an empty list is selected
+ * Converting an empty list to a target node, will remove the list and replace with an empty target node
+ */
+export var formatNodeSelectEmptyList = function formatNodeSelectEmptyList(tr, targetType, listNode, schema) {
+  var nodes = schema.nodes;
+  var headingLevel = 1;
+  var finalTargetType = targetType;
+  if (targetType.startsWith('heading')) {
+    var levelString = targetType.slice(-1);
+    var level = parseInt(levelString, 10);
+    if (!isNaN(level) && level >= 1 && level <= 6) {
+      headingLevel = level;
+      finalTargetType = 'heading';
+    }
+  }
+  var replaceNode = null;
+  if (finalTargetType === 'layoutSection') {
+    var emptyPara = nodes.paragraph.createAndFill();
+    if (emptyPara) {
+      replaceNode = createDefaultLayoutSection(schema, emptyPara);
+    }
+  } else if (finalTargetType === 'heading') {
+    replaceNode = nodes.heading.createAndFill({
+      level: headingLevel
+    });
+  } else {
+    replaceNode = nodes[finalTargetType].createAndFill();
+  }
+  if (replaceNode) {
+    tr.replaceWith(listNode.pos, listNode.pos + listNode.node.nodeSize, replaceNode);
+    tr.setSelection(new TextSelection(tr.doc.resolve(listNode.pos)));
+  }
+  return tr;
+};
+
 /**
  * Formats the current node or selection to the specified target type
+ * @param api - The editor API injection that provides access to analytics and other plugin actions
  * @param targetType - The target node type to convert to
  */
-export var formatNode = function formatNode(targetType) {
-  return function (_ref) {
-    var tr = _ref.tr;
-    var selection = tr.selection;
-    var schema = tr.doc.type.schema;
-    var nodes = schema.nodes;
+export var formatNode = function formatNode(api) {
+  return function (targetType) {
+    return function (_ref) {
+      var tr = _ref.tr;
+      var selection = tr.selection;
+      var schema = tr.doc.type.schema;
+      var nodes = schema.nodes;
 
-    // Find the node to format from the current selection
-    var nodeToFormat;
-    var nodePos = selection.from;
+      // Find the node to format from the current selection
+      var nodeToFormat;
+      var nodePos = selection.from;
 
-    // when selection is empty, we insert a empty target node
-    if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
-      return formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
-    }
+      // when selection is empty, we insert a empty target node
+      if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
+        var listNodes = [];
+        // need to find if there is any list node in the current selection
+        // As when select a empty list, selection is empty, but we want to convert the list instead of inserting a target node
+        // findSelectedNodeOfType does not work when selection is empty, so we use nodesBetween
+        tr.doc.nodesBetween(selection.from, selection.to, function (node, pos) {
+          if (isListNodeType(node.type)) {
+            listNodes.push({
+              node: node,
+              pos: pos
+            });
+          }
+        });
+        //	get the first list node as when click on drag handle if there are list node
+        //  can only select one list at a time, so we just need to find the first one
+        if (listNodes.length > 0 && fg('platform_editor_block_menu_patch_2')) {
+          var firstChild = listNodes[0];
+          return formatNodeSelectEmptyList(tr, targetType, firstChild, schema);
+        } else {
+          return formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema);
+        }
+      }
 
-    // Try to find the current node from selection
-    var selectedNode = findSelectedNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection])(selection);
-    if (selectedNode) {
-      nodeToFormat = selectedNode.node;
-      nodePos = selectedNode.pos;
-    } else {
-      // Try to find parent node (including list parents)
-      var parentNode = findParentNodeOfType([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
-      if (parentNode) {
-        nodeToFormat = parentNode.node;
-        nodePos = parentNode.pos;
-        var paragraphOrHeadingNode = findParentNodeOfType([nodes.paragraph, nodes.heading])(selection);
-        // Special case: if we found a listItem, check if we need the parent list instead
-        if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
-          var listParent = findParentNodeOfType([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
-          if (listParent) {
-            // For list transformations, we want the list parent, not the listItem
-            nodeToFormat = listParent.node;
-            nodePos = listParent.pos;
+      // Try to find the current node from selection
+      var selectedNode = findSelectedNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection])(selection);
+      if (selectedNode) {
+        nodeToFormat = selectedNode.node;
+        nodePos = selectedNode.pos;
+      } else {
+        // Try to find parent node (including list parents)
+        var parentNode = findParentNodeOfType([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
+        if (parentNode) {
+          nodeToFormat = parentNode.node;
+          nodePos = parentNode.pos;
+          var paragraphOrHeadingNode = findParentNodeOfType([nodes.paragraph, nodes.heading])(selection);
+          // Special case: if we found a listItem, check if we need the parent list instead
+          if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
+            var listParent = findParentNodeOfType([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
+            if (listParent) {
+              // For list transformations, we want the list parent, not the listItem
+              nodeToFormat = listParent.node;
+              nodePos = listParent.pos;
+            }
+          } else if (parentNode.node.type !== nodes.blockquote && paragraphOrHeadingNode) {
+            nodeToFormat = paragraphOrHeadingNode.node;
+            nodePos = paragraphOrHeadingNode.pos;
           }
-        } else if (parentNode.node.type !== nodes.blockquote && paragraphOrHeadingNode) {
-          nodeToFormat = paragraphOrHeadingNode.node;
-          nodePos = paragraphOrHeadingNode.pos;
         }
       }
-    }
-    if (!nodeToFormat) {
-      nodeToFormat = selection.$from.node();
-      nodePos = selection.$from.pos;
-    }
-    try {
-      var newTr = transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
-      if (newTr && fg('platform_editor_block_menu_selection_fix')) {
-        return setSelectionAfterTransform(newTr, nodePos, targetType);
+      if (!nodeToFormat) {
+        nodeToFormat = selection.$from.node();
+        nodePos = selection.$from.pos;
       }
-      return newTr;
-    } catch (_unused) {
-      return null;
-    }
+      try {
+        var _nodeToFormat$attrs;
+        var newTr = transformNodeToTargetType(tr, nodeToFormat, nodePos, targetType);
+        var sourceTypeName = nodeToFormat.type.name;
+        if (sourceTypeName === 'heading' && (_nodeToFormat$attrs = nodeToFormat.attrs) !== null && _nodeToFormat$attrs !== void 0 && _nodeToFormat$attrs.level) {
+          sourceTypeName = "heading".concat(nodeToFormat.attrs.level);
+        }
+        if (newTr && sourceTypeName !== targetType) {
+          var _api$analytics;
+          api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
+            action: ACTION.CONVERTED,
+            actionSubject: ACTION_SUBJECT.ELEMENT,
+            eventType: EVENT_TYPE.TRACK,
+            attributes: {
+              from: sourceTypeName,
+              to: targetType,
+              inputMethod: INPUT_METHOD.BLOCK_MENU
+            }
+          })(newTr);
+        }
+        if (newTr && fg('platform_editor_block_menu_selection_fix')) {
+          return setSelectionAfterTransform(newTr, nodePos, targetType);
+        }
+        return newTr;
+      } catch (_unused) {
+        return null;
+      }
+    };
   };
 };

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

@@ -1,7 +1,19 @@
-import type { EditorCommand } from '@atlaskit/editor-common/types';
+import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Schema, type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { BlockMenuPlugin } from '../blockMenuPluginType';
 import type { FormatNodeTargetType } from './transforms/types';
+/**
+ * Handles formatting when an empty list is selected
+ * Converting an empty list to a target node, will remove the list and replace with an empty target node
+ */
+export declare const formatNodeSelectEmptyList: (tr: Transaction, targetType: FormatNodeTargetType, listNode: {
+    node: PMNode;
+    pos: number;
+}, schema: Schema) => Transaction;
 /**
  * Formats the current node or selection to the specified target type
+ * @param api - The editor API injection that provides access to analytics and other plugin actions
  * @param targetType - The target node type to convert to
  */
-export declare const formatNode: (targetType: FormatNodeTargetType) => EditorCommand;
+export declare const formatNode: (api?: ExtractInjectionAPI<BlockMenuPlugin>) => (targetType: FormatNodeTargetType) => EditorCommand;

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

@@ -1,7 +1,19 @@
-import type { EditorCommand } from '@atlaskit/editor-common/types';
+import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Schema, type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { BlockMenuPlugin } from '../blockMenuPluginType';
 import type { FormatNodeTargetType } from './transforms/types';
+/**
+ * Handles formatting when an empty list is selected
+ * Converting an empty list to a target node, will remove the list and replace with an empty target node
+ */
+export declare const formatNodeSelectEmptyList: (tr: Transaction, targetType: FormatNodeTargetType, listNode: {
+    node: PMNode;
+    pos: number;
+}, schema: Schema) => Transaction;
 /**
  * Formats the current node or selection to the specified target type
+ * @param api - The editor API injection that provides access to analytics and other plugin actions
  * @param targetType - The target node type to convert to
  */
-export declare const formatNode: (targetType: FormatNodeTargetType) => EditorCommand;
+export declare const formatNode: (api?: ExtractInjectionAPI<BlockMenuPlugin>) => (targetType: FormatNodeTargetType) => EditorCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "4.0.1",
+	"version": "4.0.3",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,6 +30,7 @@
 	"dependencies": {
 		"@atlaskit/css": "^0.14.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
+		"@atlaskit/editor-plugin-analytics": "^6.1.0",
 		"@atlaskit/editor-plugin-block-controls": "^7.1.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.0.0",
@@ -39,15 +40,15 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.10.0",
 		"@atlaskit/icon": "^28.3.0",
-		"@atlaskit/icon-lab": "^5.7.0",
+		"@atlaskit/icon-lab": "^5.8.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/tmp-editor-statsig": "^12.32.0",
-		"@atlaskit/tokens": "^6.3.0",
+		"@atlaskit/tokens": "^6.4.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.1.0",
+		"@atlaskit/editor-common": "^110.3.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},