@atlaskit/editor-common 122.4.0 → 122.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/CHANGELOG.md +50 -0
  2. package/collab-agent-edit-changed-ranges/package.json +10 -0
  3. package/dist/cjs/collab/agent-edit-changed-ranges.js +304 -0
  4. package/dist/cjs/monitoring/error.js +1 -1
  5. package/dist/cjs/transforms/getFormattedNode.js +1 -5
  6. package/dist/cjs/transforms/list-transforms.js +2 -8
  7. package/dist/cjs/transforms/transformTaskListToBlockNodes.js +1 -5
  8. package/dist/cjs/ui/DropList/index.js +1 -1
  9. package/dist/cjs/ui/Emoji/index.js +5 -1
  10. package/dist/cjs/utils/isSingleEmoji.js +21 -0
  11. package/dist/cjs/utils/validator.js +6 -2
  12. package/dist/es2019/collab/agent-edit-changed-ranges.js +255 -0
  13. package/dist/es2019/monitoring/error.js +1 -1
  14. package/dist/es2019/transforms/getFormattedNode.js +1 -5
  15. package/dist/es2019/transforms/list-transforms.js +2 -8
  16. package/dist/es2019/transforms/transformTaskListToBlockNodes.js +1 -5
  17. package/dist/es2019/ui/DropList/index.js +1 -1
  18. package/dist/es2019/ui/Emoji/index.js +5 -1
  19. package/dist/es2019/utils/isSingleEmoji.js +15 -0
  20. package/dist/es2019/utils/validator.js +6 -1
  21. package/dist/esm/collab/agent-edit-changed-ranges.js +297 -0
  22. package/dist/esm/monitoring/error.js +1 -1
  23. package/dist/esm/transforms/getFormattedNode.js +1 -5
  24. package/dist/esm/transforms/list-transforms.js +2 -8
  25. package/dist/esm/transforms/transformTaskListToBlockNodes.js +1 -5
  26. package/dist/esm/ui/DropList/index.js +1 -1
  27. package/dist/esm/ui/Emoji/index.js +5 -1
  28. package/dist/esm/utils/isSingleEmoji.js +15 -0
  29. package/dist/esm/utils/validator.js +6 -2
  30. package/dist/types/collab/agent-edit-changed-ranges.d.ts +12 -0
  31. package/dist/types/provider-factory/profile-card-provider.d.ts +5 -0
  32. package/dist/types/utils/isSingleEmoji.d.ts +9 -0
  33. package/package.json +5 -2
  34. package/utils/isSingleEmoji/package.json +10 -0
