@atlaskit/editor-plugin-show-diff 3.1.1 → 3.1.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,12 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-show-diff
|
|
2
2
|
|
|
3
|
+
## 3.1.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`63e63c69cd679`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/63e63c69cd679) -
|
|
8
|
+
Add styling for bullet point markers on diff
|
|
9
|
+
|
|
3
10
|
## 3.1.1
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
|
@@ -40,13 +40,16 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
|
|
|
40
40
|
return colourScheme === 'traditional' ? traditionalStyleQuoteNode : editingStyleQuoteNode;
|
|
41
41
|
case 'mediaSingle':
|
|
42
42
|
case 'mediaGroup':
|
|
43
|
-
case 'embedCard':
|
|
44
43
|
case 'table':
|
|
45
44
|
case 'tableRow':
|
|
46
45
|
case 'tableCell':
|
|
47
46
|
case 'tableHeader':
|
|
48
47
|
return undefined;
|
|
49
48
|
// Handle table separately to avoid border issues
|
|
49
|
+
case 'embedCard':
|
|
50
|
+
return (0, _lazyNodeView.convertToInlineCss)({
|
|
51
|
+
'--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
|
|
52
|
+
});
|
|
50
53
|
case 'paragraph':
|
|
51
54
|
case 'heading':
|
|
52
55
|
case 'hardBreak':
|
|
@@ -57,9 +60,11 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
|
|
|
57
60
|
case 'taskItem':
|
|
58
61
|
case 'bulletList':
|
|
59
62
|
case 'orderedList':
|
|
60
|
-
case 'listItem':
|
|
61
63
|
return undefined;
|
|
62
|
-
|
|
64
|
+
case 'listItem':
|
|
65
|
+
return (0, _lazyNodeView.convertToInlineCss)({
|
|
66
|
+
'--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
|
|
67
|
+
});
|
|
63
68
|
case 'layoutSection':
|
|
64
69
|
return undefined;
|
|
65
70
|
// Layout nodes do not need special styling
|
|
@@ -108,8 +113,7 @@ var traditionalStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
|
|
|
108
113
|
var createBlockChangedDecoration = exports.createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
|
|
109
114
|
return _view.Decoration.node(change.from, change.to, {
|
|
110
115
|
style: getEditorStyleNode(change.name, colourScheme),
|
|
111
|
-
'data-testid': 'show-diff-changed-decoration-node'
|
|
112
|
-
class: "show-diff-changed-decoration-node-".concat(colourScheme || 'standard')
|
|
116
|
+
'data-testid': 'show-diff-changed-decoration-node'
|
|
113
117
|
}, {});
|
|
114
118
|
};
|
|
115
119
|
var deletedContentStyle = (0, _lazyNodeView.convertToInlineCss)({
|
|
@@ -32,13 +32,16 @@ const getEditorStyleNode = (nodeName, colourScheme) => {
|
|
|
32
32
|
return colourScheme === 'traditional' ? traditionalStyleQuoteNode : editingStyleQuoteNode;
|
|
33
33
|
case 'mediaSingle':
|
|
34
34
|
case 'mediaGroup':
|
|
35
|
-
case 'embedCard':
|
|
36
35
|
case 'table':
|
|
37
36
|
case 'tableRow':
|
|
38
37
|
case 'tableCell':
|
|
39
38
|
case 'tableHeader':
|
|
40
39
|
return undefined;
|
|
41
40
|
// Handle table separately to avoid border issues
|
|
41
|
+
case 'embedCard':
|
|
42
|
+
return convertToInlineCss({
|
|
43
|
+
'--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
|
|
44
|
+
});
|
|
42
45
|
case 'paragraph':
|
|
43
46
|
case 'heading':
|
|
44
47
|
case 'hardBreak':
|
|
@@ -49,9 +52,11 @@ const getEditorStyleNode = (nodeName, colourScheme) => {
|
|
|
49
52
|
case 'taskItem':
|
|
50
53
|
case 'bulletList':
|
|
51
54
|
case 'orderedList':
|
|
52
|
-
case 'listItem':
|
|
53
55
|
return undefined;
|
|
54
|
-
|
|
56
|
+
case 'listItem':
|
|
57
|
+
return convertToInlineCss({
|
|
58
|
+
'--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
|
|
59
|
+
});
|
|
55
60
|
case 'layoutSection':
|
|
56
61
|
return undefined;
|
|
57
62
|
// Layout nodes do not need special styling
|
|
@@ -99,8 +104,7 @@ const traditionalStyleCardBlockNode = convertToInlineCss({
|
|
|
99
104
|
*/
|
|
100
105
|
export const createBlockChangedDecoration = (change, colourScheme) => Decoration.node(change.from, change.to, {
|
|
101
106
|
style: getEditorStyleNode(change.name, colourScheme),
|
|
102
|
-
'data-testid': 'show-diff-changed-decoration-node'
|
|
103
|
-
class: `show-diff-changed-decoration-node-${colourScheme || 'standard'}`
|
|
107
|
+
'data-testid': 'show-diff-changed-decoration-node'
|
|
104
108
|
}, {});
|
|
105
109
|
const deletedContentStyle = convertToInlineCss({
|
|
106
110
|
color: "var(--ds-text-accent-gray, #44546F)",
|
|
@@ -34,13 +34,16 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
|
|
|
34
34
|
return colourScheme === 'traditional' ? traditionalStyleQuoteNode : editingStyleQuoteNode;
|
|
35
35
|
case 'mediaSingle':
|
|
36
36
|
case 'mediaGroup':
|
|
37
|
-
case 'embedCard':
|
|
38
37
|
case 'table':
|
|
39
38
|
case 'tableRow':
|
|
40
39
|
case 'tableCell':
|
|
41
40
|
case 'tableHeader':
|
|
42
41
|
return undefined;
|
|
43
42
|
// Handle table separately to avoid border issues
|
|
43
|
+
case 'embedCard':
|
|
44
|
+
return convertToInlineCss({
|
|
45
|
+
'--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
|
|
46
|
+
});
|
|
44
47
|
case 'paragraph':
|
|
45
48
|
case 'heading':
|
|
46
49
|
case 'hardBreak':
|
|
@@ -51,9 +54,11 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
|
|
|
51
54
|
case 'taskItem':
|
|
52
55
|
case 'bulletList':
|
|
53
56
|
case 'orderedList':
|
|
54
|
-
case 'listItem':
|
|
55
57
|
return undefined;
|
|
56
|
-
|
|
58
|
+
case 'listItem':
|
|
59
|
+
return convertToInlineCss({
|
|
60
|
+
'--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
|
|
61
|
+
});
|
|
57
62
|
case 'layoutSection':
|
|
58
63
|
return undefined;
|
|
59
64
|
// Layout nodes do not need special styling
|
|
@@ -102,8 +107,7 @@ var traditionalStyleCardBlockNode = convertToInlineCss({
|
|
|
102
107
|
export var createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
|
|
103
108
|
return Decoration.node(change.from, change.to, {
|
|
104
109
|
style: getEditorStyleNode(change.name, colourScheme),
|
|
105
|
-
'data-testid': 'show-diff-changed-decoration-node'
|
|
106
|
-
class: "show-diff-changed-decoration-node-".concat(colourScheme || 'standard')
|
|
110
|
+
'data-testid': 'show-diff-changed-decoration-node'
|
|
107
111
|
}, {});
|
|
108
112
|
};
|
|
109
113
|
var deletedContentStyle = convertToInlineCss({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-show-diff",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.2",
|
|
4
4
|
"description": "ShowDiff plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"prosemirror-changeset": "^2.2.1"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
|
-
"@atlaskit/editor-common": "^110.
|
|
40
|
+
"@atlaskit/editor-common": "^110.17.0",
|
|
41
41
|
"react": "^18.2.0"
|
|
42
42
|
},
|
|
43
43
|
"techstack": {
|