@atlaskit/editor-plugin-block-menu 3.1.6 → 3.2.1

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

@@ -0,0 +1,31 @@
+import React, { useCallback, createContext, useContext } from 'react';
+const BlockMenuContext = /*#__PURE__*/createContext({
+  onDropdownOpenChanged: () => {}
+});
+export const useBlockMenu = () => {
+  const context = useContext(BlockMenuContext);
+  if (!context) {
+    throw new Error('useBlockMenu must be used within BlockMenuProvider');
+  }
+  return context;
+};
+export const BlockMenuProvider = ({
+  children,
+  api
+}) => {
+  const onDropdownOpenChanged = useCallback(isOpen => {
+    if (!isOpen) {
+      // On Dropdown closed, return focus to editor
+      setTimeout(() => requestAnimationFrame(() => {
+        api === null || api === void 0 ? void 0 : api.core.actions.focus({
+          scrollIntoView: false
+        });
+      }), 1);
+    }
+  }, [api]);
+  return /*#__PURE__*/React.createElement(BlockMenuContext.Provider, {
+    value: {
+      onDropdownOpenChanged
+    }
+  }, children);
+};

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

@@ -11,6 +11,8 @@ import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import { Box } from '@atlaskit/primitives/compiled';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer';
 const styles = {
   base: "_2rko12b0 _bfhk1bhr _16qs1cd0"
@@ -62,15 +64,23 @@ const BlockMenu = ({
       currentUserIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent
     };
   });
+  const {
+    onDropdownOpenChanged
+  } = useBlockMenu();
   const hasFocus = (_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;
   useEffect(() => {
     var _api$userIntent;
-    if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !hasSelection || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+    if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
       return;
     }
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.commands.setCurrentUserIntent('blockMenuOpen'));
-  }, [api, isMenuOpen, menuTriggerBy, isSelectedViaDragHandle, hasFocus, hasSelection, currentUserIntent]);
+  }, [api, isMenuOpen, menuTriggerBy, isSelectedViaDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, currentUserIntent]);
   if (!isMenuOpen) {
     return null;
   }
@@ -84,13 +94,14 @@ const BlockMenu = ({
       })({
         tr
       });
+      onDropdownOpenChanged(false);
       api === null || api === void 0 ? void 0 : (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent(currentUserIntent === 'blockMenuOpen' ? 'default' : currentUserIntent || 'default')({
         tr
       });
       return tr;
     });
   };
-  if (!menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !hasSelection || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+  if (!menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
     closeMenu();
     return null;
   }

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

@@ -75,10 +75,16 @@ const CopyBlockMenuItem = ({
         // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
         // but we want to treat it as a block node when copying, hence setting it to false here
         if (selection.node.type.name === 'codeBlock') {
-          nodeType.inlineContent = false;
+          const codeBlockNodeType = {
+            ...nodeType,
+            inlineContent: false
+          };
+          const domNode = toDOM(selection.node, schema);
+          copyDomNode(domNode, codeBlockNodeType, selection);
+        } else {
+          const domNode = toDOM(selection.node, schema);
+          copyDomNode(domNode, nodeType, selection);
         }
-        const domNode = toDOM(selection.node, schema);
-        copyDomNode(domNode, nodeType, selection);
       }
 
       // close the block menu after copying

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

@@ -1,13 +1,20 @@
 import React, { useCallback } from 'react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export const CopySection = ({
   api,
   children
 }) => {
+  var _api$selection, _api$selection$shared, _api$selection$shared2;
   const isFormatMenuHidden = useCallback(() => {
     return checkIsFormatMenuHidden(api);
   }, [api]);
+  const selection = api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$shared = _api$selection.sharedState) === null || _api$selection$shared === void 0 ? void 0 : (_api$selection$shared2 = _api$selection$shared.currentState()) === null || _api$selection$shared2 === void 0 ? void 0 : _api$selection$shared2.selection;
+  const isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
+  if (isEmptyLineSelected) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
     hasSeparator: !isFormatMenuHidden()
   }, children);

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+export const DeleteSection = ({
+  api,
+  children
+}) => {
+  var _api$selection, _api$selection$shared, _api$selection$shared2;
+  const selection = api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$shared = _api$selection.sharedState) === null || _api$selection$shared === void 0 ? void 0 : (_api$selection$shared2 = _api$selection$shared.currentState()) === null || _api$selection$shared2 === void 0 ? void 0 : _api$selection$shared2.selection;
+  const isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
+  if (isEmptyLineSelected) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    hasSeparator: true
+  }, children);
+};