@@ -0,0 +1,297 @@
1
+ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
+ 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; } } }; }
3
+ 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; } }
4
+ 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; }
5
+ import isEqual from 'lodash/isEqual';
6
+ // localId is identity metadata: regenerating it alone should not create activity.
7
+ var sameAttrs = function sameAttrs(left, right) {
8
+ var keys = Object.keys(left).filter(function (key) {
9
+ return key !== 'localId';
10
+ });
11
+ return keys.length === Object.keys(right).filter(function (key) {
12
+ return key !== 'localId';
13
+ }).length && keys.every(function (key) {
14
+ return isEqual(left[key], right[key]);
15
+ });
16
+ };
17
+
18
+ // Compare the node's own type, attributes and marks, without comparing its children.
19
+ var sameMarkup = function sameMarkup(left, right) {
20
+ return left.type === right.type && sameAttrs(left.attrs, right.attrs) && left.marks.length === right.marks.length && left.marks.every(function (mark, index) {
21
+ return mark.type === right.marks[index].type && sameAttrs(mark.attrs, right.marks[index].attrs);
22
+ });
23
+ };
24
+ var _sameNode = function sameNode(left, right) {
25
+ if (left === right) {
26
+ return true;
27
+ }
28
+ if (!sameMarkup(left, right) || left.text !== right.text || left.childCount !== right.childCount) {
29
+ return false;
30
+ }
31
+ for (var index = 0; index < left.childCount; index++) {
32
+ if (!_sameNode(left.child(index), right.child(index))) {
33
+ return false;
34
+ }
35
+ }
36
+ return true;
37
+ };
38
+
39
+ // Positions include document structure, not just character offsets. A non-leaf node
40
+ // uses one position for each opening/closing boundary, plus the size of its content.
41
+ // Example: paragraph('Hi') at pos 0 has nodeSize 4, outer range [0, 4),
42
+ // and text content [1, 3). All ranges here use an exclusive end position.
43
+
44
+ // Keep the reason internally so a panel attribute change can survive child edits.
45
+ // Only ordinary { from, to } ranges are returned to the chrome consumer.
46
+
47
+ var _collectChanges = function collectChanges(before, after, map, ranges) {
48
+ var node = after.node,
49
+ pos = after.pos;
50
+ if (before && _sameNode(before.node, node)) {
51
+ return;
52
+ }
53
+ // Text edits belong to their textblock. A node's own markup change instead
54
+ // owns its full content, so we stop here rather than adding child ranges too.
55
+ var markupChanged = !!before && node.isBlock && !sameMarkup(before.node, node);
56
+ if (node.isTextblock || markupChanged) {
57
+ if (node.content.size > 0) {
58
+ ranges.push({
59
+ from: pos,
60
+ to: pos + node.nodeSize,
61
+ markupChanged: markupChanged
62
+ });
63
+ }
64
+ return;
65
+ }
66
+ var byPosition = new Map();
67
+ var byId = new Map();
68
+ var oldChildren = [];
69
+ before === null || before === void 0 || before.node.forEach(function (child, offset) {
70
+ // forEach offsets start inside the parent. Skip its opening boundary (+1)
71
+ // to convert this child offset into an absolute document position.
72
+ var previous = {
73
+ node: child,
74
+ pos: before.pos + 1 + offset
75
+ };
76
+ oldChildren.push(previous);
77
+ // This 1 is a mapping bias, not an added offset: follow the right side
78
+ // of an insertion at the child's start, keeping the original child after it.
79
+ var mapped = map.mapResult(previous.pos, 1);
80
+ if (!mapped.deleted) {
81
+ byPosition.set(mapped.pos, previous);
82
+ }
83
+ var id = child.attrs.localId;
84
+ if (typeof id === 'string' && id) {
85
+ // Duplicate IDs cannot identify a unique old child.
86
+ byId.set(id, byId.has(id) ? null : previous);
87
+ }
88
+ });
89
+ var nextChildren = [];
90
+ node.forEach(function (child, offset) {
91
+ return nextChildren.push({
92
+ node: child,
93
+ pos: pos + 1 + offset
94
+ });
95
+ });
96
+ // Narrow edits usually preserve mapped positions. Whole-container replacements
97
+ // may erase those positions, so stable child IDs provide a second way to match.
98
+ var preferred = nextChildren.map(function (next) {
99
+ var _ref, _byPosition$get;
100
+ 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;
101
+ });
102
+ var claims = new Map();
103
+ var _iterator = _createForOfIteratorHelper(preferred),
104
+ _step;
105
+ try {
106
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
107
+ var match = _step.value;
108
+ if (match) {
109
+ var _claims$get;
110
+ claims.set(match, ((_claims$get = claims.get(match)) !== null && _claims$get !== void 0 ? _claims$get : 0) + 1);
111
+ }
112
+ }
113
+ } catch (err) {
114
+ _iterator.e(err);
115
+ } finally {
116
+ _iterator.f();
117
+ }
118
+ nextChildren.forEach(function (next, index) {
119
+ var match = preferred[index];
120
+ // Same-index fallback supports replacements that regenerate IDs but keep
121
+ // the child structure. Different child counts make that correspondence unsafe.
122
+ var aligned = oldChildren.length === node.childCount ? oldChildren[index] : undefined;
123
+ // Reserve every position/ID match before fallback, including later siblings.
124
+ // Reusing one old sibling can otherwise disguise an equal-text insertion.
125
+ var previous = match && claims.get(match) === 1 ? match : aligned && !claims.has(aligned) ? aligned : undefined;
126
+ _collectChanges(previous, next, map, ranges);
127
+ });
128
+ };
129
+ var findPreservedNode = function findPreservedNode(doc, previous, markupChanged, indexes) {
130
+ var id = previous.attrs.localId;
131
+ if (typeof id !== 'string' || !id) {
132
+ return;
133
+ }
134
+ var byId = indexes.get(doc);
135
+ if (!byId) {
136
+ // Build only when mapping loses a candidate, then reuse for every range
137
+ // visiting this immutable snapshot. Ordinary mapped edits need no scan.
138
+ var nodeIndex = new Map();
139
+ doc.descendants(function (node, pos) {
140
+ var localId = node.attrs.localId;
141
+ if (typeof localId === 'string' && localId) {
142
+ // Keep duplicates ambiguous, including IDs outside the changed subtree.
143
+ nodeIndex.set(localId, nodeIndex.has(localId) ? null : {
144
+ node: node,
145
+ pos: pos
146
+ });
147
+ }
148
+ });
149
+ indexes.set(doc, nodeIndex);
150
+ byId = nodeIndex;
151
+ }
152
+ var match = byId.get(id);
153
+ // Attribute/mark activity belongs to the node even when its children are edited.
154
+ // Content-only activity still requires the entire candidate to survive unchanged.
155
+ var isPreserved = markupChanged ? sameMarkup : _sameNode;
156
+ return match && isPreserved(previous, match.node) ? match : undefined;
157
+ };
158
+ var mapToFinalBlocks = function mapToFinalBlocks(tr, index, range, indexes) {
159
+ var _tr$docs;
160
+ var from = range.from,
161
+ to = range.to;
162
+ // Track inner content separately from outer node bounds: +1 skips the opening
163
+ // boundary and -1 excludes the closing boundary (see paragraph example above).
164
+ var contentFrom = from + 1;
165
+ var contentTo = to - 1;
166
+ // docs[i] is the document BEFORE step i, so docs[i + 1] is its result.
167
+ // The last step has no next snapshot; tr.doc is its result instead.
168
+ var node = ((_tr$docs = tr.docs[index + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc).nodeAt(from);
169
+ if (!node) {
170
+ return [];
171
+ }
172
+ // Later non-AI steps also shift/delete existing activity, even though they
173
+ // cannot create new activity themselves. Process every intermediate document.
174
+ for (var next = index + 1; next < tr.steps.length; next++) {
175
+ var _tr$docs2;
176
+ var map = tr.mapping.maps[next];
177
+ var after = (_tr$docs2 = tr.docs[next + 1]) !== null && _tr$docs2 !== void 0 ? _tr$docs2 : tr.doc;
178
+ // Mapping biases +1 (right) and -1 (left) keep boundary insertions outside
179
+ // the tracked content. These arguments do not add/subtract document positions.
180
+ var start = map.mapResult(contentFrom, 1);
181
+ var end = map.mapResult(contentTo, -1);
182
+ if (start.deleted && end.deleted || end.pos <= start.pos) {
183
+ // A cumulative replacement can preserve the candidate content or owned markup.
184
+ // Check every intermediate doc so deletion then reinsertion never resurrects it.
185
+ var preserved = findPreservedNode(after, node, range.markupChanged, indexes);
186
+ if (!preserved) {
187
+ return [];
188
+ }
189
+ from = preserved.pos;
190
+ to = from + preserved.node.nodeSize;
191
+ contentFrom = from + 1;
192
+ contentTo = to - 1;
193
+ node = preserved.node;
194
+ } else {
195
+ // Apply the same inward biases to the outer node bounds.
196
+ from = map.map(from, 1);
197
+ to = map.map(to, -1);
198
+ contentFrom = start.pos;
199
+ contentTo = end.pos;
200
+ var current = after.nodeAt(from);
201
+ if (current && current.nodeSize === to - from) {
202
+ node = current;
203
+ }
204
+ }
205
+ }
206
+ if (from < 0 || to > tr.doc.content.size || contentTo <= contentFrom) {
207
+ return [];
208
+ }
209
+ var finalNode = tr.doc.nodeAt(from);
210
+ if (finalNode !== null && finalNode !== void 0 && finalNode.isBlock && finalNode.nodeSize === to - from) {
211
+ return [{
212
+ from: from,
213
+ to: to
214
+ }];
215
+ }
216
+ // Joins/splits can leave mapped boundaries inside the final textblock.
217
+ var blocks = [];
218
+ tr.doc.nodesBetween(contentFrom, contentTo, function (child, pos) {
219
+ if (child.isTextblock) {
220
+ blocks.push({
221
+ from: pos,
222
+ to: pos + child.nodeSize
223
+ });
224
+ return false;
225
+ }
226
+ });
227
+ return blocks;
228
+ };
229
+
230
+ /**
231
+ * Returns whole content-block ranges for selected applied steps, in tr.doc coordinates.
232
+ * Callers select actual AI writes (excluding restores, acknowledgments and preparation)
233
+ * and own experiment/lifecycle decisions. This helper does not dispatch or render.
234
+ *
235
+ * Comparing each step's snapshots also handles attribute/mark steps with empty maps.
236
+ * Shared unchanged subtrees are skipped by reference. Only localId changes are ignored;
237
+ * meaningful attributes and marks retain the affected node's full content scope.
238
+ */
239
+ export function getAgentEditChangedRanges(tr, includedStepIndexes) {
240
+ // Positions belong to each intermediate document, not just tr.doc. Keep the
241
+ // lazy indexes local to this call so deletion/reinsertion checks stay intact
242
+ // and no cache is retained between transactions or streaming chunks.
243
+ var indexes = new WeakMap();
244
+ var ranges = [];
245
+ var _iterator2 = _createForOfIteratorHelper(new Set(includedStepIndexes)),
246
+ _step2;
247
+ try {
248
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
249
+ var _tr$docs3;
250
+ var index = _step2.value;
251
+ if (!Number.isInteger(index) || index < 0 || index >= tr.steps.length) {
252
+ continue;
253
+ }
254
+ var changed = [];
255
+ // The root document has no opening boundary. Using -1 makes the recursive
256
+ // parent.pos + 1 + offset formula place its first child at position 0.
257
+ _collectChanges({
258
+ node: tr.docs[index],
259
+ pos: -1
260
+ }, {
261
+ node: (_tr$docs3 = tr.docs[index + 1]) !== null && _tr$docs3 !== void 0 ? _tr$docs3 : tr.doc,
262
+ pos: -1
263
+ }, tr.steps[index].getMap(), changed);
264
+ for (var _i = 0, _changed = changed; _i < _changed.length; _i++) {
265
+ var range = _changed[_i];
266
+ ranges.push.apply(ranges, _toConsumableArray(mapToFinalBlocks(tr, index, range, indexes)));
267
+ }
268
+ }
269
+
270
+ // Return only the surviving final-document ranges, never intermediate step states.
271
+ // Sort outer ranges before their children, then discard duplicates/contained ranges.
272
+ // Separate ranges stay separate; this must not highlight the untouched gaps.
273
+ } catch (err) {
274
+ _iterator2.e(err);
275
+ } finally {
276
+ _iterator2.f();
277
+ }
278
+ var unique = [];
279
+ var _iterator3 = _createForOfIteratorHelper(ranges.sort(function (left, right) {
280
+ return left.from - right.from || right.to - left.to;
281
+ })),
282
+ _step3;
283
+ try {
284
+ for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
285
+ var _range = _step3.value;
286
+ var previous = unique[unique.length - 1];
287
+ if (!previous || _range.to > previous.to) {
288
+ unique.push(_range);
289
+ }
290
+ }
291
+ } catch (err) {
292
+ _iterator3.e(err);
293
+ } finally {
294
+ _iterator3.f();
295
+ }
296
+ return unique;
297
+ }
@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
19
19
  var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
