@atlaskit/editor-plugin-block-menu 20.0.0 → 20.0.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 20.0.2
+
+### Patch Changes
+
+- [`202069bab1e36`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/202069bab1e36) -
+  Clean up the shipped `platform_editor_enghealth_a11y_jan_fixes` experiment. Toolbar dropdown items
+  now always render with `role="menuitem"` and without `aria-pressed`, the block menu always has
+  `role="menu"`, and show-diff deleted content always uses the a11y-fixed styles.
+- [`9c5dee87aa66d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9c5dee87aa66d) -
+  Make Small text availability respect nested parent schemas and fix Small and Normal text
+  conversion for block task items behind the `platform_editor_block_menu_small_text` experiment.
+- Updated dependencies
+
+## 20.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 20.0.0
 
 ### Patch Changes

package/dist/cjs/editor-actions/isTransformToTargetDisabled.js

@@ -8,11 +8,46 @@ exports.isTransformToTargetDisabled = exports.canParentContainNodeType = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _transform = require("../editor-commands/transform-node-utils/transform");
 var _types = require("../editor-commands/transform-node-utils/types");
 var _utils = require("../editor-commands/transform-node-utils/utils");
 var _transformSource = require("./transformSource");
-var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var getTargetMarks = function getTargetMarks(schema, currentMarks, marksToAdd, marksToRemove) {
+  if (!marksToAdd && !marksToRemove) {
+    return undefined;
+  }
+  var targetMarks = currentMarks;
+  var _iterator = _createForOfIteratorHelper(marksToRemove !== null && marksToRemove !== void 0 ? marksToRemove : []),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _name = _step.value;
+      var _markType = schema.marks[_name];
+      if (_markType) {
+        targetMarks = _markType.removeFromSet(targetMarks);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  for (var _i = 0, _Object$entries = Object.entries(marksToAdd !== null && marksToAdd !== void 0 ? marksToAdd : {}); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
+      name = _Object$entries$_i[0],
+      attrs = _Object$entries$_i[1];
+    var markType = schema.marks[name];
+    if (markType) {
+      targetMarks = markType.create(attrs).addToSet(markType.removeFromSet(targetMarks));
+    }
+  }
+  return targetMarks;
+};
+var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs, selectedNode, marksToAdd, marksToRemove) {
   var adjustedNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true, parentNode, schema);
   if (!adjustedNodeTypeName) {
     return false;
@@ -24,6 +59,11 @@ var canParentContainNodeType = exports.canParentContainNodeType = function canPa
     var node = schema.nodes[selectedNodeTypeName];
     content = node.createAndFill();
   }
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_menu_small_text') && selectedNode && (marksToAdd || marksToRemove)) {
+    var targetMarks = getTargetMarks(schema, selectedNode.marks, marksToAdd, marksToRemove);
+    var targetNode = nodeType.createAndFill(nodeTypeAttrs, content, targetMarks);
+    return Boolean(targetNode && parentNode.type.validContent(_model.Fragment.from(targetNode)));
+  }
   return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
@@ -54,6 +94,9 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
       return markType ? !((_markType$isInSet = markType.isInSet(node.marks)) !== null && _markType$isInSet !== void 0 && _markType$isInSet.eq(markType.create(attrs))) : false;
     });
     if (removesTargetMarks || addsOrReplacesTargetMarks) {
+      if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs, node, marksToAdd, marksToRemove)) {
+        return false;
+      }
       return true;
     }
   }
@@ -64,7 +107,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs, node, marksToAdd, marksToRemove)) {
     return false;
   }
   return true;

package/dist/cjs/editor-commands/transform-node-utils/steps/flattenListStep.js

@@ -6,10 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.flattenListStep = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _nodeChecks = require("../nodeChecks");
-var extractNestedLists = function extractNestedLists(node, schema) {
+var extractNestedLists = function extractNestedLists(node, schema, includeBlockTaskItems) {
   var items = [];
   var paragraph = schema.nodes.paragraph;
   var itemTypes = [schema.nodes.listItem, schema.nodes.taskItem, schema.nodes.decisionItem];
+  if (includeBlockTaskItems && schema.nodes.blockTaskItem) {
+    itemTypes.push(schema.nodes.blockTaskItem);
+  }
   var _extract = function extract(currentNode) {
     currentNode.forEach(function (child) {
       if (itemTypes.some(function (type) {
@@ -79,7 +82,7 @@ var extractNestedLists = function extractNestedLists(node, schema) {
 var flattenListStep = exports.flattenListStep = function flattenListStep(nodes, context) {
   return nodes.map(function (node) {
     if ((0, _nodeChecks.isListWithIndentation)(node.type.name, context.schema)) {
-      return node.copy(_model.Fragment.from(extractNestedLists(node, context.schema)));
+      return node.copy(_model.Fragment.from(extractNestedLists(node, context.schema, Boolean(context.includeBlockTaskItems))));
     }
     return node;
   });

package/dist/cjs/editor-commands/transform-node-utils/transform.js

@@ -94,14 +94,15 @@ var convertNodesToTargetType = exports.convertNodesToTargetType = function conve
     return sourceNodes;
   }
   var steps = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? _TRANSFORMATION_MATRIX.TRANSFORMATION_MATRIX_PANEL_C1[selectedNodeTypeName][targetNodeTypeName] : _TRANSFORMATION_MATRIX.TRANSFORMATION_MATRIX[selectedNodeTypeName][targetNodeTypeName];
+  var shouldApplyTargetNodeMarkChanges = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_menu_small_text') && Boolean(marksToAdd || marksToRemove);
   var context = {
     // sourceNode is incorrect now - what to do here?
     fromNode: sourceNode,
+    includeBlockTaskItems: shouldApplyTargetNodeMarkChanges,
     targetNodeTypeName: targetNodeTypeName,
     schema: schema,
     targetAttrs: targetAttrs
   };
-  var shouldApplyTargetNodeMarkChanges = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_menu_small_text') && Boolean(marksToAdd || marksToRemove);
   if (!shouldApplyTargetNodeMarkChanges) {
     if (!steps || steps.length === 0) {
       return sourceNodes;

package/dist/cjs/ui/block-menu.js

@@ -28,7 +28,6 @@ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-ex
 var _compiled = require("@atlaskit/primitives/compiled");
 var _redo = require("@atlaskit/prosemirror-history/redo");
 var _undo = require("@atlaskit/prosemirror-history/undo");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _blockMenuProvider = require("./block-menu-provider");
 var _BlockMenuRenderer = require("./block-menu-renderer/BlockMenuRenderer");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -159,7 +158,7 @@ var BlockMenuContent = function BlockMenuContent(_ref4) {
   }
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     testId: _blockMenu.BLOCK_MENU_TEST_ID,
-    role: (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
+    role: "menu",
     ref: ref,
     xcss: (0, _css.cx)(styles.base, styles.maxWidthStyles, styles.emptyMenuSectionStyles)
   }, /*#__PURE__*/_react.default.createElement(_uiMenu.ArrowKeyNavigationProvider, {

package/dist/es2019/editor-actions/isTransformToTargetDisabled.js

@@ -1,10 +1,30 @@
 import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
 import { getSingleTransformSourceNode, isExtensionTransformSource } from './transformSource';
-export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) => {
+const getTargetMarks = (schema, currentMarks, marksToAdd, marksToRemove) => {
+  if (!marksToAdd && !marksToRemove) {
+    return undefined;
+  }
+  let targetMarks = currentMarks;
+  for (const name of marksToRemove !== null && marksToRemove !== void 0 ? marksToRemove : []) {
+    const markType = schema.marks[name];
+    if (markType) {
+      targetMarks = markType.removeFromSet(targetMarks);
+    }
+  }
+  for (const [name, attrs] of Object.entries(marksToAdd !== null && marksToAdd !== void 0 ? marksToAdd : {})) {
+    const markType = schema.marks[name];
+    if (markType) {
+      targetMarks = markType.create(attrs).addToSet(markType.removeFromSet(targetMarks));
+    }
+  }
+  return targetMarks;
+};
+export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs, selectedNode, marksToAdd, marksToRemove) => {
   const adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true, parentNode, schema);
   if (!adjustedNodeTypeName) {
     return false;
@@ -16,6 +36,11 @@ export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNod
     const node = schema.nodes[selectedNodeTypeName];
     content = node.createAndFill();
   }
+  if (isExperimentEnabled('platform_editor_block_menu_small_text') && selectedNode && (marksToAdd || marksToRemove)) {
+    const targetMarks = getTargetMarks(schema, selectedNode.marks, marksToAdd, marksToRemove);
+    const targetNode = nodeType.createAndFill(nodeTypeAttrs, content, targetMarks);
+    return Boolean(targetNode && parentNode.type.validContent(Fragment.from(targetNode)));
+  }
   return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 const isHeadingToHeadingTransformEnabled = (selectedNode, targetNodeTypeAttrs) => {
@@ -43,6 +68,9 @@ const isTransformEnabledForNode = (node, targetNodeTypeName, targetNodeTypeAttrs
       return markType ? !((_markType$isInSet = markType.isInSet(node.marks)) !== null && _markType$isInSet !== void 0 && _markType$isInSet.eq(markType.create(attrs))) : false;
     });
     if (removesTargetMarks || addsOrReplacesTargetMarks) {
+      if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs, node, marksToAdd, marksToRemove)) {
+        return false;
+      }
       return true;
     }
   }
@@ -53,7 +81,7 @@ const isTransformEnabledForNode = (node, targetNodeTypeName, targetNodeTypeAttrs
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs, node, marksToAdd, marksToRemove)) {
     return false;
   }
   return true;

package/dist/es2019/editor-commands/transform-node-utils/steps/flattenListStep.js

@@ -1,9 +1,12 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isListWithIndentation } from '../nodeChecks';
-const extractNestedLists = (node, schema) => {
+const extractNestedLists = (node, schema, includeBlockTaskItems) => {
   const items = [];
   const paragraph = schema.nodes.paragraph;
   const itemTypes = [schema.nodes.listItem, schema.nodes.taskItem, schema.nodes.decisionItem];
+  if (includeBlockTaskItems && schema.nodes.blockTaskItem) {
+    itemTypes.push(schema.nodes.blockTaskItem);
+  }
   const extract = currentNode => {
     currentNode.forEach(child => {
       if (itemTypes.some(type => child.type === type)) {
@@ -71,7 +74,7 @@ const extractNestedLists = (node, schema) => {
 export const flattenListStep = (nodes, context) => {
   return nodes.map(node => {
     if (isListWithIndentation(node.type.name, context.schema)) {
-      return node.copy(Fragment.from(extractNestedLists(node, context.schema)));
+      return node.copy(Fragment.from(extractNestedLists(node, context.schema, Boolean(context.includeBlockTaskItems))));
     }
     return node;
   });

package/dist/es2019/editor-commands/transform-node-utils/transform.js

@@ -82,14 +82,15 @@ export const convertNodesToTargetType = ({
     return sourceNodes;
   }
   const steps = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? TRANSFORMATION_MATRIX_PANEL_C1[selectedNodeTypeName][targetNodeTypeName] : TRANSFORMATION_MATRIX[selectedNodeTypeName][targetNodeTypeName];
+  const shouldApplyTargetNodeMarkChanges = isExperimentEnabled('platform_editor_block_menu_small_text') && Boolean(marksToAdd || marksToRemove);
   const context = {
     // sourceNode is incorrect now - what to do here?
     fromNode: sourceNode,
+    includeBlockTaskItems: shouldApplyTargetNodeMarkChanges,
     targetNodeTypeName,
     schema,
     targetAttrs
   };
-  const shouldApplyTargetNodeMarkChanges = isExperimentEnabled('platform_editor_block_menu_small_text') && Boolean(marksToAdd || marksToRemove);
   if (!shouldApplyTargetNodeMarkChanges) {
     if (!steps || steps.length === 0) {
       return sourceNodes;

package/dist/es2019/ui/block-menu.js

@@ -19,7 +19,6 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { Box } from '@atlaskit/primitives/compiled';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
 const styles = {
@@ -148,7 +147,7 @@ const BlockMenuContent = ({
   }
   return /*#__PURE__*/React.createElement(Box, {
     testId: BLOCK_MENU_TEST_ID,
-    role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
+    role: "menu",
     ref: ref,
     xcss: cx(styles.base, styles.maxWidthStyles, styles.emptyMenuSectionStyles)
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {

package/dist/esm/editor-actions/isTransformToTargetDisabled.js

@@ -1,11 +1,46 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
 import { getSingleTransformSourceNode, isExtensionTransformSource } from './transformSource';
-export var canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+var getTargetMarks = function getTargetMarks(schema, currentMarks, marksToAdd, marksToRemove) {
+  if (!marksToAdd && !marksToRemove) {
+    return undefined;
+  }
+  var targetMarks = currentMarks;
+  var _iterator = _createForOfIteratorHelper(marksToRemove !== null && marksToRemove !== void 0 ? marksToRemove : []),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _name = _step.value;
+      var _markType = schema.marks[_name];
+      if (_markType) {
+        targetMarks = _markType.removeFromSet(targetMarks);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  for (var _i = 0, _Object$entries = Object.entries(marksToAdd !== null && marksToAdd !== void 0 ? marksToAdd : {}); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      name = _Object$entries$_i[0],
+      attrs = _Object$entries$_i[1];
+    var markType = schema.marks[name];
+    if (markType) {
+      targetMarks = markType.create(attrs).addToSet(markType.removeFromSet(targetMarks));
+    }
+  }
+  return targetMarks;
+};
+export var canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs, selectedNode, marksToAdd, marksToRemove) {
   var adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true, parentNode, schema);
   if (!adjustedNodeTypeName) {
     return false;
@@ -17,6 +52,11 @@ export var canParentContainNodeType = function canParentContainNodeType(schema,
     var node = schema.nodes[selectedNodeTypeName];
     content = node.createAndFill();
   }
+  if (isExperimentEnabled('platform_editor_block_menu_small_text') && selectedNode && (marksToAdd || marksToRemove)) {
+    var targetMarks = getTargetMarks(schema, selectedNode.marks, marksToAdd, marksToRemove);
+    var targetNode = nodeType.createAndFill(nodeTypeAttrs, content, targetMarks);
+    return Boolean(targetNode && parentNode.type.validContent(Fragment.from(targetNode)));
+  }
   return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
@@ -47,6 +87,9 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
       return markType ? !((_markType$isInSet = markType.isInSet(node.marks)) !== null && _markType$isInSet !== void 0 && _markType$isInSet.eq(markType.create(attrs))) : false;
     });
     if (removesTargetMarks || addsOrReplacesTargetMarks) {
+      if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs, node, marksToAdd, marksToRemove)) {
+        return false;
+      }
       return true;
     }
   }
@@ -57,7 +100,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs, node, marksToAdd, marksToRemove)) {
     return false;
   }
   return true;

package/dist/esm/editor-commands/transform-node-utils/steps/flattenListStep.js

@@ -1,9 +1,12 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isListWithIndentation } from '../nodeChecks';
-var extractNestedLists = function extractNestedLists(node, schema) {
+var extractNestedLists = function extractNestedLists(node, schema, includeBlockTaskItems) {
   var items = [];
   var paragraph = schema.nodes.paragraph;
   var itemTypes = [schema.nodes.listItem, schema.nodes.taskItem, schema.nodes.decisionItem];
+  if (includeBlockTaskItems && schema.nodes.blockTaskItem) {
+    itemTypes.push(schema.nodes.blockTaskItem);
+  }
   var _extract = function extract(currentNode) {
     currentNode.forEach(function (child) {
       if (itemTypes.some(function (type) {
@@ -73,7 +76,7 @@ var extractNestedLists = function extractNestedLists(node, schema) {
 export var flattenListStep = function flattenListStep(nodes, context) {
   return nodes.map(function (node) {
     if (isListWithIndentation(node.type.name, context.schema)) {
-      return node.copy(Fragment.from(extractNestedLists(node, context.schema)));
+      return node.copy(Fragment.from(extractNestedLists(node, context.schema, Boolean(context.includeBlockTaskItems))));
     }
     return node;
   });

package/dist/esm/editor-commands/transform-node-utils/transform.js

@@ -87,14 +87,15 @@ export var convertNodesToTargetType = function convertNodesToTargetType(_ref3) {
     return sourceNodes;
   }
   var steps = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? TRANSFORMATION_MATRIX_PANEL_C1[selectedNodeTypeName][targetNodeTypeName] : TRANSFORMATION_MATRIX[selectedNodeTypeName][targetNodeTypeName];
+  var shouldApplyTargetNodeMarkChanges = isExperimentEnabled('platform_editor_block_menu_small_text') && Boolean(marksToAdd || marksToRemove);
   var context = {
     // sourceNode is incorrect now - what to do here?
     fromNode: sourceNode,
+    includeBlockTaskItems: shouldApplyTargetNodeMarkChanges,
     targetNodeTypeName: targetNodeTypeName,
     schema: schema,
     targetAttrs: targetAttrs
   };
-  var shouldApplyTargetNodeMarkChanges = isExperimentEnabled('platform_editor_block_menu_small_text') && Boolean(marksToAdd || marksToRemove);
   if (!shouldApplyTargetNodeMarkChanges) {
     if (!steps || steps.length === 0) {
       return sourceNodes;

package/dist/esm/ui/block-menu.js

@@ -20,7 +20,6 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { Box } from '@atlaskit/primitives/compiled';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
 var styles = {
@@ -150,7 +149,7 @@ var BlockMenuContent = function BlockMenuContent(_ref4) {
   }
   return /*#__PURE__*/React.createElement(Box, {
     testId: BLOCK_MENU_TEST_ID,
-    role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
+    role: "menu",
     ref: ref,
     xcss: cx(styles.base, styles.maxWidthStyles, styles.emptyMenuSectionStyles)
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {

package/dist/types/editor-actions/isTransformToTargetDisabled.d.ts

@@ -1,6 +1,6 @@
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
-import type { NodeTypeName } from '../editor-commands/transform-node-utils/types';
+import type { NodeTypeName, TargetNodeMarks } from '../editor-commands/transform-node-utils/types';
 import type { TransformNodeMarkChanges } from '../editor-commands/types';
 import type { BlockMenuTransformSourceRegistry } from './transformSourceRegistry';
 type TransformDisabledArgs = {
@@ -10,6 +10,6 @@ type TransformDisabledArgs = {
     targetNodeTypeName: string;
     transformRegistry?: Pick<BlockMenuTransformSourceRegistry, 'resolve'>;
 };
-export declare const canParentContainNodeType: (schema: Schema, selectedNodeTypeName: NodeTypeName, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
+export declare const canParentContainNodeType: (schema: Schema, selectedNodeTypeName: NodeTypeName, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>, selectedNode?: PMNode, marksToAdd?: TargetNodeMarks, marksToRemove?: string[]) => boolean;
 export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, targetNodeMarkChanges, transformRegistry, }: TransformDisabledArgs) => boolean;
 export {};

package/dist/types/editor-commands/transform-node-utils/types.d.ts

@@ -9,6 +9,7 @@ export type TransformStep = (nodes: PMNode[], context: TransformStepContext) =>
 export type TargetNodeMarks = Record<string, Record<string, unknown>>;
 export interface TransformStepContext {
     fromNode: PMNode;
+    includeBlockTaskItems?: boolean;
     schema: Schema;
     targetAttrs?: Record<string, unknown>;
     targetNodeTypeName: NodeTypeName;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "20.0.0",
+	"version": "20.0.2",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,14 +42,14 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/prosemirror-history": "^1.2.0",
-		"@atlaskit/tmp-editor-statsig": "^205.0.0",
+		"@atlaskit/tmp-editor-statsig": "^207.0.0",
 		"@atlaskit/tokens": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^125.0.0",
+		"@atlaskit/editor-common": "^125.2.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},