package/dist/es2019/ui/utils/checkIsFormatMenuHidden.js

@@ -1,5 +1,6 @@
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isNestedNode } from './isNestedNode';
 const getIsFormatMenuHidden = (selection, schema, menuTriggerBy) => {
   const nodes = schema.nodes;
@@ -26,6 +27,39 @@ const getIsFormatMenuHidden = (selection, schema, menuTriggerBy) => {
   const isNested = isNestedNode(selection, menuTriggerBy);
   return !content || isNested;
 };
+const getIsFormatMenuHiddenEmptyLine = (selection, schema, menuTriggerBy) => {
+  const nodes = schema.nodes;
+  if (!nodes) {
+    return false;
+  }
+  const isNested = isNestedNode(selection, menuTriggerBy);
+  if (selection.empty || selection.content().size === 0) {
+    // if empty selection, show format menu
+    return false;
+  } else if (isNested) {
+    // if nested,  always hide format menu
+    return true;
+  } else {
+    let content;
+    const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
+    if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
+      allowedNodes.push(nodes.layoutSection);
+    }
+    if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
+      allowedNodes.push(nodes.expand);
+    }
+    const selectedNode = findSelectedNodeOfType(allowedNodes)(selection);
+    if (selectedNode) {
+      content = selectedNode.node;
+    } else {
+      const listTypeOrBlockQuoteNode = findParentNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.listItem, nodes.taskItem])(selection);
+      if (listTypeOrBlockQuoteNode) {
+        content = listTypeOrBlockQuoteNode.node;
+      }
+    }
+    return !content;
+  }
+};
 export const checkIsFormatMenuHidden = api => {
   var _api$selection, _api$selection$shared, _api$selection$shared2, _api$core$sharedState, _api$blockControls, _api$blockControls$sh;
   const selection = api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$shared = _api$selection.sharedState) === null || _api$selection$shared === void 0 ? void 0 : (_api$selection$shared2 = _api$selection$shared.currentState()) === null || _api$selection$shared2 === void 0 ? void 0 : _api$selection$shared2.selection;
@@ -34,5 +68,5 @@ export const checkIsFormatMenuHidden = api => {
   if (!selection || !schema || !menuTriggerBy) {
     return false;
   }
-  return getIsFormatMenuHidden(selection, schema, menuTriggerBy);
+  return expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true) ? getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) : getIsFormatMenuHidden(selection, schema, menuTriggerBy);
 };

package/dist/esm/blockMenuPlugin.js

@@ -4,6 +4,7 @@ import { formatNode as _formatNode } from './editor-commands/formatNode';
 import { createPlugin } from './pm-plugins/main';
 import BlockMenu from './ui/block-menu';
 import { getBlockMenuComponents } from './ui/block-menu-components';
+import { BlockMenuProvider } from './ui/block-menu-provider';
 export var blockMenuPlugin = function blockMenuPlugin(_ref) {
   var api = _ref.api,
     config = _ref.config;
@@ -33,18 +34,34 @@ export var blockMenuPlugin = function blockMenuPlugin(_ref) {
         return _formatNode(targetType);
       }
     },
