@atlaskit/editor-plugin-block-controls 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.1.1
+
+### Patch Changes
+
+- [#117391](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/117391)
+  [`1655b74fcb544`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1655b74fcb544) -
+  Fix drop table on table trigger native dnd
+
 ## 3.1.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/main.js

@@ -13,9 +13,11 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _selection2 = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
+var _editorTables = require("@atlaskit/editor-tables");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _element = require("@atlaskit/pragmatic-drag-and-drop-auto-scroll/element");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
@@ -29,7 +31,7 @@ var _keymap = require("./keymap");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
 var _analytics2 = require("./utils/analytics");
 var _anchorUtils = require("./utils/anchor-utils");
-var _selection2 = require("./utils/selection");
+var _selection3 = require("./utils/selection");
 var _transactions = require("./utils/transactions");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -107,7 +109,7 @@ var destroyFn = function destroyFn(api, editorView) {
           var _api$analytics2;
           var nodeTypes, hasSelectedMultipleNodes;
           if (isMultiSelect && api) {
-            var position = (0, _selection2.getSelectedSlicePosition)(start, tr, api);
+            var position = (0, _selection3.getSelectedSlicePosition)(start, tr, api);
             var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, position.from, position.to);
             nodeTypes = attributes.nodeTypes;
             hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
@@ -535,10 +537,26 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           var domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           var nodeTarget = state.doc.nodeAt(domPos);
           var isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
-          var isInSelection = domPos >= state.selection.$from.pos && domPos < state.selection.$to.pos;
 
-          // Prevent the default drop behavior if the position is within the activeNode or Editor selection
-          if (isSameNode || isInSelection && isMultiSelectEnabled) {
+          // CellSelection doesn't expose true from/to positions, we need to query the ranges
+          var selectionRange = state.selection instanceof _editorTables.CellSelection ? state.selection.ranges.reduce(function (previousValue, currentValue, _currentIndex, _array) {
+            return {
+              $from: currentValue.$from.min(previousValue.$from),
+              $to: currentValue.$to.max(previousValue.$to)
+            };
+          }) : {
+            $from: state.selection.$from,
+            $to: state.selection.$to
+          };
+          var expandedSelection = (0, _selection2.expandSelectionBounds)(selectionRange.$from, selectionRange.$to);
+          var expandedAnchor = expandedSelection.$anchor;
+          var expandedHead = expandedSelection.$head;
+          var expandedSelectionFrom = Math.min(expandedAnchor.pos, expandedHead.pos);
+          var expandedSelectionTo = Math.max(expandedAnchor.pos, expandedHead.pos);
+          var isInExpandedSelection = domPos >= expandedSelectionFrom && domPos < expandedSelectionTo;
+
+          // Prevent the default drop behavior if the position is within the activeNode or within the expanded selection when multiselect is on
+          if (isSameNode || isInExpandedSelection && isMultiSelectEnabled) {
             event.preventDefault();
             return true;
           }

package/dist/es2019/pm-plugins/main.js

@@ -4,9 +4,11 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyDocument, isTextInput } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
@@ -520,10 +522,26 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           const domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           const nodeTarget = state.doc.nodeAt(domPos);
           const isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
-          const isInSelection = domPos >= state.selection.$from.pos && domPos < state.selection.$to.pos;
 
-          // Prevent the default drop behavior if the position is within the activeNode or Editor selection
-          if (isSameNode || isInSelection && isMultiSelectEnabled) {
+          // CellSelection doesn't expose true from/to positions, we need to query the ranges
+          const selectionRange = state.selection instanceof CellSelection ? state.selection.ranges.reduce((previousValue, currentValue, _currentIndex, _array) => {
+            return {
+              $from: currentValue.$from.min(previousValue.$from),
+              $to: currentValue.$to.max(previousValue.$to)
+            };
+          }) : {
+            $from: state.selection.$from,
+            $to: state.selection.$to
+          };
+          const expandedSelection = expandSelectionBounds(selectionRange.$from, selectionRange.$to);
+          const expandedAnchor = expandedSelection.$anchor;
+          const expandedHead = expandedSelection.$head;
+          const expandedSelectionFrom = Math.min(expandedAnchor.pos, expandedHead.pos);
+          const expandedSelectionTo = Math.max(expandedAnchor.pos, expandedHead.pos);
+          const isInExpandedSelection = domPos >= expandedSelectionFrom && domPos < expandedSelectionTo;
+
+          // Prevent the default drop behavior if the position is within the activeNode or within the expanded selection when multiselect is on
+          if (isSameNode || isInExpandedSelection && isMultiSelectEnabled) {
             event.preventDefault();
             return true;
           }

package/dist/esm/pm-plugins/main.js

@@ -8,9 +8,11 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyDocument, isTextInput } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
@@ -528,10 +530,26 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           var domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           var nodeTarget = state.doc.nodeAt(domPos);
           var isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
-          var isInSelection = domPos >= state.selection.$from.pos && domPos < state.selection.$to.pos;
 
-          // Prevent the default drop behavior if the position is within the activeNode or Editor selection
-          if (isSameNode || isInSelection && isMultiSelectEnabled) {
+          // CellSelection doesn't expose true from/to positions, we need to query the ranges
+          var selectionRange = state.selection instanceof CellSelection ? state.selection.ranges.reduce(function (previousValue, currentValue, _currentIndex, _array) {
+            return {
+              $from: currentValue.$from.min(previousValue.$from),
+              $to: currentValue.$to.max(previousValue.$to)
+            };
+          }) : {
+            $from: state.selection.$from,
+            $to: state.selection.$to
+          };
+          var expandedSelection = expandSelectionBounds(selectionRange.$from, selectionRange.$to);
+          var expandedAnchor = expandedSelection.$anchor;
+          var expandedHead = expandedSelection.$head;
+          var expandedSelectionFrom = Math.min(expandedAnchor.pos, expandedHead.pos);
+          var expandedSelectionTo = Math.max(expandedAnchor.pos, expandedHead.pos);
+          var isInExpandedSelection = domPos >= expandedSelectionFrom && domPos < expandedSelectionTo;
+
+          // Prevent the default drop behavior if the position is within the activeNode or within the expanded selection when multiselect is on
+          if (isSameNode || isInExpandedSelection && isMultiSelectEnabled) {
             event.preventDefault();
             return true;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,15 +42,15 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^24.0.0",
+		"@atlaskit/icon": "^24.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^2.0.0",
-		"@atlaskit/primitives": "^14.0.0",
+		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/theme": "^17.0.0",
 		"@atlaskit/tmp-editor-statsig": "^3.2.0",
-		"@atlaskit/tokens": "^4.1.0",
+		"@atlaskit/tokens": "^4.2.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",