@atlaskit/editor-plugin-block-controls 8.0.0 → 8.0.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 8.0.2
+
+### Patch Changes
+
+- [`4bf196f8645a7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4bf196f8645a7) -
+  Editor-4011: Added util function isMultiNodeSelection
+- Updated dependencies
+
+## 8.0.1
+
+### Patch Changes
+
+- [`908cbf07c65ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/908cbf07c65ac) -
+  EDITOR-4055 Fix block menu empty line handle selection
+- Updated dependencies
+
 ## 8.0.0
 
 ### Patch Changes

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleMouseOver = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _selection = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -177,19 +178,9 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
       if (toolbarFlagsEnabled) {
         if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
           var _selectionPreservatio;
-          var selection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
-          var nodeTypes = [];
-          selection === null || selection === void 0 || selection.$from.doc.nodesBetween(selection.from, selection.to, function (node, pos) {
-            if (pos < selection.from) {
-              // ignore parent node
-              return true;
-            }
-            nodeTypes.push(node.type.name);
-
-            // only care about the top level (relatively in the range) nodes
-            return false;
-          });
-          var isMultipleSelected = nodeTypes.length > 1;
+          var preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+          var selection = preservedSelection || view.state.selection;
+          var isMultipleSelected = selection && (0, _selection.isMultiBlockSelection)(selection);
 
           // Only execute when selection is not a multi-selection, block menu is open, and menu is opened via keyboard
           // as when it is a multi-selection, the showDragHandleAt command interfere with selection

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -91,8 +91,8 @@ var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
   if (nodeName === 'paragraph' && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
     return false;
   }
-  var isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
-  var isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.textContent) === '';
+  var isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
+  var isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && (node === null || node === void 0 ? void 0 : node.textContent) === '';
 
   // if block menu and empty line format menu are enabled,
   // we want to set the selection to avoid the selection goes to the top of the document

package/dist/cjs/ui/drag-handle.js

@@ -339,23 +339,6 @@ var getNodeMargins = function getNodeMargins(node) {
   }
   return _consts2.nodeMargins[nodeTypeName] || _consts2.nodeMargins['default'];
 };
-var isMultiNodeRange = function isMultiNodeRange(range) {
-  if (range.endIndex - range.startIndex <= 1) {
-    return false; // At most one child
-  }
-
-  // Count block nodes in the range, return true if more than one
-  var blockCount = 0;
-  for (var i = range.startIndex; i < range.endIndex; i++) {
-    if (range.parent.child(i).isBlock) {
-      blockCount++;
-    }
-    if (blockCount > 1) {
-      return true;
-    }
-  }
-  return false;
-};
 var isPosWithinRange = function isPosWithinRange(pos, range) {
   return range.start <= pos && range.end >= pos + 1;
 };
@@ -397,7 +380,7 @@ var expandAndUpdateSelection = function expandAndUpdateSelection(_ref2) {
   });
 
   // Set selection to expanded selection range if it encompases the clicked drag handle