+    getSharedState: function getSharedState(editorState) {
+      var _api$blockControls;
+      if (!editorState) {
+        return {
+          currentSelectedNodeName: undefined
+        };
+      }
+
+      // Get the menuTriggerBy from blockControls plugin if available
+      var currentSelectedNodeName = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.menuTriggerBy;
+      return {
+        currentSelectedNodeName: currentSelectedNodeName
+      };
+    },
     contentComponent: function contentComponent(_ref2) {
       var editorView = _ref2.editorView,
         popupsMountPoint = _ref2.popupsMountPoint,
         popupsBoundariesElement = _ref2.popupsBoundariesElement,
         popupsScrollableElement = _ref2.popupsScrollableElement;
-      return /*#__PURE__*/React.createElement(BlockMenu, {
+      return /*#__PURE__*/React.createElement(BlockMenuProvider, {
+        api: api
+      }, /*#__PURE__*/React.createElement(BlockMenu, {
         editorView: editorView,
         api: api,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement
-      });
+      }));
     }
   };
 };

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

@@ -1,5 +1,46 @@
-import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { createDefaultLayoutSection } from './transforms/layout-transforms';
 import { transformNodeToTargetType } from './transforms/transformNodeToTargetType';
+/**
+ * Handles formatting when selection is empty by inserting a new target node
+ */
+var formatNodeWhenSelectionEmpty = function formatNodeWhenSelectionEmpty(tr, targetType, nodePos, schema) {
+  var _pmSafeInsert;
+  var nodes = schema.nodes;
+  var paragraph = nodes.paragraph;
+  // if not using the ' ' here, the safeInsert from editor-common will fail to insert the heading
+  // and the pmSafeInsert introduce an issue that after inserting heading, and click on the handle, selection will go to top of the doc
+  // as an workaround, use the spaceTextNode here
+  var spaceTextNode = schema.text(' ');
+  var targetNode;
+  if (targetType.startsWith('heading')) {
+    var levelString = targetType.slice(-1);
+    var level = parseInt(levelString, 10);
+    if (isNaN(level) || level < 1 || level > 6) {
+      return null;
+    }
+    targetNode = nodes.heading.createAndFill({
+      level: level
+    }, spaceTextNode);
+  } else if (targetType === 'paragraph') {
+    targetNode = nodes.paragraph.createAndFill({}, spaceTextNode);
+  } else if (targetType === 'layoutSection') {
+    var contentAsParagraph = paragraph.createAndFill({}, spaceTextNode);
+    if (contentAsParagraph) {
+      targetNode = createDefaultLayoutSection(schema, contentAsParagraph);
+    }
+  } else {
+    var targetNodeType = nodes[targetType];
+    targetNode = targetNodeType.createAndFill();
+  }
+  if (!targetNode) {
+    return tr;
+  }
+  tr = (_pmSafeInsert = pmSafeInsert(targetNode, nodePos)(tr)) !== null && _pmSafeInsert !== void 0 ? _pmSafeInsert : tr;
+  return tr;
+};
+
 /**
  * Formats the current node or selection to the specified target type
  * @param targetType - The target node type to convert to
@@ -8,12 +49,18 @@ export var formatNode = function formatNode(targetType) {
   return function (_ref) {
     var tr = _ref.tr;
     var selection = tr.selection;
-    var nodes = tr.doc.type.schema.nodes;
+    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;
 
+    // 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);
+    }
+
     // 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) {

package/dist/esm/editor-commands/transforms/layout-transforms.js

@@ -2,26 +2,33 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { DEFAULT_TWO_COLUMN_LAYOUT_COLUMN_WIDTH } from '@atlaskit/editor-common/styles';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { convertUnwrappedLayoutContent, unwrapLayoutNodesToTextNodes } from './layout/utils';
+import { isHeadingOrParagraphNode } from './utils';
+export var createDefaultLayoutSection = function createDefaultLayoutSection(schema, content) {
+  var _schema$nodes = schema.nodes,
+    layoutSection = _schema$nodes.layoutSection,
+    layoutColumn = _schema$nodes.layoutColumn,
+    paragraph = _schema$nodes.paragraph;
+  var layoutContent = Fragment.fromArray([layoutColumn.createChecked({
+    width: DEFAULT_TWO_COLUMN_LAYOUT_COLUMN_WIDTH
+  }, content), layoutColumn.create({
+    width: DEFAULT_TWO_COLUMN_LAYOUT_COLUMN_WIDTH
+  }, paragraph.createAndFill())]);
+  return layoutSection.createChecked(undefined, layoutContent);
+};
 export var convertToLayout = function convertToLayout(context) {
   var tr = context.tr,
     sourceNode = context.sourceNode,
     sourcePos = context.sourcePos;
-  var _ref = tr.doc.type.schema.nodes || {},
-    layoutSection = _ref.layoutSection,
-    layoutColumn = _ref.layoutColumn,
-    paragraph = _ref.paragraph;
   var content = sourceNode.mark(sourceNode.marks.filter(function (mark) {
     return mark.type.name !== 'breakout';
   }));
-  var layoutContent = Fragment.fromArray([layoutColumn.createChecked({
-    width: DEFAULT_TWO_COLUMN_LAYOUT_COLUMN_WIDTH
-  }, content), layoutColumn.create({
-    width: DEFAULT_TWO_COLUMN_LAYOUT_COLUMN_WIDTH
-  }, paragraph.createAndFill())]);
-  var layoutSectionNode = layoutSection.createChecked(undefined, layoutContent);
-
-  // Replace the original node with the new layout node
-  tr.replaceRangeWith(sourcePos, sourcePos + sourceNode.nodeSize, layoutSectionNode);
+  var layoutSectionNode = createDefaultLayoutSection(tr.doc.type.schema, content);
+  if (isHeadingOrParagraphNode(sourceNode)) {
+    // -1 to fix when sourceNode is the last node in the document, unable to convert to layout
+    tr.replaceRangeWith(sourcePos > 0 ? sourcePos - 1 : sourcePos, sourcePos + sourceNode.nodeSize - 1, layoutSectionNode);
+  } else {
+    tr.replaceRangeWith(sourcePos, sourcePos + sourceNode.nodeSize, layoutSectionNode);
+  }
   return tr;
 };
 export var transformLayoutNode = function transformLayoutNode(context) {
@@ -31,11 +38,11 @@ export var transformLayoutNode = function transformLayoutNode(context) {
     sourcePos = context.sourcePos,
     targetAttrs = context.targetAttrs;
   var schema = tr.doc.type.schema || {};
-  var _ref2 = schema.nodes || {},
-    layoutSection = _ref2.layoutSection,
-    layoutColumn = _ref2.layoutColumn,
-    paragraph = _ref2.paragraph,
-    heading = _ref2.heading;
+  var _ref = schema.nodes || {},
+    layoutSection = _ref.layoutSection,
+    layoutColumn = _ref.layoutColumn,
+    paragraph = _ref.paragraph,
+    heading = _ref.heading;
   var layoutColumnNodes = [];
   var targetTextNodeType = targetNodeType === heading ? heading : paragraph;
   sourceNode.children.forEach(function (child) {

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

@@ -8,6 +8,7 @@ import CopyBlockMenuItem from './copy-block';
 import { CopyLinkDropdownItem } from './copy-link';
 import { CopySection } from './copy-section';
 import { DeleteDropdownItem } from './delete-button';
+import { DeleteSection } from './delete-section';
 import { FormatMenuSection } from './format-menu-section';
 import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
@@ -148,8 +149,8 @@ export var getBlockMenuComponents = function getBlockMenuComponents(_ref4) {
     rank: BLOCK_MENU_SECTION_RANK[DELETE_MENU_SECTION.key],
     component: function component(_ref7) {
       var children = _ref7.children;
-      return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        hasSeparator: true
+      return /*#__PURE__*/React.createElement(DeleteSection, {
+        api: api
       }, children);
     }
   }], _toConsumableArray(getMoveUpMoveDownMenuComponents(api)), [{

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

@@ -0,0 +1,32 @@
+import React, { useCallback, createContext, useContext } from 'react';
+var BlockMenuContext = /*#__PURE__*/createContext({
+  onDropdownOpenChanged: function onDropdownOpenChanged() {}
+});
+export var useBlockMenu = function useBlockMenu() {
+  var context = useContext(BlockMenuContext);
+  if (!context) {
+    throw new Error('useBlockMenu must be used within BlockMenuProvider');
+  }
+  return context;
+};
+export var BlockMenuProvider = function BlockMenuProvider(_ref) {
+  var children = _ref.children,
+    api = _ref.api;
+  var onDropdownOpenChanged = useCallback(function (isOpen) {
+    if (!isOpen) {
+      // On Dropdown closed, return focus to editor
+      setTimeout(function () {
+        return requestAnimationFrame(function () {
+          api === null || api === void 0 || api.core.actions.focus({
+            scrollIntoView: false
+          });
+        });
+      }, 1);
+    }
+  }, [api]);
+  return /*#__PURE__*/React.createElement(BlockMenuContext.Provider, {
+    value: {
+      onDropdownOpenChanged: onDropdownOpenChanged
+    }
+  }, children);
+};

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

@@ -11,6 +11,8 @@ import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import { Box } from '@atlaskit/primitives/compiled';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer';
 var styles = {
   base: "_2rko12b0 _bfhk1bhr _16qs1cd0"
@@ -65,15 +67,22 @@ var BlockMenu = function BlockMenu(_ref2) {
     isSelectedViaDragHandle = _useSharedPluginState.isSelectedViaDragHandle,
     isMenuOpen = _useSharedPluginState.isMenuOpen,
     currentUserIntent = _useSharedPluginState.currentUserIntent;
+  var _useBlockMenu = useBlockMenu(),
+    onDropdownOpenChanged = _useBlockMenu.onDropdownOpenChanged;
   var hasFocus = (_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;
   useEffect(function () {
     var _api$userIntent;
-    if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !hasSelection || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+    if (!isMenuOpen || !menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
       return;
     }
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.commands.setCurrentUserIntent('blockMenuOpen'));
-  }, [api, isMenuOpen, menuTriggerBy, isSelectedViaDragHandle, hasFocus, hasSelection, currentUserIntent]);
+  }, [api, isMenuOpen, menuTriggerBy, isSelectedViaDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, currentUserIntent]);
   if (!isMenuOpen) {
     return null;
   }
@@ -86,13 +95,14 @@ var BlockMenu = function BlockMenu(_ref2) {
       })({
         tr: tr
       });
+      onDropdownOpenChanged(false);
       api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent(currentUserIntent === 'blockMenuOpen' ? 'default' : currentUserIntent || 'default')({
         tr: tr
       });
       return tr;
     });
   };
