@atlaskit/editor-plugin-block-controls 9.1.17 → 9.1.18

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 9.1.18
+
+### Patch Changes
+
+- [`1bd298ad0a152`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bd298ad0a152) -
+  [ux] EDITOR-6280 Clean up platform_editor_block_menu_v2_patch_3 to fix icon and copy in jira block
+  menu
+- Updated dependencies
+
 ## 9.1.17
 
 ### Patch Changes

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

@@ -9,7 +9,6 @@ var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 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 _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(doc, start, nodeSize) {
   var $startPos = doc.resolve(start);
@@ -97,21 +96,11 @@ 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, _experiments.editorExperiment)('platform_editor_block_menu', 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' && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3')) {
-      return _state.TextSelection.create(doc, start, start + nodeSize);
-    }
     return new _state.NodeSelection(doc.resolve(start));
   }
 

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

@@ -3,7 +3,6 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const getInlineNodePos = (doc, start, nodeSize) => {
   const $startPos = doc.resolve(start);
@@ -92,19 +91,11 @@ 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 (editorExperiment('platform_editor_block_menu', 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' && !fg('platform_editor_block_menu_v2_patch_3')) {
-      return TextSelection.create(doc, start, start + nodeSize);
-    }
     return new NodeSelection(doc.resolve(start));
   }
 

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

@@ -3,7 +3,6 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var getInlineNodePos = function getInlineNodePos(doc, start, nodeSize) {
   var $startPos = doc.resolve(start);
@@ -91,21 +90,11 @@ 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 (editorExperiment('platform_editor_block_menu', 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' && !fg('platform_editor_block_menu_v2_patch_3')) {
-      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": "9.1.17",
+	"version": "9.1.18",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/theme": "^23.0.0",
-		"@atlaskit/tmp-editor-statsig": "^62.0.0",
+		"@atlaskit/tmp-editor-statsig": "^62.2.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^21.1.0",
 		"@babel/runtime": "^7.0.0",
@@ -132,9 +132,6 @@
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_v2_patch_3": {
-			"type": "boolean"
-		},
 		"platform_editor_table_sticky_header_patch_6": {
 			"type": "boolean"
 		},