@atlaskit/editor-plugin-show-diff 19.0.1 → 19.0.3
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 +22 -0
- package/dist/cjs/pm-plugins/calculateDiff/calculateDiffDecorations.js +4 -1
- package/dist/cjs/pm-plugins/decorations/colorSchemes/factory.js +1 -2
- package/dist/cjs/pm-plugins/decorations/createAnchorDecorationWidgets.js +4 -1
- package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.js +1 -2
- package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js +1 -2
- package/dist/es2019/pm-plugins/calculateDiff/calculateDiffDecorations.js +4 -1
- package/dist/es2019/pm-plugins/decorations/colorSchemes/factory.js +1 -2
- package/dist/es2019/pm-plugins/decorations/createAnchorDecorationWidgets.js +4 -1
- package/dist/es2019/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.js +1 -2
- package/dist/es2019/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js +2 -3
- package/dist/esm/pm-plugins/calculateDiff/calculateDiffDecorations.js +4 -1
- package/dist/esm/pm-plugins/decorations/colorSchemes/factory.js +1 -2
- package/dist/esm/pm-plugins/decorations/createAnchorDecorationWidgets.js +4 -1
- package/dist/esm/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.js +1 -2
- package/dist/esm/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js +2 -3
- package/dist/types/pm-plugins/decorations/colorSchemes/factory.d.ts +1 -2
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-show-diff
|
|
2
2
|
|
|
3
|
+
## 19.0.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 19.0.2
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`202069bab1e36`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/202069bab1e36) -
|
|
14
|
+
Clean up the shipped `platform_editor_enghealth_a11y_jan_fixes` experiment. Toolbar dropdown items
|
|
15
|
+
now always render with `role="menuitem"` and without `aria-pressed`, the block menu always has
|
|
16
|
+
`role="menu"`, and show-diff deleted content always uses the a11y-fixed styles.
|
|
17
|
+
- [`5a9dc1baf2bde`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a9dc1baf2bde) -
|
|
18
|
+
EDITOR-9232 Clamp out-of-range suggestion slice override measurements behind
|
|
19
|
+
platform_editor_ai_show_diff_patch_2
|
|
20
|
+
- [`8e881a291b8c9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8e881a291b8c9) -
|
|
21
|
+
Keep existing parent list markers unhighlighted for nested additions behind
|
|
22
|
+
platform_editor_ai_review_moment.
|
|
23
|
+
- Updated dependencies
|
|
24
|
+
|
|
3
25
|
## 19.0.1
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -253,6 +253,9 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
|
|
|
253
253
|
// table/row/paragraph decorations there are redundant and cause expensive per-cell
|
|
254
254
|
// re-render. Blocks outside the table keep their normal decorations.
|
|
255
255
|
var coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
|
|
256
|
+
// nodesBetween visits ancestors that start before the changed range.
|
|
257
|
+
// Only fully contained blocks should mark existing list bullets as new.
|
|
258
|
+
var requireContainedBlocks = (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_review_moment', 'isEnabled', false) === true;
|
|
256
259
|
// Iterate over the document nodes within the range
|
|
257
260
|
doc.nodesBetween(from, to, function (node, pos) {
|
|
258
261
|
if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
|
|
@@ -261,7 +264,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
|
|
|
261
264
|
return;
|
|
262
265
|
}
|
|
263
266
|
}
|
|
264
|
-
if (node.isBlock && (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || pos + node.nodeSize <= to)) {
|
|
267
|
+
if (node.isBlock && (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to)) {
|
|
265
268
|
var _nodeEnd = pos + node.nodeSize;
|
|
266
269
|
var _isActive = isRangeActive(activeIndexPos, pos, _nodeEnd);
|
|
267
270
|
decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createBlockChangedDecoration.createBlockChangedDecoration)({
|
|
@@ -1183,8 +1183,7 @@ function buildDeletedInlineNodeCSSVariables(colors, isActive) {
|
|
|
1183
1183
|
*
|
|
1184
1184
|
* The three `stateful`-only variables are omitted for `static` (standard) so editor-core's fallback
|
|
1185
1185
|
* wins, which is what standard rendered before:
|
|
1186
|
-
* - `--diff-delete-opacity` —
|
|
1187
|
-
* `platform_editor_enghealth_a11y_jan_fixes`, a split the scheme must not flatten.
|
|
1186
|
+
* - `--diff-delete-opacity` — standard falls through to editor-core's 0.8 fallback.
|
|
1188
1187
|
* - `--diff-delete-ring-width` — traditional's deleted media ring tracks the inherited marker ring
|
|
1189
1188
|
* width instead of a fixed 1px.
|
|
1190
1189
|
* - `--diff-delete-text-decoration-color` — standard's blockquote strike must stay `currentColor`.
|
|
@@ -131,7 +131,10 @@ var getEdgeCasesForSlice = function getEdgeCasesForSlice(doc, from, slice, measu
|
|
|
131
131
|
var targets = [];
|
|
132
132
|
// edge cases can only be top level nodes, so we only care about the top level nodes in the slice
|
|
133
133
|
slice.content.forEach(function (node, offset) {
|
|
134
|
-
|
|
134
|
+
// the node can be outside the doc if we have a sliceOverride which adds additional new content
|
|
135
|
+
// but we still need to the edgeCases to resolve a node in the doc to attach the widget to
|
|
136
|
+
// and we use the provided measureElement to make sure it is in the right position
|
|
137
|
+
var edgeCase = edgeCases(doc, Math.min(from + offset, doc.content.size - 1), node);
|
|
135
138
|
if (edgeCase) {
|
|
136
139
|
targets.push(_objectSpread(_objectSpread({}, edgeCase), {}, {
|
|
137
140
|
measureElement: measureElement
|
|
@@ -8,7 +8,6 @@ exports.resolveRemovedLozengeStyle = exports.resolveNestedInsertedNodeStyle = ex
|
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
10
10
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
11
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
12
11
|
var _isExtendedEnabled = require("../../isExtendedEnabled");
|
|
13
12
|
var _factory = require("../colorSchemes/factory");
|
|
14
13
|
var _schemes = require("../colorSchemes/schemes");
|
|
@@ -54,7 +53,7 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
|
|
|
54
53
|
if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted) {
|
|
55
54
|
return (0, _factory.buildInsertedInlineStyle)(colors, isActive, hideAddedDiffsUnderline);
|
|
56
55
|
}
|
|
57
|
-
var base = (0, _factory.buildDeletedInlineContentStyle)(colors, isActive ? 'active' :
|
|
56
|
+
var base = (0, _factory.buildDeletedInlineContentStyle)(colors, isActive ? 'active' : 'new');
|
|
58
57
|
|
|
59
58
|
// Text-like blocks (heading, lists, blockquote) render their deleted content through this
|
|
60
59
|
// getter rather than `getDeletedContentStyle`, so without this they never receive the
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.resolveRemovedLozengeStyleLegacy = exports.resolveNestedInsertedNodeStyleLegacy = exports.resolveCellOverlayStyleLegacy = exports.hasRestingDeletedRingLegacy = exports.getInsertedContentStyleLegacy = exports.getDeletedContentStyleUnboundedLegacy = exports.getDeletedContentStyleLegacy = exports.getChangedNodeStyleLegacy = exports.getChangedContentStyleLegacy = void 0;
|
|
7
7
|
var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
|
|
8
8
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
9
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
10
9
|
var _isExtendedEnabled = require("../../isExtendedEnabled");
|
|
11
10
|
var _standard = require("../colorSchemes/standard");
|
|
12
11
|
var _traditional = require("../colorSchemes/traditional");
|
|
@@ -101,7 +100,7 @@ var getChangedContentStyleLegacy = exports.getChangedContentStyleLegacy = functi
|
|
|
101
100
|
if (isActive) {
|
|
102
101
|
return (0, _standard.getStandardDeletedContentStyleActive)();
|
|
103
102
|
}
|
|
104
|
-
return (0,
|
|
103
|
+
return (0, _standard.getStandardDeletedContentStyleNew)();
|
|
105
104
|
};
|
|
106
105
|
|
|
107
106
|
/** Pre-refactor node-specific style for a changed block node. */
|
|
@@ -221,6 +221,9 @@ const calculateNodesForBlockDecoration = ({
|
|
|
221
221
|
// table/row/paragraph decorations there are redundant and cause expensive per-cell
|
|
222
222
|
// re-render. Blocks outside the table keep their normal decorations.
|
|
223
223
|
const coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
|
|
224
|
+
// nodesBetween visits ancestors that start before the changed range.
|
|
225
|
+
// Only fully contained blocks should mark existing list bullets as new.
|
|
226
|
+
const requireContainedBlocks = UNSAFE_expValNoExposure('platform_editor_ai_review_moment', 'isEnabled', false) === true;
|
|
224
227
|
// Iterate over the document nodes within the range
|
|
225
228
|
doc.nodesBetween(from, to, (node, pos) => {
|
|
226
229
|
if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
|
|
@@ -229,7 +232,7 @@ const calculateNodesForBlockDecoration = ({
|
|
|
229
232
|
return;
|
|
230
233
|
}
|
|
231
234
|
}
|
|
232
|
-
if (node.isBlock && (!isExtendedEnabled(diffType) || pos + node.nodeSize <= to)) {
|
|
235
|
+
if (node.isBlock && (!isExtendedEnabled(diffType) || (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to)) {
|
|
233
236
|
const nodeEnd = pos + node.nodeSize;
|
|
234
237
|
const isActive = isRangeActive(activeIndexPos, pos, nodeEnd);
|
|
235
238
|
decorations.push(...createBlockChangedDecoration({
|
|
@@ -1106,8 +1106,7 @@ export function buildDeletedInlineNodeCSSVariables(colors, isActive) {
|
|
|
1106
1106
|
*
|
|
1107
1107
|
* The three `stateful`-only variables are omitted for `static` (standard) so editor-core's fallback
|
|
1108
1108
|
* wins, which is what standard rendered before:
|
|
1109
|
-
* - `--diff-delete-opacity` —
|
|
1110
|
-
* `platform_editor_enghealth_a11y_jan_fixes`, a split the scheme must not flatten.
|
|
1109
|
+
* - `--diff-delete-opacity` — standard falls through to editor-core's 0.8 fallback.
|
|
1111
1110
|
* - `--diff-delete-ring-width` — traditional's deleted media ring tracks the inherited marker ring
|
|
1112
1111
|
* width instead of a fixed 1px.
|
|
1113
1112
|
* - `--diff-delete-text-decoration-color` — standard's blockquote strike must stay `currentColor`.
|
|
@@ -118,7 +118,10 @@ const getEdgeCasesForSlice = (doc, from, slice, measureElement) => {
|
|
|
118
118
|
const targets = [];
|
|
119
119
|
// edge cases can only be top level nodes, so we only care about the top level nodes in the slice
|
|
120
120
|
slice.content.forEach((node, offset) => {
|
|
121
|
-
|
|
121
|
+
// the node can be outside the doc if we have a sliceOverride which adds additional new content
|
|
122
|
+
// but we still need to the edgeCases to resolve a node in the doc to attach the widget to
|
|
123
|
+
// and we use the provided measureElement to make sure it is in the right position
|
|
124
|
+
const edgeCase = edgeCases(doc, Math.min(from + offset, doc.content.size - 1), node);
|
|
122
125
|
if (edgeCase) {
|
|
123
126
|
targets.push({
|
|
124
127
|
...edgeCase,
|
|
@@ -12,7 +12,6 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
14
14
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
15
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
16
15
|
import { isExtendedEnabled } from '../../isExtendedEnabled';
|
|
17
16
|
import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildAddedCellOverlayStyleNew, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedInlineContentStyle, buildDeletedInlineContentStyleExtended, buildDeletedLozengeActiveStyle, buildDeletedLozengeStyle, buildDeletedNodeCSSVariables, buildDeletedQuoteNodeWithLozengeStyle, buildDeletedStrikethroughLine, buildDeletedWrappedBlockOutline, buildInsertedBlockNodeStyle, buildInsertedInlineStyle, buildInsertStyleInBlockExtended, buildInsertStyleInBlockExtendedNoUnderline, buildInsertStyleNode } from '../colorSchemes/factory';
|
|
18
17
|
import { colorSchemeRegistry, getLegacyColorScheme, standardScheme } from '../colorSchemes/schemes';
|
|
@@ -39,7 +38,7 @@ const getChangedContentStyleNext = (colorScheme, isActive = false, isInserted =
|
|
|
39
38
|
if (isExtendedEnabled(diffType) && isInserted) {
|
|
40
39
|
return buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline);
|
|
41
40
|
}
|
|
42
|
-
const base = buildDeletedInlineContentStyle(colors, isActive ? 'active' :
|
|
41
|
+
const base = buildDeletedInlineContentStyle(colors, isActive ? 'active' : 'new');
|
|
43
42
|
|
|
44
43
|
// Text-like blocks (heading, lists, blockquote) render their deleted content through this
|
|
45
44
|
// getter rather than `getDeletedContentStyle`, so without this they never receive the
|
|
@@ -10,9 +10,8 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
|
|
12
12
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
13
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
14
13
|
import { isExtendedEnabled } from '../../isExtendedEnabled';
|
|
15
|
-
import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode,
|
|
14
|
+
import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, getStandardDeletedContentStyleActive, getStandardDeletedContentStyleNew, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from '../colorSchemes/standard';
|
|
16
15
|
import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayRoundedStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from '../colorSchemes/traditional';
|
|
17
16
|
const lozengeStyle = convertToInlineCss({
|
|
18
17
|
display: 'inline-flex',
|
|
@@ -90,7 +89,7 @@ export const getChangedContentStyleLegacy = (colorScheme, isActive = false, isIn
|
|
|
90
89
|
if (isActive) {
|
|
91
90
|
return getStandardDeletedContentStyleActive();
|
|
92
91
|
}
|
|
93
|
-
return
|
|
92
|
+
return getStandardDeletedContentStyleNew();
|
|
94
93
|
};
|
|
95
94
|
|
|
96
95
|
/** Pre-refactor node-specific style for a changed block node. */
|
|
@@ -246,6 +246,9 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
|
|
|
246
246
|
// table/row/paragraph decorations there are redundant and cause expensive per-cell
|
|
247
247
|
// re-render. Blocks outside the table keep their normal decorations.
|
|
248
248
|
var coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
|
|
249
|
+
// nodesBetween visits ancestors that start before the changed range.
|
|
250
|
+
// Only fully contained blocks should mark existing list bullets as new.
|
|
251
|
+
var requireContainedBlocks = UNSAFE_expValNoExposure('platform_editor_ai_review_moment', 'isEnabled', false) === true;
|
|
249
252
|
// Iterate over the document nodes within the range
|
|
250
253
|
doc.nodesBetween(from, to, function (node, pos) {
|
|
251
254
|
if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
|
|
@@ -254,7 +257,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
|
|
|
254
257
|
return;
|
|
255
258
|
}
|
|
256
259
|
}
|
|
257
|
-
if (node.isBlock && (!isExtendedEnabled(diffType) || pos + node.nodeSize <= to)) {
|
|
260
|
+
if (node.isBlock && (!isExtendedEnabled(diffType) || (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to)) {
|
|
258
261
|
var _nodeEnd = pos + node.nodeSize;
|
|
259
262
|
var _isActive = isRangeActive(activeIndexPos, pos, _nodeEnd);
|
|
260
263
|
decorations.push.apply(decorations, _toConsumableArray(createBlockChangedDecoration({
|
|
@@ -1107,8 +1107,7 @@ export function buildDeletedInlineNodeCSSVariables(colors, isActive) {
|
|
|
1107
1107
|
*
|
|
1108
1108
|
* The three `stateful`-only variables are omitted for `static` (standard) so editor-core's fallback
|
|
1109
1109
|
* wins, which is what standard rendered before:
|
|
1110
|
-
* - `--diff-delete-opacity` —
|
|
1111
|
-
* `platform_editor_enghealth_a11y_jan_fixes`, a split the scheme must not flatten.
|
|
1110
|
+
* - `--diff-delete-opacity` — standard falls through to editor-core's 0.8 fallback.
|
|
1112
1111
|
* - `--diff-delete-ring-width` — traditional's deleted media ring tracks the inherited marker ring
|
|
1113
1112
|
* width instead of a fixed 1px.
|
|
1114
1113
|
* - `--diff-delete-text-decoration-color` — standard's blockquote strike must stay `currentColor`.
|
|
@@ -125,7 +125,10 @@ var getEdgeCasesForSlice = function getEdgeCasesForSlice(doc, from, slice, measu
|
|
|
125
125
|
var targets = [];
|
|
126
126
|
// edge cases can only be top level nodes, so we only care about the top level nodes in the slice
|
|
127
127
|
slice.content.forEach(function (node, offset) {
|
|
128
|
-
|
|
128
|
+
// the node can be outside the doc if we have a sliceOverride which adds additional new content
|
|
129
|
+
// but we still need to the edgeCases to resolve a node in the doc to attach the widget to
|
|
130
|
+
// and we use the provided measureElement to make sure it is in the right position
|
|
131
|
+
var edgeCase = edgeCases(doc, Math.min(from + offset, doc.content.size - 1), node);
|
|
129
132
|
if (edgeCase) {
|
|
130
133
|
targets.push(_objectSpread(_objectSpread({}, edgeCase), {}, {
|
|
131
134
|
measureElement: measureElement
|
|
@@ -15,7 +15,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
15
15
|
*/
|
|
16
16
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
17
17
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
18
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
19
18
|
import { isExtendedEnabled } from '../../isExtendedEnabled';
|
|
20
19
|
import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildAddedCellOverlayStyleNew, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedInlineContentStyle, buildDeletedInlineContentStyleExtended, buildDeletedLozengeActiveStyle, buildDeletedLozengeStyle, buildDeletedNodeCSSVariables, buildDeletedQuoteNodeWithLozengeStyle, buildDeletedStrikethroughLine, buildDeletedWrappedBlockOutline, buildInsertedBlockNodeStyle, buildInsertedInlineStyle, buildInsertStyleInBlockExtended, buildInsertStyleInBlockExtendedNoUnderline, buildInsertStyleNode } from '../colorSchemes/factory';
|
|
21
20
|
import { colorSchemeRegistry, getLegacyColorScheme, standardScheme } from '../colorSchemes/schemes';
|
|
@@ -48,7 +47,7 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
|
|
|
48
47
|
if (isExtendedEnabled(diffType) && isInserted) {
|
|
49
48
|
return buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline);
|
|
50
49
|
}
|
|
51
|
-
var base = buildDeletedInlineContentStyle(colors, isActive ? 'active' :
|
|
50
|
+
var base = buildDeletedInlineContentStyle(colors, isActive ? 'active' : 'new');
|
|
52
51
|
|
|
53
52
|
// Text-like blocks (heading, lists, blockquote) render their deleted content through this
|
|
54
53
|
// getter rather than `getDeletedContentStyle`, so without this they never receive the
|
|
@@ -10,9 +10,8 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
|
|
12
12
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
13
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
14
13
|
import { isExtendedEnabled } from '../../isExtendedEnabled';
|
|
15
|
-
import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode,
|
|
14
|
+
import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, getStandardDeletedContentStyleActive, getStandardDeletedContentStyleNew, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from '../colorSchemes/standard';
|
|
16
15
|
import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayRoundedStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from '../colorSchemes/traditional';
|
|
17
16
|
var lozengeStyle = convertToInlineCss({
|
|
18
17
|
display: 'inline-flex',
|
|
@@ -94,7 +93,7 @@ export var getChangedContentStyleLegacy = function getChangedContentStyleLegacy(
|
|
|
94
93
|
if (isActive) {
|
|
95
94
|
return getStandardDeletedContentStyleActive();
|
|
96
95
|
}
|
|
97
|
-
return
|
|
96
|
+
return getStandardDeletedContentStyleNew();
|
|
98
97
|
};
|
|
99
98
|
|
|
100
99
|
/** Pre-refactor node-specific style for a changed block node. */
|
|
@@ -238,8 +238,7 @@ export declare function buildDeletedInlineNodeCSSVariables(colors: DiffColorSche
|
|
|
238
238
|
*
|
|
239
239
|
* The three `stateful`-only variables are omitted for `static` (standard) so editor-core's fallback
|
|
240
240
|
* wins, which is what standard rendered before:
|
|
241
|
-
* - `--diff-delete-opacity` —
|
|
242
|
-
* `platform_editor_enghealth_a11y_jan_fixes`, a split the scheme must not flatten.
|
|
241
|
+
* - `--diff-delete-opacity` — standard falls through to editor-core's 0.8 fallback.
|
|
243
242
|
* - `--diff-delete-ring-width` — traditional's deleted media ring tracks the inherited marker ring
|
|
244
243
|
* width instead of a fixed 1px.
|
|
245
244
|
* - `--diff-delete-text-decoration-color` — standard's blockquote strike must stay `currentColor`.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-show-diff",
|
|
3
|
-
"version": "19.0.
|
|
3
|
+
"version": "19.0.3",
|
|
4
4
|
"description": "ShowDiff plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@atlaskit/platform-feature-experiments": "^0.3.0",
|
|
40
40
|
"@atlaskit/platform-feature-flags": "^2.2.0",
|
|
41
41
|
"@atlaskit/primitives": "^22.5.0",
|
|
42
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
42
|
+
"@atlaskit/tmp-editor-statsig": "^208.0.0",
|
|
43
43
|
"@atlaskit/tokens": "^20.0.0",
|
|
44
44
|
"@babel/runtime": "^7.0.0",
|
|
45
45
|
"@compiled/react": "^1.0.2",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"react-intl": "^7.0.0"
|
|
72
72
|
},
|
|
73
73
|
"peerDependencies": {
|
|
74
|
-
"@atlaskit/editor-common": "^125.
|
|
74
|
+
"@atlaskit/editor-common": "^125.2.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"
|