@atlaskit/editor-common 122.4.0 → 122.6.0

package/dist/es2019/collab/agent-edit-changed-ranges.js

@@ -0,0 +1,255 @@
+import isEqual from 'lodash/isEqual';
+// localId is identity metadata: regenerating it alone should not create activity.
+const sameAttrs = (left, right) => {
+  const keys = Object.keys(left).filter(key => key !== 'localId');
+  return keys.length === Object.keys(right).filter(key => key !== 'localId').length && keys.every(key => isEqual(left[key], right[key]));
+};
+
+// Compare the node's own type, attributes and marks, without comparing its children.
+const sameMarkup = (left, right) => left.type === right.type && sameAttrs(left.attrs, right.attrs) && left.marks.length === right.marks.length && left.marks.every((mark, index) => mark.type === right.marks[index].type && sameAttrs(mark.attrs, right.marks[index].attrs));
+const sameNode = (left, right) => {
+  if (left === right) {
+    return true;
+  }
+  if (!sameMarkup(left, right) || left.text !== right.text || left.childCount !== right.childCount) {
+    return false;
+  }
+  for (let index = 0; index < left.childCount; index++) {
+    if (!sameNode(left.child(index), right.child(index))) {
+      return false;
+    }
+  }
+  return true;
+};
+
+// Positions include document structure, not just character offsets. A non-leaf node
+// uses one position for each opening/closing boundary, plus the size of its content.
+// Example: paragraph('Hi') at pos 0 has nodeSize 4, outer range [0, 4),
+// and text content [1, 3). All ranges here use an exclusive end position.
+
+// Keep the reason internally so a panel attribute change can survive child edits.
+// Only ordinary { from, to } ranges are returned to the chrome consumer.
+
+const collectChanges = (before, after, map, ranges) => {
+  const {
+    node,
+    pos
+  } = after;
+  if (before && sameNode(before.node, node)) {
+    return;
+  }
+  // Text edits belong to their textblock. A node's own markup change instead
+  // owns its full content, so we stop here rather than adding child ranges too.
+  const markupChanged = !!before && node.isBlock && !sameMarkup(before.node, node);
+  if (node.isTextblock || markupChanged) {
+    if (node.content.size > 0) {
+      ranges.push({
+        from: pos,
+        to: pos + node.nodeSize,
+        markupChanged
+      });
+    }
+    return;
+  }
+  const byPosition = new Map();
+  const byId = new Map();
+  const oldChildren = [];
+  before === null || before === void 0 ? void 0 : before.node.forEach((child, offset) => {
+    // forEach offsets start inside the parent. Skip its opening boundary (+1)
+    // to convert this child offset into an absolute document position.
+    const previous = {
+      node: child,
+      pos: before.pos + 1 + offset
+    };
+    oldChildren.push(previous);
+    // This 1 is a mapping bias, not an added offset: follow the right side
+    // of an insertion at the child's start, keeping the original child after it.
+    const mapped = map.mapResult(previous.pos, 1);
+    if (!mapped.deleted) {
+      byPosition.set(mapped.pos, previous);
+    }
+    const id = child.attrs.localId;
+    if (typeof id === 'string' && id) {
+      // Duplicate IDs cannot identify a unique old child.
+      byId.set(id, byId.has(id) ? null : previous);
+    }
+  });
+  const nextChildren = [];
+  node.forEach((child, offset) => nextChildren.push({
+    node: child,
+    pos: pos + 1 + offset
+  }));
+  // Narrow edits usually preserve mapped positions. Whole-container replacements
+  // may erase those positions, so stable child IDs provide a second way to match.
+  const preferred = nextChildren.map(next => {
+    var _ref, _byPosition$get;
+    return (_ref = (_byPosition$get = byPosition.get(next.pos)) !== null && _byPosition$get !== void 0 ? _byPosition$get : byId.get(next.node.attrs.localId)) !== null && _ref !== void 0 ? _ref : undefined;
+  });
+  const claims = new Map();
+  for (const match of preferred) {
+    if (match) {
+      var _claims$get;
+      claims.set(match, ((_claims$get = claims.get(match)) !== null && _claims$get !== void 0 ? _claims$get : 0) + 1);
+    }
+  }
+  nextChildren.forEach((next, index) => {
+    const match = preferred[index];
+    // Same-index fallback supports replacements that regenerate IDs but keep
+    // the child structure. Different child counts make that correspondence unsafe.
+    const aligned = oldChildren.length === node.childCount ? oldChildren[index] : undefined;
+    // Reserve every position/ID match before fallback, including later siblings.
+    // Reusing one old sibling can otherwise disguise an equal-text insertion.
+    const previous = match && claims.get(match) === 1 ? match : aligned && !claims.has(aligned) ? aligned : undefined;
+    collectChanges(previous, next, map, ranges);
+  });
+};
+const findPreservedNode = (doc, previous, markupChanged, indexes) => {
+  const id = previous.attrs.localId;
+  if (typeof id !== 'string' || !id) {
+    return;
+  }
+  let byId = indexes.get(doc);
+  if (!byId) {
+    // Build only when mapping loses a candidate, then reuse for every range
+    // visiting this immutable snapshot. Ordinary mapped edits need no scan.
+    const nodeIndex = new Map();
+    doc.descendants((node, pos) => {
+      const localId = node.attrs.localId;
+      if (typeof localId === 'string' && localId) {
+        // Keep duplicates ambiguous, including IDs outside the changed subtree.
+        nodeIndex.set(localId, nodeIndex.has(localId) ? null : {
+          node,
+          pos
+        });
+      }
+    });
+    indexes.set(doc, nodeIndex);
+    byId = nodeIndex;
+  }
+  const match = byId.get(id);
+  // Attribute/mark activity belongs to the node even when its children are edited.
+  // Content-only activity still requires the entire candidate to survive unchanged.
+  const isPreserved = markupChanged ? sameMarkup : sameNode;
+  return match && isPreserved(previous, match.node) ? match : undefined;
+};
+const mapToFinalBlocks = (tr, index, range, indexes) => {
+  var _tr$docs;
+  let {
+    from,
+    to
+  } = range;
+  // Track inner content separately from outer node bounds: +1 skips the opening
+  // boundary and -1 excludes the closing boundary (see paragraph example above).
+  let contentFrom = from + 1;
+  let contentTo = to - 1;
+  // docs[i] is the document BEFORE step i, so docs[i + 1] is its result.
+  // The last step has no next snapshot; tr.doc is its result instead.
+  let node = ((_tr$docs = tr.docs[index + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc).nodeAt(from);
+  if (!node) {
+    return [];
+  }
+  // Later non-AI steps also shift/delete existing activity, even though they
+  // cannot create new activity themselves. Process every intermediate document.
+  for (let next = index + 1; next < tr.steps.length; next++) {
+    var _tr$docs2;
+    const map = tr.mapping.maps[next];
+    const after = (_tr$docs2 = tr.docs[next + 1]) !== null && _tr$docs2 !== void 0 ? _tr$docs2 : tr.doc;
+    // Mapping biases +1 (right) and -1 (left) keep boundary insertions outside
+    // the tracked content. These arguments do not add/subtract document positions.
+    const start = map.mapResult(contentFrom, 1);
+    const end = map.mapResult(contentTo, -1);
+    if (start.deleted && end.deleted || end.pos <= start.pos) {
+      // A cumulative replacement can preserve the candidate content or owned markup.
+      // Check every intermediate doc so deletion then reinsertion never resurrects it.
+      const preserved = findPreservedNode(after, node, range.markupChanged, indexes);
+      if (!preserved) {
+        return [];
+      }
+      from = preserved.pos;
+      to = from + preserved.node.nodeSize;
+      contentFrom = from + 1;
+      contentTo = to - 1;
+      node = preserved.node;
+    } else {
+      // Apply the same inward biases to the outer node bounds.
+      from = map.map(from, 1);
+      to = map.map(to, -1);
+      contentFrom = start.pos;
+      contentTo = end.pos;
+      const current = after.nodeAt(from);
+      if (current && current.nodeSize === to - from) {
+        node = current;
+      }
+    }
+  }
+  if (from < 0 || to > tr.doc.content.size || contentTo <= contentFrom) {
+    return [];
+  }
+  const finalNode = tr.doc.nodeAt(from);
+  if (finalNode !== null && finalNode !== void 0 && finalNode.isBlock && finalNode.nodeSize === to - from) {
+    return [{
+      from,
+      to
+    }];
+  }
+  // Joins/splits can leave mapped boundaries inside the final textblock.
+  const blocks = [];
+  tr.doc.nodesBetween(contentFrom, contentTo, (child, pos) => {
+    if (child.isTextblock) {
+      blocks.push({
+        from: pos,
+        to: pos + child.nodeSize
+      });
+      return false;
+    }
+  });
+  return blocks;
+};
+
+/**
+ * Returns whole content-block ranges for selected applied steps, in tr.doc coordinates.
+ * Callers select actual AI writes (excluding restores, acknowledgments and preparation)
+ * and own experiment/lifecycle decisions. This helper does not dispatch or render.
+ *
+ * Comparing each step's snapshots also handles attribute/mark steps with empty maps.
+ * Shared unchanged subtrees are skipped by reference. Only localId changes are ignored;
+ * meaningful attributes and marks retain the affected node's full content scope.
+ */
+export function getAgentEditChangedRanges(tr, includedStepIndexes) {
+  // Positions belong to each intermediate document, not just tr.doc. Keep the
+  // lazy indexes local to this call so deletion/reinsertion checks stay intact
+  // and no cache is retained between transactions or streaming chunks.
+  const indexes = new WeakMap();
+  const ranges = [];
+  for (const index of new Set(includedStepIndexes)) {
+    var _tr$docs3;
+    if (!Number.isInteger(index) || index < 0 || index >= tr.steps.length) {
+      continue;
+    }
+    const changed = [];
+    // The root document has no opening boundary. Using -1 makes the recursive
+    // parent.pos + 1 + offset formula place its first child at position 0.
+    collectChanges({
+      node: tr.docs[index],
+      pos: -1
+    }, {
+      node: (_tr$docs3 = tr.docs[index + 1]) !== null && _tr$docs3 !== void 0 ? _tr$docs3 : tr.doc,
+      pos: -1
+    }, tr.steps[index].getMap(), changed);
+    for (const range of changed) {
+      ranges.push(...mapToFinalBlocks(tr, index, range, indexes));
+    }
+  }
+
+  // Return only the surviving final-document ranges, never intermediate step states.
+  // Sort outer ranges before their children, then discard duplicates/contained ranges.
+  // Separate ranges stay separate; this must not highlight the untouched gaps.
+  const unique = [];
+  for (const range of ranges.sort((left, right) => left.from - right.from || right.to - left.to)) {
+    const previous = unique[unique.length - 1];
+    if (!previous || range.to > previous.to) {
+      unique.push(range);
+    }
+  }
+  return unique;
+}

package/dist/es2019/monitoring/error.js

@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 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 = "122.3.3";
+const packageVersion = "122.5.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/transforms/getFormattedNode.js

@@ -1,5 +1,4 @@
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const getFormattedNode = tr => {
   const {
     selection
@@ -7,10 +6,7 @@ export const getFormattedNode = tr => {
   const {
     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);
+  const isBlockTaskItemEnabled = !!nodes.blockTaskItem;
 
   // Find the node to format from the current selection
   let nodeToFormat;

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

@@ -1,5 +1,4 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { convertBlockToInlineContent } from './convertBlockToInlineContent';
 import { createBlockTaskItem } from './createBlockTaskItem';
 import { isBulletOrOrderedList } from './isBulletOrOrderedList';
@@ -34,10 +33,7 @@ export const transformListRecursively = (props, onhandleUnsupportedContent) => {
     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);
+  const isBlockTaskEnabled = !!blockTaskItem;
 
   /**
    * Extracts paragraph children from a blockTaskItem, preserving their marks.
@@ -204,9 +200,7 @@ export const transformToTaskList = (tr, range, targetNodeType, targetAttrs, node
       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 isBlockTaskItemEnabled = !!blockTaskItem;
     const listItems = [];
 
     // Process each block in the range

package/dist/es2019/transforms/transformTaskListToBlockNodes.js

@@ -1,6 +1,5 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const transformTaskListToBlockNodes = context => {
   const {
     tr,
@@ -16,10 +15,7 @@ export const transformTaskListToBlockNodes = context => {
   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);
+  const isBlockTaskItemEnabled = !!blockTaskItem;
   if (isBlockTaskItemEnabled) {
     const blockTaskItemsResult = findChildrenByType(sourceNode, blockTaskItem);
     if (blockTaskItemsResult.length > 0 && targetNodeType === schema.nodes.paragraph) {

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/fg';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "122.3.3";
+const packageVersion = "122.5.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

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

@@ -1,5 +1,7 @@
 import React, { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ResourcedEmoji } from '@atlaskit/emoji/element';
+import { isSingleEmoji } from '../../utils/isSingleEmoji';
 const EmojiNodeFunctional = props => {
   var _resourceConfig$optim;
   const {
@@ -18,12 +20,13 @@ const EmojiNodeFunctional = props => {
     fallback
   }), [shortName, id, fallback]);
   const emojiProviderResolver = useMemo(() => Promise.resolve(emojiProvider), [emojiProvider]);
+  const customFallback = fg('platform_editor_custom_emoji_unicode_fallback') && !isSingleEmoji(fallback || shortName) ? '\uFFFD' : undefined;
   if (allowTextFallback && !emojiProvider) {
     return /*#__PURE__*/React.createElement("span", {
       "data-emoji-id": id,
       "data-emoji-short-name": shortName,
       "data-emoji-text": fallback || shortName
-    }, fallback || shortName);
+    }, customFallback || fallback || shortName);
   }
   if (!emojiProvider) {
     return null;
@@ -34,6 +37,7 @@ const EmojiNodeFunctional = props => {
     showTooltip: showTooltip,
     fitToHeight: fitToHeight,
     optimistic: true,
+    customFallback: customFallback,
     optimisticImageURL: resourceConfig === null || resourceConfig === void 0 ? void 0 : (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
       id,
       fallback,

package/dist/es2019/utils/isSingleEmoji.js

@@ -0,0 +1,15 @@
+const SINGLE_EMOJI_REGEX =
+// Regular expression to match a single emoji character
+/^(\p{Emoji_Presentation}(?:[\u{1F3FB}-\u{1F3FF}])?|\p{Extended_Pictographic}\u{FE0F}(?:[\u{1F3FB}-\u{1F3FF}])?(?:\u{200D}\p{Extended_Pictographic}\u{FE0F}?(?:[\u{1F3FB}-\u{1F3FF}])?)*|\p{Extended_Pictographic}\u{FE0F}?(?:[\u{1F3FB}-\u{1F3FF}])?(?:\u{200D}\p{Extended_Pictographic}\u{FE0F}?(?:[\u{1F3FB}-\u{1F3FF}])?)+|\p{Regional_Indicator}\p{Regional_Indicator})$/u;
+
+/**
+ * Check if we can nicely fallback to the nodes text
+ *
+ * @param fallbackText string of the nodes fallback text
+ *
+ * @example
+ * isSingleEmoji('😀') // true
+ */
+export function isSingleEmoji(fallbackText) {
+  return SINGLE_EMOJI_REGEX.test(fallbackText !== null && fallbackText !== void 0 ? fallbackText : '');
+}

package/dist/es2019/utils/validator.js

@@ -480,6 +480,7 @@ export const getValidNode = (originalNode, schema = defaultSchema, adfStage = 'f
           let mentionText = '';
           let mentionId;
           let mentionAccess;
+          let localId;
           if (attrs) {
             const {
               text,
@@ -490,6 +491,7 @@ export const getValidNode = (originalNode, schema = defaultSchema, adfStage = 'f
             mentionText = text || displayName;
             mentionId = id;
             mentionAccess = accessLevel;
+            localId = attrs.localId;
           }
           if (!mentionText) {
             mentionText = text || '@unknown';
@@ -500,7 +502,10 @@ export const getValidNode = (originalNode, schema = defaultSchema, adfStage = 'f
               attrs: {
                 id: mentionId,
                 text: mentionText,
-                accessLevel: ''
+                accessLevel: '',
+                ...(localId ? {
+                  localId
+                } : {})
               },
               ...(fg('editor_inline_comments_on_inline_nodes') ? {
                 marks