@atlaskit/editor-plugin-block-controls 4.2.4 → 4.2.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 4.2.5
+
+### Patch Changes
+
+- [`6ae99901c8e16`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ae99901c8e16) -
+  [ux] ED-29018 Fix block menu not opening when task list drag handle is clicked
+
 ## 4.2.4
 
 ### Patch Changes

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

@@ -18,6 +18,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
 var _analytics2 = require("../pm-plugins/utils/analytics");
@@ -410,7 +411,12 @@ var moveNode = exports.moveNode = function moveNode(api) {
       if (!convertedNode) {
         return tr;
       }
-      tr.delete(sliceFrom, sliceTo); // delete the content from the original position
+      if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type.name) === 'taskList' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+        sliceFrom = sliceFrom - 1;
+      }
+
+      // delete the content from the original position
+      tr.delete(sliceFrom, sliceTo);
       var mappedTo = tr.mapping.map(to);
       var isDestNestedLoneEmptyParagraph = destParent.type.name !== 'doc' && destParent.childCount === 1 && (0, _utils.isEmptyParagraph)($to.nodeAfter);
       if (convertedNodeSlice && isDestNestedLoneEmptyParagraph) {

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

@@ -9,6 +9,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
   var $startPos = tr.doc.resolve(start);
@@ -94,7 +95,7 @@ var newGetSelection = function newGetSelection(tr, start) {
     var $mediaStartPos = tr.doc.resolve(start + 1);
     return new _state.NodeSelection($mediaStartPos);
   }
-  if (nodeName === 'taskList' && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
+  if (nodeName === 'taskList' && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_1')) {
     return _state.TextSelection.create(tr.doc, start, start + nodeSize);
   }
   var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),

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

@@ -10,6 +10,7 @@ import { Selection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
@@ -413,7 +414,12 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   if (!convertedNode) {
     return tr;
   }
-  tr.delete(sliceFrom, sliceTo); // delete the content from the original position
+  if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type.name) === 'taskList' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    sliceFrom = sliceFrom - 1;
+  }
+
+  // delete the content from the original position
+  tr.delete(sliceFrom, sliceTo);
   const mappedTo = tr.mapping.map(to);
   const isDestNestedLoneEmptyParagraph = destParent.type.name !== 'doc' && destParent.childCount === 1 && isEmptyParagraph($to.nodeAfter);
   if (convertedNodeSlice && isDestNestedLoneEmptyParagraph) {

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

@@ -3,6 +3,7 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const getInlineNodePos = (tr, start, nodeSize) => {
   const $startPos = tr.doc.resolve(start);
@@ -89,7 +90,7 @@ const newGetSelection = (tr, start) => {
     const $mediaStartPos = tr.doc.resolve(start + 1);
     return new NodeSelection($mediaStartPos);
   }
-  if (nodeName === 'taskList' && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+  if (nodeName === 'taskList' && !expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
     return TextSelection.create(tr.doc, start, start + nodeSize);
   }
   const {

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

@@ -13,6 +13,7 @@ import { Selection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
@@ -404,7 +405,12 @@ export var moveNode = function moveNode(api) {
       if (!convertedNode) {
         return tr;
       }
-      tr.delete(sliceFrom, sliceTo); // delete the content from the original position
+      if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type.name) === 'taskList' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+        sliceFrom = sliceFrom - 1;
+      }
+
+      // delete the content from the original position
+      tr.delete(sliceFrom, sliceTo);
       var mappedTo = tr.mapping.map(to);
       var isDestNestedLoneEmptyParagraph = destParent.type.name !== 'doc' && destParent.childCount === 1 && isEmptyParagraph($to.nodeAfter);
       if (convertedNodeSlice && isDestNestedLoneEmptyParagraph) {

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

@@ -3,6 +3,7 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
   var $startPos = tr.doc.resolve(start);
@@ -88,7 +89,7 @@ var newGetSelection = function newGetSelection(tr, start) {
     var $mediaStartPos = tr.doc.resolve(start + 1);
     return new NodeSelection($mediaStartPos);
   }
-  if (nodeName === 'taskList' && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+  if (nodeName === 'taskList' && !expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
     return TextSelection.create(tr.doc, start, start + nodeSize);
   }
   var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "4.2.4",
+	"version": "4.2.5",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^50.2.1",
+		"@atlaskit/adf-schema": "^50.2.2",
 		"@atlaskit/editor-plugin-accessibility-utils": "^3.0.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^3.0.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.11.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^11.5.0",
+		"@atlaskit/tmp-editor-statsig": "^11.7.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.28.0",
+		"@atlaskit/editor-common": "^107.31.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"