-  if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiNodeRange(expandedRange.range)) {
+  if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && (0, _selection.isMultiBlockRange)(expandedRange.range)) {
     var collapsed = (0, _getSelection.collapseToSelectionRange)(expandedRange.$from, expandedRange.$to);
 
     // Then create a selection from the start of the first node to the end of the last node

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -1,4 +1,5 @@
 import memoizeOne from 'memoize-one';
+import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -169,19 +170,9 @@ export const handleMouseOver = (view, event, api) => {
       if (toolbarFlagsEnabled) {
         if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
           var _selectionPreservatio;
-          const selection = (_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
-          const nodeTypes = [];
-          selection === null || selection === void 0 ? void 0 : selection.$from.doc.nodesBetween(selection.from, selection.to, (node, pos) => {
-            if (pos < selection.from) {
-              // ignore parent node
-              return true;
-            }
-            nodeTypes.push(node.type.name);
-
-            // only care about the top level (relatively in the range) nodes
-            return false;
-          });
-          const isMultipleSelected = nodeTypes.length > 1;
+          const preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+          const selection = preservedSelection || view.state.selection;
+          const isMultipleSelected = selection && isMultiBlockSelection(selection);
 
           // Only execute when selection is not a multi-selection, block menu is open, and menu is opened via keyboard
           // as when it is a multi-selection, the showDragHandleAt command interfere with selection

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -86,8 +86,8 @@ const newGetSelection = (doc, selectionEmpty, start) => {
   if (nodeName === 'paragraph' && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && !expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
     return false;
   }
-  const isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
-  const isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.textContent) === '';
+  const isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
+  const isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && (node === null || node === void 0 ? void 0 : node.textContent) === '';
 
   // if block menu and empty line format menu are enabled,
   // we want to set the selection to avoid the selection goes to the top of the document

package/dist/es2019/ui/drag-handle.js

@@ -14,7 +14,7 @@ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-commo
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
+import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
 import { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -334,23 +334,6 @@ const getNodeMargins = node => {
   }
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
-const isMultiNodeRange = range => {
-  if (range.endIndex - range.startIndex <= 1) {
-    return false; // At most one child
-  }
-
-  // Count block nodes in the range, return true if more than one
-  let blockCount = 0;
-  for (let i = range.startIndex; i < range.endIndex; i++) {
-    if (range.parent.child(i).isBlock) {
-      blockCount++;
-    }
-    if (blockCount > 1) {
-      return true;
-    }
-  }
-  return false;
-};
 const isPosWithinRange = (pos, range) => {
   return range.start <= pos && range.end >= pos + 1;
 };
@@ -394,7 +377,7 @@ const expandAndUpdateSelection = ({
   });
 
   // Set selection to expanded selection range if it encompases the clicked drag handle
-  if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiNodeRange(expandedRange.range)) {
+  if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiBlockRange(expandedRange.range)) {
     const collapsed = collapseToSelectionRange(expandedRange.$from, expandedRange.$to);
 
     // Then create a selection from the start of the first node to the end of the last node

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -1,5 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import memoizeOne from 'memoize-one';
+import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -170,19 +171,9 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
       if (toolbarFlagsEnabled) {
         if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
           var _selectionPreservatio;
-          var selection = (_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
-          var nodeTypes = [];
-          selection === null || selection === void 0 || selection.$from.doc.nodesBetween(selection.from, selection.to, function (node, pos) {
-            if (pos < selection.from) {
-              // ignore parent node
-              return true;
-            }
-            nodeTypes.push(node.type.name);
-
-            // only care about the top level (relatively in the range) nodes
-            return false;
-          });
-          var isMultipleSelected = nodeTypes.length > 1;
+          var preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+          var selection = preservedSelection || view.state.selection;
+          var isMultipleSelected = selection && isMultiBlockSelection(selection);
 
           // Only execute when selection is not a multi-selection, block menu is open, and menu is opened via keyboard
           // as when it is a multi-selection, the showDragHandleAt command interfere with selection

package/dist/esm/pm-plugins/utils/getSelection.js

@@ -85,8 +85,8 @@ var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
   if (nodeName === 'paragraph' && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && !expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
     return false;
   }
-  var isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
-  var isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.textContent) === '';
+  var isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
+  var isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && (node === null || node === void 0 ? void 0 : node.textContent) === '';
 
   // if block menu and empty line format menu are enabled,
   // we want to set the selection to avoid the selection goes to the top of the document

package/dist/esm/ui/drag-handle.js

@@ -19,7 +19,7 @@ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-commo
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
+import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
 import { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -336,23 +336,6 @@ var getNodeMargins = function getNodeMargins(node) {
   }
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
-var isMultiNodeRange = function isMultiNodeRange(range) {
-  if (range.endIndex - range.startIndex <= 1) {
-    return false; // At most one child
-  }
-
-  // Count block nodes in the range, return true if more than one
-  var blockCount = 0;
-  for (var i = range.startIndex; i < range.endIndex; i++) {
-    if (range.parent.child(i).isBlock) {
-      blockCount++;
-    }
-    if (blockCount > 1) {
-      return true;
-    }
-  }
-  return false;
-};
 var isPosWithinRange = function isPosWithinRange(pos, range) {
   return range.start <= pos && range.end >= pos + 1;
 };
@@ -394,7 +377,7 @@ var expandAndUpdateSelection = function expandAndUpdateSelection(_ref2) {
   });
 
   // Set selection to expanded selection range if it encompases the clicked drag handle
-  if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiNodeRange(expandedRange.range)) {
+  if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiBlockRange(expandedRange.range)) {
     var collapsed = collapseToSelectionRange(expandedRange.$from, expandedRange.$to);
 
     // Then create a selection from the start of the first node to the end of the last node

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "8.0.0",
+	"version": "8.0.2",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",