@atlaskit/editor-plugin-block-controls 13.0.5 → 13.0.7

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 13.0.7
+
+### Patch Changes
+
+- [`c664929c3f15d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c664929c3f15d) -
+  Clean up experiment `platform_editor_clean_up_widget_mark_logic`
+- [`5c279743e9b74`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c279743e9b74) -
+  Fire an exposure event for the `remix_button_right_margin_hover` experiment.
+- Updated dependencies
+
+## 13.0.6
+
+### Patch Changes
+
+- [`e850980f5a66f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e850980f5a66f) -
+  [EDITOR-6790] Block-controls drag-handle wrapper's background is removed and instead set
+  on`::before` on `.pm-table-container.pm-table-sticky` to keep masking the row insert dots when
+  legacy sticky header is activated while also not overlapping the column insert button.
+- [`7754772ebfa47`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7754772ebfa47) -
+  Fix table text length calculation for Remix/Improve Writing hero prompts: use
+  tableNode.textContent for CellSelection instead of textBetween which only spans anchor/head cell
+  range
+- Updated dependencies
+
 ## 13.0.5
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -10,7 +10,9 @@ var _react = _interopRequireDefault(require("react"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _handleKeyDownWithPreservedSelection = require("./editor-commands/handle-key-down-with-preserved-selection");
 var _mapPreservedSelection2 = require("./editor-commands/map-preserved-selection");
@@ -44,6 +46,27 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         var blockControlsState = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState();
         var preservedSelection = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection;
         if (preservedSelection && preservedSelection.from !== preservedSelection.to) {
+          // CellSelection covers a table: collect each selected cell's text joined with spaces
+          // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
+          // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
+          // word boundaries, which raw textContent fusion breaks.
+          if (preservedSelection instanceof _cellSelection.CellSelection && (0, _expValEquals.expValEquals)('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+            // Use node(1) to reliably target the table node regardless of $anchorCell depth.
+            // node(-1) would return tableRow if $anchorCell is at tableCell depth.
+            var tableNode = preservedSelection.$anchorCell.node(1);
+            var cellTexts = [];
+            if (tableNode) {
+              // forEachCell iterates only the selected cells, not all cells in the table.
+              preservedSelection.forEachCell(function (cell) {
+                cellTexts.push(cell.textContent);
+              });
+            }
+            var _textContent = cellTexts.filter(Boolean).join(' ');
+            return {
+              textLength: _textContent.length,
+              textContent: _textContent
+            };
+          }
           var from = preservedSelection.from,
             to = preservedSelection.to;
           var textContent = editorView.state.doc.textBetween(from, to, '\n');

package/dist/cjs/pm-plugins/decorations-drag-handle.js

@@ -75,7 +75,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, pos),
+    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }
@@ -84,7 +84,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     type: _decorationsCommon.TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(_decorationsCommon.TYPE_HANDLE_DEC, "-").concat((0, _uuid.default)()),
-    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? (0, _marks.getActiveBlockMarks)(editorState, pos) : undefined,
+    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }

package/dist/cjs/pm-plugins/decorations-quick-insert-button.js

@@ -62,7 +62,7 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, rootPos),
+    marks: (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _marks.getMatchingBlockMarks)(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(_) {
       if ((0, _platformFeatureFlags.fg)('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/cjs/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -123,7 +123,9 @@ var processHoverSide = function processHoverSide(view, api) {
   }
 
   // Added right-margin hover, gated so it can be rolled back. When off, fall through to midpoint.
-  if ((0, _experiments.editorExperiment)('remix_button_right_margin_hover', true)) {
+  if ((0, _experiments.editorExperiment)('remix_button_right_margin_hover', true, {
+    exposure: true
+  })) {
     var closestBlock = target === null || target === void 0 ? void 0 : target.closest(BLOCK_SELECTORS);
     var blockElement = closestBlock instanceof HTMLElement ? closestBlock : null;
 

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

@@ -3,61 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMatchingBlockMarks = exports.getActiveBlockMarks = void 0;
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-var getActiveBlockMarks = exports.getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
-  var alignment = state.schema.marks.alignment;
-  var resolvedPos = state.doc.resolve(pos);
-
-  // find all active marks at the position
-  var marks = resolvedPos.marks();
-  var supportedMarks = marks.filter(function (mark) {
-    return mark.type === alignment;
-  });
-
-  /**
-   * Fix for widget positioning at alignment mark boundaries.
-   * When the previous node has alignment but the next node doesn't, we need to prevent
-   * the widget from inheriting alignment marks. This ensures the widget is positioned
-   * correctly at the boundary rather than being absorbed into the alignment wrapper.
-   */
-  if (supportedMarks.length > 0 && (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
-    var _resolvedPos$nodeAfte;
-    var nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(function (mark) {
-      return mark.type === alignment;
-    })) || [];
-
-    // Compare alignment values to ensure they are the same
-    var alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(function (mark) {
-      return nextNodeMarks.some(function (nextMark) {
-        return nextMark.eq(mark);
-      });
-    });
-
-    // previous node has alignment but next node does not have alignment or alignment values differ
-    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
-      return [];
-    }
-  }
-  return supportedMarks;
-};
-
+exports.getMatchingBlockMarks = void 0;
 /** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
 var hasMatchingMark = function hasMatchingMark(mark, marks) {
   var found = mark.type.isInSet(marks);

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

@@ -82,6 +82,37 @@ var buttonWrapperStyles = (0, _react2.css)({
     boxSizing: 'border-box'
   }
 });
+
+// EDITOR-6790 - When the `platform_editor_table_col_insert` experiment is enabled,
+// drop the linear-gradient background that paints over the legacy `tr.sticky` table
+// header so the new left-edge column-insert affordance is not visually clipped.
+// Keep all paddings / margins identical to `buttonWrapperStyles` so the drag-handle
+// layout does not shift between the two variants.
+var buttonWrapperStylesNoBackground = (0, _react2.css)({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+  '[data-blocks-drag-handle-container]:has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls tr.sticky) &': {
+    marginBottom: "var(--ds-space-negative-200, -16px)",
+    paddingBottom: "var(--ds-space-200, 16px)",
+    marginTop: "var(--ds-space-negative-400, -32px)",
+    paddingTop: "calc(".concat("var(--ds-space-400, 32px)", " - 1px)"),
+    marginRight: "var(--ds-space-negative-150, -12px)",
+    paddingRight: "var(--ds-space-150, 12px)",
+    boxSizing: 'border-box'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+  '[data-prosemirror-mark-name="breakout"]:has([data-blocks-drag-handle-container]):has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls tr.sticky) &': {
+    marginBottom: "var(--ds-space-negative-200, -16px)",
+    paddingBottom: "var(--ds-space-200, 16px)",
+    marginTop: "var(--ds-space-negative-400, -32px)",
+    paddingTop: "calc(".concat("var(--ds-space-400, 32px)", " - 1px)"),
+    marginRight: "var(--ds-space-negative-150, -12px)",
+    paddingRight: "var(--ds-space-150, 12px)",
+    boxSizing: 'border-box'
+  }
+});
 var buttonWrapperStylesPatch = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
   '[data-blocks-drag-handle-container]:has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls [data-number-column="true"] tr.sticky) &': {
@@ -1092,7 +1123,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         });
       }
     }, (0, _react2.jsx)("span", {
-      css: [(0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
+      css: [(0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && (
+      // EDITOR-6790 - drop the masking background under the new
+      // column-insert experiment so the left-edge dot is not clipped.
+      (0, _expValEquals.expValEquals)('platform_editor_table_col_insert', 'isEnabled', true) ? buttonWrapperStylesNoBackground : buttonWrapperStyles), buttonWrapperStylesPatch]
     }, renderButton()))));
   };
   var stickyWithoutTooltip = function stickyWithoutTooltip() {
@@ -1108,7 +1142,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     }, (0, _react2.jsx)("span", {
       css: [tooltipContainerStyles, (0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithMask, !(0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
     }, (0, _react2.jsx)("span", {
-      css: [(0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
+      css: [(0, _dragHandlePositions.shouldMaskNodeControls)(nodeType, isTopLevelNodeValue) && (
+      // EDITOR-6790 - drop the masking background under the new
+      // column-insert experiment so the left-edge dot is not clipped.
+      (0, _expValEquals.expValEquals)('platform_editor_table_col_insert', 'isEnabled', true) ? buttonWrapperStylesNoBackground : buttonWrapperStyles), buttonWrapperStylesPatch]
     }, renderButton())));
   };
   var buttonWithTooltip = function buttonWithTooltip() {

package/dist/es2019/blockControlsPlugin.js

@@ -2,7 +2,9 @@ import React from 'react';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { handleKeyDownWithPreservedSelection } from './editor-commands/handle-key-down-with-preserved-selection';
 import { mapPreservedSelection } from './editor-commands/map-preserved-selection';
@@ -35,6 +37,27 @@ export const blockControlsPlugin = ({
         const blockControlsState = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState();
         const preservedSelection = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection;
         if (preservedSelection && preservedSelection.from !== preservedSelection.to) {
+          // CellSelection covers a table: collect each selected cell's text joined with spaces
+          // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
+          // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
+          // word boundaries, which raw textContent fusion breaks.
+          if (preservedSelection instanceof CellSelection && expValEquals('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+            // Use node(1) to reliably target the table node regardless of $anchorCell depth.
+            // node(-1) would return tableRow if $anchorCell is at tableCell depth.
+            const tableNode = preservedSelection.$anchorCell.node(1);
+            const cellTexts = [];
+            if (tableNode) {
+              // forEachCell iterates only the selected cells, not all cells in the table.
+              preservedSelection.forEachCell(cell => {
+                cellTexts.push(cell.textContent);
+              });
+            }
+            const textContent = cellTexts.filter(Boolean).join(' ');
+            return {
+              textLength: textContent.length,
+              textContent
+            };
+          }
           const {
             from,
             to

package/dist/es2019/pm-plugins/decorations-drag-handle.js

@@ -10,7 +10,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_DRAG_HANDLE_ATTR } from '../ui/consts';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 const TYPE_ACTIVE_HANDLE_DEC = 'active-drag-handle-node';
 
 /**
@@ -62,7 +62,7 @@ export const dragHandleDecoration = ({
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: node => {
       unbind && unbind();
     }
@@ -71,7 +71,7 @@ export const dragHandleDecoration = ({
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: `${TYPE_HANDLE_DEC}-${uuid()}`,
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? getActiveBlockMarks(editorState, pos) : undefined,
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: node => {
       unbind && unbind();
     }

package/dist/es2019/pm-plugins/decorations-quick-insert-button.js

@@ -7,7 +7,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_QUICK_INSERT_ATTR } from '../ui/consts';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 const TYPE_QUICK_INSERT = 'INSERT_BUTTON';
 const TYPE_ACTIVE_QUICK_INSERT_NODE = 'active-quick-insert-node';
 export const findQuickInsertInsertButtonDecoration = (decorations, from, to) => {
@@ -48,7 +48,7 @@ export const quickInsertButtonDecoration = ({
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: _ => {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/es2019/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -104,7 +104,9 @@ const processHoverSide = (view, api) => {
   }
 
   // Added right-margin hover, gated so it can be rolled back. When off, fall through to midpoint.
-  if (editorExperiment('remix_button_right_margin_hover', true)) {
+  if (editorExperiment('remix_button_right_margin_hover', true, {
+    exposure: true
+  })) {
     const closestBlock = target === null || target === void 0 ? void 0 : target.closest(BLOCK_SELECTORS);
     const blockElement = closestBlock instanceof HTMLElement ? closestBlock : null;
 

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

@@ -1,52 +1,3 @@
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-export const getActiveBlockMarks = (state, pos) => {
-  const {
-    alignment
-  } = state.schema.marks;
-  const resolvedPos = state.doc.resolve(pos);
-
-  // find all active marks at the position
-  const marks = resolvedPos.marks();
-  const supportedMarks = marks.filter(mark => mark.type === alignment);
-
-  /**
-   * Fix for widget positioning at alignment mark boundaries.
-   * When the previous node has alignment but the next node doesn't, we need to prevent
-   * the widget from inheriting alignment marks. This ensures the widget is positioned
-   * correctly at the boundary rather than being absorbed into the alignment wrapper.
-   */
-  if (supportedMarks.length > 0 && expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
-    var _resolvedPos$nodeAfte;
-    const nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(mark => mark.type === alignment)) || [];
-
-    // Compare alignment values to ensure they are the same
-    const alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(mark => nextNodeMarks.some(nextMark => nextMark.eq(mark)));
-
-    // previous node has alignment but next node does not have alignment or alignment values differ
-    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
-      return [];
-    }
-  }
-  return supportedMarks;
-};
-
 /** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
 const hasMatchingMark = (mark, marks) => {
   const found = mark.type.isInSet(marks);

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

@@ -73,6 +73,37 @@ const buttonWrapperStyles = css({
     boxSizing: 'border-box'
   }
 });
+
+// EDITOR-6790 - When the `platform_editor_table_col_insert` experiment is enabled,
+// drop the linear-gradient background that paints over the legacy `tr.sticky` table
+// header so the new left-edge column-insert affordance is not visually clipped.
+// Keep all paddings / margins identical to `buttonWrapperStyles` so the drag-handle
+// layout does not shift between the two variants.
+const buttonWrapperStylesNoBackground = css({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+  '[data-blocks-drag-handle-container]:has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls tr.sticky) &': {
+    marginBottom: "var(--ds-space-negative-200, -16px)",
+    paddingBottom: "var(--ds-space-200, 16px)",
+    marginTop: "var(--ds-space-negative-400, -32px)",
+    paddingTop: `calc(${"var(--ds-space-400, 32px)"} - 1px)`,
+    marginRight: "var(--ds-space-negative-150, -12px)",
+    paddingRight: "var(--ds-space-150, 12px)",
+    boxSizing: 'border-box'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+  '[data-prosemirror-mark-name="breakout"]:has([data-blocks-drag-handle-container]):has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls tr.sticky) &': {
+    marginBottom: "var(--ds-space-negative-200, -16px)",
+    paddingBottom: "var(--ds-space-200, 16px)",
+    marginTop: "var(--ds-space-negative-400, -32px)",
+    paddingTop: `calc(${"var(--ds-space-400, 32px)"} - 1px)`,
+    marginRight: "var(--ds-space-negative-150, -12px)",
+    paddingRight: "var(--ds-space-150, 12px)",
+    boxSizing: 'border-box'
+  }
+});
 const buttonWrapperStylesPatch = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
   '[data-blocks-drag-handle-container]:has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls [data-number-column="true"] tr.sticky) &': {
@@ -1071,7 +1102,10 @@ export const DragHandle = ({
       });
     }
   }, jsx("span", {
-    css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
+    css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && (
+    // EDITOR-6790 - drop the masking background under the new
+    // column-insert experiment so the left-edge dot is not clipped.
+    expValEquals('platform_editor_table_col_insert', 'isEnabled', true) ? buttonWrapperStylesNoBackground : buttonWrapperStyles), buttonWrapperStylesPatch]
   }, renderButton()))));
   const stickyWithoutTooltip = () => jsx(Box
   // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
@@ -1085,7 +1119,10 @@ export const DragHandle = ({
   }, jsx("span", {
     css: [tooltipContainerStyles, shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithMask, !shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
   }, jsx("span", {
-    css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
+    css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && (
+    // EDITOR-6790 - drop the masking background under the new
+    // column-insert experiment so the left-edge dot is not clipped.
+    expValEquals('platform_editor_table_col_insert', 'isEnabled', true) ? buttonWrapperStylesNoBackground : buttonWrapperStyles), buttonWrapperStylesPatch]
   }, renderButton())));
   const buttonWithTooltip = () => jsx(Tooltip, {
     content: tooltipContent,

package/dist/esm/blockControlsPlugin.js

@@ -5,7 +5,9 @@ import React from 'react';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { handleKeyDownWithPreservedSelection } from './editor-commands/handle-key-down-with-preserved-selection';
 import { mapPreservedSelection as _mapPreservedSelection } from './editor-commands/map-preserved-selection';
@@ -37,6 +39,27 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         var blockControlsState = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState();
         var preservedSelection = blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection;
         if (preservedSelection && preservedSelection.from !== preservedSelection.to) {
+          // CellSelection covers a table: collect each selected cell's text joined with spaces
+          // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
+          // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
+          // word boundaries, which raw textContent fusion breaks.
+          if (preservedSelection instanceof CellSelection && expValEquals('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+            // Use node(1) to reliably target the table node regardless of $anchorCell depth.
+            // node(-1) would return tableRow if $anchorCell is at tableCell depth.
+            var tableNode = preservedSelection.$anchorCell.node(1);
+            var cellTexts = [];
+            if (tableNode) {
+              // forEachCell iterates only the selected cells, not all cells in the table.
+              preservedSelection.forEachCell(function (cell) {
+                cellTexts.push(cell.textContent);
+              });
+            }
+            var _textContent = cellTexts.filter(Boolean).join(' ');
+            return {
+              textLength: _textContent.length,
+              textContent: _textContent
+            };
+          }
           var from = preservedSelection.from,
             to = preservedSelection.to;
           var textContent = editorView.state.doc.textBetween(from, to, '\n');

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -11,7 +11,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_DRAG_HANDLE_ATTR } from '../ui/consts';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 var TYPE_ACTIVE_HANDLE_DEC = 'active-drag-handle-node';
 
 /**
@@ -67,7 +67,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }
@@ -76,7 +76,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? getActiveBlockMarks(editorState, pos) : undefined,
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, pos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(node) {
       unbind && unbind();
     }

package/dist/esm/pm-plugins/decorations-quick-insert-button.js

@@ -8,7 +8,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ACTIVE_QUICK_INSERT_ATTR } from '../ui/consts';
 import { QuickInsertWithVisibility } from '../ui/quick-insert-button';
-import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
+import { getMatchingBlockMarks } from './utils/marks';
 var TYPE_QUICK_INSERT = 'INSERT_BUTTON';
 var TYPE_ACTIVE_QUICK_INSERT_NODE = 'active-quick-insert-node';
 export var findQuickInsertInsertButtonDecoration = function findQuickInsertInsertButtonDecoration(decorations, from, to) {
@@ -54,7 +54,7 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
+    marks: expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getMatchingBlockMarks(editorState, rootPos, [editorState.schema.marks.alignment, editorState.schema.marks.fontSize]) : [],
     destroy: function destroy(_) {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/esm/pm-plugins/interaction-tracking/handle-mouse-move.js

@@ -118,7 +118,9 @@ var processHoverSide = function processHoverSide(view, api) {
   }
 
   // Added right-margin hover, gated so it can be rolled back. When off, fall through to midpoint.
-  if (editorExperiment('remix_button_right_margin_hover', true)) {
+  if (editorExperiment('remix_button_right_margin_hover', true, {
+    exposure: true
+  })) {
     var closestBlock = target === null || target === void 0 ? void 0 : target.closest(BLOCK_SELECTORS);
     var blockElement = closestBlock instanceof HTMLElement ? closestBlock : null;
 

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

@@ -1,58 +1,3 @@
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-export var getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
-  var alignment = state.schema.marks.alignment;
-  var resolvedPos = state.doc.resolve(pos);
-
-  // find all active marks at the position
-  var marks = resolvedPos.marks();
-  var supportedMarks = marks.filter(function (mark) {
-    return mark.type === alignment;
-  });
-
-  /**
-   * Fix for widget positioning at alignment mark boundaries.
-   * When the previous node has alignment but the next node doesn't, we need to prevent
-   * the widget from inheriting alignment marks. This ensures the widget is positioned
-   * correctly at the boundary rather than being absorbed into the alignment wrapper.
-   */
-  if (supportedMarks.length > 0 && expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
-    var _resolvedPos$nodeAfte;
-    var nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(function (mark) {
-      return mark.type === alignment;
-    })) || [];
-
-    // Compare alignment values to ensure they are the same
-    var alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(function (mark) {
-      return nextNodeMarks.some(function (nextMark) {
-        return nextMark.eq(mark);
-      });
-    });
-
-    // previous node has alignment but next node does not have alignment or alignment values differ
-    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
-      return [];
-    }
-  }
-  return supportedMarks;
-};
-
 /** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
 var hasMatchingMark = function hasMatchingMark(mark, marks) {
   var found = mark.type.isInSet(marks);

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

@@ -78,6 +78,37 @@ var buttonWrapperStyles = css({
     boxSizing: 'border-box'
   }
 });
+
+// EDITOR-6790 - When the `platform_editor_table_col_insert` experiment is enabled,
+// drop the linear-gradient background that paints over the legacy `tr.sticky` table
+// header so the new left-edge column-insert affordance is not visually clipped.
+// Keep all paddings / margins identical to `buttonWrapperStyles` so the drag-handle
+// layout does not shift between the two variants.
+var buttonWrapperStylesNoBackground = css({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+  '[data-blocks-drag-handle-container]:has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls tr.sticky) &': {
+    marginBottom: "var(--ds-space-negative-200, -16px)",
+    paddingBottom: "var(--ds-space-200, 16px)",
+    marginTop: "var(--ds-space-negative-400, -32px)",
+    paddingTop: "calc(".concat("var(--ds-space-400, 32px)", " - 1px)"),
+    marginRight: "var(--ds-space-negative-150, -12px)",
+    paddingRight: "var(--ds-space-150, 12px)",
+    boxSizing: 'border-box'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
+  '[data-prosemirror-mark-name="breakout"]:has([data-blocks-drag-handle-container]):has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls tr.sticky) &': {
+    marginBottom: "var(--ds-space-negative-200, -16px)",
+    paddingBottom: "var(--ds-space-200, 16px)",
+    marginTop: "var(--ds-space-negative-400, -32px)",
+    paddingTop: "calc(".concat("var(--ds-space-400, 32px)", " - 1px)"),
+    marginRight: "var(--ds-space-negative-150, -12px)",
+    paddingRight: "var(--ds-space-150, 12px)",
+    boxSizing: 'border-box'
+  }
+});
 var buttonWrapperStylesPatch = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
   '[data-blocks-drag-handle-container]:has(+ [data-prosemirror-node-name="table"] .pm-table-with-controls [data-number-column="true"] tr.sticky) &': {
@@ -1088,7 +1119,10 @@ export var DragHandle = function DragHandle(_ref) {
         });
       }
     }, jsx("span", {
-      css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
+      css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && (
+      // EDITOR-6790 - drop the masking background under the new
+      // column-insert experiment so the left-edge dot is not clipped.
+      expValEquals('platform_editor_table_col_insert', 'isEnabled', true) ? buttonWrapperStylesNoBackground : buttonWrapperStyles), buttonWrapperStylesPatch]
     }, renderButton()))));
   };
   var stickyWithoutTooltip = function stickyWithoutTooltip() {
@@ -1104,7 +1138,10 @@ export var DragHandle = function DragHandle(_ref) {
     }, jsx("span", {
       css: [tooltipContainerStyles, shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithMask, !shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && tooltipContainerStylesStickyHeaderWithoutMask]
     }, jsx("span", {
-      css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && buttonWrapperStyles, buttonWrapperStylesPatch]
+      css: [shouldMaskNodeControls(nodeType, isTopLevelNodeValue) && (
+      // EDITOR-6790 - drop the masking background under the new
+      // column-insert experiment so the left-edge dot is not clipped.
+      expValEquals('platform_editor_table_col_insert', 'isEnabled', true) ? buttonWrapperStylesNoBackground : buttonWrapperStyles), buttonWrapperStylesPatch]
     }, renderButton())));
   };
   var buttonWithTooltip = function buttonWithTooltip() {

package/dist/types/pm-plugins/utils/marks.d.ts

@@ -1,22 +1,5 @@
 import type { Mark, MarkType } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-/**
- * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
- *
- * Returns list of block marks on schema that widgets are allowed to render inside
- * Currently
- * - indent
- * - alignment
- * @param state - The editor state
- * @returns The block marks
- * @example
- * ```ts
- * const marks = getBlockMarks(state);
- * console.log(marks);
- * // [indent, alignment]
- * ```
- */
-export declare const getActiveBlockMarks: (state: EditorState, pos: number) => Mark[];
 /**
  * Returns supported block marks at `pos` only when both adjacent siblings
  * share the exact same set of those marks. Returns `[]` when they differ,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "13.0.5",
+	"version": "13.0.7",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,20 +27,20 @@
 		"@atlaskit/editor-plugin-editor-disabled": "^12.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^14.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^11.0.0",
-		"@atlaskit/editor-plugin-interaction": "^21.0.0",
+		"@atlaskit/editor-plugin-interaction": "^22.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^9.0.0",
 		"@atlaskit/editor-plugin-metrics": "^13.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^12.0.0",
 		"@atlaskit/editor-plugin-selection": "^12.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^9.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^12.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^12.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^10.0.0",
 		"@atlaskit/editor-plugin-width": "^13.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/icon": "^36.0.0",
-		"@atlaskit/icon-lab": "^7.0.0",
+		"@atlaskit/icon-lab": "^7.1.0",
 		"@atlaskit/link": "^4.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^2.0.0",
@@ -48,8 +48,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.0.0",
 		"@atlaskit/primitives": "^20.0.0",
 		"@atlaskit/theme": "^26.0.0",
-		"@atlaskit/tmp-editor-statsig": "^109.0.0",
-		"@atlaskit/tokens": "^14.0.0",
+		"@atlaskit/tmp-editor-statsig": "^110.0.0",
+		"@atlaskit/tokens": "^15.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -59,7 +59,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.6.0",
+		"@atlaskit/editor-common": "^116.11.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -147,6 +147,6 @@
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"react-intl": "^6.6.2"
+		"react-intl": "^7.0.0"
 	}
 }