@atlaskit/editor-plugin-show-diff 21.0.3 → 22.0.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 (5) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/pm-plugins/decorations/extractContributorTags.js +3 -3
  3. package/dist/es2019/pm-plugins/decorations/extractContributorTags.js +3 -3
  4. package/dist/esm/pm-plugins/decorations/extractContributorTags.js +3 -3
  5. package/package.json +9 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # @atlaskit/editor-plugin-show-diff
2
2
 
3
+ ## 22.0.0
4
+
5
+ ### Patch Changes
6
+
7
+ - [`a99760331343b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a99760331343b) -
8
+ Fix contributor tag ordering: a wide inline/widget change that merely overlapped a block's range
9
+ (rather than being contained by it) was wrongly folded into the block's tag, hiding its own
10
+ attribution.
11
+ - Updated dependencies
12
+
3
13
  ## 21.0.3
4
14
 
5
15
  ### Patch Changes
package/dist/cjs/pm-plugins/decorations/extractContributorTags.js CHANGED
@@ -50,11 +50,11 @@ var leadsReplacement = function leadsReplacement(widget) {
50
50
 
51
51
  /**
52
52
  * Whether `inner` captions the same change as the block decoration `block`, in which case only the
53
- * block keeps the tag — one tag per block. Containment counts in either direction: a leaf block's
54
- * highlight spans the wrapper the block sits in. Merely adjacent ranges keep a tag each.
53
+ * block keeps the tag — one tag per block. Only when the block fully covers `inner`; a wider
54
+ * inline/widget range that merely overlaps the block is a separate change (EDITOR-9473).
55
55
  */
56
56
  var isSameBlockChange = function isSameBlockChange(inner, block) {
57
- return inner.spec.attributionKey === block.spec.attributionKey && (block.from <= inner.from && inner.to <= block.to || inner.from <= block.from && block.to <= inner.to);
57
+ return inner.spec.attributionKey === block.spec.attributionKey && block.from <= inner.from && inner.to <= block.to;
58
58
  };
59
59
 
60
60
  /**
package/dist/es2019/pm-plugins/decorations/extractContributorTags.js CHANGED
@@ -29,10 +29,10 @@ const leadsReplacement = widget => fg('confluence_ncs_step_diffing_version_histo
29
29
 
30
30
  /**
31
31
  * Whether `inner` captions the same change as the block decoration `block`, in which case only the
32
- * block keeps the tag — one tag per block. Containment counts in either direction: a leaf block's
33
- * highlight spans the wrapper the block sits in. Merely adjacent ranges keep a tag each.
32
+ * block keeps the tag — one tag per block. Only when the block fully covers `inner`; a wider
33
+ * inline/widget range that merely overlaps the block is a separate change (EDITOR-9473).
34
34
  */
35
- const isSameBlockChange = (inner, block) => inner.spec.attributionKey === block.spec.attributionKey && (block.from <= inner.from && inner.to <= block.to || inner.from <= block.from && block.to <= inner.to);
35
+ const isSameBlockChange = (inner, block) => inner.spec.attributionKey === block.spec.attributionKey && block.from <= inner.from && inner.to <= block.to;
36
36
 
37
37
  /**
38
38
  * Whether `outer` is the box `inner` sits in, for one contributor. Nested blocks they inserted read
package/dist/esm/pm-plugins/decorations/extractContributorTags.js CHANGED
@@ -44,11 +44,11 @@ var leadsReplacement = function leadsReplacement(widget) {
44
44
 
45
45
  /**
46
46
  * Whether `inner` captions the same change as the block decoration `block`, in which case only the
47
- * block keeps the tag — one tag per block. Containment counts in either direction: a leaf block's
48
- * highlight spans the wrapper the block sits in. Merely adjacent ranges keep a tag each.
47
+ * block keeps the tag — one tag per block. Only when the block fully covers `inner`; a wider
48
+ * inline/widget range that merely overlaps the block is a separate change (EDITOR-9473).
49
49
  */
50
50
  var isSameBlockChange = function isSameBlockChange(inner, block) {
51
- return inner.spec.attributionKey === block.spec.attributionKey && (block.from <= inner.from && inner.to <= block.to || inner.from <= block.from && block.to <= inner.to);
51
+ return inner.spec.attributionKey === block.spec.attributionKey && block.from <= inner.from && inner.to <= block.to;
52
52
  };
53
53
 
54
54
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-show-diff",
3
- "version": "21.0.3",
3
+ "version": "22.0.0",
4
4
  "description": "ShowDiff plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -29,10 +29,10 @@
29
29
  "@atlaskit/agent-color": "^1.0.0",
30
30
  "@atlaskit/avatar": "^30.0.0",
31
31
  "@atlaskit/custom-steps": "^1.1.0",
32
- "@atlaskit/editor-plugin-accessibility-utils": "^23.0.0",
33
- "@atlaskit/editor-plugin-analytics": "^23.0.0",
34
- "@atlaskit/editor-plugin-limited-mode": "^20.0.0",
35
- "@atlaskit/editor-plugin-user-intent": "^21.0.0",
32
+ "@atlaskit/editor-plugin-accessibility-utils": "^24.0.0",
33
+ "@atlaskit/editor-plugin-analytics": "^24.0.0",
34
+ "@atlaskit/editor-plugin-limited-mode": "^21.0.0",
35
+ "@atlaskit/editor-plugin-user-intent": "^22.0.0",
36
36
  "@atlaskit/editor-prosemirror": "^9.0.0",
37
37
  "@atlaskit/editor-shared-styles": "^4.3.0",
38
38
  "@atlaskit/editor-tables": "^3.2.0",
@@ -53,7 +53,7 @@
53
53
  "@atlaskit/button": "^25.4.0",
54
54
  "@atlaskit/css": "^1.1.0",
55
55
  "@atlaskit/dropdown-menu": "^21.0.0",
56
- "@atlaskit/editor-core": "^233.0.0",
56
+ "@atlaskit/editor-core": "^234.0.0",
57
57
  "@atlaskit/editor-json-transformer": "^10.0.0",
58
58
  "@atlaskit/editor-plugins": "^16.1.0",
59
59
  "@atlaskit/form": "^18.0.0",
@@ -63,15 +63,15 @@
63
63
  "@atlaskit/util-data-test": "^19.1.0",
64
64
  "@atlassian/confluence-presets": "workspace:^",
65
65
  "@atlassian/content-reconciliation": "^0.1.3506",
66
- "@atlassian/editor-ai-injected-editors": "^37.0.0",
67
- "@atlassian/editor-plugin-ai": "^77.0.0",
66
+ "@atlassian/editor-ai-injected-editors": "^38.0.0",
67
+ "@atlassian/editor-plugin-ai": "^78.0.0",
68
68
  "@atlassian/structured-docs-types": "workspace:^",
69
69
  "react": "^19.2.0",
70
70
  "react-dom": "^19.2.0",
71
71
  "react-intl": "^7.0.0"
72
72
  },
73
73
  "peerDependencies": {
74
- "@atlaskit/editor-common": "^127.2.0",
74
+ "@atlaskit/editor-common": "^128.0.0",
75
75
  "react": "^18.2.0 || ^19.2.0",
76
76
  "react-dom": "^18.2.0 || ^19.2.0",
77
77
  "react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"