20
20
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
21
21
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
22
- var packageVersion = "122.3.3";
22
+ var packageVersion = "122.5.0";
23
23
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
24
24
  // Remove URL as it has UGC
25
25
  // Ignored via go/ees007
@@ -1,12 +1,8 @@
1
1
  import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
2
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
2
  export var getFormattedNode = function getFormattedNode(tr) {
4
3
  var selection = tr.selection;
5
4
  var nodes = tr.doc.type.schema.nodes;
6
-
7
- // gating behind platform_editor_small_font_size to support task lists with font size applied,
8
- // but keep this solution general
9
- var isBlockTaskItemEnabled = !!nodes.blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
5
+ var isBlockTaskItemEnabled = !!nodes.blockTaskItem;
10
6
 
11
7
  // Find the node to format from the current selection
12
8
  var nodeToFormat;
@@ -3,7 +3,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  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; }
4
4
  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; }
5
5
  import { Fragment } from '@atlaskit/editor-prosemirror/model';
6
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
6
  import { convertBlockToInlineContent } from './convertBlockToInlineContent';
8
7
  import { createBlockTaskItem } from './createBlockTaskItem';
9
8
  import { isBulletOrOrderedList } from './isBulletOrOrderedList';
@@ -35,10 +34,7 @@ var _transformListRecursively = function transformListRecursively(props, onhandl
35
34
  taskItem = _schema$nodes.taskItem,
36
35
  paragraph = _schema$nodes.paragraph,
37
36
  blockTaskItem = _schema$nodes.blockTaskItem;
38
-
39
- // gating behind platform_editor_small_font_size to support task lists with font size applied,
40
- // but keep this solution general
41
- var isBlockTaskEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
37
+ var isBlockTaskEnabled = !!blockTaskItem;
42
38
 
43
39
  /**
44
40
  * Extracts paragraph children from a blockTaskItem, preserving their marks.
@@ -199,9 +195,7 @@ export var transformToTaskList = function transformToTaskList(tr, range, targetN
199
195
  var taskItem = nodes.taskItem,
200
196
  paragraph = nodes.paragraph,
201
197
  blockTaskItem = nodes.blockTaskItem;
202
- // gating behind platform_editor_small_font_size to support task lists with font size applied,
203
- // but keep this solution general
204
- var isBlockTaskItemEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
198
+ var isBlockTaskItemEnabled = !!blockTaskItem;
205
199
  var listItems = [];
206
200
 
207
201
  // Process each block in the range
@@ -3,7 +3,6 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
3
3
  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; }
4
4
  import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
5
5
  import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
6
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
6
  export var transformTaskListToBlockNodes = function transformTaskListToBlockNodes(context) {
8
7
  var tr = context.tr,
9
8
  targetNodeType = context.targetNodeType,
@@ -13,10 +12,7 @@ export var transformTaskListToBlockNodes = function transformTaskListToBlockNode
13
12
  var selection = tr.selection;
14
13
  var schema = selection.$from.doc.type.schema;
15
14
  var blockTaskItem = schema.nodes.blockTaskItem;
16
-
17
- // gating behind platform_editor_small_font_size to support task lists with font size applied,
18
- // but keep this solution general
19
- var isBlockTaskItemEnabled = !!blockTaskItem && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
15
+ var isBlockTaskItemEnabled = !!blockTaskItem;
20
16
  if (isBlockTaskItemEnabled) {
21
17
  var blockTaskItemsResult = findChildrenByType(sourceNode, blockTaskItem);
22
18
  if (blockTaskItemsResult.length > 0 && targetNodeType === schema.nodes.paragraph) {
@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
21
21
  import { fg } from '@atlaskit/platform-feature-flags/fg';
22
22
  import Layer from '../Layer';
23
23
  var packageName = "@atlaskit/editor-common";
24
- var packageVersion = "122.3.3";
24
+ var packageVersion = "122.5.0";
25
25
  var halfFocusRing = 1;
26
26
  var dropOffset = '0, 8';
27
27
  var fadeIn = keyframes({
@@ -1,5 +1,7 @@
1
1
  import React, { useMemo } from 'react';
2
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
2
3
  import { ResourcedEmoji } from '@atlaskit/emoji/element';
4
+ import { isSingleEmoji } from '../../utils/isSingleEmoji';
3
5
  var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
4
6
  var _resourceConfig$optim;
5
7
  var allowTextFallback = props.allowTextFallback,
@@ -20,12 +22,13 @@ var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
20
22
  var emojiProviderResolver = useMemo(function () {
21
23
  return Promise.resolve(emojiProvider);
22
24
  }, [emojiProvider]);
25
+ var customFallback = fg('platform_editor_custom_emoji_unicode_fallback') && !isSingleEmoji(fallback || shortName) ? "\uFFFD" : undefined;
23
26
  if (allowTextFallback && !emojiProvider) {
24
27
  return /*#__PURE__*/React.createElement("span", {
25
28
  "data-emoji-id": id,
26
29
  "data-emoji-short-name": shortName,
27
30
  "data-emoji-text": fallback || shortName
28
- }, fallback || shortName);
31
+ }, customFallback || fallback || shortName);
29
32
  }
