@atlaskit/editor-plugin-block-controls 7.14.0 → 7.15.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.15.0
+
+### Minor Changes
+
+- [`762b79e21f96a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/762b79e21f96a) -
+  Migrated and cleaned up legacy iconography usage.
+
+### Patch Changes
+
+- [`e4dce058a2b52`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e4dce058a2b52) -
+  EDITOR-3793 Stop preserving selection on block menu close
+- Updated dependencies
+
+## 7.14.1
+
+### Patch Changes
+
+- [`9391799e9bdf4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9391799e9bdf4) -
+  Clean up platform_editor_elements_dnd_select_node_on_drag
+- Updated dependencies
+
 ## 7.14.0
 
 ### Minor Changes

package/dist/cjs/blockControlsPlugin.js

@@ -102,6 +102,9 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
                 tr: tr
               });
             }
+            (0, _editorCommands.stopPreservingSelection)({
+              tr: tr
+            });
             return tr;
           }
 

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

@@ -17,13 +17,13 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
+var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _consts = require("@atlaskit/editor-shared-styles/consts");
 var _dragHandleVertical = _interopRequireDefault(require("@atlaskit/icon/core/drag-handle-vertical"));
-var _dragHandler = _interopRequireDefault(require("@atlaskit/icon/glyph/drag-handler"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview");
@@ -38,7 +38,7 @@ var _pluginKey = require("../pm-plugins/selection-preservation/plugin-key");
 var _analytics2 = require("../pm-plugins/utils/analytics");
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _getSelection = require("../pm-plugins/utils/getSelection");
-var _selection = require("../pm-plugins/utils/selection");
+var _selection2 = require("../pm-plugins/utils/selection");
 var _consts2 = require("./consts");
 var _dragPreview = require("./drag-preview");
 var _anchorName = require("./utils/anchor-name");
@@ -332,7 +332,7 @@ var getExpandedSelectionRange = function getExpandedSelectionRange(_ref) {
   var selectUp = resolvedStartPos.pos < selection.from;
   var $from = isShiftPressed && selectUp ? resolvedStartPos : selection.$from;
   var $to = isShiftPressed && !selectUp ? doc.resolve(resolvedStartPos.pos + 1) : selection.$to;
-  return $from.blockRange($to);
+  return (0, _selection.expandToBlockRange)($from, $to);
 };
 var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
   var _api$core4;
@@ -427,7 +427,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
           nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
-      var range = getExpandedSelectionRange({
+      var expandedRange = getExpandedSelectionRange({
         doc: tr.doc,
         selection: selection,
         resolvedStartPos: resolvedStartPos,
@@ -435,11 +435,11 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       });
 
       // Set selection to expanded selection range if it encompases the clicked drag handle
-      if (range && isPosWithinRange(startPos, range) && isMultiNodeRange(range)) {
-        var collapsed = (0, _getSelection.collapseToSelectionRange)(tr.doc.resolve(range.start), tr.doc.resolve(range.end));
+      if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiNodeRange(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
-        tr.setSelection(_state.TextSelection.create(tr.doc, Math.min(selection.from, collapsed ? collapsed.$from.pos : range.start), Math.max(selection.to, collapsed ? collapsed.$to.pos : range.end)));
+        tr.setSelection(_state.TextSelection.create(tr.doc, Math.min(selection.from, collapsed.$from.pos), Math.max(selection.to, collapsed.$to.pos)));
       } else {
         // Select the clicked drag handle's node only
         tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
@@ -481,8 +481,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
         tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
       } else if (isTopLevelNode && $anchor.depth <= _consts2.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_shift_click_select')) {
         var _api$blockControls3;
-        var alignAnchorHeadToSel = (0, _selection.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
-        var selectionWithExpandedHead = (0, _selection.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
+        var alignAnchorHeadToSel = (0, _selection2.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
+        var selectionWithExpandedHead = (0, _selection2.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
         api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.setMultiSelectPositions()({
           tr: tr
@@ -611,7 +611,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
               api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
                 tr: tr
               });
-            } else if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_select_node_on_drag')) {
+            } else {
               tr = (0, _getSelection.selectNode)(tr, handlePos, nodeType, api);
             }
             return tr;
@@ -1048,8 +1048,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       }, (0, _react2.jsx)(_dragHandleVertical.default, {
         spacing: "spacious",
         label: "",
-        LEGACY_fallbackIcon: _dragHandler.default,
-        LEGACY_size: "medium",
         size: "small"
       })))
     );

package/dist/es2019/blockControlsPlugin.js

@@ -92,6 +92,9 @@ export const blockControlsPlugin = ({
             tr
           });
         }
+        stopPreservingSelection({
+          tr
+        });
         return tr;
       }
 

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

@@ -14,13 +14,13 @@ 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 { 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';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFullPageNarrowBreakout, akEditorTableToolbarSize, relativeSizeToBaseFontSize } from '@atlaskit/editor-shared-styles/consts';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
-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';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
@@ -328,7 +328,7 @@ const getExpandedSelectionRange = ({
   const selectUp = resolvedStartPos.pos < selection.from;
   const $from = isShiftPressed && selectUp ? resolvedStartPos : selection.$from;
   const $to = isShiftPressed && !selectUp ? doc.resolve(resolvedStartPos.pos + 1) : selection.$to;
-  return $from.blockRange($to);
+  return expandToBlockRange($from, $to);
 };
 export const DragHandle = ({
   view,
@@ -405,7 +405,7 @@ export const DragHandle = ({
           nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
-      const range = getExpandedSelectionRange({
+      const expandedRange = getExpandedSelectionRange({
         doc: tr.doc,
         selection,
         resolvedStartPos,
@@ -413,11 +413,11 @@ export const DragHandle = ({
       });
 
       // Set selection to expanded selection range if it encompases the clicked drag handle
-      if (range && isPosWithinRange(startPos, range) && isMultiNodeRange(range)) {
-        const collapsed = collapseToSelectionRange(tr.doc.resolve(range.start), tr.doc.resolve(range.end));
+      if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiNodeRange(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
-        tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, collapsed ? collapsed.$from.pos : range.start), Math.max(selection.to, collapsed ? collapsed.$to.pos : range.end)));
+        tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, collapsed.$from.pos), Math.max(selection.to, collapsed.$to.pos)));
       } else {
         // Select the clicked drag handle's node only
         tr = selectNode(tr, startPos, nodeType, api);
@@ -588,7 +588,7 @@ export const DragHandle = ({
               api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.setMultiSelectPositions()({
                 tr
               });
-            } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
+            } else {
               tr = selectNode(tr, handlePos, nodeType, api);
             }
             return tr;
@@ -1033,8 +1033,6 @@ export const DragHandle = ({
   }, jsx(DragHandleVerticalIcon, {
     spacing: "spacious",
     label: "",
-    LEGACY_fallbackIcon: DragHandlerIcon,
-    LEGACY_size: "medium",
     size: "small"
   })));
   const stickyWithTooltip = () => jsx(Box

package/dist/esm/blockControlsPlugin.js

@@ -95,6 +95,9 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
                 tr: tr
               });
             }
+            _stopPreservingSelection({
+              tr: tr
+            });
             return tr;
           }
 

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

@@ -19,13 +19,13 @@ 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 { 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';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFullPageNarrowBreakout, akEditorTableToolbarSize, relativeSizeToBaseFontSize } from '@atlaskit/editor-shared-styles/consts';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
-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';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
@@ -329,7 +329,7 @@ var getExpandedSelectionRange = function getExpandedSelectionRange(_ref) {
   var selectUp = resolvedStartPos.pos < selection.from;
   var $from = isShiftPressed && selectUp ? resolvedStartPos : selection.$from;
   var $to = isShiftPressed && !selectUp ? doc.resolve(resolvedStartPos.pos + 1) : selection.$to;
-  return $from.blockRange($to);
+  return expandToBlockRange($from, $to);
 };
 export var DragHandle = function DragHandle(_ref2) {
   var _api$core4;
@@ -424,7 +424,7 @@ export var DragHandle = function DragHandle(_ref2) {
           nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
-      var range = getExpandedSelectionRange({
+      var expandedRange = getExpandedSelectionRange({
         doc: tr.doc,
         selection: selection,
         resolvedStartPos: resolvedStartPos,
@@ -432,11 +432,11 @@ export var DragHandle = function DragHandle(_ref2) {
       });
 
       // Set selection to expanded selection range if it encompases the clicked drag handle
-      if (range && isPosWithinRange(startPos, range) && isMultiNodeRange(range)) {
-        var collapsed = collapseToSelectionRange(tr.doc.resolve(range.start), tr.doc.resolve(range.end));
+      if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiNodeRange(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
-        tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, collapsed ? collapsed.$from.pos : range.start), Math.max(selection.to, collapsed ? collapsed.$to.pos : range.end)));
+        tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, collapsed.$from.pos), Math.max(selection.to, collapsed.$to.pos)));
       } else {
         // Select the clicked drag handle's node only
         tr = selectNode(tr, startPos, nodeType, api);
@@ -608,7 +608,7 @@ export var DragHandle = function DragHandle(_ref2) {
               api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
                 tr: tr
               });
-            } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
+            } else {
               tr = selectNode(tr, handlePos, nodeType, api);
             }
             return tr;
@@ -1045,8 +1045,6 @@ export var DragHandle = function DragHandle(_ref2) {
       }, jsx(DragHandleVerticalIcon, {
         spacing: "spacious",
         label: "",
-        LEGACY_fallbackIcon: DragHandlerIcon,
-        LEGACY_size: "medium",
         size: "small"
       })))
     );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.14.0",
+	"version": "7.15.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^29.1.0",
+		"@atlaskit/icon": "^29.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -54,8 +54,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^15.10.0",
-		"@atlaskit/tokens": "^8.4.0",
+		"@atlaskit/tmp-editor-statsig": "^15.12.0",
+		"@atlaskit/tokens": "^8.6.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.42.0",
+		"@atlaskit/editor-common": "^110.45.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -119,9 +119,6 @@
 		"platform_editor_elements_dnd_shift_click_select": {
 			"type": "boolean"
 		},
-		"platform_editor_elements_dnd_select_node_on_drag": {
-			"type": "boolean"
-		},
 		"platform_editor_ease_of_use_metrics": {
 			"type": "boolean"
 		},