@atlaskit/editor-plugin-block-controls 7.2.3 → 7.2.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.2.4
+
+### Patch Changes
+
+- [`dc211dc1927b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dc211dc1927b5) -
+  [ux] ED-29232: Fixed issues with block menu for file
+- Updated dependencies
+
 ## 7.2.3
 
 ### Patch Changes

package/dist/cjs/editor-commands/utils/move-node-utils.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getShouldMoveNode = exports.getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeDown = exports.getCurrentNodePosFromDragHandleSelection = exports.canMoveNodeUpOrDown = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _getNestedNodePosition = require("../../pm-plugins/utils/getNestedNodePosition");
@@ -21,6 +22,10 @@ var getCurrentNodePosFromDragHandleSelection = exports.getCurrentNodePosFromDrag
     // We only move table node if it's fully selected
     // to avoid shortcut collision with table drag and drop
     currentNodePos = (_findTable$pos = (_findTable = (0, _utils.findTable)(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
+  } else if (selection instanceof _state.NodeSelection && selection.node.type === schema.nodes.media && selection.node.attrs.type === 'file' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    // When a file is selected, it is actually wrapped in a media group
+    // return the position of the media group , as the group is the node that we want to move up or down
+    currentNodePos = selection.$from.pos - 1;
   } else if (!(selection instanceof _selection.GapCursorSelection)) {
     // 2. caret cursor is inside the node
     // 3. the start of the selection is inside the node

package/dist/es2019/editor-commands/utils/move-node-utils.js

@@ -1,4 +1,5 @@
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getNestedNodePosition } from '../../pm-plugins/utils/getNestedNodePosition';
@@ -16,6 +17,10 @@ export const getCurrentNodePosFromDragHandleSelection = ({
     // We only move table node if it's fully selected
     // to avoid shortcut collision with table drag and drop
     currentNodePos = (_findTable$pos = (_findTable = findTable(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
+  } else if (selection instanceof NodeSelection && selection.node.type === schema.nodes.media && selection.node.attrs.type === 'file' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    // When a file is selected, it is actually wrapped in a media group
+    // return the position of the media group , as the group is the node that we want to move up or down
+    currentNodePos = selection.$from.pos - 1;
   } else if (!(selection instanceof GapCursorSelection)) {
     // 2. caret cursor is inside the node
     // 3. the start of the selection is inside the node

package/dist/esm/editor-commands/utils/move-node-utils.js

@@ -1,4 +1,5 @@
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getNestedNodePosition } from '../../pm-plugins/utils/getNestedNodePosition';
@@ -15,6 +16,10 @@ export var getCurrentNodePosFromDragHandleSelection = function getCurrentNodePos
     // We only move table node if it's fully selected
     // to avoid shortcut collision with table drag and drop
     currentNodePos = (_findTable$pos = (_findTable = findTable(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
+  } else if (selection instanceof NodeSelection && selection.node.type === schema.nodes.media && selection.node.attrs.type === 'file' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    // When a file is selected, it is actually wrapped in a media group
+    // return the position of the media group , as the group is the node that we want to move up or down
+    currentNodePos = selection.$from.pos - 1;
   } else if (!(selection instanceof GapCursorSelection)) {
     // 2. caret cursor is inside the node
     // 3. the start of the selection is inside the node

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.2.3",
+	"version": "7.2.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,8 +37,8 @@
 		"@atlaskit/editor-plugin-limited-mode": "^3.0.0",
 		"@atlaskit/editor-plugin-metrics": "^7.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^6.0.0",
-		"@atlaskit/editor-plugin-selection": "^6.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^6.2.0",
+		"@atlaskit/editor-plugin-selection": "^6.1.0",
+		"@atlaskit/editor-plugin-type-ahead": "^6.3.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
 		"@atlaskit/editor-plugin-width": "^7.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.2.0",
+		"@atlaskit/tmp-editor-statsig": "^13.4.0",
 		"@atlaskit/tokens": "^6.4.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@babel/runtime": "^7.0.0",
@@ -64,7 +64,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.4.0",
+		"@atlaskit/editor-common": "^110.7.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"