@atlaskit/editor-plugin-block-menu 6.0.14 → 6.0.15

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.15
+
+### Patch Changes
+
+- [`2a1bf10d70beb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2a1bf10d70beb) -
+  EDITOR-4293 Fix block menu selection highlight issues
+- Updated dependencies
+
 ## 6.0.14
 
 ### Patch Changes

package/dist/cjs/editor-commands/transformNode.js

@@ -10,8 +10,9 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _isNestedNode = require("../ui/utils/isNestedNode");
-var _transform = require("./transform-node-utils/transform");
+var _transform2 = require("./transform-node-utils/transform");
 var _utils = require("./transforms/utils");
 var transformNode = exports.transformNode = function transformNode(api) {
   return function (targetType, metadata) {
@@ -41,7 +42,7 @@ var transformNode = exports.transformNode = function transformNode(api) {
         var typeName = node.type.name;
         sourceNodeTypes[typeName] = (sourceNodeTypes[typeName] || 0) + 1;
       });
-      var resultNodes = (0, _transform.convertNodesToTargetType)({
+      var resultNodes = (0, _transform2.convertNodesToTargetType)({
         sourceNodes: sourceNodes,
         targetNodeType: targetType,
         schema: tr.doc.type.schema,
@@ -51,6 +52,7 @@ var transformNode = exports.transformNode = function transformNode(api) {
       });
       var content = resultNodes.length > 0 ? resultNodes : slice.content;
       if (preservedSelection instanceof _state.NodeSelection && preservedSelection.node.type === nodes.mediaSingle) {
+        var _api$blockControls2;
         // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
         var deleteFrom = $from.pos;
         var deleteTo = $to.pos;
@@ -59,6 +61,17 @@ var transformNode = exports.transformNode = function transformNode(api) {
         // especially when mediaSingle with caption is at the bottom of the document
         var insertPos = Math.min(deleteFrom, tr.doc.content.size);
         tr.insert(insertPos, content);
+
+        // when we replace and insert content, we need to manually map the preserved selection
+        // through the transaction, otherwise it will treat the selection as having been deleted
+        // and stop preserving it
+        var oldSize = slice.size;
+        var newSize = Array.isArray(content) ? content.reduce(function (sum, node) {
+          return sum + node.nodeSize;
+        }, 0) : content.size;
+        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.mapPreservedSelection(new _transform.Mapping([new _transform.StepMap([0, oldSize, newSize])]))({
+          tr: tr
+        });
       } else {
         tr.replaceWith(sliceStart, $to.pos, content);
       }

package/dist/es2019/editor-commands/transformNode.js

@@ -2,6 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { convertNodesToTargetType } from './transform-node-utils/transform';
 import { isListNode } from './transforms/utils';
@@ -45,6 +46,7 @@ export const transformNode = api => (targetType, metadata) => ({
   });
   const content = resultNodes.length > 0 ? resultNodes : slice.content;
   if (preservedSelection instanceof NodeSelection && preservedSelection.node.type === nodes.mediaSingle) {
+    var _api$blockControls2;
     // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
     const deleteFrom = $from.pos;
     const deleteTo = $to.pos;
@@ -53,6 +55,15 @@ export const transformNode = api => (targetType, metadata) => ({
     // especially when mediaSingle with caption is at the bottom of the document
     const insertPos = Math.min(deleteFrom, tr.doc.content.size);
     tr.insert(insertPos, content);
+
+    // when we replace and insert content, we need to manually map the preserved selection
+    // through the transaction, otherwise it will treat the selection as having been deleted
+    // and stop preserving it
+    const oldSize = slice.size;
+    const newSize = Array.isArray(content) ? content.reduce((sum, node) => sum + node.nodeSize, 0) : content.size;
+    api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.mapPreservedSelection(new Mapping([new StepMap([0, oldSize, newSize])]))({
+      tr
+    });
   } else {
     tr.replaceWith(sliceStart, $to.pos, content);
   }

package/dist/esm/editor-commands/transformNode.js

@@ -3,6 +3,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { convertNodesToTargetType } from './transform-node-utils/transform';
 import { isListNode } from './transforms/utils';
@@ -44,6 +45,7 @@ export var transformNode = function transformNode(api) {
       });
       var content = resultNodes.length > 0 ? resultNodes : slice.content;
       if (preservedSelection instanceof NodeSelection && preservedSelection.node.type === nodes.mediaSingle) {
+        var _api$blockControls2;
         // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
         var deleteFrom = $from.pos;
         var deleteTo = $to.pos;
@@ -52,6 +54,17 @@ export var transformNode = function transformNode(api) {
         // especially when mediaSingle with caption is at the bottom of the document
         var insertPos = Math.min(deleteFrom, tr.doc.content.size);
         tr.insert(insertPos, content);
+
+        // when we replace and insert content, we need to manually map the preserved selection
+        // through the transaction, otherwise it will treat the selection as having been deleted
+        // and stop preserving it
+        var oldSize = slice.size;
+        var newSize = Array.isArray(content) ? content.reduce(function (sum, node) {
+          return sum + node.nodeSize;
+        }, 0) : content.size;
+        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.mapPreservedSelection(new Mapping([new StepMap([0, oldSize, newSize])]))({
+          tr: tr
+        });
       } else {
         tr.replaceWith(sliceStart, $to.pos, content);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.14",
+	"version": "6.0.15",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.13.0",
+		"@atlaskit/tmp-editor-statsig": "^16.15.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@babel/runtime": "^7.0.0"
 	},