@atlaskit/editor-plugin-block-controls 8.0.9 → 8.0.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 8.0.10
+
+### Patch Changes
+
+- [`df9b89b4945d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df9b89b4945d1) -
+  Editor-4255: "Fix heading with alignment nested inside layout not showing block menu"
+- Updated dependencies
+
 ## 8.0.9
 
 ### Patch Changes

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

@@ -96,11 +96,21 @@ var newGetSelection = exports.newGetSelection = function newGetSelection(doc, se
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       var $mediaStartPos = doc.resolve(start + 1);
       return new _state.NodeSelection($mediaStartPos);
     }
+
+    // if heading with alignment nested inside a layout column, return TextSelection
+    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
+    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
+    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(function (mark) {
+      return mark.type.name === 'alignment';
+    }) && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn') {
+      return _state.TextSelection.create(doc, start, start + nodeSize);
+    }
     return new _state.NodeSelection(doc.resolve(start));
   }
 

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

@@ -91,11 +91,19 @@ export const newGetSelection = (doc, selectionEmpty, start) => {
   const nodeSize = node ? node.nodeSize : 1;
   const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       const $mediaStartPos = doc.resolve(start + 1);
       return new NodeSelection($mediaStartPos);
     }
+
+    // if heading with alignment nested inside a layout column, return TextSelection
+    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
+    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
+    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(mark => mark.type.name === 'alignment') && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn') {
+      return TextSelection.create(doc, start, start + nodeSize);
+    }
     return new NodeSelection(doc.resolve(start));
   }
 

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

@@ -90,11 +90,21 @@ export var newGetSelection = function newGetSelection(doc, selectionEmpty, start
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       var $mediaStartPos = doc.resolve(start + 1);
       return new NodeSelection($mediaStartPos);
     }
+
+    // if heading with alignment nested inside a layout column, return TextSelection
+    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
+    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
+    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(function (mark) {
+      return mark.type.name === 'alignment';
+    }) && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn') {
+      return TextSelection.create(doc, start, start + nodeSize);
+    }
     return new NodeSelection(doc.resolve(start));
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "8.0.9",
+	"version": "8.0.10",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^17.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.15.0",
+		"@atlaskit/tmp-editor-statsig": "^16.18.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@babel/runtime": "^7.0.0",