30
33
  if (!emojiProvider) {
31
34
  return null;
@@ -36,6 +39,7 @@ var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
36
39
  showTooltip: showTooltip,
37
40
  fitToHeight: fitToHeight,
38
41
  optimistic: true,
42
+ customFallback: customFallback,
39
43
  optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
40
44
  id: id,
41
45
  fallback: fallback,
@@ -0,0 +1,15 @@
1
+ var SINGLE_EMOJI_REGEX =
2
+ // Regular expression to match a single emoji character
3
+ /^((?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDED5-\uDED8\uDEDC-\uDEDF\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB\uDFF0]|\uD83E[\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDDFF\uDE70-\uDE7C\uDE80-\uDE8A\uDE8E-\uDEC6\uDEC8\uDECD-\uDEDC\uDEDF-\uDEEA\uDEEF-\uDEF8])(?:(?:\uD83C[\uDFFB-\uDFFF]))?|(?:[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDC2C-\uDC2F\uDC94-\uDC9F\uDCAF\uDCB0\uDCC0\uDCCF\uDCD0\uDCF6-\uDCFF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDAE-\uDDE5\uDE01-\uDE0F\uDE1A\uDE2F\uDE32-\uDE3A\uDE3C-\uDE3F\uDE49-\uDE5F\uDE66-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFA]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDEE5\uDEE9\uDEEB-\uDEF0\uDEF3-\uDEFF\uDFDA-\uDFFF]|\uD83E[\uDC0C-\uDC0F\uDC48-\uDC4F\uDC5A-\uDC5F\uDC88-\uDC8F\uDCAE\uDCAF\uDCBC-\uDCBF\uDCC2-\uDCCF\uDCD9-\uDCFF\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDDFF\uDE58-\uDE5F\uDE6E-\uDEFF]|\uD83F[\uDC00-\uDFFD])\uFE0F(?:(?:\uD83C[\uDFFB-\uDFFF]))?(?:\u200D(?:[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDC2C-\uDC2F\uDC94-\uDC9F\uDCAF\uDCB0\uDCC0\uDCCF\uDCD0\uDCF6-\uDCFF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDAE-\uDDE5\uDE01-\uDE0F\uDE1A\uDE2F\uDE32-\uDE3A\uDE3C-\uDE3F\uDE49-\uDE5F\uDE66-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFA]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDEE5\uDEE9\uDEEB-\uDEF0\uDEF3-\uDEFF\uDFDA-\uDFFF]|\uD83E[\uDC0C-\uDC0F\uDC48-\uDC4F\uDC5A-\uDC5F\uDC88-\uDC8F\uDCAE\uDCAF\uDCBC-\uDCBF\uDCC2-\uDCCF\uDCD9-\uDCFF\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDDFF\uDE58-\uDE5F\uDE6E-\uDEFF]|\uD83F[\uDC00-\uDFFD])\uFE0F?(?:(?:\uD83C[\uDFFB-\uDFFF]))?)*|(?:[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDC2C-\uDC2F\uDC94-\uDC9F\uDCAF\uDCB0\uDCC0\uDCCF\uDCD0\uDCF6-\uDCFF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDAE-\uDDE5\uDE01-\uDE0F\uDE1A\uDE2F\uDE32-\uDE3A\uDE3C-\uDE3F\uDE49-\uDE5F\uDE66-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFA]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDEE5\uDEE9\uDEEB-\uDEF0\uDEF3-\uDEFF\uDFDA-\uDFFF]|\uD83E[\uDC0C-\uDC0F\uDC48-\uDC4F\uDC5A-\uDC5F\uDC88-\uDC8F\uDCAE\uDCAF\uDCBC-\uDCBF\uDCC2-\uDCCF\uDCD9-\uDCFF\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDDFF\uDE58-\uDE5F\uDE6E-\uDEFF]|\uD83F[\uDC00-\uDFFD])\uFE0F?(?:(?:\uD83C[\uDFFB-\uDFFF]))?(?:\u200D(?:[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDC2C-\uDC2F\uDC94-\uDC9F\uDCAF\uDCB0\uDCC0\uDCCF\uDCD0\uDCF6-\uDCFF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDAE-\uDDE5\uDE01-\uDE0F\uDE1A\uDE2F\uDE32-\uDE3A\uDE3C-\uDE3F\uDE49-\uDE5F\uDE66-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFA]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDEE5\uDEE9\uDEEB-\uDEF0\uDEF3-\uDEFF\uDFDA-\uDFFF]|\uD83E[\uDC0C-\uDC0F\uDC48-\uDC4F\uDC5A-\uDC5F\uDC88-\uDC8F\uDCAE\uDCAF\uDCBC-\uDCBF\uDCC2-\uDCCF\uDCD9-\uDCFF\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDDFF\uDE58-\uDE5F\uDE6E-\uDEFF]|\uD83F[\uDC00-\uDFFD])\uFE0F?(?:(?:\uD83C[\uDFFB-\uDFFF]))?)+|(?:\uD83C[\uDDE6-\uDDFF])(?:\uD83C[\uDDE6-\uDDFF]))$/;
4
+
5
+ /**
6
+ * Check if we can nicely fallback to the nodes text
7
+ *
8
+ * @param fallbackText string of the nodes fallback text
9
+ *
10
+ * @example
11
+ * isSingleEmoji('😀') // true
12
+ */
13
+ export function isSingleEmoji(fallbackText) {
14
+ return SINGLE_EMOJI_REGEX.test(fallbackText !== null && fallbackText !== void 0 ? fallbackText : '');
15
+ }
@@ -486,6 +486,7 @@ export var getValidNode = function getValidNode(originalNode) {
486
486
  var mentionText = '';
487
487
  var mentionId;
488
488
  var mentionAccess;
489
+ var localId;
489
490
  if (attrs) {
490
491
  var _text = attrs.text,
491
492
  displayName = attrs.displayName,
@@ -494,6 +495,7 @@ export var getValidNode = function getValidNode(originalNode) {
494
495
  mentionText = _text || displayName;
495
496
  mentionId = _id2;
496
497
  mentionAccess = accessLevel;
498
+ localId = attrs.localId;
497
499
  }
498
500
  if (!mentionText) {
499
501
  mentionText = text || '@unknown';
@@ -501,11 +503,13 @@ export var getValidNode = function getValidNode(originalNode) {
501
503
  if (mentionText && mentionId) {
502
504
  var mentionNode = _objectSpread({
503
505
  type: type,
504
- attrs: {
506
+ attrs: _objectSpread({
505
507
  id: mentionId,
506
508
  text: mentionText,
507
509
  accessLevel: ''
508
- }
510
+ }, localId ? {
511
+ localId: localId
512
+ } : {})
509
513
  }, fg('editor_inline_comments_on_inline_nodes') ? {
510
514
  marks: marks
511
515
  } : {});
@@ -0,0 +1,12 @@
1
+ import type { Transaction } from '@atlaskit/editor-prosemirror/state';
2
+ import type { AgentEditChromeRange } from './agent-edit-chrome';
3
+ /**
4
+ * Returns whole content-block ranges for selected applied steps, in tr.doc coordinates.
5
+ * Callers select actual AI writes (excluding restores, acknowledgments and preparation)
6
+ * and own experiment/lifecycle decisions. This helper does not dispatch or render.
7
+ *
8
+ * Comparing each step's snapshots also handles attribute/mark steps with empty maps.
9
+ * Shared unchanged subtrees are skipped by reference. Only localId changes are ignored;
10
+ * meaningful attributes and marks retain the affected node's full content scope.
11
+ */
12
+ export declare function getAgentEditChangedRanges(tr: Transaction, includedStepIndexes: readonly number[]): AgentEditChromeRange[];
@@ -1,4 +1,5 @@
1
1
  import type { ReactNode } from 'react';
2
+ import type { Placement } from '@atlaskit/popper/main';
2
3
  import type { ProfileCardAction } from '@atlaskit/profilecard/types';
3
4
  import type ProfileClient from '@atlaskit/profilecard/profile-card-client';
4
5
  /**
@@ -16,8 +17,12 @@ import type ProfileClient from '@atlaskit/profilecard/profile-card-client';
16
17
  export type RenderUserMentionCard = (props: {
17
18
  children: ReactNode;
18
19
  cloudId: string;
20
+ /** Renders a reduced, non-interactive card with the header + manager section only */
21
+ isReduced?: boolean;
19
22
  /** Optional mention-local marker supplied by the renderer. */
20
23
  localId?: string;
24
+ /** Popper placement for the card relative to the `referenceElement`. */
25
+ placement?: Placement;
21
26
  /** Known identity to prefill the card with, giving its trigger a concrete accessible name. */
22
27
  prefilledProfileData?: {
23
28
  accountId: string;
@@ -0,0 +1,9 @@
1
+ /**
2
+ * Check if we can nicely fallback to the nodes text
3
+ *
4
+ * @param fallbackText string of the nodes fallback text
5
+ *
6
+ * @example
7
+ * isSingleEmoji('😀') // true
8
+ */
9
+ export declare function isSingleEmoji(fallbackText: string | undefined): boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "122.4.0",
3
+ "version": "122.6.0",
4
4
  "description": "A package that contains common classes and components for editor and renderer",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -84,7 +84,7 @@
84
84
  "@atlaskit/task-decision": "^21.10.0",
85
85
  "@atlaskit/teams-app-config": "^3.1.0",
86
86
  "@atlaskit/textfield": "^10.2.0",
87
- "@atlaskit/tmp-editor-statsig": "^193.0.0",
87
+ "@atlaskit/tmp-editor-statsig": "^194.0.0",
88
88
  "@atlaskit/tokens": "^16.12.0",
89
89
  "@atlaskit/tooltip": "^24.3.0",
90
90
  "@atlaskit/width-detector": "^7.2.0",
@@ -244,6 +244,9 @@
244
244
  },
245
245
  "platform_editor_embed_height_only_fallback": {
246
246
  "type": "boolean"
247
+ },
248
+ "platform_editor_custom_emoji_unicode_fallback": {
249
+ "type": "boolean"
247
250
  }
248
251
  },
249
252
  "platform-experiments": {
@@ -0,0 +1,10 @@
1
+ {
2
+ "name": "@atlaskit/editor-common/utils/isSingleEmoji",
3
+ "main": "../../dist/cjs/utils/isSingleEmoji.js",
4
+ "module": "../../dist/esm/utils/isSingleEmoji.js",
5
+ "module:es2019": "../../dist/es2019/utils/isSingleEmoji.js",
6
+ "sideEffects": [
7
+ "**/*.compiled.css"
8
+ ],
9
+ "types": "../../dist/types/utils/isSingleEmoji.d.ts"
10
+ }