@atlaskit/editor-plugin-block-controls 11.4.5 → 11.4.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 11.4.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.4.6
+
+### Patch Changes
+
+- [`32dce97f78584`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/32dce97f78584) -
+  Fix preserved selection mapping when comment editors append a trailing paragraph after block menu
+  transforms.
+- Updated dependencies
+
 ## 11.4.5
 
 ### Patch Changes

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -11,6 +11,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _domAttrName = require("../ui/utils/dom-attr-name");
 var _decorationsAnchor = require("./decorations-anchor");
@@ -234,8 +235,9 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
-      // Don't show drag handle for layout column in a single column layout
+    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && (0, _experiments.editorExperiment)('advanced_layouts', true) && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      // Don't show drag handle for layout column in a single column layout,
+      // unless the layout column menu is enabled (menu needs the handle to be accessible).
       return false;
     }
     var targetPos = view.state.doc.resolve(pos).pos;

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

@@ -4,9 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mapPreservedSelection = exports.getSelectedSlicePosition = exports.getMultiSelectionIfPosInside = exports.expandSelectionHeadToNodeAtPos = exports.createPreservedSelection = exports.alignAnchorHeadInDirectionOfPos = exports.adjustSelectionBoundsForEdgePositions = void 0;
+var _blockType = require("@atlaskit/editor-common/block-type");
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _main = require("../main");
 var _getSelection = require("./getSelection");
 var getMultiSelectionIfPosInside = exports.getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(api, pos, tr) {
@@ -94,7 +96,11 @@ var mapPreservedSelection = exports.mapPreservedSelection = function mapPreserve
     preservedSelectionMapping = _ref.preservedSelectionMapping;
   var mapping = preservedSelectionMapping || tr.mapping;
   var from = mapping.map(selection.from);
-  var to = mapping.map(selection.to);
+  // When lastNodeMustBeParagraph inserts a trailing paragraph exactly at the end boundary
+  // of a preserved block selection, keep the mapped end position on the left side of the
+  // inserted paragraph so it is not included in the preserved selection.
+  var shouldTrimTrailingParagraph = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_jira_patch_2') && tr.getMeta(_blockType.INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META) === true;
+  var to = shouldTrimTrailingParagraph ? mapping.map(selection.to, -1) : mapping.map(selection.to);
   var isSelectionEmpty = from === to;
   var wasSelectionEmpty = selection.from === selection.to;
   if (isSelectionEmpty && !wasSelectionEmpty) {

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -3,6 +3,7 @@ import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -226,8 +227,9 @@ export const handleMouseOver = (view, event, api) => {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true)) {
-      // Don't show drag handle for layout column in a single column layout
+    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      // Don't show drag handle for layout column in a single column layout,
+      // unless the layout column menu is enabled (menu needs the handle to be accessible).
       return false;
     }
     const targetPos = view.state.doc.resolve(pos).pos;

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

@@ -1,6 +1,8 @@
+import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getBlockControlsMeta, key } from '../main';
 import { newGetSelection } from './getSelection';
 export const getMultiSelectionIfPosInside = (api, pos, tr) => {
@@ -90,7 +92,11 @@ export const mapPreservedSelection = (selection, tr) => {
   } = getBlockControlsMeta(tr) || {};
   const mapping = preservedSelectionMapping || tr.mapping;
   const from = mapping.map(selection.from);
-  const to = mapping.map(selection.to);
+  // When lastNodeMustBeParagraph inserts a trailing paragraph exactly at the end boundary
+  // of a preserved block selection, keep the mapped end position on the left side of the
+  // inserted paragraph so it is not included in the preserved selection.
+  const shouldTrimTrailingParagraph = fg('platform_editor_block_menu_jira_patch_2') && tr.getMeta(INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META) === true;
+  const to = shouldTrimTrailingParagraph ? mapping.map(selection.to, -1) : mapping.map(selection.to);
   const isSelectionEmpty = from === to;
   const wasSelectionEmpty = selection.from === selection.to;
   if (isSelectionEmpty && !wasSelectionEmpty) {

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -4,6 +4,7 @@ import { isMultiBlockSelection } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getAnchorAttrName, getTypeNameAttrName, getTypeNameFromDom, NODE_ANCHOR_ATTR_NAME } from '../ui/utils/dom-attr-name';
 import { IGNORE_NODE_DESCENDANTS_ADVANCED_LAYOUT, IGNORE_NODES_NEXT } from './decorations-anchor';
@@ -227,8 +228,9 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true)) {
-      // Don't show drag handle for layout column in a single column layout
+    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      // Don't show drag handle for layout column in a single column layout,
+      // unless the layout column menu is enabled (menu needs the handle to be accessible).
       return false;
     }
     var targetPos = view.state.doc.resolve(pos).pos;

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

@@ -1,6 +1,8 @@
+import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getBlockControlsMeta, key } from '../main';
 import { newGetSelection } from './getSelection';
 export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(api, pos, tr) {
@@ -88,7 +90,11 @@ export var mapPreservedSelection = function mapPreservedSelection(selection, tr)
     preservedSelectionMapping = _ref.preservedSelectionMapping;
   var mapping = preservedSelectionMapping || tr.mapping;
   var from = mapping.map(selection.from);
-  var to = mapping.map(selection.to);
+  // When lastNodeMustBeParagraph inserts a trailing paragraph exactly at the end boundary
+  // of a preserved block selection, keep the mapped end position on the left side of the
+  // inserted paragraph so it is not included in the preserved selection.
+  var shouldTrimTrailingParagraph = fg('platform_editor_block_menu_jira_patch_2') && tr.getMeta(INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META) === true;
+  var to = shouldTrimTrailingParagraph ? mapping.map(selection.to, -1) : mapping.map(selection.to);
   var isSelectionEmpty = from === to;
   var wasSelectionEmpty = selection.from === selection.to;
   if (isSelectionEmpty && !wasSelectionEmpty) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "11.4.5",
+	"version": "11.4.7",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/editor-plugin-quick-insert": "^10.4.0",
 		"@atlaskit/editor-plugin-selection": "^10.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^7.3.0",
-		"@atlaskit/editor-plugin-type-ahead": "^10.1.0",
+		"@atlaskit/editor-plugin-type-ahead": "^10.2.0",
 		"@atlaskit/editor-plugin-user-intent": "^8.2.0",
 		"@atlaskit/editor-plugin-width": "^11.1.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
@@ -55,8 +55,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^19.0.0",
-		"@atlaskit/theme": "^23.2.0",
-		"@atlaskit/tmp-editor-statsig": "^82.0.0",
+		"@atlaskit/theme": "^24.0.0",
+		"@atlaskit/tmp-editor-statsig": "^82.3.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^22.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.36.0",
+		"@atlaskit/editor-common": "^114.41.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -141,12 +141,17 @@
 		"platform_editor_block_menu_jira_patch_1": {
 			"type": "boolean"
 		},
+		"platform_editor_block_menu_jira_patch_2": {
+			"type": "boolean"
+		},
 		"confluence_remix_button_right_side_block_fg": {
 			"type": "boolean"
 		}
 	},
 	"devDependencies": {
 		"@atlassian/structured-docs-types": "workspace:^",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
 		"react-intl": "^6.6.2"
 	}
 }