@atlaskit/editor-plugin-block-controls 2.19.1 → 2.19.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.19.2
+
+### Patch Changes
+
+- [#102237](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102237)
+  [`ff4d14b55fec9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ff4d14b55fec9) -
+  [ED-26244] clean up platform_editor_element_drag_and_drop_ed_24885
+
 ## 2.19.1
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.blockControlsPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _moveNode = require("./editor-commands/move-node");
 var _moveToLayout = require("./editor-commands/move-to-layout");
 var _main = require("./pm-plugins/main");
-var _getSelection = require("./pm-plugins/utils/getSelection");
 var _dragHandleMenu = require("./ui/drag-handle-menu");
 var _globalStyles = require("./ui/global-styles");
 var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPlugin(_ref) {
@@ -53,9 +51,6 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           if (pos === undefined) {
             return tr;
           }
-          if (!(0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
-            tr = (0, _getSelection.selectNode)(tr, pos, nodeType);
-          }
           tr.setMeta(_main.key, {
             isDragging: true,
             activeNode: {

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

@@ -73,7 +73,7 @@ var selectedStyles = (0, _react2.css)({
   color: "var(--ds-icon-selected, #0C66E4)"
 });
 var DragHandle = exports.DragHandle = function DragHandle(_ref) {
-  var _api$core2, _api$analytics2, _api$core4, _api$core6;
+  var _api$core2, _api$analytics2, _api$core4;
   var view = _ref.view,
     api = _ref.api,
     formatMessage = _ref.formatMessage,
@@ -146,7 +146,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
   // but ensures the preview is generated correctly.
   var handleMouseDown = (0, _react.useCallback)(function () {
-    var _api$core3;
     if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
       // prevent native drag and drop.
       if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
@@ -157,39 +156,16 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         return undefined;
       }
     }
-    if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
-      return undefined;
-    }
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
-      var tr = _ref3.tr;
-      var startPos = getPos();
-      if (startPos === undefined) {
-        return tr;
-      }
-      var node = tr.doc.nodeAt(startPos);
-      if (!node) {
-        return tr;
-      }
-      var selection;
-      if (isLayoutColumn && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
-        selection = new _state.NodeSelection(tr.doc.resolve(startPos));
-      } else {
-        var $startPos = tr.doc.resolve(startPos + node.nodeSize);
-        selection = new _state.TextSelection($startPos);
-      }
-      tr.setSelection(selection);
-      return tr;
-    });
-  }, [api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, getPos, isLayoutColumn]);
+  }, [isLayoutColumn]);
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
       // allow user to use spacebar to select the node
 
       if (!e.repeat && e.key === ' ') {
-        var _api$core5;
+        var _api$core3;
         var startPos = getPos();
-        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref4) {
-          var tr = _ref4.tr;
+        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
+          var tr = _ref3.tr;
           if (startPos === undefined) {
             return tr;
           }
@@ -213,7 +189,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         view.focus();
       }
     }
-  }, [getPos, api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions, view]);
+  }, [getPos, api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, view]);
   (0, _react.useEffect)(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -227,11 +203,11 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           start: start
         };
       },
-      onGenerateDragPreview: function onGenerateDragPreview(_ref5) {
-        var nativeSetDragImage = _ref5.nativeSetDragImage;
+      onGenerateDragPreview: function onGenerateDragPreview(_ref4) {
+        var nativeSetDragImage = _ref4.nativeSetDragImage;
         (0, _setCustomNativeDragPreview.setCustomNativeDragPreview)({
-          render: function render(_ref6) {
-            var container = _ref6.container;
+          render: function render(_ref5) {
+            var container = _ref5.container;
             var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -242,13 +218,13 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         });
       },
       onDragStart: function onDragStart() {
-        var _api$core7;
+        var _api$core5;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref7) {
+        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref6) {
           var _api$blockControls, _api$analytics3;
-          var tr = _ref7.tr;
+          var tr = _ref6.tr;
           api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });

package/dist/es2019/blockControlsPlugin.js

@@ -1,9 +1,7 @@
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
 import { createPlugin, key } from './pm-plugins/main';
-import { selectNode } from './pm-plugins/utils/getSelection';
 import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
 export const blockControlsPlugin = ({
@@ -44,9 +42,6 @@ export const blockControlsPlugin = ({
       if (pos === undefined) {
         return tr;
       }
-      if (!fg('platform_editor_element_drag_and_drop_ed_24885')) {
-        tr = selectNode(tr, pos, nodeType);
-      }
       tr.setMeta(key, {
         isDragging: true,
         activeNode: {

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

@@ -10,7 +10,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { useSharedPluginState } 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 { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -71,7 +71,7 @@ export const DragHandle = ({
   handleOptions,
   isTopLevelNode = true
 }) => {
-  var _api$core2, _api$analytics2, _api$core4, _api$core6;
+  var _api$core2, _api$analytics2, _api$core4;
   const start = getPos();
   const buttonRef = useRef(null);
   const [blockCardWidth, setBlockCardWidth] = useState(768);
@@ -129,7 +129,6 @@ export const DragHandle = ({
   // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
   // but ensures the preview is generated correctly.
   const handleMouseDown = useCallback(() => {
-    var _api$core3;
     if (editorExperiment('advanced_layouts', true)) {
       // prevent native drag and drop.
       if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
@@ -140,39 +139,15 @@ export const DragHandle = ({
         return undefined;
       }
     }
-    if (fg('platform_editor_element_drag_and_drop_ed_24885')) {
-      return undefined;
-    }
-    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
-      tr
-    }) => {
-      const startPos = getPos();
-      if (startPos === undefined) {
-        return tr;
-      }
-      const node = tr.doc.nodeAt(startPos);
-      if (!node) {
-        return tr;
-      }
-      let selection;
-      if (isLayoutColumn && editorExperiment('advanced_layouts', true)) {
-        selection = new NodeSelection(tr.doc.resolve(startPos));
-      } else {
-        const $startPos = tr.doc.resolve(startPos + node.nodeSize);
-        selection = new TextSelection($startPos);
-      }
-      tr.setSelection(selection);
-      return tr;
-    });
-  }, [api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, getPos, isLayoutColumn]);
+  }, [isLayoutColumn]);
   const handleKeyDown = useCallback(e => {
     if (fg('platform_editor_element_drag_and_drop_ed_23873')) {
       // allow user to use spacebar to select the node
 
       if (!e.repeat && e.key === ' ') {
-        var _api$core5;
+        var _api$core3;
         const startPos = getPos();
-        api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
+        api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
           tr
         }) => {
           if (startPos === undefined) {
@@ -196,7 +171,7 @@ export const DragHandle = ({
         view.focus();
       }
     }
-  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions, view]);
+  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, view]);
   useEffect(() => {
     const element = buttonRef.current;
     if (!element) {
@@ -225,11 +200,11 @@ export const DragHandle = ({
         });
       },
       onDragStart() {
-        var _api$core7;
+        var _api$core5;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 ? void 0 : (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions.execute(({
+        api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
           tr
         }) => {
           var _api$blockControls, _api$analytics3;

package/dist/esm/blockControlsPlugin.js

@@ -1,9 +1,7 @@
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
 import { createPlugin, key } from './pm-plugins/main';
-import { selectNode } from './pm-plugins/utils/getSelection';
 import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
 export var blockControlsPlugin = function blockControlsPlugin(_ref) {
@@ -46,9 +44,6 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           if (pos === undefined) {
             return tr;
           }
-          if (!fg('platform_editor_element_drag_and_drop_ed_24885')) {
-            tr = selectNode(tr, pos, nodeType);
-          }
           tr.setMeta(key, {
             isDragging: true,
             activeNode: {

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

@@ -12,7 +12,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { useSharedPluginState } 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 { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -64,7 +64,7 @@ var selectedStyles = css({
   color: "var(--ds-icon-selected, #0C66E4)"
 });
 export var DragHandle = function DragHandle(_ref) {
-  var _api$core2, _api$analytics2, _api$core4, _api$core6;
+  var _api$core2, _api$analytics2, _api$core4;
   var view = _ref.view,
     api = _ref.api,
     formatMessage = _ref.formatMessage,
@@ -137,7 +137,6 @@ export var DragHandle = function DragHandle(_ref) {
   // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
   // but ensures the preview is generated correctly.
   var handleMouseDown = useCallback(function () {
-    var _api$core3;
     if (editorExperiment('advanced_layouts', true)) {
       // prevent native drag and drop.
       if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
@@ -148,39 +147,16 @@ export var DragHandle = function DragHandle(_ref) {
         return undefined;
       }
     }
-    if (fg('platform_editor_element_drag_and_drop_ed_24885')) {
-      return undefined;
-    }
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
-      var tr = _ref3.tr;
-      var startPos = getPos();
-      if (startPos === undefined) {
-        return tr;
-      }
-      var node = tr.doc.nodeAt(startPos);
-      if (!node) {
-        return tr;
-      }
-      var selection;
-      if (isLayoutColumn && editorExperiment('advanced_layouts', true)) {
-        selection = new NodeSelection(tr.doc.resolve(startPos));
-      } else {
-        var $startPos = tr.doc.resolve(startPos + node.nodeSize);
-        selection = new TextSelection($startPos);
-      }
-      tr.setSelection(selection);
-      return tr;
-    });
-  }, [api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, getPos, isLayoutColumn]);
+  }, [isLayoutColumn]);
   var handleKeyDown = useCallback(function (e) {
     if (fg('platform_editor_element_drag_and_drop_ed_23873')) {
       // allow user to use spacebar to select the node
 
       if (!e.repeat && e.key === ' ') {
-        var _api$core5;
+        var _api$core3;
         var startPos = getPos();
-        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref4) {
-          var tr = _ref4.tr;
+        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
+          var tr = _ref3.tr;
           if (startPos === undefined) {
             return tr;
           }
@@ -204,7 +180,7 @@ export var DragHandle = function DragHandle(_ref) {
         view.focus();
       }
     }
-  }, [getPos, api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions, view]);
+  }, [getPos, api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, view]);
   useEffect(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -218,11 +194,11 @@ export var DragHandle = function DragHandle(_ref) {
           start: start
         };
       },
-      onGenerateDragPreview: function onGenerateDragPreview(_ref5) {
-        var nativeSetDragImage = _ref5.nativeSetDragImage;
+      onGenerateDragPreview: function onGenerateDragPreview(_ref4) {
+        var nativeSetDragImage = _ref4.nativeSetDragImage;
         setCustomNativeDragPreview({
-          render: function render(_ref6) {
-            var container = _ref6.container;
+          render: function render(_ref5) {
+            var container = _ref5.container;
             var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -233,13 +209,13 @@ export var DragHandle = function DragHandle(_ref) {
         });
       },
       onDragStart: function onDragStart() {
-        var _api$core7;
+        var _api$core5;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref7) {
+        api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref6) {
           var _api$blockControls, _api$analytics3;
-          var tr = _ref7.tr;
+          var tr = _ref6.tr;
           api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.19.1",
+	"version": "2.19.2",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -118,9 +118,6 @@
 		"platform_editor_element_drag_and_drop_debug": {
 			"type": "boolean"
 		},
-		"platform_editor_element_drag_and_drop_ed_24885": {
-			"type": "boolean"
-		},
 		"platform_editor_element_dnd_nested_fix_patch_6": {
 			"type": "boolean"
 		},