@atlaskit/editor-plugin-block-controls 11.2.15 → 11.2.17

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 11.2.17
+
+### Patch Changes
+
+- [`2023cac0fd36f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2023cac0fd36f) -
+  Add column drag handle context menu placeholder, gated behind the
+  platform_editor_layout_column_menu experiment flag.
+- Updated dependencies
+
+## 11.2.16
+
+### Patch Changes
+
+- [`38fb4916b9085`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38fb4916b9085) -
+  Add `@atlaskit/editor-common/node-selection` entry-point with platform-level node selection
+  utilities. Under `platform_editor_maui_jira_updates`, `open-remix-modal` and
+  `editor-plugin-block-controls` delegate to these utilities, fixing remix selection in environments
+  where `blockControls` is not present.
+- Updated dependencies
+
 ## 11.2.15
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils/expand-and-update-selection.js

@@ -4,9 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.expandAndUpdateSelection = void 0;
+var _nodeSelection = require("@atlaskit/editor-common/node-selection");
 var _selection = require("@atlaskit/editor-common/selection");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _getSelection = require("./getSelection");
 var _selection2 = require("./selection");
 var isPosWithinRange = function isPosWithinRange(pos, range) {
@@ -60,6 +64,12 @@ var expandAndUpdateSelection = exports.expandAndUpdateSelection = function expan
   if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && (0, _selection.isMultiBlockRange)(expandedRange.range)) {
     // Then create a selection from the start of the first node to the end of the last node
     tr.setSelection(_state.TextSelection.create(tr.doc, Math.min(selection.from, expandedRange.$from.pos), Math.max(selection.to, expandedRange.$to.pos)));
+  } else if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  (0, _platformFeatureFlags.fg)('platform_editor_maui_jira_updates') && ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || (0, _experiments.editorExperiment)('platform_editor_block_menu', true))) {
+    // Under the gate (and when on the simplified newGetSelection path), use
+    // the platform-level composer — same path as open-remix-modal, no drift.
+    (0, _nodeSelection.selectNodeAtPos)(tr, startPos, nodeType);
   } else if (nodeType === 'table') {
     (0, _utils.selectTableClosestToPos)(tr, tr.doc.resolve(startPos + 1));
   } else {

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

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.newGetSelection = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = void 0;
+var _nodeSelection = require("@atlaskit/editor-common/node-selection");
 var _selection2 = require("@atlaskit/editor-common/selection");
 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);
@@ -91,6 +93,16 @@ var oldGetSelection = function oldGetSelection(tr, start) {
  * @returns The appropriate selection for the node.
  */
 var newGetSelection = exports.newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
+  // Under the gate, delegate to getNodeSelectionForPos only when
+  // platform_editor_block_menu is on — getNodeSelectionForPos matches that
+  // simplified path (NodeSelection for all nodes). When block_menu is off,
+  // fall through to the oldGetSelection branch which handles expand/taskList/
+  // inline nodes correctly with TextSelection.
+  if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  (0, _platformFeatureFlags.fg)('platform_editor_maui_jira_updates') && (0, _experiments.editorExperiment)('platform_editor_block_menu', true)) {
+    return (0, _nodeSelection.getNodeSelectionForPos)(doc, start) || false;
+  }
   var node = doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;
@@ -136,7 +148,15 @@ var getSelection = exports.getSelection = function getSelection(tr, start, api)
   return oldGetSelection(tr, start);
 };
 var selectNode = exports.selectNode = function selectNode(tr, start, nodeType, api) {
-  // For table, we need to do cell selection instead of node selection
+  // Only use the platform path when already on the simplified newGetSelection
+  // branch — i.e. when platform_editor_block_menu is on or toolbar flags are
+  // enabled. This preserves oldGetSelection behaviour (e.g. taskList →
+  // TextSelection) in legacy contexts where those flags are off.
+  if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  (0, _platformFeatureFlags.fg)('platform_editor_maui_jira_updates') && (0, _experiments.editorExperiment)('platform_editor_block_menu', true)) {
+    return (0, _nodeSelection.selectNodeAtPos)(tr, start, nodeType);
+  }
   if (nodeType === 'table') {
     tr = (0, _utils2.selectTableClosestToPos)(tr, tr.doc.resolve(start + 1));
     return tr;

package/dist/cjs/ui/drag-handle.js

@@ -464,6 +464,9 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
+      if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        tr.setMeta('toggleLayoutColumnMenu', {});
+      }
       var resolvedStartPos = tr.doc.resolve(startPos);
       var selection = ((_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
@@ -512,6 +515,9 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
+      if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        tr.setMeta('toggleLayoutColumnMenu', {});
+      }
       var mSelect = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       var $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
       if (tr.selection.empty || !e.shiftKey) {

package/dist/es2019/pm-plugins/utils/expand-and-update-selection.js

@@ -1,6 +1,10 @@
+import { selectNodeAtPos } from '@atlaskit/editor-common/node-selection';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { selectNode } from './getSelection';
 import { adjustSelectionBoundsForEdgePositions } from './selection';
 const isPosWithinRange = (pos, range) => {
@@ -56,6 +60,12 @@ export const expandAndUpdateSelection = ({
   if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiBlockRange(expandedRange.range)) {
     // Then create a selection from the start of the first node to the end of the last node
     tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, expandedRange.$from.pos), Math.max(selection.to, expandedRange.$to.pos)));
+  } else if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform_editor_maui_jira_updates') && (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || editorExperiment('platform_editor_block_menu', true))) {
+    // Under the gate (and when on the simplified newGetSelection path), use
+    // the platform-level composer — same path as open-remix-modal, no drift.
+    selectNodeAtPos(tr, startPos, nodeType);
   } else if (nodeType === 'table') {
     selectTableClosestToPos(tr, tr.doc.resolve(startPos + 1));
   } else {

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

@@ -1,8 +1,10 @@
+import { getNodeSelectionForPos, selectNodeAtPos } from '@atlaskit/editor-common/node-selection';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 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);
@@ -86,6 +88,16 @@ const oldGetSelection = (tr, start) => {
  * @returns The appropriate selection for the node.
  */
 export const newGetSelection = (doc, selectionEmpty, start) => {
+  // Under the gate, delegate to getNodeSelectionForPos only when
+  // platform_editor_block_menu is on — getNodeSelectionForPos matches that
+  // simplified path (NodeSelection for all nodes). When block_menu is off,
+  // fall through to the oldGetSelection branch which handles expand/taskList/
+  // inline nodes correctly with TextSelection.
+  if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform_editor_maui_jira_updates') && editorExperiment('platform_editor_block_menu', true)) {
+    return getNodeSelectionForPos(doc, start) || false;
+  }
   const node = doc.nodeAt(start);
   const isNodeSelection = node && NodeSelection.isSelectable(node);
   const nodeSize = node ? node.nodeSize : 1;
@@ -132,7 +144,15 @@ export const getSelection = (tr, start, api) => {
   return oldGetSelection(tr, start);
 };
 export const selectNode = (tr, start, nodeType, api) => {
-  // For table, we need to do cell selection instead of node selection
+  // Only use the platform path when already on the simplified newGetSelection
+  // branch — i.e. when platform_editor_block_menu is on or toolbar flags are
+  // enabled. This preserves oldGetSelection behaviour (e.g. taskList →
+  // TextSelection) in legacy contexts where those flags are off.
+  if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform_editor_maui_jira_updates') && editorExperiment('platform_editor_block_menu', true)) {
+    return selectNodeAtPos(tr, start, nodeType);
+  }
   if (nodeType === 'table') {
     tr = selectTableClosestToPos(tr, tr.doc.resolve(start + 1));
     return tr;

package/dist/es2019/ui/drag-handle.js

@@ -439,6 +439,9 @@ export const DragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        tr.setMeta('toggleLayoutColumnMenu', {});
+      }
       const resolvedStartPos = tr.doc.resolve(startPos);
       const selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
@@ -488,6 +491,9 @@ export const DragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        tr.setMeta('toggleLayoutColumnMenu', {});
+      }
       const mSelect = api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       const $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
       if (tr.selection.empty || !e.shiftKey) {

package/dist/esm/pm-plugins/utils/expand-and-update-selection.js

@@ -1,6 +1,10 @@
+import { selectNodeAtPos } from '@atlaskit/editor-common/node-selection';
 import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { selectNode } from './getSelection';
 import { adjustSelectionBoundsForEdgePositions } from './selection';
 var isPosWithinRange = function isPosWithinRange(pos, range) {
@@ -54,6 +58,12 @@ export var expandAndUpdateSelection = function expandAndUpdateSelection(_ref2) {
   if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && isMultiBlockRange(expandedRange.range)) {
     // Then create a selection from the start of the first node to the end of the last node
     tr.setSelection(TextSelection.create(tr.doc, Math.min(selection.from, expandedRange.$from.pos), Math.max(selection.to, expandedRange.$to.pos)));
+  } else if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform_editor_maui_jira_updates') && (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || editorExperiment('platform_editor_block_menu', true))) {
+    // Under the gate (and when on the simplified newGetSelection path), use
+    // the platform-level composer — same path as open-remix-modal, no drift.
+    selectNodeAtPos(tr, startPos, nodeType);
   } else if (nodeType === 'table') {
     selectTableClosestToPos(tr, tr.doc.resolve(startPos + 1));
   } else {

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

@@ -1,8 +1,10 @@
+import { getNodeSelectionForPos, selectNodeAtPos } from '@atlaskit/editor-common/node-selection';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 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);
@@ -85,6 +87,16 @@ var oldGetSelection = function oldGetSelection(tr, start) {
  * @returns The appropriate selection for the node.
  */
 export var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
+  // Under the gate, delegate to getNodeSelectionForPos only when
+  // platform_editor_block_menu is on — getNodeSelectionForPos matches that
+  // simplified path (NodeSelection for all nodes). When block_menu is off,
+  // fall through to the oldGetSelection branch which handles expand/taskList/
+  // inline nodes correctly with TextSelection.
+  if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform_editor_maui_jira_updates') && editorExperiment('platform_editor_block_menu', true)) {
+    return getNodeSelectionForPos(doc, start) || false;
+  }
   var node = doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;
@@ -130,7 +142,15 @@ export var getSelection = function getSelection(tr, start, api) {
   return oldGetSelection(tr, start);
 };
 export var selectNode = function selectNode(tr, start, nodeType, api) {
-  // For table, we need to do cell selection instead of node selection
+  // Only use the platform path when already on the simplified newGetSelection
+  // branch — i.e. when platform_editor_block_menu is on or toolbar flags are
+  // enabled. This preserves oldGetSelection behaviour (e.g. taskList →
+  // TextSelection) in legacy contexts where those flags are off.
+  if (
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform_editor_maui_jira_updates') && editorExperiment('platform_editor_block_menu', true)) {
+    return selectNodeAtPos(tr, start, nodeType);
+  }
   if (nodeType === 'table') {
     tr = selectTableClosestToPos(tr, tr.doc.resolve(start + 1));
     return tr;

package/dist/esm/ui/drag-handle.js

@@ -460,6 +460,9 @@ export var DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        tr.setMeta('toggleLayoutColumnMenu', {});
+      }
       var resolvedStartPos = tr.doc.resolve(startPos);
       var selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
@@ -508,6 +511,9 @@ export var DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
+      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        tr.setMeta('toggleLayoutColumnMenu', {});
+      }
       var mSelect = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       var $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
       if (tr.selection.empty || !e.shiftKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "11.2.15",
+	"version": "11.2.17",
 	"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.2.0",
-		"@atlaskit/tmp-editor-statsig": "^77.0.0",
+		"@atlaskit/tmp-editor-statsig": "^77.3.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^22.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.20.0",
+		"@atlaskit/editor-common": "^114.26.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -132,6 +132,9 @@
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},
+		"platform_editor_maui_jira_updates": {
+			"type": "boolean"
+		},
 		"platform_editor_table_sticky_header_patch_6": {
 			"type": "boolean"
 		},