@atlaskit/editor-plugin-show-diff 14.5.0 → 14.5.2
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.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-show-diff
|
|
2
2
|
|
|
3
|
+
## 14.5.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 14.5.1
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`0417aa8001bf1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0417aa8001bf1) -
|
|
14
|
+
Fix attributed changes not using agreed step type
|
|
15
|
+
|
|
3
16
|
## 14.5.0
|
|
4
17
|
|
|
5
18
|
### Minor Changes
|
|
@@ -409,7 +409,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
|
|
|
409
409
|
stepIndex: stepIndex
|
|
410
410
|
});
|
|
411
411
|
}));
|
|
412
|
-
attributedChanges = (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions);
|
|
412
|
+
attributedChanges = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && diffType === 'step' ? (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions) : (0, _toConsumableArray2.default)(changeset.changes);
|
|
413
413
|
// The attributed pipeline gives no guarantee that its output ranges are disjoint — see
|
|
414
414
|
// `collapseOverlappingChanges`.
|
|
415
415
|
var uncollapsedChanges = getAttributedChanges({
|
|
@@ -372,7 +372,7 @@ const calculateDiffDecorationsInner = ({
|
|
|
372
372
|
...attribution,
|
|
373
373
|
stepIndex
|
|
374
374
|
})));
|
|
375
|
-
attributedChanges = diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions);
|
|
375
|
+
attributedChanges = isExtendedEnabled(diffType) && diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : [...changeset.changes];
|
|
376
376
|
// The attributed pipeline gives no guarantee that its output ranges are disjoint — see
|
|
377
377
|
// `collapseOverlappingChanges`.
|
|
378
378
|
const uncollapsedChanges = getAttributedChanges({
|
|
@@ -402,7 +402,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
|
|
|
402
402
|
stepIndex: stepIndex
|
|
403
403
|
});
|
|
404
404
|
}));
|
|
405
|
-
attributedChanges = diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions);
|
|
405
|
+
attributedChanges = isExtendedEnabled(diffType) && diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : _toConsumableArray(changeset.changes);
|
|
406
406
|
// The attributed pipeline gives no guarantee that its output ranges are disjoint — see
|
|
407
407
|
// `collapseOverlappingChanges`.
|
|
408
408
|
var uncollapsedChanges = getAttributedChanges({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-show-diff",
|
|
3
|
-
"version": "14.5.
|
|
3
|
+
"version": "14.5.2",
|
|
4
4
|
"description": "ShowDiff plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"@atlaskit/platform-feature-experiments": "^0.3.0",
|
|
34
34
|
"@atlaskit/platform-feature-flags": "^2.2.0",
|
|
35
35
|
"@atlaskit/primitives": "^22.5.0",
|
|
36
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
36
|
+
"@atlaskit/tmp-editor-statsig": "^178.0.0",
|
|
37
37
|
"@atlaskit/tokens": "^16.11.0",
|
|
38
38
|
"@atlaskit/tooltip": "^24.3.0",
|
|
39
39
|
"@atlaskit/visually-hidden": "^4.4.0",
|