-  if (!menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !hasSelection || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+  if (!menuTriggerBy || !isSelectedViaDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
     closeMenu();
     return null;
   }

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 import React from 'react';
 import { injectIntl, useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/block-menu';
@@ -73,10 +76,15 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
         // When nodeType.inlineContent is true, it will be treated as an inline node in the copyDomNode function,
         // but we want to treat it as a block node when copying, hence setting it to false here
         if (selection.node.type.name === 'codeBlock') {
-          _nodeType.inlineContent = false;
+          var codeBlockNodeType = _objectSpread(_objectSpread({}, _nodeType), {}, {
+            inlineContent: false
+          });
+          var _domNode2 = toDOM(selection.node, schema);
+          copyDomNode(_domNode2, codeBlockNodeType, selection);
+        } else {
+          var _domNode3 = toDOM(selection.node, schema);
+          copyDomNode(_domNode3, _nodeType, selection);
         }
-        var _domNode2 = toDOM(selection.node, schema);
-        copyDomNode(_domNode2, _nodeType, selection);
       }
 
       // close the block menu after copying

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

@@ -1,12 +1,19 @@
 import React, { useCallback } from 'react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export var CopySection = function CopySection(_ref) {
+  var _api$selection;
   var api = _ref.api,
     children = _ref.children;
   var isFormatMenuHidden = useCallback(function () {
     return checkIsFormatMenuHidden(api);
   }, [api]);
+  var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState) === null || _api$selection === void 0 || (_api$selection = _api$selection.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+  var isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
+  if (isEmptyLineSelected) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
     hasSeparator: !isFormatMenuHidden()
   }, children);

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+export var DeleteSection = function DeleteSection(_ref) {
+  var _api$selection;
+  var api = _ref.api,
+    children = _ref.children;
+  var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState) === null || _api$selection === void 0 || (_api$selection = _api$selection.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+  var isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
+  if (isEmptyLineSelected) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    hasSeparator: true
+  }, children);
+};

