@atlaskit/editor-common 112.8.4 → 112.9.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-common
 
+## 112.9.1
+
+### Patch Changes
+
+- [`9b33b26d69865`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b33b26d69865) -
+  Narrow list replacement range during indent/outdent for collab-friendly cursor preservation
+- [`3f6f3c13a6033`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3f6f3c13a6033) -
+  Fix fontSize mark preservation during list type conversions (bullet/ordered ↔ task list) and
+  blockTaskItem handling when toggling task list off
+- Updated dependencies
+
+## 112.9.0
+
+### Minor Changes
+
+- [`9f5fba61d4c9d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9f5fba61d4c9d) -
+  do not show external badge for images hosted on bitbucket.org
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 112.8.4
 
 ### Patch Changes

package/dist/cjs/lists/index.js

@@ -99,6 +99,12 @@ Object.defineProperty(exports, "moveTargetIntoList", {
     return _replaceContent.moveTargetIntoList;
   }
 });
+Object.defineProperty(exports, "narrowReplacementRange", {
+  enumerable: true,
+  get: function get() {
+    return _narrowReplacementRange.narrowReplacementRange;
+  }
+});
 Object.defineProperty(exports, "normalizeListItemsSelection", {
   enumerable: true,
   get: function get() {
@@ -124,6 +130,7 @@ var _analytics = require("./analytics");
 var _indentation = require("./indentation");
 var _restoreSelection = require("./restore-selection");
 var _buildReplacementFragment = require("./build-replacement-fragment");
+var _narrowReplacementRange = require("./narrow-replacement-range");
 var _flattenList = require("./flatten-list");
 var _utils = require("../utils");
 var _messages = require("./messages");

package/dist/cjs/lists/narrow-replacement-range.js

@@ -0,0 +1,82 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.narrowReplacementRange = narrowReplacementRange;
+var _model = require("@atlaskit/editor-prosemirror/model");
+/**
+ * Narrows a full-list replacement to the minimal changed range.
+ *
+ * Compares the old root list node with the new replacement fragment
+ * from both ends to find the first and last positions where they differ,
+ * then returns only the changed subrange.
+ *
+ * This reduces the scope of `tr.replaceWith()` so that remote cursors
+ * on unchanged items are preserved during collaborative editing.
+ */
+function narrowReplacementRange(doc, rootListStart, rootListEnd, fragment, contentStartOffsets) {
+  var oldNode = doc.nodeAt(rootListStart);
+  var newNode = fragment.childCount === 1 ? fragment.firstChild : null;
+  if (!oldNode || !newNode || newNode.type !== oldNode.type) {
+    return {
+      start: rootListStart,
+      end: rootListEnd,
+      fragment: fragment,
+      adjustedContentStartOffsets: contentStartOffsets
+    };
+  }
+  var minChildCount = Math.min(oldNode.childCount, newNode.childCount);
+  var commonPrefixChildren = 0;
+  var prefixSize = 0;
+  for (var i = 0; i < minChildCount; i++) {
+    var oldChild = oldNode.child(i);
+    var newChild = newNode.child(i);
+    if (oldChild.eq(newChild)) {
+      commonPrefixChildren++;
+      prefixSize += oldChild.nodeSize;
+    } else {
+      break;
+    }
+  }
+  var commonSuffixChildren = 0;
+  var suffixSize = 0;
+  for (var _i = 0; _i < minChildCount - commonPrefixChildren; _i++) {
+    var _oldChild = oldNode.child(oldNode.childCount - 1 - _i);
+    var _newChild = newNode.child(newNode.childCount - 1 - _i);
+    if (_oldChild.eq(_newChild)) {
+      commonSuffixChildren++;
+      suffixSize += _oldChild.nodeSize;
+    } else {
+      break;
+    }
+  }
+  var totalCommon = commonPrefixChildren + commonSuffixChildren;
+  if (totalCommon >= oldNode.childCount && totalCommon >= newNode.childCount) {
+    return {
+      start: rootListStart,
+      end: rootListStart,
+      fragment: _model.Fragment.empty,
+      adjustedContentStartOffsets: contentStartOffsets
+    };
+  }
+  var narrowedStart = rootListStart + 1 + prefixSize;
+  var narrowedEnd = rootListEnd - 1 - suffixSize;
+  var changedChildStart = commonPrefixChildren;
+  var changedChildEnd = newNode.childCount - commonSuffixChildren;
+  var changedNodes = [];
+  for (var _i2 = changedChildStart; _i2 < changedChildEnd; _i2++) {
+    changedNodes.push(newNode.child(_i2));
+  }
+  var narrowedFragment = _model.Fragment.from(changedNodes);
+  var prefixOffset = 1 + prefixSize;
+  var adjustedContentStartOffsets = contentStartOffsets.map(function (offset) {
+    return offset - prefixOffset;
+  });
+  return {
+    start: narrowedStart,
+    end: narrowedEnd,
+    fragment: narrowedFragment,
+    adjustedContentStartOffsets: adjustedContentStartOffsets
+  };
+}

package/dist/cjs/media-single/ExternalImageBadge.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _statusInformation = _interopRequireDefault(require("@atlaskit/icon/core/status-information"));
 var _primitives = require("@atlaskit/primitives");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _media = require("../media");
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
@@ -21,6 +22,7 @@ var baseStyles = (0, _primitives.xcss)({
   cursor: 'pointer'
 });
 var NO_EXTERNAL_BADGE_HOSTS = ['atlassian.com', 'loom.com', 'dam-cdn.atl.orangelogic.com'];
+var NO_EXTERNAL_BADGE_HOSTS_NEW = ['atlassian.com', 'loom.com', 'dam-cdn.atl.orangelogic.com', 'bitbucket.org'];
 var isUnbadgedUrl = exports.isUnbadgedUrl = function isUnbadgedUrl(url) {
   if (!url) {
     return false;
@@ -38,6 +40,11 @@ var isUnbadgedUrl = exports.isUnbadgedUrl = function isUnbadgedUrl(url) {
   if (protocol === 'data:') {
     return pathname === null || pathname === void 0 ? void 0 : pathname.startsWith('image/');
   }
+  if ((0, _expValEquals.expValEquals)('platform_editor_media_external_badge_bbc_fix', 'isEnable', true)) {
+    return Boolean(hostname && NO_EXTERNAL_BADGE_HOSTS_NEW.some(function (host) {
+      return hostname === host || hostname.endsWith(".".concat(host));
+    }));
+  }
   return Boolean(hostname && NO_EXTERNAL_BADGE_HOSTS.some(function (host) {
     return hostname === host || hostname.endsWith(".".concat(host));
   }));

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "112.8.3";
+var packageVersion = "0.0.0-development";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/transforms/list-transforms.js

@@ -9,7 +9,11 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _listUtils = require("./list-utils");
+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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getContentSupportChecker = function getContentSupportChecker(targetNodeType) {
@@ -21,6 +25,16 @@ var getContentSupportChecker = function getContentSupportChecker(targetNodeType)
     }
   };
 };
+var createBlockTaskItemWithMarks = function createBlockTaskItemWithMarks(content, marks, schema) {
+  var _schema$nodes = schema.nodes,
+    blockTaskItem = _schema$nodes.blockTaskItem,
+    paragraph = _schema$nodes.paragraph;
+  var allowedMarks = marks.filter(function (mark) {
+    return blockTaskItem.allowsMarkType(mark.type);
+  });
+  var newParagraph = paragraph.create(null, content.length > 0 ? content : null, allowedMarks);
+  return blockTaskItem.create(null, newParagraph);
+};
 var _transformListRecursively = exports.transformListRecursively = function transformListRecursively(props, onhandleUnsupportedContent) {
   var transformedItems = [];
   var listNode = props.listNode,
@@ -31,17 +45,36 @@ var _transformListRecursively = exports.transformListRecursively = function tran
     supportedListTypes = props.supportedListTypes,
     schema = props.schema,
     targetNodeType = props.targetNodeType;
-  var _schema$nodes = schema.nodes,
-    taskList = _schema$nodes.taskList,
-    listItem = _schema$nodes.listItem,
-    taskItem = _schema$nodes.taskItem,
-    paragraph = _schema$nodes.paragraph;
+  var _schema$nodes2 = schema.nodes,
+    taskList = _schema$nodes2.taskList,
+    listItem = _schema$nodes2.listItem,
+    taskItem = _schema$nodes2.taskItem,
+    paragraph = _schema$nodes2.paragraph,
+    blockTaskItem = _schema$nodes2.blockTaskItem;
+
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  var isBlockTaskEnabled = !!blockTaskItem && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+
+  /**
+   * Extracts paragraph children from a blockTaskItem, preserving their marks.
+   */
+  var extractParagraphsFromBlockTaskItem = function extractParagraphsFromBlockTaskItem(node) {
+    var paragraphs = [];
+    node.forEach(function (child) {
+      if (child.type === paragraph) {
+        paragraphs.push(child);
+      }
+    });
+    return paragraphs;
+  };
   listNode.forEach(function (child) {
     if (isSourceBulletOrOrdered && isTargetTask) {
       // Convert bullet/ordered => task
       if (child.type === listItem) {
         var inlineContent = [];
         var nestedTaskLists = [];
+        var blockMarks = [];
         child.forEach(function (grandChild) {
           if (supportedListTypes.has(grandChild.type) && grandChild.type !== taskList) {
             nestedTaskLists.push(_transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
@@ -50,18 +83,39 @@ var _transformListRecursively = exports.transformListRecursively = function tran
           } else if (!getContentSupportChecker(taskItem)(grandChild) && !grandChild.isTextblock) {
             onhandleUnsupportedContent === null || onhandleUnsupportedContent === void 0 || onhandleUnsupportedContent(grandChild);
           } else {
+            if (isBlockTaskEnabled && grandChild.type === paragraph && grandChild.marks.length > 0) {
+              blockMarks = grandChild.marks;
+            }
             inlineContent.push.apply(inlineContent, (0, _toConsumableArray2.default)((0, _listUtils.convertBlockToInlineContent)(grandChild, schema)));
           }
         });
-        transformedItems.push(taskItem.create(null, inlineContent.length > 0 ? inlineContent : null));
+        if (isBlockTaskEnabled && blockMarks.length > 0) {
+          transformedItems.push(createBlockTaskItemWithMarks(inlineContent, blockMarks, schema));
+        } else {
+          transformedItems.push(taskItem.create(null, inlineContent.length > 0 ? inlineContent : null));
+        }
         transformedItems.push.apply(transformedItems, nestedTaskLists);
       }
     } else if (isSourceTask && isTargetBulletOrOrdered) {
       // Convert task => bullet/ordered
       if (child.type === taskItem) {
         var _inlineContent = (0, _toConsumableArray2.default)(child.content.content);
-        var paragraphNode = paragraph.create(null, _inlineContent.length > 0 ? _inlineContent : null);
+
+        // Transfer taskItem's block marks to the paragraph.
+        // Use listItem.allowsMarkType since the paragraph will be inside a listItem
+        // (which uses ParagraphWithFontSizeStage0 that allows fontSize).
+        var paragraphMarks = isBlockTaskEnabled && child.marks.length > 0 ? child.marks.filter(function (mark) {
+          return listItem.allowsMarkType(mark.type);
+        }) : undefined;
+        var paragraphNode = paragraph.create(null, _inlineContent.length > 0 ? _inlineContent : null, paragraphMarks);
         transformedItems.push(listItem.create(null, [paragraphNode]));
+      } else if (isBlockTaskEnabled && child.type === blockTaskItem) {
+        // blockTaskItem wraps content in paragraphs — extract them directly,
+        // preserving their fontSize marks
+        var paragraphs = extractParagraphsFromBlockTaskItem(child);
+        if (paragraphs.length > 0) {
+          transformedItems.push(listItem.create(null, paragraphs));
+        }
       } else if (child.type === taskList) {
         var transformedNestedList = _transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
           listNode: child
@@ -195,21 +249,27 @@ var transformBetweenListTypes = exports.transformBetweenListTypes = function tra
  */
 var transformToTaskList = exports.transformToTaskList = function transformToTaskList(tr, range, targetNodeType, targetAttrs, nodes) {
   try {
-    var taskItem = nodes.taskItem;
+    var taskItem = nodes.taskItem,
+      paragraph = nodes.paragraph,
+      blockTaskItem = nodes.blockTaskItem;
+    // gating behind platform_editor_small_font_size to support task lists with font size applied,
+    // but keep this solution general
+    var isBlockTaskItemEnabled = !!blockTaskItem && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
     var listItems = [];
 
     // Process each block in the range
     tr.doc.nodesBetween(range.start, range.end, function (node) {
       if (node.isBlock) {
-        // For block nodes like paragraphs, directly use their inline content
         var inlineContent = (0, _toConsumableArray2.default)(node.content.content);
         if (inlineContent.length > 0) {
-          // Create task item with inline content directly
-          var listItem = taskItem.create(targetAttrs, inlineContent);
-          listItems.push(listItem);
+          if (isBlockTaskItemEnabled && node.type === paragraph && node.marks.length > 0) {
+            listItems.push(createBlockTaskItemWithMarks(inlineContent, node.marks, tr.doc.type.schema));
+          } else {
+            listItems.push(taskItem.create(targetAttrs, inlineContent));
+          }
         }
       }
-      return false; // Don't traverse into children
+      return false;
     });
     if (listItems.length === 0) {
       return null;
@@ -233,6 +293,44 @@ var transformTaskListToBlockNodes = exports.transformTaskListToBlockNodes = func
     sourcePos = context.sourcePos;
   var selection = tr.selection;
   var schema = selection.$from.doc.type.schema;
+  var blockTaskItem = schema.nodes.blockTaskItem;
+
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  var isBlockTaskItemEnabled = !!blockTaskItem && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+  if (isBlockTaskItemEnabled) {
+    var blockTaskItemsResult = (0, _utils.findChildrenByType)(sourceNode, blockTaskItem);
+    if (blockTaskItemsResult.length > 0 && targetNodeType === schema.nodes.paragraph) {
+      // blockTaskItem content is (paragraph | extension)+
+      // Extract paragraph children directly — they may carry block marks (e.g. fontSize)
+      var _targetNodes = [];
+      var _iterator = _createForOfIteratorHelper(blockTaskItemsResult),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var blockItem = _step.value.node;
+          blockItem.forEach(function (child) {
+            if (child.type === schema.nodes.paragraph) {
+              _targetNodes.push(child);
+            }
+          });
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      if (_targetNodes.length === 0) {
+        return null;
+      }
+      var _slice = new _model.Slice(_model.Fragment.fromArray(_targetNodes), 0, 0);
+      var _rangeStart = sourcePos !== null ? sourcePos : selection.from;
+      tr.replaceRange(_rangeStart, _rangeStart + sourceNode.nodeSize, _slice);
+      return tr;
+    }
+  }
+
+  // Original logic for regular taskItem children
   var taskItemsResult = (0, _utils.findChildrenByType)(sourceNode, schema.nodes.taskItem);
   var taskItems = taskItemsResult.map(function (item) {
     return item.node;
@@ -280,6 +378,10 @@ var getFormattedNode = exports.getFormattedNode = function getFormattedNode(tr)
   var selection = tr.selection;
   var nodes = tr.doc.type.schema.nodes;
 
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  var isBlockTaskItemEnabled = !!nodes.blockTaskItem && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+
   // Find the node to format from the current selection
   var nodeToFormat;
   var nodePos = selection.from;
@@ -291,13 +393,17 @@ var getFormattedNode = exports.getFormattedNode = function getFormattedNode(tr)
     nodePos = selectedNode.pos;
   } else {
     // Try to find parent node (including list parents)
-    var parentNode = (0, _utils.findParentNodeOfType)([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
+    var parentNodeTypes = [nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection];
+    if (isBlockTaskItemEnabled) {
+      parentNodeTypes.push(nodes.blockTaskItem);
+    }
+    var parentNode = (0, _utils.findParentNodeOfType)(parentNodeTypes)(selection);
     if (parentNode) {
       nodeToFormat = parentNode.node;
       nodePos = parentNode.pos;
       var paragraphOrHeadingNode = (0, _utils.findParentNodeOfType)([nodes.paragraph, nodes.heading])(selection);
-      // Special case: if we found a listItem, check if we need the parent list instead
-      if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
+      // Special case: if we found a listItem/taskItem/blockTaskItem, check if we need the parent list instead
+      if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem || isBlockTaskItemEnabled && parentNode.node.type === nodes.blockTaskItem) {
         var listParent = (0, _utils.findParentNodeOfType)([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
         if (listParent) {
           // For list transformations, we want the list parent, not the listItem

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "112.8.3";
+var packageVersion = "0.0.0-development";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/lists/index.js

@@ -8,6 +8,7 @@ export { getCommonListAnalyticsAttributes, countListItemsInSelection } from './a
 export { hasValidListIndentationLevel } from './indentation';
 export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';
+export { narrowReplacementRange } from './narrow-replacement-range';
 export { flattenList } from './flatten-list';
 export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '../utils';
 export { messages } from './messages';

package/dist/es2019/lists/narrow-replacement-range.js

@@ -0,0 +1,74 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Narrows a full-list replacement to the minimal changed range.
+ *
+ * Compares the old root list node with the new replacement fragment
+ * from both ends to find the first and last positions where they differ,
+ * then returns only the changed subrange.
+ *
+ * This reduces the scope of `tr.replaceWith()` so that remote cursors
+ * on unchanged items are preserved during collaborative editing.
+ */
+export function narrowReplacementRange(doc, rootListStart, rootListEnd, fragment, contentStartOffsets) {
+  const oldNode = doc.nodeAt(rootListStart);
+  const newNode = fragment.childCount === 1 ? fragment.firstChild : null;
+  if (!oldNode || !newNode || newNode.type !== oldNode.type) {
+    return {
+      start: rootListStart,
+      end: rootListEnd,
+      fragment,
+      adjustedContentStartOffsets: contentStartOffsets
+    };
+  }
+  const minChildCount = Math.min(oldNode.childCount, newNode.childCount);
+  let commonPrefixChildren = 0;
+  let prefixSize = 0;
+  for (let i = 0; i < minChildCount; i++) {
+    const oldChild = oldNode.child(i);
+    const newChild = newNode.child(i);
+    if (oldChild.eq(newChild)) {
+      commonPrefixChildren++;
+      prefixSize += oldChild.nodeSize;
+    } else {
+      break;
+    }
+  }
+  let commonSuffixChildren = 0;
+  let suffixSize = 0;
+  for (let i = 0; i < minChildCount - commonPrefixChildren; i++) {
+    const oldChild = oldNode.child(oldNode.childCount - 1 - i);
+    const newChild = newNode.child(newNode.childCount - 1 - i);
+    if (oldChild.eq(newChild)) {
+      commonSuffixChildren++;
+      suffixSize += oldChild.nodeSize;
+    } else {
+      break;
+    }
+  }
+  const totalCommon = commonPrefixChildren + commonSuffixChildren;
+  if (totalCommon >= oldNode.childCount && totalCommon >= newNode.childCount) {
+    return {
+      start: rootListStart,
+      end: rootListStart,
+      fragment: Fragment.empty,
+      adjustedContentStartOffsets: contentStartOffsets
+    };
+  }
+  const narrowedStart = rootListStart + 1 + prefixSize;
+  const narrowedEnd = rootListEnd - 1 - suffixSize;
+  const changedChildStart = commonPrefixChildren;
+  const changedChildEnd = newNode.childCount - commonSuffixChildren;
+  const changedNodes = [];
+  for (let i = changedChildStart; i < changedChildEnd; i++) {
+    changedNodes.push(newNode.child(i));
+  }
+  const narrowedFragment = Fragment.from(changedNodes);
+  const prefixOffset = 1 + prefixSize;
+  const adjustedContentStartOffsets = contentStartOffsets.map(offset => offset - prefixOffset);
+  return {
+    start: narrowedStart,
+    end: narrowedEnd,
+    fragment: narrowedFragment,
+    adjustedContentStartOffsets
+  };
+}

package/dist/es2019/media-single/ExternalImageBadge.js

@@ -3,6 +3,7 @@ import { useIntl } from 'react-intl-next';
 import InfoIcon from '@atlaskit/icon/core/status-information';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { externalMediaMessages } from '../media';
 const baseStyles = xcss({
@@ -13,6 +14,7 @@ const baseStyles = xcss({
   cursor: 'pointer'
 });
 const NO_EXTERNAL_BADGE_HOSTS = ['atlassian.com', 'loom.com', 'dam-cdn.atl.orangelogic.com'];
+const NO_EXTERNAL_BADGE_HOSTS_NEW = ['atlassian.com', 'loom.com', 'dam-cdn.atl.orangelogic.com', 'bitbucket.org'];
 export const isUnbadgedUrl = url => {
   if (!url) {
     return false;
@@ -32,6 +34,9 @@ export const isUnbadgedUrl = url => {
   if (protocol === 'data:') {
     return pathname === null || pathname === void 0 ? void 0 : pathname.startsWith('image/');
   }
+  if (expValEquals('platform_editor_media_external_badge_bbc_fix', 'isEnable', true)) {
+    return Boolean(hostname && NO_EXTERNAL_BADGE_HOSTS_NEW.some(host => hostname === host || hostname.endsWith(`.${host}`)));
+  }
   return Boolean(hostname && NO_EXTERNAL_BADGE_HOSTS.some(host => hostname === host || hostname.endsWith(`.${host}`)));
 };
 export const ExternalImageBadge = ({

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "112.8.3";
+const packageVersion = "0.0.0-development";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/transforms/list-transforms.js

@@ -1,5 +1,6 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType, findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getSupportedListTypesSet, isBulletOrOrderedList, isTaskList, convertBlockToInlineContent } from './list-utils';
 const getContentSupportChecker = targetNodeType => {
   return node => {
@@ -10,6 +11,15 @@ const getContentSupportChecker = targetNodeType => {
     }
   };
 };
+const createBlockTaskItemWithMarks = (content, marks, schema) => {
+  const {
+    blockTaskItem,
+    paragraph
+  } = schema.nodes;
+  const allowedMarks = marks.filter(mark => blockTaskItem.allowsMarkType(mark.type));
+  const newParagraph = paragraph.create(null, content.length > 0 ? content : null, allowedMarks);
+  return blockTaskItem.create(null, newParagraph);
+};
 export const transformListRecursively = (props, onhandleUnsupportedContent) => {
   const transformedItems = [];
   const {
@@ -26,14 +36,33 @@ export const transformListRecursively = (props, onhandleUnsupportedContent) => {
     taskList,
     listItem,
     taskItem,
-    paragraph
+    paragraph,
+    blockTaskItem
   } = schema.nodes;
+
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  const isBlockTaskEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+
+  /**
+   * Extracts paragraph children from a blockTaskItem, preserving their marks.
+   */
+  const extractParagraphsFromBlockTaskItem = node => {
+    const paragraphs = [];
+    node.forEach(child => {
+      if (child.type === paragraph) {
+        paragraphs.push(child);
+      }
+    });
+    return paragraphs;
+  };
   listNode.forEach(child => {
     if (isSourceBulletOrOrdered && isTargetTask) {
       // Convert bullet/ordered => task
       if (child.type === listItem) {
         const inlineContent = [];
         const nestedTaskLists = [];
+        let blockMarks = [];
         child.forEach(grandChild => {
           if (supportedListTypes.has(grandChild.type) && grandChild.type !== taskList) {
             nestedTaskLists.push(transformListRecursively({
@@ -43,18 +72,37 @@ export const transformListRecursively = (props, onhandleUnsupportedContent) => {
           } else if (!getContentSupportChecker(taskItem)(grandChild) && !grandChild.isTextblock) {
             onhandleUnsupportedContent === null || onhandleUnsupportedContent === void 0 ? void 0 : onhandleUnsupportedContent(grandChild);
           } else {
+            if (isBlockTaskEnabled && grandChild.type === paragraph && grandChild.marks.length > 0) {
+              blockMarks = grandChild.marks;
+            }
             inlineContent.push(...convertBlockToInlineContent(grandChild, schema));
           }
         });
-        transformedItems.push(taskItem.create(null, inlineContent.length > 0 ? inlineContent : null));
+        if (isBlockTaskEnabled && blockMarks.length > 0) {
+          transformedItems.push(createBlockTaskItemWithMarks(inlineContent, blockMarks, schema));
+        } else {
+          transformedItems.push(taskItem.create(null, inlineContent.length > 0 ? inlineContent : null));
+        }
         transformedItems.push(...nestedTaskLists);
       }
     } else if (isSourceTask && isTargetBulletOrOrdered) {
       // Convert task => bullet/ordered
       if (child.type === taskItem) {
         const inlineContent = [...child.content.content];
-        const paragraphNode = paragraph.create(null, inlineContent.length > 0 ? inlineContent : null);
+
+        // Transfer taskItem's block marks to the paragraph.
+        // Use listItem.allowsMarkType since the paragraph will be inside a listItem
+        // (which uses ParagraphWithFontSizeStage0 that allows fontSize).
+        const paragraphMarks = isBlockTaskEnabled && child.marks.length > 0 ? child.marks.filter(mark => listItem.allowsMarkType(mark.type)) : undefined;
+        const paragraphNode = paragraph.create(null, inlineContent.length > 0 ? inlineContent : null, paragraphMarks);
         transformedItems.push(listItem.create(null, [paragraphNode]));
+      } else if (isBlockTaskEnabled && child.type === blockTaskItem) {
+        // blockTaskItem wraps content in paragraphs — extract them directly,
+        // preserving their fontSize marks
+        const paragraphs = extractParagraphsFromBlockTaskItem(child);
+        if (paragraphs.length > 0) {
+          transformedItems.push(listItem.create(null, paragraphs));
+        }
       } else if (child.type === taskList) {
         const transformedNestedList = transformListRecursively({
           ...props,
@@ -199,22 +247,28 @@ export const transformBetweenListTypes = context => {
 export const transformToTaskList = (tr, range, targetNodeType, targetAttrs, nodes) => {
   try {
     const {
-      taskItem
+      taskItem,
+      paragraph,
+      blockTaskItem
     } = nodes;
+    // gating behind platform_editor_small_font_size to support task lists with font size applied,
+    // but keep this solution general
+    const isBlockTaskItemEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
     const listItems = [];
 
     // Process each block in the range
     tr.doc.nodesBetween(range.start, range.end, node => {
       if (node.isBlock) {
-        // For block nodes like paragraphs, directly use their inline content
         const inlineContent = [...node.content.content];
         if (inlineContent.length > 0) {
-          // Create task item with inline content directly
-          const listItem = taskItem.create(targetAttrs, inlineContent);
-          listItems.push(listItem);
+          if (isBlockTaskItemEnabled && node.type === paragraph && node.marks.length > 0) {
+            listItems.push(createBlockTaskItemWithMarks(inlineContent, node.marks, tr.doc.type.schema));
+          } else {
+            listItems.push(taskItem.create(targetAttrs, inlineContent));
+          }
         }
       }
-      return false; // Don't traverse into children
+      return false;
     });
     if (listItems.length === 0) {
       return null;
@@ -242,6 +296,39 @@ export const transformTaskListToBlockNodes = context => {
     selection
   } = tr;
   const schema = selection.$from.doc.type.schema;
+  const {
+    blockTaskItem
+  } = schema.nodes;
+
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  const isBlockTaskItemEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+  if (isBlockTaskItemEnabled) {
+    const blockTaskItemsResult = findChildrenByType(sourceNode, blockTaskItem);
+    if (blockTaskItemsResult.length > 0 && targetNodeType === schema.nodes.paragraph) {
+      // blockTaskItem content is (paragraph | extension)+
+      // Extract paragraph children directly — they may carry block marks (e.g. fontSize)
+      const targetNodes = [];
+      for (const {
+        node: blockItem
+      } of blockTaskItemsResult) {
+        blockItem.forEach(child => {
+          if (child.type === schema.nodes.paragraph) {
+            targetNodes.push(child);
+          }
+        });
+      }
+      if (targetNodes.length === 0) {
+        return null;
+      }
+      const slice = new Slice(Fragment.fromArray(targetNodes), 0, 0);
+      const rangeStart = sourcePos !== null ? sourcePos : selection.from;
+      tr.replaceRange(rangeStart, rangeStart + sourceNode.nodeSize, slice);
+      return tr;
+    }
+  }
+
+  // Original logic for regular taskItem children
   const taskItemsResult = findChildrenByType(sourceNode, schema.nodes.taskItem);
   const taskItems = taskItemsResult.map(item => item.node);
   const taskItemFragments = taskItems.map(taskItem => taskItem.content);
@@ -283,6 +370,10 @@ export const getFormattedNode = tr => {
     nodes
   } = tr.doc.type.schema;
 
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  const isBlockTaskItemEnabled = !!nodes.blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+
   // Find the node to format from the current selection
   let nodeToFormat;
   let nodePos = selection.from;
@@ -294,13 +385,17 @@ export const getFormattedNode = tr => {
     nodePos = selectedNode.pos;
   } else {
     // Try to find parent node (including list parents)
-    const parentNode = findParentNodeOfType([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
+    const parentNodeTypes = [nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection];
+    if (isBlockTaskItemEnabled) {
+      parentNodeTypes.push(nodes.blockTaskItem);
+    }
+    const parentNode = findParentNodeOfType(parentNodeTypes)(selection);
     if (parentNode) {
       nodeToFormat = parentNode.node;
       nodePos = parentNode.pos;
       const paragraphOrHeadingNode = findParentNodeOfType([nodes.paragraph, nodes.heading])(selection);
-      // Special case: if we found a listItem, check if we need the parent list instead
-      if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
+      // Special case: if we found a listItem/taskItem/blockTaskItem, check if we need the parent list instead
+      if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem || isBlockTaskItemEnabled && parentNode.node.type === nodes.blockTaskItem) {
         const listParent = findParentNodeOfType([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
         if (listParent) {
           // For list transformations, we want the list parent, not the listItem

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "112.8.3";
+const packageVersion = "0.0.0-development";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/lists/index.js

@@ -8,6 +8,7 @@ export { getCommonListAnalyticsAttributes, countListItemsInSelection } from './a
 export { hasValidListIndentationLevel } from './indentation';
 export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';
+export { narrowReplacementRange } from './narrow-replacement-range';
 export { flattenList } from './flatten-list';
 export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '../utils';
 export { messages } from './messages';

package/dist/esm/lists/narrow-replacement-range.js

@@ -0,0 +1,76 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Narrows a full-list replacement to the minimal changed range.
+ *
+ * Compares the old root list node with the new replacement fragment
+ * from both ends to find the first and last positions where they differ,
+ * then returns only the changed subrange.
+ *
+ * This reduces the scope of `tr.replaceWith()` so that remote cursors
+ * on unchanged items are preserved during collaborative editing.
+ */
+export function narrowReplacementRange(doc, rootListStart, rootListEnd, fragment, contentStartOffsets) {
+  var oldNode = doc.nodeAt(rootListStart);
+  var newNode = fragment.childCount === 1 ? fragment.firstChild : null;
+  if (!oldNode || !newNode || newNode.type !== oldNode.type) {
+    return {
+      start: rootListStart,
+      end: rootListEnd,
+      fragment: fragment,
+      adjustedContentStartOffsets: contentStartOffsets
+    };
+  }
+  var minChildCount = Math.min(oldNode.childCount, newNode.childCount);
+  var commonPrefixChildren = 0;
+  var prefixSize = 0;
+  for (var i = 0; i < minChildCount; i++) {
+    var oldChild = oldNode.child(i);
+    var newChild = newNode.child(i);
+    if (oldChild.eq(newChild)) {
+      commonPrefixChildren++;
+      prefixSize += oldChild.nodeSize;
+    } else {
+      break;
+    }
+  }
+  var commonSuffixChildren = 0;
+  var suffixSize = 0;
+  for (var _i = 0; _i < minChildCount - commonPrefixChildren; _i++) {
+    var _oldChild = oldNode.child(oldNode.childCount - 1 - _i);
+    var _newChild = newNode.child(newNode.childCount - 1 - _i);
+    if (_oldChild.eq(_newChild)) {
+      commonSuffixChildren++;
+      suffixSize += _oldChild.nodeSize;
+    } else {
+      break;
+    }
+  }
+  var totalCommon = commonPrefixChildren + commonSuffixChildren;
+  if (totalCommon >= oldNode.childCount && totalCommon >= newNode.childCount) {
+    return {
+      start: rootListStart,
+      end: rootListStart,
+      fragment: Fragment.empty,
+      adjustedContentStartOffsets: contentStartOffsets
+    };
+  }
+  var narrowedStart = rootListStart + 1 + prefixSize;
+  var narrowedEnd = rootListEnd - 1 - suffixSize;
+  var changedChildStart = commonPrefixChildren;
+  var changedChildEnd = newNode.childCount - commonSuffixChildren;
+  var changedNodes = [];
+  for (var _i2 = changedChildStart; _i2 < changedChildEnd; _i2++) {
+    changedNodes.push(newNode.child(_i2));
+  }
+  var narrowedFragment = Fragment.from(changedNodes);
+  var prefixOffset = 1 + prefixSize;
+  var adjustedContentStartOffsets = contentStartOffsets.map(function (offset) {
+    return offset - prefixOffset;
+  });
+  return {
+    start: narrowedStart,
+    end: narrowedEnd,
+    fragment: narrowedFragment,
+    adjustedContentStartOffsets: adjustedContentStartOffsets
+  };
+}

package/dist/esm/media-single/ExternalImageBadge.js

@@ -3,6 +3,7 @@ import { useIntl } from 'react-intl-next';
 import InfoIcon from '@atlaskit/icon/core/status-information';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { externalMediaMessages } from '../media';
 var baseStyles = xcss({
@@ -13,6 +14,7 @@ var baseStyles = xcss({
   cursor: 'pointer'
 });
 var NO_EXTERNAL_BADGE_HOSTS = ['atlassian.com', 'loom.com', 'dam-cdn.atl.orangelogic.com'];
+var NO_EXTERNAL_BADGE_HOSTS_NEW = ['atlassian.com', 'loom.com', 'dam-cdn.atl.orangelogic.com', 'bitbucket.org'];
 export var isUnbadgedUrl = function isUnbadgedUrl(url) {
   if (!url) {
     return false;
@@ -30,6 +32,11 @@ export var isUnbadgedUrl = function isUnbadgedUrl(url) {
   if (protocol === 'data:') {
     return pathname === null || pathname === void 0 ? void 0 : pathname.startsWith('image/');
   }
+  if (expValEquals('platform_editor_media_external_badge_bbc_fix', 'isEnable', true)) {
+    return Boolean(hostname && NO_EXTERNAL_BADGE_HOSTS_NEW.some(function (host) {
+      return hostname === host || hostname.endsWith(".".concat(host));
+    }));
+  }
   return Boolean(hostname && NO_EXTERNAL_BADGE_HOSTS.some(function (host) {
     return hostname === host || hostname.endsWith(".".concat(host));
   }));

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "112.8.3";
+var packageVersion = "0.0.0-development";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/transforms/list-transforms.js

@@ -1,9 +1,13 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType, findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getSupportedListTypesSet, isBulletOrOrderedList, isTaskList, convertBlockToInlineContent } from './list-utils';
 var getContentSupportChecker = function getContentSupportChecker(targetNodeType) {
   return function (node) {
@@ -14,6 +18,16 @@ var getContentSupportChecker = function getContentSupportChecker(targetNodeType)
     }
   };
 };
+var createBlockTaskItemWithMarks = function createBlockTaskItemWithMarks(content, marks, schema) {
+  var _schema$nodes = schema.nodes,
+    blockTaskItem = _schema$nodes.blockTaskItem,
+    paragraph = _schema$nodes.paragraph;
+  var allowedMarks = marks.filter(function (mark) {
+    return blockTaskItem.allowsMarkType(mark.type);
+  });
+  var newParagraph = paragraph.create(null, content.length > 0 ? content : null, allowedMarks);
+  return blockTaskItem.create(null, newParagraph);
+};
 var _transformListRecursively = function transformListRecursively(props, onhandleUnsupportedContent) {
   var transformedItems = [];
   var listNode = props.listNode,
@@ -24,17 +38,36 @@ var _transformListRecursively = function transformListRecursively(props, onhandl
     supportedListTypes = props.supportedListTypes,
     schema = props.schema,
     targetNodeType = props.targetNodeType;
-  var _schema$nodes = schema.nodes,
-    taskList = _schema$nodes.taskList,
-    listItem = _schema$nodes.listItem,
-    taskItem = _schema$nodes.taskItem,
-    paragraph = _schema$nodes.paragraph;
+  var _schema$nodes2 = schema.nodes,
+    taskList = _schema$nodes2.taskList,
+    listItem = _schema$nodes2.listItem,
+    taskItem = _schema$nodes2.taskItem,
+    paragraph = _schema$nodes2.paragraph,
+    blockTaskItem = _schema$nodes2.blockTaskItem;
+
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  var isBlockTaskEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+
+  /**
+   * Extracts paragraph children from a blockTaskItem, preserving their marks.
+   */
+  var extractParagraphsFromBlockTaskItem = function extractParagraphsFromBlockTaskItem(node) {
+    var paragraphs = [];
+    node.forEach(function (child) {
+      if (child.type === paragraph) {
+        paragraphs.push(child);
+      }
+    });
+    return paragraphs;
+  };
   listNode.forEach(function (child) {
     if (isSourceBulletOrOrdered && isTargetTask) {
       // Convert bullet/ordered => task
       if (child.type === listItem) {
         var inlineContent = [];
         var nestedTaskLists = [];
+        var blockMarks = [];
         child.forEach(function (grandChild) {
           if (supportedListTypes.has(grandChild.type) && grandChild.type !== taskList) {
             nestedTaskLists.push(_transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
@@ -43,18 +76,39 @@ var _transformListRecursively = function transformListRecursively(props, onhandl
           } else if (!getContentSupportChecker(taskItem)(grandChild) && !grandChild.isTextblock) {
             onhandleUnsupportedContent === null || onhandleUnsupportedContent === void 0 || onhandleUnsupportedContent(grandChild);
           } else {
+            if (isBlockTaskEnabled && grandChild.type === paragraph && grandChild.marks.length > 0) {
+              blockMarks = grandChild.marks;
+            }
             inlineContent.push.apply(inlineContent, _toConsumableArray(convertBlockToInlineContent(grandChild, schema)));
           }
         });
-        transformedItems.push(taskItem.create(null, inlineContent.length > 0 ? inlineContent : null));
+        if (isBlockTaskEnabled && blockMarks.length > 0) {
+          transformedItems.push(createBlockTaskItemWithMarks(inlineContent, blockMarks, schema));
+        } else {
+          transformedItems.push(taskItem.create(null, inlineContent.length > 0 ? inlineContent : null));
+        }
         transformedItems.push.apply(transformedItems, nestedTaskLists);
       }
     } else if (isSourceTask && isTargetBulletOrOrdered) {
       // Convert task => bullet/ordered
       if (child.type === taskItem) {
         var _inlineContent = _toConsumableArray(child.content.content);
-        var paragraphNode = paragraph.create(null, _inlineContent.length > 0 ? _inlineContent : null);
+
+        // Transfer taskItem's block marks to the paragraph.
+        // Use listItem.allowsMarkType since the paragraph will be inside a listItem
+        // (which uses ParagraphWithFontSizeStage0 that allows fontSize).
+        var paragraphMarks = isBlockTaskEnabled && child.marks.length > 0 ? child.marks.filter(function (mark) {
+          return listItem.allowsMarkType(mark.type);
+        }) : undefined;
+        var paragraphNode = paragraph.create(null, _inlineContent.length > 0 ? _inlineContent : null, paragraphMarks);
         transformedItems.push(listItem.create(null, [paragraphNode]));
+      } else if (isBlockTaskEnabled && child.type === blockTaskItem) {
+        // blockTaskItem wraps content in paragraphs — extract them directly,
+        // preserving their fontSize marks
+        var paragraphs = extractParagraphsFromBlockTaskItem(child);
+        if (paragraphs.length > 0) {
+          transformedItems.push(listItem.create(null, paragraphs));
+        }
       } else if (child.type === taskList) {
         var transformedNestedList = _transformListRecursively(_objectSpread(_objectSpread({}, props), {}, {
           listNode: child
@@ -189,21 +243,27 @@ export var transformBetweenListTypes = function transformBetweenListTypes(contex
  */
 export var transformToTaskList = function transformToTaskList(tr, range, targetNodeType, targetAttrs, nodes) {
   try {
-    var taskItem = nodes.taskItem;
+    var taskItem = nodes.taskItem,
+      paragraph = nodes.paragraph,
+      blockTaskItem = nodes.blockTaskItem;
+    // gating behind platform_editor_small_font_size to support task lists with font size applied,
+    // but keep this solution general
+    var isBlockTaskItemEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
     var listItems = [];
 
     // Process each block in the range
     tr.doc.nodesBetween(range.start, range.end, function (node) {
       if (node.isBlock) {
-        // For block nodes like paragraphs, directly use their inline content
         var inlineContent = _toConsumableArray(node.content.content);
         if (inlineContent.length > 0) {
-          // Create task item with inline content directly
-          var listItem = taskItem.create(targetAttrs, inlineContent);
-          listItems.push(listItem);
+          if (isBlockTaskItemEnabled && node.type === paragraph && node.marks.length > 0) {
+            listItems.push(createBlockTaskItemWithMarks(inlineContent, node.marks, tr.doc.type.schema));
+          } else {
+            listItems.push(taskItem.create(targetAttrs, inlineContent));
+          }
         }
       }
-      return false; // Don't traverse into children
+      return false;
     });
     if (listItems.length === 0) {
       return null;
@@ -227,6 +287,44 @@ export var transformTaskListToBlockNodes = function transformTaskListToBlockNode
     sourcePos = context.sourcePos;
   var selection = tr.selection;
   var schema = selection.$from.doc.type.schema;
+  var blockTaskItem = schema.nodes.blockTaskItem;
+
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  var isBlockTaskItemEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+  if (isBlockTaskItemEnabled) {
+    var blockTaskItemsResult = findChildrenByType(sourceNode, blockTaskItem);
+    if (blockTaskItemsResult.length > 0 && targetNodeType === schema.nodes.paragraph) {
+      // blockTaskItem content is (paragraph | extension)+
+      // Extract paragraph children directly — they may carry block marks (e.g. fontSize)
+      var _targetNodes = [];
+      var _iterator = _createForOfIteratorHelper(blockTaskItemsResult),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var blockItem = _step.value.node;
+          blockItem.forEach(function (child) {
+            if (child.type === schema.nodes.paragraph) {
+              _targetNodes.push(child);
+            }
+          });
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      if (_targetNodes.length === 0) {
+        return null;
+      }
+      var _slice = new Slice(Fragment.fromArray(_targetNodes), 0, 0);
+      var _rangeStart = sourcePos !== null ? sourcePos : selection.from;
+      tr.replaceRange(_rangeStart, _rangeStart + sourceNode.nodeSize, _slice);
+      return tr;
+    }
+  }
+
+  // Original logic for regular taskItem children
   var taskItemsResult = findChildrenByType(sourceNode, schema.nodes.taskItem);
   var taskItems = taskItemsResult.map(function (item) {
     return item.node;
@@ -274,6 +372,10 @@ export var getFormattedNode = function getFormattedNode(tr) {
   var selection = tr.selection;
   var nodes = tr.doc.type.schema.nodes;
 
+  // gating behind platform_editor_small_font_size to support task lists with font size applied,
+  // but keep this solution general
+  var isBlockTaskItemEnabled = !!nodes.blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+
   // Find the node to format from the current selection
   var nodeToFormat;
   var nodePos = selection.from;
@@ -285,13 +387,17 @@ export var getFormattedNode = function getFormattedNode(tr) {
     nodePos = selectedNode.pos;
   } else {
     // Try to find parent node (including list parents)
-    var parentNode = findParentNodeOfType([nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection])(selection);
+    var parentNodeTypes = [nodes.blockquote, nodes.panel, nodes.expand, nodes.codeBlock, nodes.listItem, nodes.taskItem, nodes.layoutSection];
+    if (isBlockTaskItemEnabled) {
+      parentNodeTypes.push(nodes.blockTaskItem);
+    }
+    var parentNode = findParentNodeOfType(parentNodeTypes)(selection);
     if (parentNode) {
       nodeToFormat = parentNode.node;
       nodePos = parentNode.pos;
       var paragraphOrHeadingNode = findParentNodeOfType([nodes.paragraph, nodes.heading])(selection);
-      // Special case: if we found a listItem, check if we need the parent list instead
-      if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem) {
+      // Special case: if we found a listItem/taskItem/blockTaskItem, check if we need the parent list instead
+      if (parentNode.node.type === nodes.listItem || parentNode.node.type === nodes.taskItem || isBlockTaskItemEnabled && parentNode.node.type === nodes.blockTaskItem) {
         var listParent = findParentNodeOfType([nodes.bulletList, nodes.orderedList, nodes.taskList])(selection);
         if (listParent) {
           // For list transformations, we want the list parent, not the listItem

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "112.8.3";
+var packageVersion = "0.0.0-development";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/types/lists/index.d.ts

@@ -6,6 +6,8 @@ export { hasValidListIndentationLevel } from './indentation';
 export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';
 export type { BuildResult } from './build-replacement-fragment';
+export { narrowReplacementRange } from './narrow-replacement-range';
+export type { NarrowedReplacement } from './narrow-replacement-range';
 export type { FlattenedItem } from './flatten-list';
 export { flattenList } from './flatten-list';
 export type { FlattenListOptions, FlattenListResult } from './flatten-list';

package/dist/types/lists/narrow-replacement-range.d.ts

@@ -0,0 +1,19 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+export type NarrowedReplacement = {
+    adjustedContentStartOffsets: number[];
+    end: number;
+    fragment: Fragment;
+    start: number;
+};
+/**
+ * Narrows a full-list replacement to the minimal changed range.
+ *
+ * Compares the old root list node with the new replacement fragment
+ * from both ends to find the first and last positions where they differ,
+ * then returns only the changed subrange.
+ *
+ * This reduces the scope of `tr.replaceWith()` so that remote cursors
+ * on unchanged items are preserved during collaborative editing.
+ */
+export declare function narrowReplacementRange(doc: PMNode, rootListStart: number, rootListEnd: number, fragment: Fragment, contentStartOffsets: number[]): NarrowedReplacement;

package/dist/types-ts4.5/lists/index.d.ts

@@ -6,6 +6,8 @@ export { hasValidListIndentationLevel } from './indentation';
 export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';
 export type { BuildResult } from './build-replacement-fragment';
+export { narrowReplacementRange } from './narrow-replacement-range';
+export type { NarrowedReplacement } from './narrow-replacement-range';
 export type { FlattenedItem } from './flatten-list';
 export { flattenList } from './flatten-list';
 export type { FlattenListOptions, FlattenListResult } from './flatten-list';

package/dist/types-ts4.5/lists/narrow-replacement-range.d.ts

@@ -0,0 +1,19 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+export type NarrowedReplacement = {
+    adjustedContentStartOffsets: number[];
+    end: number;
+    fragment: Fragment;
+    start: number;
+};
+/**
+ * Narrows a full-list replacement to the minimal changed range.
+ *
+ * Compares the old root list node with the new replacement fragment
+ * from both ends to find the first and last positions where they differ,
+ * then returns only the changed subrange.
+ *
+ * This reduces the scope of `tr.replaceWith()` so that remote cursors
+ * on unchanged items are preserved during collaborative editing.
+ */
+export declare function narrowReplacementRange(doc: PMNode, rootListStart: number, rootListEnd: number, fragment: Fragment, contentStartOffsets: number[]): NarrowedReplacement;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "112.8.4",
+	"version": "112.9.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,14 +35,14 @@
 		"@atlaskit/afm-i18n-platform-editor-editor-common": "2.18.0",
 		"@atlaskit/analytics-listeners": "^10.0.0",
 		"@atlaskit/analytics-namespaced-context": "^7.2.0",
-		"@atlaskit/analytics-next": "^11.1.0",
+		"@atlaskit/analytics-next": "^11.2.0",
 		"@atlaskit/atlassian-context": "^0.6.0",
 		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/button": "^23.10.0",
 		"@atlaskit/codemod-utils": "^4.2.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/custom-steps": "^0.16.0",
-		"@atlaskit/dropdown-menu": "^16.7.0",
+		"@atlaskit/dropdown-menu": "^16.8.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
@@ -70,7 +70,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/popper": "^7.1.0",
-		"@atlaskit/primitives": "^18.0.0",
+		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/profilecard": "^24.44.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/react-ufo": "^5.5.0",
@@ -81,7 +81,7 @@
 		"@atlaskit/status": "^3.1.0",
 		"@atlaskit/task-decision": "^19.3.0",
 		"@atlaskit/textfield": "^8.2.0",
-		"@atlaskit/tmp-editor-statsig": "^45.0.0",
+		"@atlaskit/tmp-editor-statsig": "^46.0.0",
 		"@atlaskit/tokens": "^11.2.0",
 		"@atlaskit/tooltip": "^21.0.0",
 		"@atlaskit/width-detector": "^5.0.0",