@atlaskit/editor-plugin-block-menu 5.1.1 → 5.1.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.1.3
+
+### Patch Changes
+
+- [`8ae5288a74a40`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8ae5288a74a40) -
+  Update traversal logic in selection
+- Updated dependencies
+
+## 5.1.2
+
+### Patch Changes
+
+- [`00c08e3995cb2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/00c08e3995cb2) -
+  Clean up platform_editor_block_menu_empty_line
+- Updated dependencies
+
 ## 5.1.1
 
 ### Patch Changes

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

@@ -8,7 +8,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-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");
@@ -107,7 +106,7 @@ var formatNode = exports.formatNode = function formatNode(api) {
       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)) {
+      if (selection.empty) {
         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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.transformNode = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("./transform-node-utils/transform");
+var _utils = require("./transforms/utils");
 var transformNode = exports.transformNode = function transformNode(api) {
   return (
     // eslint-disable-next-line no-unused-vars
@@ -22,28 +23,19 @@ var transformNode = exports.transformNode = function transformNode(api) {
           $from = preservedSelection.$from;
         var selectedParent = $from.parent;
         var fragment = _model.Fragment.empty;
-        // top level selections can safely be transformed without checking for depth
-        var isWithinSelectedRange = $from.depth === 0;
-        tr.doc.nodesBetween(from, to, function (node) {
-          // need to only transform selected content, for nested selections nodesBetween includes the path to the selected parent
-          if (!isWithinSelectedRange && node.eq(selectedParent)) {
-            isWithinSelectedRange = true;
-            return true;
+        var isList = (0, _utils.isListNode)(selectedParent);
+        var slice = tr.doc.slice(isList ? from - 1 : from, isList ? to + 1 : to);
+        slice.content.forEach(function (node) {
+          var outputNode = (0, _transform.getOutputNodes)({
+            sourceNode: node,
+            targetNodeType: targetType,
+            schema: tr.doc.type.schema
+          });
+          if (outputNode) {
+            fragment = fragment.append(_model.Fragment.fromArray(outputNode));
           }
-          if (isWithinSelectedRange) {
-            var outputNode = (0, _transform.getOutputNodes)({
-              sourceNode: node,
-              targetNodeType: targetType,
-              schema: tr.doc.type.schema
-            });
-            if (outputNode) {
-              fragment = fragment.append(_model.Fragment.fromArray(outputNode));
-            }
-            return false;
-          }
-          return true;
         });
-        tr.replaceWith(preservedSelection.from, preservedSelection.to, fragment);
+        tr.replaceWith(isList ? preservedSelection.from - 1 : preservedSelection.from, preservedSelection.to, fragment);
         return tr;
       };
     }

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

@@ -23,7 +23,6 @@ var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _compiled = require("@atlaskit/primitives/compiled");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockMenuProvider = require("./block-menu-provider");
 var _blockMenuRenderer = require("./block-menu-renderer");
@@ -43,7 +42,6 @@ var useConditionalBlockMenuEffect = (0, _platformFeatureFlagsReact.conditionalHo
     menuTriggerBy = _ref.menuTriggerBy,
     selectedByShortcutOrDragHandle = _ref.selectedByShortcutOrDragHandle,
     hasFocus = _ref.hasFocus,
-    shouldShowBlockMenuForEmptyLine = _ref.shouldShowBlockMenuForEmptyLine,
     openedViaKeyboard = _ref.openedViaKeyboard,
     prevIsMenuOpenRef = _ref.prevIsMenuOpenRef;
   /**
@@ -51,7 +49,7 @@ var useConditionalBlockMenuEffect = (0, _platformFeatureFlagsReact.conditionalHo
    */
   (0, _react.useEffect)(function () {
     var _api$userIntent;
-    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine) {
+    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus) {
       return;
     }
 
@@ -71,20 +69,19 @@ var useConditionalBlockMenuEffect = (0, _platformFeatureFlagsReact.conditionalHo
     // Update the previous state
     prevIsMenuOpenRef.current = isMenuOpen;
     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, selectedByShortcutOrDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, openedViaKeyboard, prevIsMenuOpenRef]);
+  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, openedViaKeyboard, prevIsMenuOpenRef]);
 }, function (_ref2) {
   var api = _ref2.api,
     isMenuOpen = _ref2.isMenuOpen,
     menuTriggerBy = _ref2.menuTriggerBy,
     selectedByShortcutOrDragHandle = _ref2.selectedByShortcutOrDragHandle,
     hasFocus = _ref2.hasFocus,
-    shouldShowBlockMenuForEmptyLine = _ref2.shouldShowBlockMenuForEmptyLine,
     currentUserIntent = _ref2.currentUserIntent,
     openedViaKeyboard = _ref2.openedViaKeyboard,
     prevIsMenuOpenRef = _ref2.prevIsMenuOpenRef;
   (0, _react.useEffect)(function () {
     var _api$userIntent2;
-    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
       return;
     }
 
@@ -104,7 +101,7 @@ var useConditionalBlockMenuEffect = (0, _platformFeatureFlagsReact.conditionalHo
     // Update the previous state
     prevIsMenuOpenRef.current = isMenuOpen;
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent('blockMenuOpen'));
-  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
+  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
 });
 var BlockMenuContent = function BlockMenuContent(_ref3) {
   var _api$blockMenu;
@@ -167,10 +164,6 @@ var BlockMenu = function BlockMenu(_ref4) {
   var prevIsMenuOpenRef = (0, _react.useRef)(false);
   var popupRef = (0, _react.useRef)(undefined);
   var hasFocus = (_ref5 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref5 !== void 0 ? _ref5 : false;
-  var hasSelection = !!editorView && !editorView.state.selection.empty;
-  // hasSelection true, always show block menu
-  // hasSelection false, only show block menu when empty line experiment is enabled
-  var shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true);
   var selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard;
 
   // Use conditional hook based on feature flag
@@ -180,7 +173,6 @@ var BlockMenu = function BlockMenu(_ref4) {
     menuTriggerBy: menuTriggerBy,
     selectedByShortcutOrDragHandle: selectedByShortcutOrDragHandle,
     hasFocus: hasFocus,
-    shouldShowBlockMenuForEmptyLine: shouldShowBlockMenuForEmptyLine,
     currentUserIntent: (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_user_intent_fix') ? undefined : currentUserIntent,
     openedViaKeyboard: openedViaKeyboard,
     prevIsMenuOpenRef: prevIsMenuOpenRef
@@ -217,7 +209,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       return tr;
     });
   };
-  if (!menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+  if (!menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
     closeMenu();
     return null;
   }

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

@@ -7,13 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.DeleteSection = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var DeleteSection = exports.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) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true);
+  var isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty);
   if (isEmptyLineSelected) {
     return null;
   }

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

@@ -5,32 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkIsFormatMenuHidden = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES = true;
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema) {
-  var nodes = schema.nodes;
-  if (!nodes) {
-    return false;
-  }
-  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
-    var disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
-    var disabledNode = (0, _utils.findSelectedNodeOfType)(disabledOnNodes)(selection);
-    return !!disabledNode;
-  }
-  var content;
-  var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection, nodes.expand];
-  var selectedNode = (0, _utils.findSelectedNodeOfType)(allowedNodes)(selection);
-  if (selectedNode) {
-    content = selectedNode.node;
-  } else {
-    var listTypeOrBlockQuoteNode = (0, _utils.findParentNodeOfType)([nodes.paragraph, nodes.heading, nodes.blockquote, nodes.listItem, nodes.taskItem])(selection);
-    if (listTypeOrBlockQuoteNode) {
-      content = listTypeOrBlockQuoteNode.node;
-    }
-  }
-  return !content;
-};
-var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema) {
   var nodes = schema.nodes;
   if (!nodes) {
     return false;
@@ -66,5 +42,5 @@ var checkIsFormatMenuHidden = exports.checkIsFormatMenuHidden = function checkIs
   if (!selection || !schema || !menuTriggerBy) {
     return false;
   }
-  return (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true) ? getIsFormatMenuHiddenEmptyLine(selection, schema) : getIsFormatMenuHidden(selection, schema);
+  return getIsFormatMenuHidden(selection, schema);
 };

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

@@ -2,7 +2,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
-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';
@@ -112,7 +111,7 @@ export const formatNode = api => (targetType, analyticsAttrs) => {
     let 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)) {
+    if (selection.empty) {
       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

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

@@ -1,5 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getOutputNodes } from './transform-node-utils/transform';
+import { isListNode } from './transforms/utils';
 export const transformNode = api =>
 // eslint-disable-next-line no-unused-vars
 (targetType, analyticsAttrs) => {
@@ -18,28 +19,19 @@ export const transformNode = api =>
     } = preservedSelection;
     const selectedParent = $from.parent;
     let fragment = Fragment.empty;
-    // top level selections can safely be transformed without checking for depth
-    let isWithinSelectedRange = $from.depth === 0;
-    tr.doc.nodesBetween(from, to, node => {
-      // need to only transform selected content, for nested selections nodesBetween includes the path to the selected parent
-      if (!isWithinSelectedRange && node.eq(selectedParent)) {
-        isWithinSelectedRange = true;
-        return true;
+    const isList = isListNode(selectedParent);
+    const slice = tr.doc.slice(isList ? from - 1 : from, isList ? to + 1 : to);
+    slice.content.forEach(node => {
+      const outputNode = getOutputNodes({
+        sourceNode: node,
+        targetNodeType: targetType,
+        schema: tr.doc.type.schema
+      });
+      if (outputNode) {
+        fragment = fragment.append(Fragment.fromArray(outputNode));
       }
-      if (isWithinSelectedRange) {
-        const outputNode = getOutputNodes({
-          sourceNode: node,
-          targetNodeType: targetType,
-          schema: tr.doc.type.schema
-        });
-        if (outputNode) {
-          fragment = fragment.append(Fragment.fromArray(outputNode));
-        }
-        return false;
-      }
-      return true;
     });
-    tr.replaceWith(preservedSelection.from, preservedSelection.to, fragment);
+    tr.replaceWith(isList ? preservedSelection.from - 1 : preservedSelection.from, preservedSelection.to, fragment);
     return tr;
   };
 };

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

@@ -16,7 +16,6 @@ import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownM
 import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { Box } from '@atlaskit/primitives/compiled';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer';
@@ -33,7 +32,6 @@ const useConditionalBlockMenuEffect = conditionalHooksFactory(() => fg('platform
   menuTriggerBy,
   selectedByShortcutOrDragHandle,
   hasFocus,
-  shouldShowBlockMenuForEmptyLine,
   openedViaKeyboard,
   prevIsMenuOpenRef
 }) => {
@@ -42,7 +40,7 @@ const useConditionalBlockMenuEffect = conditionalHooksFactory(() => fg('platform
    */
   useEffect(() => {
     var _api$userIntent;
-    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine) {
+    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus) {
       return;
     }
 
@@ -62,21 +60,20 @@ const useConditionalBlockMenuEffect = conditionalHooksFactory(() => fg('platform
     // Update the previous state
     prevIsMenuOpenRef.current = isMenuOpen;
     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, selectedByShortcutOrDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, openedViaKeyboard, prevIsMenuOpenRef]);
+  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, openedViaKeyboard, prevIsMenuOpenRef]);
 }, ({
   api,
   isMenuOpen,
   menuTriggerBy,
   selectedByShortcutOrDragHandle,
   hasFocus,
-  shouldShowBlockMenuForEmptyLine,
   currentUserIntent,
   openedViaKeyboard,
   prevIsMenuOpenRef
 }) => {
   useEffect(() => {
     var _api$userIntent2;
-    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
       return;
     }
 
@@ -96,7 +93,7 @@ const useConditionalBlockMenuEffect = conditionalHooksFactory(() => fg('platform
     // Update the previous state
     prevIsMenuOpenRef.current = isMenuOpen;
     api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent('blockMenuOpen'));
-  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
+  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
 });
 const BlockMenuContent = ({
   api,
@@ -157,10 +154,6 @@ const BlockMenu = ({
   const prevIsMenuOpenRef = useRef(false);
   const popupRef = useRef(undefined);
   const hasFocus = (_ref = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref !== void 0 ? _ref : false;
-  const hasSelection = !!editorView && !editorView.state.selection.empty;
-  // hasSelection true, always show block menu
-  // hasSelection false, only show block menu when empty line experiment is enabled
-  const shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
   const selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard;
 
   // Use conditional hook based on feature flag
@@ -170,7 +163,6 @@ const BlockMenu = ({
     menuTriggerBy,
     selectedByShortcutOrDragHandle,
     hasFocus,
-    shouldShowBlockMenuForEmptyLine,
     currentUserIntent: fg('platform_editor_toolbar_aifc_user_intent_fix') ? undefined : currentUserIntent,
     openedViaKeyboard,
     prevIsMenuOpenRef
@@ -209,7 +201,7 @@ const BlockMenu = ({
       return tr;
     });
   };
-  if (!menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+  if (!menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
     closeMenu();
     return null;
   }

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

@@ -1,13 +1,12 @@
 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);
+  const isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty);
   if (isEmptyLineSelected) {
     return null;
   }

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

@@ -1,30 +1,6 @@
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 const TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES = true;
 const getIsFormatMenuHidden = (selection, schema) => {
-  const nodes = schema.nodes;
-  if (!nodes) {
-    return false;
-  }
-  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
-    const disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
-    const disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
-    return !!disabledNode;
-  }
-  let content;
-  const allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection, 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;
-};
-const getIsFormatMenuHiddenEmptyLine = (selection, schema) => {
   const nodes = schema.nodes;
   if (!nodes) {
     return false;
@@ -60,5 +36,5 @@ export const checkIsFormatMenuHidden = api => {
   if (!selection || !schema || !menuTriggerBy) {
     return false;
   }
-  return expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true) ? getIsFormatMenuHiddenEmptyLine(selection, schema) : getIsFormatMenuHidden(selection, schema);
+  return getIsFormatMenuHidden(selection, schema);
 };

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

@@ -2,7 +2,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType, safeInsert as pmSafeInsert } from '@atlaskit/editor-prosemirror/utils';
-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';
@@ -102,7 +101,7 @@ export var formatNode = function formatNode(api) {
       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)) {
+      if (selection.empty) {
         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

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

@@ -1,5 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getOutputNodes } from './transform-node-utils/transform';
+import { isListNode } from './transforms/utils';
 export var transformNode = function transformNode(api) {
   return (
     // eslint-disable-next-line no-unused-vars
@@ -16,28 +17,19 @@ export var transformNode = function transformNode(api) {
           $from = preservedSelection.$from;
         var selectedParent = $from.parent;
         var fragment = Fragment.empty;
-        // top level selections can safely be transformed without checking for depth
-        var isWithinSelectedRange = $from.depth === 0;
-        tr.doc.nodesBetween(from, to, function (node) {
-          // need to only transform selected content, for nested selections nodesBetween includes the path to the selected parent
-          if (!isWithinSelectedRange && node.eq(selectedParent)) {
-            isWithinSelectedRange = true;
-            return true;
+        var isList = isListNode(selectedParent);
+        var slice = tr.doc.slice(isList ? from - 1 : from, isList ? to + 1 : to);
+        slice.content.forEach(function (node) {
+          var outputNode = getOutputNodes({
+            sourceNode: node,
+            targetNodeType: targetType,
+            schema: tr.doc.type.schema
+          });
+          if (outputNode) {
+            fragment = fragment.append(Fragment.fromArray(outputNode));
           }
-          if (isWithinSelectedRange) {
-            var outputNode = getOutputNodes({
-              sourceNode: node,
-              targetNodeType: targetType,
-              schema: tr.doc.type.schema
-            });
-            if (outputNode) {
-              fragment = fragment.append(Fragment.fromArray(outputNode));
-            }
-            return false;
-          }
-          return true;
         });
-        tr.replaceWith(preservedSelection.from, preservedSelection.to, fragment);
+        tr.replaceWith(isList ? preservedSelection.from - 1 : preservedSelection.from, preservedSelection.to, fragment);
         return tr;
       };
     }

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

@@ -16,7 +16,6 @@ import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownM
 import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { Box } from '@atlaskit/primitives/compiled';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer';
@@ -35,7 +34,6 @@ var useConditionalBlockMenuEffect = conditionalHooksFactory(function () {
     menuTriggerBy = _ref.menuTriggerBy,
     selectedByShortcutOrDragHandle = _ref.selectedByShortcutOrDragHandle,
     hasFocus = _ref.hasFocus,
-    shouldShowBlockMenuForEmptyLine = _ref.shouldShowBlockMenuForEmptyLine,
     openedViaKeyboard = _ref.openedViaKeyboard,
     prevIsMenuOpenRef = _ref.prevIsMenuOpenRef;
   /**
@@ -43,7 +41,7 @@ var useConditionalBlockMenuEffect = conditionalHooksFactory(function () {
    */
   useEffect(function () {
     var _api$userIntent;
-    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine) {
+    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus) {
       return;
     }
 
@@ -63,20 +61,19 @@ var useConditionalBlockMenuEffect = conditionalHooksFactory(function () {
     // Update the previous state
     prevIsMenuOpenRef.current = isMenuOpen;
     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, selectedByShortcutOrDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, openedViaKeyboard, prevIsMenuOpenRef]);
+  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, openedViaKeyboard, prevIsMenuOpenRef]);
 }, function (_ref2) {
   var api = _ref2.api,
     isMenuOpen = _ref2.isMenuOpen,
     menuTriggerBy = _ref2.menuTriggerBy,
     selectedByShortcutOrDragHandle = _ref2.selectedByShortcutOrDragHandle,
     hasFocus = _ref2.hasFocus,
-    shouldShowBlockMenuForEmptyLine = _ref2.shouldShowBlockMenuForEmptyLine,
     currentUserIntent = _ref2.currentUserIntent,
     openedViaKeyboard = _ref2.openedViaKeyboard,
     prevIsMenuOpenRef = _ref2.prevIsMenuOpenRef;
   useEffect(function () {
     var _api$userIntent2;
-    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+    if (!isMenuOpen || !menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
       return;
     }
 
@@ -96,7 +93,7 @@ var useConditionalBlockMenuEffect = conditionalHooksFactory(function () {
     // Update the previous state
     prevIsMenuOpenRef.current = isMenuOpen;
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.commands.setCurrentUserIntent('blockMenuOpen'));
-  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, shouldShowBlockMenuForEmptyLine, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
+  }, [api, isMenuOpen, menuTriggerBy, selectedByShortcutOrDragHandle, hasFocus, currentUserIntent, openedViaKeyboard, prevIsMenuOpenRef]);
 });
 var BlockMenuContent = function BlockMenuContent(_ref3) {
   var _api$blockMenu;
@@ -159,10 +156,6 @@ var BlockMenu = function BlockMenu(_ref4) {
   var prevIsMenuOpenRef = useRef(false);
   var popupRef = useRef(undefined);
   var hasFocus = (_ref5 = (editorView === null || editorView === void 0 ? void 0 : editorView.hasFocus()) || document.activeElement === targetHandleRef || popupRef.current && (popupRef.current.contains(document.activeElement) || popupRef.current === document.activeElement)) !== null && _ref5 !== void 0 ? _ref5 : false;
-  var hasSelection = !!editorView && !editorView.state.selection.empty;
-  // hasSelection true, always show block menu
-  // hasSelection false, only show block menu when empty line experiment is enabled
-  var shouldShowBlockMenuForEmptyLine = hasSelection || !hasSelection && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true);
   var selectedByShortcutOrDragHandle = !!isSelectedViaDragHandle || !!openedViaKeyboard;
 
   // Use conditional hook based on feature flag
@@ -172,7 +165,6 @@ var BlockMenu = function BlockMenu(_ref4) {
     menuTriggerBy: menuTriggerBy,
     selectedByShortcutOrDragHandle: selectedByShortcutOrDragHandle,
     hasFocus: hasFocus,
-    shouldShowBlockMenuForEmptyLine: shouldShowBlockMenuForEmptyLine,
     currentUserIntent: fg('platform_editor_toolbar_aifc_user_intent_fix') ? undefined : currentUserIntent,
     openedViaKeyboard: openedViaKeyboard,
     prevIsMenuOpenRef: prevIsMenuOpenRef
@@ -209,7 +201,7 @@ var BlockMenu = function BlockMenu(_ref4) {
       return tr;
     });
   };
-  if (!menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || !shouldShowBlockMenuForEmptyLine || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
+  if (!menuTriggerBy || !selectedByShortcutOrDragHandle || !hasFocus || ['resizing', 'dragging'].includes(currentUserIntent || '')) {
     closeMenu();
     return null;
   }

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

@@ -1,12 +1,11 @@
 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);
+  var isEmptyLineSelected = !!(selection !== null && selection !== void 0 && selection.empty);
   if (isEmptyLineSelected) {
     return null;
   }

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

@@ -1,30 +1,6 @@
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 var TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES = true;
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema) {
-  var nodes = schema.nodes;
-  if (!nodes) {
-    return false;
-  }
-  if (TRANSFORM_MENU_ENABLED_FOR_ALL_TOP_LEVEL_NODES) {
-    var disabledOnNodes = [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
-    var disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
-    return !!disabledNode;
-  }
-  var content;
-  var allowedNodes = [nodes.paragraph, nodes.heading, nodes.blockquote, nodes.panel, nodes.codeBlock, nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.layoutSection, 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;
-};
-var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema) {
   var nodes = schema.nodes;
   if (!nodes) {
     return false;
@@ -60,5 +36,5 @@ export var checkIsFormatMenuHidden = function checkIsFormatMenuHidden(api) {
   if (!selection || !schema || !menuTriggerBy) {
     return false;
   }
-  return expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true) ? getIsFormatMenuHiddenEmptyLine(selection, schema) : getIsFormatMenuHidden(selection, schema);
+  return getIsFormatMenuHidden(selection, schema);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.1.1",
+	"version": "5.1.3",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,12 +44,12 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.3.0",
+		"@atlaskit/tmp-editor-statsig": "^14.4.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.36.0",
+		"@atlaskit/editor-common": "^110.37.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},