@atlaskit/editor-plugin-block-controls 11.2.7 → 11.2.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 11.2.9
+
+### Patch Changes
+
+- [`f35afb9a5ed6e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f35afb9a5ed6e) -
+  Fix getMatchingBlockMarks to check both adjacent siblings before returning marks
+- Updated dependencies
+
+## 11.2.8
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 11.2.7
 
 ### Patch Changes

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

@@ -57,7 +57,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_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]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, pos),
     destroy: function destroy(node) {
       unbind && unbind();
     }
@@ -66,7 +66,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_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]) : (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,
     destroy: function destroy(node) {
       unbind && unbind();
     }

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

@@ -44,7 +44,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_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]) : (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, rootPos),
     destroy: function destroy(_) {
       if ((0, _platformFeatureFlags.fg)('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getActiveBlockMarks = void 0;
+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.
@@ -56,4 +56,49 @@ var getActiveBlockMarks = exports.getActiveBlockMarks = function getActiveBlockM
     }
   }
   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);
+  return !!found && mark.eq(found);
+};
+
+/**
+ * Returns supported block marks at `pos` only when both adjacent siblings
+ * share the exact same set of those marks. Returns `[]` when they differ,
+ * so the widget sits outside all mark wrappers and avoids mis-nesting.
+ */
+var getMatchingBlockMarks = exports.getMatchingBlockMarks = function getMatchingBlockMarks(state, pos, supportedMarkTypes) {
+  var _nodeAfter$marks, _nodeBefore$marks;
+  var resolvedPos = state.doc.resolve(pos);
+  var validMarkTypes = supportedMarkTypes.filter(Boolean);
+  var supportedMarks = resolvedPos.marks().filter(function (mark) {
+    return validMarkTypes.includes(mark.type);
+  });
+  if (supportedMarks.length === 0) {
+    return [];
+  }
+  var nodeAfter = resolvedPos.nodeAfter,
+    nodeBefore = resolvedPos.nodeBefore;
+  var nextMarks = (_nodeAfter$marks = nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.marks) !== null && _nodeAfter$marks !== void 0 ? _nodeAfter$marks : [];
+  var prevMarks = (_nodeBefore$marks = nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.marks) !== null && _nodeBefore$marks !== void 0 ? _nodeBefore$marks : [];
+  var nextSupported = nextMarks.filter(function (m) {
+    return validMarkTypes.includes(m.type);
+  });
+  var allMatchNext = supportedMarks.every(function (m) {
+    return hasMatchingMark(m, nextMarks);
+  });
+
+  // First node — no previous sibling to compare against.
+  if (!nodeBefore) {
+    return nextSupported.length === supportedMarks.length && allMatchNext ? supportedMarks : [];
+  }
+
+  // `supportedMarks` already comes from `nodeBefore` (via resolvedPos.marks()).
+  // Compare counts to guard against extra supported marks on either side.
+  var prevSupported = prevMarks.filter(function (m) {
+    return validMarkTypes.includes(m.type);
+  });
+  return prevSupported.length === nextSupported.length && allMatchNext ? supportedMarks : [];
 };

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

@@ -9,7 +9,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
-import { getActiveBlockMarks } from './utils/marks';
+import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
 export const emptyParagraphNodeDecorations = () => {
   const anchorName = `--node-anchor-paragraph-0`;
   const style = `anchor-name: ${anchorName}; margin-top: 0px;`;
@@ -48,7 +48,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_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]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
     destroy: node => {
       unbind && unbind();
     }
@@ -57,7 +57,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_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]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? getActiveBlockMarks(editorState, pos) : undefined,
     destroy: node => {
       unbind && unbind();
     }

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

@@ -6,7 +6,7 @@ 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 { QuickInsertWithVisibility } from '../ui/quick-insert-button';
-import { getActiveBlockMarks } from './utils/marks';
+import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
 const TYPE_QUICK_INSERT = 'INSERT_BUTTON';
 export const findQuickInsertInsertButtonDecoration = (decorations, from, to) => {
   return decorations.find(from, to, spec => spec.type === TYPE_QUICK_INSERT);
@@ -35,7 +35,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_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]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
     destroy: _ => {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

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

@@ -45,4 +45,43 @@ export const getActiveBlockMarks = (state, pos) => {
     }
   }
   return supportedMarks;
+};
+
+/** True when `mark` has an equal counterpart (type + attrs) in `marks`. */
+const hasMatchingMark = (mark, marks) => {
+  const found = mark.type.isInSet(marks);
+  return !!found && mark.eq(found);
+};
+
+/**
+ * Returns supported block marks at `pos` only when both adjacent siblings
+ * share the exact same set of those marks. Returns `[]` when they differ,
+ * so the widget sits outside all mark wrappers and avoids mis-nesting.
+ */
+export const getMatchingBlockMarks = (state, pos, supportedMarkTypes) => {
+  var _nodeAfter$marks, _nodeBefore$marks;
+  const resolvedPos = state.doc.resolve(pos);
+  const validMarkTypes = supportedMarkTypes.filter(Boolean);
+  const supportedMarks = resolvedPos.marks().filter(mark => validMarkTypes.includes(mark.type));
+  if (supportedMarks.length === 0) {
+    return [];
+  }
+  const {
+    nodeAfter,
+    nodeBefore
+  } = resolvedPos;
+  const nextMarks = (_nodeAfter$marks = nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.marks) !== null && _nodeAfter$marks !== void 0 ? _nodeAfter$marks : [];
+  const prevMarks = (_nodeBefore$marks = nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.marks) !== null && _nodeBefore$marks !== void 0 ? _nodeBefore$marks : [];
+  const nextSupported = nextMarks.filter(m => validMarkTypes.includes(m.type));
+  const allMatchNext = supportedMarks.every(m => hasMatchingMark(m, nextMarks));
+
+  // First node — no previous sibling to compare against.
+  if (!nodeBefore) {
+    return nextSupported.length === supportedMarks.length && allMatchNext ? supportedMarks : [];
+  }
+
+  // `supportedMarks` already comes from `nodeBefore` (via resolvedPos.marks()).
+  // Compare counts to guard against extra supported marks on either side.
+  const prevSupported = prevMarks.filter(m => validMarkTypes.includes(m.type));
+  return prevSupported.length === nextSupported.length && allMatchNext ? supportedMarks : [];
 };

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

@@ -10,7 +10,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
-import { getActiveBlockMarks } from './utils/marks';
+import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
 export var emptyParagraphNodeDecorations = function emptyParagraphNodeDecorations() {
   var anchorName = "--node-anchor-paragraph-0";
   var style = "anchor-name: ".concat(anchorName, "; margin-top: 0px;");
@@ -49,7 +49,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_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]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
     destroy: function destroy(node) {
       unbind && unbind();
     }
@@ -58,7 +58,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_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]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? getActiveBlockMarks(editorState, pos) : undefined,
     destroy: function destroy(node) {
       unbind && unbind();
     }

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

@@ -6,7 +6,7 @@ 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 { QuickInsertWithVisibility } from '../ui/quick-insert-button';
-import { getActiveBlockMarks } from './utils/marks';
+import { getActiveBlockMarks, getMatchingBlockMarks } from './utils/marks';
 var TYPE_QUICK_INSERT = 'INSERT_BUTTON';
 export var findQuickInsertInsertButtonDecoration = function findQuickInsertInsertButtonDecoration(decorations, from, to) {
   return decorations.find(from, to, function (spec) {
@@ -36,7 +36,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_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]) : expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
     destroy: function destroy(_) {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

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

@@ -51,4 +51,49 @@ export var getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
     }
   }
   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);
+  return !!found && mark.eq(found);
+};
+
+/**
+ * Returns supported block marks at `pos` only when both adjacent siblings
+ * share the exact same set of those marks. Returns `[]` when they differ,
+ * so the widget sits outside all mark wrappers and avoids mis-nesting.
+ */
+export var getMatchingBlockMarks = function getMatchingBlockMarks(state, pos, supportedMarkTypes) {
+  var _nodeAfter$marks, _nodeBefore$marks;
+  var resolvedPos = state.doc.resolve(pos);
+  var validMarkTypes = supportedMarkTypes.filter(Boolean);
+  var supportedMarks = resolvedPos.marks().filter(function (mark) {
+    return validMarkTypes.includes(mark.type);
+  });
+  if (supportedMarks.length === 0) {
+    return [];
+  }
+  var nodeAfter = resolvedPos.nodeAfter,
+    nodeBefore = resolvedPos.nodeBefore;
+  var nextMarks = (_nodeAfter$marks = nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.marks) !== null && _nodeAfter$marks !== void 0 ? _nodeAfter$marks : [];
+  var prevMarks = (_nodeBefore$marks = nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.marks) !== null && _nodeBefore$marks !== void 0 ? _nodeBefore$marks : [];
+  var nextSupported = nextMarks.filter(function (m) {
+    return validMarkTypes.includes(m.type);
+  });
+  var allMatchNext = supportedMarks.every(function (m) {
+    return hasMatchingMark(m, nextMarks);
+  });
+
+  // First node — no previous sibling to compare against.
+  if (!nodeBefore) {
+    return nextSupported.length === supportedMarks.length && allMatchNext ? supportedMarks : [];
+  }
+
+  // `supportedMarks` already comes from `nodeBefore` (via resolvedPos.marks()).
+  // Compare counts to guard against extra supported marks on either side.
+  var prevSupported = prevMarks.filter(function (m) {
+    return validMarkTypes.includes(m.type);
+  });
+  return prevSupported.length === nextSupported.length && allMatchNext ? supportedMarks : [];
 };

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

@@ -1,4 +1,4 @@
-import type { Mark } from '@atlaskit/editor-prosemirror/model';
+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.
@@ -17,3 +17,9 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
  * ```
  */
 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,
+ * so the widget sits outside all mark wrappers and avoids mis-nesting.
+ */
+export declare const getMatchingBlockMarks: (state: EditorState, pos: number, supportedMarkTypes: MarkType[]) => Mark[];

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

@@ -1,4 +1,4 @@
-import type { Mark } from '@atlaskit/editor-prosemirror/model';
+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.
@@ -17,3 +17,9 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
  * ```
  */
 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,
+ * so the widget sits outside all mark wrappers and avoids mis-nesting.
+ */
+export declare const getMatchingBlockMarks: (state: EditorState, pos: number, supportedMarkTypes: MarkType[]) => Mark[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "11.2.7",
+	"version": "11.2.9",
 	"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": "^71.0.0",
+		"@atlaskit/tmp-editor-statsig": "^72.1.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^21.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.12.0",
+		"@atlaskit/editor-common": "^114.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"