package/dist/esm/ui/utils/checkIsFormatMenuHidden.js

@@ -1,5 +1,6 @@
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { isNestedNode } from './isNestedNode';
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, menuTriggerBy) {
   var nodes = schema.nodes;
@@ -26,6 +27,39 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
   var isNested = isNestedNode(selection, menuTriggerBy);
   return !content || isNested;
 };
+var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) {
+  var nodes = schema.nodes;
+  if (!nodes) {
+    return false;
+  }
+  var isNested = isNestedNode(selection, menuTriggerBy);
+  if (selection.empty || selection.content().size === 0) {
+    // if empty selection, show format menu
+    return false;
+  } else if (isNested) {
+    // if nested,  always hide format menu
+    return true;
+  } else {
+    var content;
+    var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList];
+    if (expValEquals('platform_editor_block_menu_layout_format', 'isEnabled', true)) {
+      allowedNodes.push(nodes.layoutSection);
+    }
+    if (expValEquals('platform_editor_block_menu_expand_format', 'isEnabled', true)) {
+      allowedNodes.push(nodes.expand);
+    }
+    var selectedNode = findSelectedNodeOfType(allowedNodes)(selection);
+    if (selectedNode) {
+      content = selectedNode.node;
+    } else {
+      var listTypeOrBlockQuoteNode = findParentNodeOfType([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.listItem, nodes.taskItem])(selection);
+      if (listTypeOrBlockQuoteNode) {
+        content = listTypeOrBlockQuoteNode.node;
+      }
+    }
+    return !content;
+  }
+};
 export var checkIsFormatMenuHidden = function checkIsFormatMenuHidden(api) {
   var _api$selection, _api$core$sharedState, _api$blockControls;
   var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState) === null || _api$selection === void 0 || (_api$selection = _api$selection.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
@@ -34,5 +68,5 @@ export var checkIsFormatMenuHidden = function checkIsFormatMenuHidden(api) {
   if (!selection || !schema || !menuTriggerBy) {
     return false;
   }
-  return getIsFormatMenuHidden(selection, schema, menuTriggerBy);
+  return expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true) ? getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) : getIsFormatMenuHidden(selection, schema, menuTriggerBy);
 };

package/dist/types/blockMenuPluginType.d.ts

@@ -19,6 +19,7 @@ export type BlockMenuPlugin = NextEditorPlugin<'blockMenu', {
         OptionalPlugin<DecorationsPlugin>
     ];
     pluginConfiguration?: BlockMenuPluginOptions;
+    sharedState: BlockMenuSharedState;
 }>;
 export type BlockMenuPluginOptions = {
     /**
@@ -31,6 +32,13 @@ export type BlockMenuPluginOptions = {
      */
     getLinkPath?: () => string | null;
 };
+export type BlockMenuSharedState = {
+    /**
+     * The name of the currently selected node type that triggered the block menu
+     * This exposes the menuTriggerBy value from blockControls plugin
+     */
+    currentSelectedNodeName: string | undefined;
+} | undefined;
 type WithRank<T> = T & {
     rank: number;
 };

package/dist/types/editor-commands/transforms/layout-transforms.d.ts

@@ -1,3 +1,6 @@
 import type { TransformContext } from '@atlaskit/editor-common/transforms';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type Schema } from '@atlaskit/editor-prosemirror/model';
+export declare const createDefaultLayoutSection: (schema: Schema, content: PMNode) => PMNode;
 export declare const convertToLayout: (context: TransformContext) => import("prosemirror-state").Transaction;
 export declare const transformLayoutNode: (context: TransformContext) => import("prosemirror-state").Transaction;

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { blockMenuPlugin } from './blockMenuPlugin';
-export type { BlockMenuPlugin, RegisterBlockMenuComponent, Parent, BlockMenuPluginOptions, } from './blockMenuPluginType';
+export type { BlockMenuPlugin, RegisterBlockMenuComponent, Parent, BlockMenuPluginOptions, BlockMenuSharedState, } from './blockMenuPluginType';