@atlaskit/editor-plugin-code-block-advanced 6.2.8 → 6.2.9
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 +6 -0
- package/dist/cjs/nodeviews/codeBlockNodeWithToDOMFixed.js +2 -2
- package/dist/cjs/ui/syntaxHighlightingTheme.js +12 -12
- package/dist/cjs/ui/theme.js +13 -13
- package/dist/es2019/nodeviews/codeBlockNodeWithToDOMFixed.js +2 -2
- package/dist/es2019/ui/syntaxHighlightingTheme.js +12 -12
- package/dist/es2019/ui/theme.js +18 -18
- package/dist/esm/nodeviews/codeBlockNodeWithToDOMFixed.js +2 -2
- package/dist/esm/ui/syntaxHighlightingTheme.js +12 -12
- package/dist/esm/ui/theme.js +13 -13
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -51,7 +51,7 @@ var _toDOM = function toDOM(node, formattedAriaLabel, config) {
|
|
|
51
51
|
// Based on packages/editor/editor-common/src/styles/shared/code-block.ts
|
|
52
52
|
// But we can't reuse that class as it adds a ::before that intefers with this approach
|
|
53
53
|
style: (0, _lazyNodeView.convertToInlineCss)({
|
|
54
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
54
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
55
55
|
position: 'relative',
|
|
56
56
|
width: 'var(--lineNumberGutterWidth, 2rem)',
|
|
57
57
|
/* top and bottom | left and right */
|
|
@@ -65,7 +65,7 @@ var _toDOM = function toDOM(node, formattedAriaLabel, config) {
|
|
|
65
65
|
class: 'code-block-gutter-pseudo-element',
|
|
66
66
|
style: (0, _lazyNodeView.convertToInlineCss)({
|
|
67
67
|
textAlign: 'right',
|
|
68
|
-
color: "var(--ds-text-subtlest, #
|
|
68
|
+
color: "var(--ds-text-subtlest, #6B6E76)",
|
|
69
69
|
fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
|
|
70
70
|
whiteSpace: 'pre-wrap'
|
|
71
71
|
}),
|
|
@@ -9,7 +9,7 @@ var _highlight = require("@lezer/highlight");
|
|
|
9
9
|
// Based on `platform/packages/design-system/code/src/internal/theme/styles.tsx`
|
|
10
10
|
var highlightStyle = exports.highlightStyle = _language.HighlightStyle.define([{
|
|
11
11
|
tag: _highlight.tags.meta,
|
|
12
|
-
color: "var(--ds-text, #
|
|
12
|
+
color: "var(--ds-text, #292A2E)"
|
|
13
13
|
}, {
|
|
14
14
|
tag: _highlight.tags.link,
|
|
15
15
|
textDecoration: 'underline'
|
|
@@ -32,16 +32,16 @@ var highlightStyle = exports.highlightStyle = _language.HighlightStyle.define([{
|
|
|
32
32
|
textDecoration: 'line-through'
|
|
33
33
|
}, {
|
|
34
34
|
tag: _highlight.tags.keyword,
|
|
35
|
-
color: "var(--ds-text-accent-blue, #
|
|
35
|
+
color: "var(--ds-text-accent-blue, #1558BC)",
|
|
36
36
|
// Custom syntax styling to match existing styling
|
|
37
37
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
38
38
|
fontWeight: "var(--ds-font-weight-bold, 700)"
|
|
39
39
|
}, {
|
|
40
40
|
tag: [_highlight.tags.atom, _highlight.tags.bool, _highlight.tags.url, _highlight.tags.contentSeparator, _highlight.tags.labelName],
|
|
41
|
-
color: "var(--ds-text-accent-blue, #
|
|
41
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
42
42
|
}, {
|
|
43
43
|
tag: [_highlight.tags.literal],
|
|
44
|
-
color: "var(--ds-text-accent-blue, #
|
|
44
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
45
45
|
}, {
|
|
46
46
|
tag: _highlight.tags.inserted,
|
|
47
47
|
color: "var(--ds-text-accent-green, #216E4E)"
|
|
@@ -59,29 +59,29 @@ var highlightStyle = exports.highlightStyle = _language.HighlightStyle.define([{
|
|
|
59
59
|
color: "var(--ds-text-accent-teal, #206A83)"
|
|
60
60
|
}, {
|
|
61
61
|
tag: _highlight.tags.definition(_highlight.tags.variableName),
|
|
62
|
-
color: "var(--ds-text, #
|
|
62
|
+
color: "var(--ds-text, #292A2E)"
|
|
63
63
|
}, {
|
|
64
64
|
tag: _highlight.tags.local(_highlight.tags.variableName),
|
|
65
|
-
color: "var(--ds-text, #
|
|
65
|
+
color: "var(--ds-text, #292A2E)"
|
|
66
66
|
}, {
|
|
67
67
|
tag: [_highlight.tags.typeName, _highlight.tags.namespace],
|
|
68
|
-
color: "var(--ds-text-accent-blue, #
|
|
68
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
69
69
|
}, {
|
|
70
70
|
tag: _highlight.tags.className,
|
|
71
|
-
color: "var(--ds-text-accent-purple, #
|
|
71
|
+
color: "var(--ds-text-accent-purple, #803FA5)"
|
|
72
72
|
}, {
|
|
73
73
|
tag: [_highlight.tags.special(_highlight.tags.variableName), _highlight.tags.macroName],
|
|
74
|
-
color: "var(--ds-text, #
|
|
74
|
+
color: "var(--ds-text, #292A2E)"
|
|
75
75
|
}, {
|
|
76
76
|
tag: _highlight.tags.definition(_highlight.tags.propertyName),
|
|
77
|
-
color: "var(--ds-text, #
|
|
77
|
+
color: "var(--ds-text, #292A2E)"
|
|
78
78
|
}, {
|
|
79
79
|
tag: _highlight.tags.comment,
|
|
80
|
-
color: "var(--ds-text-subtlest, #
|
|
80
|
+
color: "var(--ds-text-subtlest, #6B6E76)",
|
|
81
81
|
fontStyle: 'italic'
|
|
82
82
|
}, {
|
|
83
83
|
tag: _highlight.tags.invalid,
|
|
84
|
-
color: "var(--ds-text, #
|
|
84
|
+
color: "var(--ds-text, #292A2E)"
|
|
85
85
|
}]);
|
|
86
86
|
|
|
87
87
|
/**
|
package/dist/cjs/ui/theme.js
CHANGED
|
@@ -15,7 +15,7 @@ var getFontSize = function getFontSize() {
|
|
|
15
15
|
};
|
|
16
16
|
var cmTheme = exports.cmTheme = _view.EditorView.theme({
|
|
17
17
|
'&': {
|
|
18
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
18
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
19
19
|
padding: '0',
|
|
20
20
|
marginTop: "var(--ds-space-100, 8px)",
|
|
21
21
|
marginBottom: "var(--ds-space-100, 8px)",
|
|
@@ -39,12 +39,12 @@ var cmTheme = exports.cmTheme = _view.EditorView.theme({
|
|
|
39
39
|
},
|
|
40
40
|
'.cm-content': {
|
|
41
41
|
cursor: 'text',
|
|
42
|
-
caretColor: "var(--ds-text, #
|
|
42
|
+
caretColor: "var(--ds-text, #292A2E)",
|
|
43
43
|
margin: "var(--ds-space-100, 8px)",
|
|
44
44
|
padding: "var(--ds-space-0, 0px)"
|
|
45
45
|
},
|
|
46
46
|
'.cm-scroller': {
|
|
47
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
47
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
48
48
|
// Custom syntax styling to match existing styling
|
|
49
49
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
50
50
|
lineHeight: 'unset',
|
|
@@ -56,16 +56,16 @@ var cmTheme = exports.cmTheme = _view.EditorView.theme({
|
|
|
56
56
|
backgroundAttachment: 'local, local, local, local, scroll, scroll, scroll, scroll'
|
|
57
57
|
},
|
|
58
58
|
'&.cm-focused .cm-cursor': {
|
|
59
|
-
borderLeftColor: "var(--ds-text, #
|
|
59
|
+
borderLeftColor: "var(--ds-text, #292A2E)"
|
|
60
60
|
},
|
|
61
61
|
'.cm-gutter': {
|
|
62
62
|
padding: "var(--ds-space-100, 8px)"
|
|
63
63
|
},
|
|
64
64
|
'.cm-gutters': {
|
|
65
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
65
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
66
66
|
border: 'none',
|
|
67
67
|
padding: "var(--ds-space-0, 0px)",
|
|
68
|
-
color: "var(--ds-text-subtlest, #
|
|
68
|
+
color: "var(--ds-text-subtlest, #6B6E76)"
|
|
69
69
|
},
|
|
70
70
|
'.cm-lineNumbers .cm-gutterElement': {
|
|
71
71
|
paddingLeft: "var(--ds-space-0, 0px)",
|
|
@@ -92,23 +92,23 @@ var codeFoldingTheme = exports.codeFoldingTheme = _view.EditorView.theme({
|
|
|
92
92
|
paddingLeft: "var(--ds-space-050, 4px)"
|
|
93
93
|
},
|
|
94
94
|
'.cm-gutterElement:has([data-marker-dom-element="true"])': {
|
|
95
|
-
color: "var(--ds-icon-subtle, #
|
|
95
|
+
color: "var(--ds-icon-subtle, #505258)"
|
|
96
96
|
},
|
|
97
97
|
'.cm-gutterElement:has([data-marker-dom-element="true"]):hover': {
|
|
98
|
-
color: "var(--ds-text-accent-gray-bolder, #
|
|
98
|
+
color: "var(--ds-text-accent-gray-bolder, #1E1F21)"
|
|
99
99
|
},
|
|
100
100
|
'.cm-foldPlaceholder': {
|
|
101
101
|
// To give spacing between lines
|
|
102
102
|
height: '20px',
|
|
103
|
-
backgroundColor: "var(--ds-background-accent-gray-subtlest, #
|
|
103
|
+
backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)",
|
|
104
104
|
border: 'none',
|
|
105
|
-
color: "var(--ds-text, #
|
|
106
|
-
outline: "1px solid ".concat("var(--ds-border-accent-gray, #
|
|
105
|
+
color: "var(--ds-text, #292A2E)",
|
|
106
|
+
outline: "1px solid ".concat("var(--ds-border-accent-gray, #7D818A)"),
|
|
107
107
|
paddingLeft: "var(--ds-space-025, 2px)",
|
|
108
108
|
paddingRight: "var(--ds-space-025, 2px)"
|
|
109
109
|
},
|
|
110
110
|
'.cm-foldPlaceholder:hover': {
|
|
111
|
-
backgroundColor: "var(--ds-background-accent-gray-subtlest-hovered, #
|
|
111
|
+
backgroundColor: "var(--ds-background-accent-gray-subtlest-hovered, #DDDEE1)"
|
|
112
112
|
}
|
|
113
113
|
});
|
|
114
114
|
|
|
@@ -122,5 +122,5 @@ function overflowShadow(_ref) {
|
|
|
122
122
|
var width = "var(--ds-space-100, 8px)";
|
|
123
123
|
var leftCoverWidthResolved = leftCoverWidth || width;
|
|
124
124
|
var rightCoverWidthResolved = rightCoverWidth || width;
|
|
125
|
-
return "\n linear-gradient(\n to right,\n ".concat("var(--ds-background-neutral, #
|
|
125
|
+
return "\n linear-gradient(\n to right,\n ".concat("var(--ds-background-neutral, #0515240F)", " ", leftCoverWidthResolved, ",\n transparent ").concat(leftCoverWidthResolved, "\n ),\n linear-gradient(\n to right,\n ", "var(--ds-surface-raised, #FFFFFF)", " ").concat(leftCoverWidthResolved, ",\n transparent ").concat(leftCoverWidthResolved, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-background-neutral, #0515240F)", " ").concat(rightCoverWidthResolved, ",\n transparent ").concat(rightCoverWidthResolved, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-surface-raised, #FFFFFF)", " ").concat(rightCoverWidthResolved, ",\n transparent ").concat(rightCoverWidthResolved, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-shadow-overflow-spread, #1E1F2129)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-shadow-overflow-perimeter, #1E1F211f)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n ),\n linear-gradient(\n to right,\n ", "var(--ds-shadow-overflow-spread, #1E1F2129)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n ),\n linear-gradient(\n to right,\n ", "var(--ds-shadow-overflow-perimeter, #1E1F211f)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n )\n");
|
|
126
126
|
}
|
|
@@ -37,7 +37,7 @@ const toDOM = (node, formattedAriaLabel, config) => {
|
|
|
37
37
|
// Based on packages/editor/editor-common/src/styles/shared/code-block.ts
|
|
38
38
|
// But we can't reuse that class as it adds a ::before that intefers with this approach
|
|
39
39
|
style: convertToInlineCss({
|
|
40
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
40
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
41
41
|
position: 'relative',
|
|
42
42
|
width: 'var(--lineNumberGutterWidth, 2rem)',
|
|
43
43
|
/* top and bottom | left and right */
|
|
@@ -51,7 +51,7 @@ const toDOM = (node, formattedAriaLabel, config) => {
|
|
|
51
51
|
class: 'code-block-gutter-pseudo-element',
|
|
52
52
|
style: convertToInlineCss({
|
|
53
53
|
textAlign: 'right',
|
|
54
|
-
color: "var(--ds-text-subtlest, #
|
|
54
|
+
color: "var(--ds-text-subtlest, #6B6E76)",
|
|
55
55
|
fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
|
|
56
56
|
whiteSpace: 'pre-wrap'
|
|
57
57
|
}),
|
|
@@ -3,7 +3,7 @@ import { tags } from '@lezer/highlight';
|
|
|
3
3
|
// Based on `platform/packages/design-system/code/src/internal/theme/styles.tsx`
|
|
4
4
|
export const highlightStyle = HighlightStyle.define([{
|
|
5
5
|
tag: tags.meta,
|
|
6
|
-
color: "var(--ds-text, #
|
|
6
|
+
color: "var(--ds-text, #292A2E)"
|
|
7
7
|
}, {
|
|
8
8
|
tag: tags.link,
|
|
9
9
|
textDecoration: 'underline'
|
|
@@ -26,16 +26,16 @@ export const highlightStyle = HighlightStyle.define([{
|
|
|
26
26
|
textDecoration: 'line-through'
|
|
27
27
|
}, {
|
|
28
28
|
tag: tags.keyword,
|
|
29
|
-
color: "var(--ds-text-accent-blue, #
|
|
29
|
+
color: "var(--ds-text-accent-blue, #1558BC)",
|
|
30
30
|
// Custom syntax styling to match existing styling
|
|
31
31
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
32
32
|
fontWeight: "var(--ds-font-weight-bold, 700)"
|
|
33
33
|
}, {
|
|
34
34
|
tag: [tags.atom, tags.bool, tags.url, tags.contentSeparator, tags.labelName],
|
|
35
|
-
color: "var(--ds-text-accent-blue, #
|
|
35
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
36
36
|
}, {
|
|
37
37
|
tag: [tags.literal],
|
|
38
|
-
color: "var(--ds-text-accent-blue, #
|
|
38
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
39
39
|
}, {
|
|
40
40
|
tag: tags.inserted,
|
|
41
41
|
color: "var(--ds-text-accent-green, #216E4E)"
|
|
@@ -53,29 +53,29 @@ export const highlightStyle = HighlightStyle.define([{
|
|
|
53
53
|
color: "var(--ds-text-accent-teal, #206A83)"
|
|
54
54
|
}, {
|
|
55
55
|
tag: tags.definition(tags.variableName),
|
|
56
|
-
color: "var(--ds-text, #
|
|
56
|
+
color: "var(--ds-text, #292A2E)"
|
|
57
57
|
}, {
|
|
58
58
|
tag: tags.local(tags.variableName),
|
|
59
|
-
color: "var(--ds-text, #
|
|
59
|
+
color: "var(--ds-text, #292A2E)"
|
|
60
60
|
}, {
|
|
61
61
|
tag: [tags.typeName, tags.namespace],
|
|
62
|
-
color: "var(--ds-text-accent-blue, #
|
|
62
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
63
63
|
}, {
|
|
64
64
|
tag: tags.className,
|
|
65
|
-
color: "var(--ds-text-accent-purple, #
|
|
65
|
+
color: "var(--ds-text-accent-purple, #803FA5)"
|
|
66
66
|
}, {
|
|
67
67
|
tag: [tags.special(tags.variableName), tags.macroName],
|
|
68
|
-
color: "var(--ds-text, #
|
|
68
|
+
color: "var(--ds-text, #292A2E)"
|
|
69
69
|
}, {
|
|
70
70
|
tag: tags.definition(tags.propertyName),
|
|
71
|
-
color: "var(--ds-text, #
|
|
71
|
+
color: "var(--ds-text, #292A2E)"
|
|
72
72
|
}, {
|
|
73
73
|
tag: tags.comment,
|
|
74
|
-
color: "var(--ds-text-subtlest, #
|
|
74
|
+
color: "var(--ds-text-subtlest, #6B6E76)",
|
|
75
75
|
fontStyle: 'italic'
|
|
76
76
|
}, {
|
|
77
77
|
tag: tags.invalid,
|
|
78
|
-
color: "var(--ds-text, #
|
|
78
|
+
color: "var(--ds-text, #292A2E)"
|
|
79
79
|
}]);
|
|
80
80
|
|
|
81
81
|
/**
|
package/dist/es2019/ui/theme.js
CHANGED
|
@@ -5,7 +5,7 @@ const getLineHeight = () => expValEquals('cc_editor_ai_content_mode', 'variant',
|
|
|
5
5
|
const getFontSize = () => expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? '0.875em' : '0.875rem';
|
|
6
6
|
export const cmTheme = CodeMirror.theme({
|
|
7
7
|
'&': {
|
|
8
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
8
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
9
9
|
padding: '0',
|
|
10
10
|
marginTop: "var(--ds-space-100, 8px)",
|
|
11
11
|
marginBottom: "var(--ds-space-100, 8px)",
|
|
@@ -29,12 +29,12 @@ export const cmTheme = CodeMirror.theme({
|
|
|
29
29
|
},
|
|
30
30
|
'.cm-content': {
|
|
31
31
|
cursor: 'text',
|
|
32
|
-
caretColor: "var(--ds-text, #
|
|
32
|
+
caretColor: "var(--ds-text, #292A2E)",
|
|
33
33
|
margin: "var(--ds-space-100, 8px)",
|
|
34
34
|
padding: "var(--ds-space-0, 0px)"
|
|
35
35
|
},
|
|
36
36
|
'.cm-scroller': {
|
|
37
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
37
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
38
38
|
// Custom syntax styling to match existing styling
|
|
39
39
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
40
40
|
lineHeight: 'unset',
|
|
@@ -46,16 +46,16 @@ export const cmTheme = CodeMirror.theme({
|
|
|
46
46
|
backgroundAttachment: 'local, local, local, local, scroll, scroll, scroll, scroll'
|
|
47
47
|
},
|
|
48
48
|
'&.cm-focused .cm-cursor': {
|
|
49
|
-
borderLeftColor: "var(--ds-text, #
|
|
49
|
+
borderLeftColor: "var(--ds-text, #292A2E)"
|
|
50
50
|
},
|
|
51
51
|
'.cm-gutter': {
|
|
52
52
|
padding: "var(--ds-space-100, 8px)"
|
|
53
53
|
},
|
|
54
54
|
'.cm-gutters': {
|
|
55
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
55
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
56
56
|
border: 'none',
|
|
57
57
|
padding: "var(--ds-space-0, 0px)",
|
|
58
|
-
color: "var(--ds-text-subtlest, #
|
|
58
|
+
color: "var(--ds-text-subtlest, #6B6E76)"
|
|
59
59
|
},
|
|
60
60
|
'.cm-lineNumbers .cm-gutterElement': {
|
|
61
61
|
paddingLeft: "var(--ds-space-0, 0px)",
|
|
@@ -82,23 +82,23 @@ export const codeFoldingTheme = CodeMirror.theme({
|
|
|
82
82
|
paddingLeft: "var(--ds-space-050, 4px)"
|
|
83
83
|
},
|
|
84
84
|
'.cm-gutterElement:has([data-marker-dom-element="true"])': {
|
|
85
|
-
color: "var(--ds-icon-subtle, #
|
|
85
|
+
color: "var(--ds-icon-subtle, #505258)"
|
|
86
86
|
},
|
|
87
87
|
'.cm-gutterElement:has([data-marker-dom-element="true"]):hover': {
|
|
88
|
-
color: "var(--ds-text-accent-gray-bolder, #
|
|
88
|
+
color: "var(--ds-text-accent-gray-bolder, #1E1F21)"
|
|
89
89
|
},
|
|
90
90
|
'.cm-foldPlaceholder': {
|
|
91
91
|
// To give spacing between lines
|
|
92
92
|
height: '20px',
|
|
93
|
-
backgroundColor: "var(--ds-background-accent-gray-subtlest, #
|
|
93
|
+
backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)",
|
|
94
94
|
border: 'none',
|
|
95
|
-
color: "var(--ds-text, #
|
|
96
|
-
outline: `1px solid ${"var(--ds-border-accent-gray, #
|
|
95
|
+
color: "var(--ds-text, #292A2E)",
|
|
96
|
+
outline: `1px solid ${"var(--ds-border-accent-gray, #7D818A)"}`,
|
|
97
97
|
paddingLeft: "var(--ds-space-025, 2px)",
|
|
98
98
|
paddingRight: "var(--ds-space-025, 2px)"
|
|
99
99
|
},
|
|
100
100
|
'.cm-foldPlaceholder:hover': {
|
|
101
|
-
backgroundColor: "var(--ds-background-accent-gray-subtlest-hovered, #
|
|
101
|
+
backgroundColor: "var(--ds-background-accent-gray-subtlest-hovered, #DDDEE1)"
|
|
102
102
|
}
|
|
103
103
|
});
|
|
104
104
|
|
|
@@ -116,7 +116,7 @@ function overflowShadow({
|
|
|
116
116
|
return `
|
|
117
117
|
linear-gradient(
|
|
118
118
|
to right,
|
|
119
|
-
${"var(--ds-background-neutral, #
|
|
119
|
+
${"var(--ds-background-neutral, #0515240F)"} ${leftCoverWidthResolved},
|
|
120
120
|
transparent ${leftCoverWidthResolved}
|
|
121
121
|
),
|
|
122
122
|
linear-gradient(
|
|
@@ -126,7 +126,7 @@ function overflowShadow({
|
|
|
126
126
|
),
|
|
127
127
|
linear-gradient(
|
|
128
128
|
to left,
|
|
129
|
-
${"var(--ds-background-neutral, #
|
|
129
|
+
${"var(--ds-background-neutral, #0515240F)"} ${rightCoverWidthResolved},
|
|
130
130
|
transparent ${rightCoverWidthResolved}
|
|
131
131
|
),
|
|
132
132
|
linear-gradient(
|
|
@@ -136,22 +136,22 @@ function overflowShadow({
|
|
|
136
136
|
),
|
|
137
137
|
linear-gradient(
|
|
138
138
|
to left,
|
|
139
|
-
${"var(--ds-shadow-overflow-spread, #
|
|
139
|
+
${"var(--ds-shadow-overflow-spread, #1E1F2129)"} 0,
|
|
140
140
|
${"var(--ds-UNSAFE-transparent, transparent)"} ${width}
|
|
141
141
|
),
|
|
142
142
|
linear-gradient(
|
|
143
143
|
to left,
|
|
144
|
-
${"var(--ds-shadow-overflow-perimeter, #
|
|
144
|
+
${"var(--ds-shadow-overflow-perimeter, #1E1F211f)"} 0,
|
|
145
145
|
${"var(--ds-UNSAFE-transparent, transparent)"} ${width}
|
|
146
146
|
),
|
|
147
147
|
linear-gradient(
|
|
148
148
|
to right,
|
|
149
|
-
${"var(--ds-shadow-overflow-spread, #
|
|
149
|
+
${"var(--ds-shadow-overflow-spread, #1E1F2129)"} 0,
|
|
150
150
|
${"var(--ds-UNSAFE-transparent, transparent)"} ${width}
|
|
151
151
|
),
|
|
152
152
|
linear-gradient(
|
|
153
153
|
to right,
|
|
154
|
-
${"var(--ds-shadow-overflow-perimeter, #
|
|
154
|
+
${"var(--ds-shadow-overflow-perimeter, #1E1F211f)"} 0,
|
|
155
155
|
${"var(--ds-UNSAFE-transparent, transparent)"} ${width}
|
|
156
156
|
)
|
|
157
157
|
`;
|
|
@@ -44,7 +44,7 @@ var _toDOM = function toDOM(node, formattedAriaLabel, config) {
|
|
|
44
44
|
// Based on packages/editor/editor-common/src/styles/shared/code-block.ts
|
|
45
45
|
// But we can't reuse that class as it adds a ::before that intefers with this approach
|
|
46
46
|
style: convertToInlineCss({
|
|
47
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
47
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
48
48
|
position: 'relative',
|
|
49
49
|
width: 'var(--lineNumberGutterWidth, 2rem)',
|
|
50
50
|
/* top and bottom | left and right */
|
|
@@ -58,7 +58,7 @@ var _toDOM = function toDOM(node, formattedAriaLabel, config) {
|
|
|
58
58
|
class: 'code-block-gutter-pseudo-element',
|
|
59
59
|
style: convertToInlineCss({
|
|
60
60
|
textAlign: 'right',
|
|
61
|
-
color: "var(--ds-text-subtlest, #
|
|
61
|
+
color: "var(--ds-text-subtlest, #6B6E76)",
|
|
62
62
|
fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)",
|
|
63
63
|
whiteSpace: 'pre-wrap'
|
|
64
64
|
}),
|
|
@@ -3,7 +3,7 @@ import { tags } from '@lezer/highlight';
|
|
|
3
3
|
// Based on `platform/packages/design-system/code/src/internal/theme/styles.tsx`
|
|
4
4
|
export var highlightStyle = HighlightStyle.define([{
|
|
5
5
|
tag: tags.meta,
|
|
6
|
-
color: "var(--ds-text, #
|
|
6
|
+
color: "var(--ds-text, #292A2E)"
|
|
7
7
|
}, {
|
|
8
8
|
tag: tags.link,
|
|
9
9
|
textDecoration: 'underline'
|
|
@@ -26,16 +26,16 @@ export var highlightStyle = HighlightStyle.define([{
|
|
|
26
26
|
textDecoration: 'line-through'
|
|
27
27
|
}, {
|
|
28
28
|
tag: tags.keyword,
|
|
29
|
-
color: "var(--ds-text-accent-blue, #
|
|
29
|
+
color: "var(--ds-text-accent-blue, #1558BC)",
|
|
30
30
|
// Custom syntax styling to match existing styling
|
|
31
31
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
32
32
|
fontWeight: "var(--ds-font-weight-bold, 700)"
|
|
33
33
|
}, {
|
|
34
34
|
tag: [tags.atom, tags.bool, tags.url, tags.contentSeparator, tags.labelName],
|
|
35
|
-
color: "var(--ds-text-accent-blue, #
|
|
35
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
36
36
|
}, {
|
|
37
37
|
tag: [tags.literal],
|
|
38
|
-
color: "var(--ds-text-accent-blue, #
|
|
38
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
39
39
|
}, {
|
|
40
40
|
tag: tags.inserted,
|
|
41
41
|
color: "var(--ds-text-accent-green, #216E4E)"
|
|
@@ -53,29 +53,29 @@ export var highlightStyle = HighlightStyle.define([{
|
|
|
53
53
|
color: "var(--ds-text-accent-teal, #206A83)"
|
|
54
54
|
}, {
|
|
55
55
|
tag: tags.definition(tags.variableName),
|
|
56
|
-
color: "var(--ds-text, #
|
|
56
|
+
color: "var(--ds-text, #292A2E)"
|
|
57
57
|
}, {
|
|
58
58
|
tag: tags.local(tags.variableName),
|
|
59
|
-
color: "var(--ds-text, #
|
|
59
|
+
color: "var(--ds-text, #292A2E)"
|
|
60
60
|
}, {
|
|
61
61
|
tag: [tags.typeName, tags.namespace],
|
|
62
|
-
color: "var(--ds-text-accent-blue, #
|
|
62
|
+
color: "var(--ds-text-accent-blue, #1558BC)"
|
|
63
63
|
}, {
|
|
64
64
|
tag: tags.className,
|
|
65
|
-
color: "var(--ds-text-accent-purple, #
|
|
65
|
+
color: "var(--ds-text-accent-purple, #803FA5)"
|
|
66
66
|
}, {
|
|
67
67
|
tag: [tags.special(tags.variableName), tags.macroName],
|
|
68
|
-
color: "var(--ds-text, #
|
|
68
|
+
color: "var(--ds-text, #292A2E)"
|
|
69
69
|
}, {
|
|
70
70
|
tag: tags.definition(tags.propertyName),
|
|
71
|
-
color: "var(--ds-text, #
|
|
71
|
+
color: "var(--ds-text, #292A2E)"
|
|
72
72
|
}, {
|
|
73
73
|
tag: tags.comment,
|
|
74
|
-
color: "var(--ds-text-subtlest, #
|
|
74
|
+
color: "var(--ds-text-subtlest, #6B6E76)",
|
|
75
75
|
fontStyle: 'italic'
|
|
76
76
|
}, {
|
|
77
77
|
tag: tags.invalid,
|
|
78
|
-
color: "var(--ds-text, #
|
|
78
|
+
color: "var(--ds-text, #292A2E)"
|
|
79
79
|
}]);
|
|
80
80
|
|
|
81
81
|
/**
|
package/dist/esm/ui/theme.js
CHANGED
|
@@ -9,7 +9,7 @@ var getFontSize = function getFontSize() {
|
|
|
9
9
|
};
|
|
10
10
|
export var cmTheme = CodeMirror.theme({
|
|
11
11
|
'&': {
|
|
12
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
12
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
13
13
|
padding: '0',
|
|
14
14
|
marginTop: "var(--ds-space-100, 8px)",
|
|
15
15
|
marginBottom: "var(--ds-space-100, 8px)",
|
|
@@ -33,12 +33,12 @@ export var cmTheme = CodeMirror.theme({
|
|
|
33
33
|
},
|
|
34
34
|
'.cm-content': {
|
|
35
35
|
cursor: 'text',
|
|
36
|
-
caretColor: "var(--ds-text, #
|
|
36
|
+
caretColor: "var(--ds-text, #292A2E)",
|
|
37
37
|
margin: "var(--ds-space-100, 8px)",
|
|
38
38
|
padding: "var(--ds-space-0, 0px)"
|
|
39
39
|
},
|
|
40
40
|
'.cm-scroller': {
|
|
41
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
41
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
42
42
|
// Custom syntax styling to match existing styling
|
|
43
43
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
44
44
|
lineHeight: 'unset',
|
|
@@ -50,16 +50,16 @@ export var cmTheme = CodeMirror.theme({
|
|
|
50
50
|
backgroundAttachment: 'local, local, local, local, scroll, scroll, scroll, scroll'
|
|
51
51
|
},
|
|
52
52
|
'&.cm-focused .cm-cursor': {
|
|
53
|
-
borderLeftColor: "var(--ds-text, #
|
|
53
|
+
borderLeftColor: "var(--ds-text, #292A2E)"
|
|
54
54
|
},
|
|
55
55
|
'.cm-gutter': {
|
|
56
56
|
padding: "var(--ds-space-100, 8px)"
|
|
57
57
|
},
|
|
58
58
|
'.cm-gutters': {
|
|
59
|
-
backgroundColor: "var(--ds-background-neutral, #
|
|
59
|
+
backgroundColor: "var(--ds-background-neutral, #0515240F)",
|
|
60
60
|
border: 'none',
|
|
61
61
|
padding: "var(--ds-space-0, 0px)",
|
|
62
|
-
color: "var(--ds-text-subtlest, #
|
|
62
|
+
color: "var(--ds-text-subtlest, #6B6E76)"
|
|
63
63
|
},
|
|
64
64
|
'.cm-lineNumbers .cm-gutterElement': {
|
|
65
65
|
paddingLeft: "var(--ds-space-0, 0px)",
|
|
@@ -86,23 +86,23 @@ export var codeFoldingTheme = CodeMirror.theme({
|
|
|
86
86
|
paddingLeft: "var(--ds-space-050, 4px)"
|
|
87
87
|
},
|
|
88
88
|
'.cm-gutterElement:has([data-marker-dom-element="true"])': {
|
|
89
|
-
color: "var(--ds-icon-subtle, #
|
|
89
|
+
color: "var(--ds-icon-subtle, #505258)"
|
|
90
90
|
},
|
|
91
91
|
'.cm-gutterElement:has([data-marker-dom-element="true"]):hover': {
|
|
92
|
-
color: "var(--ds-text-accent-gray-bolder, #
|
|
92
|
+
color: "var(--ds-text-accent-gray-bolder, #1E1F21)"
|
|
93
93
|
},
|
|
94
94
|
'.cm-foldPlaceholder': {
|
|
95
95
|
// To give spacing between lines
|
|
96
96
|
height: '20px',
|
|
97
|
-
backgroundColor: "var(--ds-background-accent-gray-subtlest, #
|
|
97
|
+
backgroundColor: "var(--ds-background-accent-gray-subtlest, #F0F1F2)",
|
|
98
98
|
border: 'none',
|
|
99
|
-
color: "var(--ds-text, #
|
|
100
|
-
outline: "1px solid ".concat("var(--ds-border-accent-gray, #
|
|
99
|
+
color: "var(--ds-text, #292A2E)",
|
|
100
|
+
outline: "1px solid ".concat("var(--ds-border-accent-gray, #7D818A)"),
|
|
101
101
|
paddingLeft: "var(--ds-space-025, 2px)",
|
|
102
102
|
paddingRight: "var(--ds-space-025, 2px)"
|
|
103
103
|
},
|
|
104
104
|
'.cm-foldPlaceholder:hover': {
|
|
105
|
-
backgroundColor: "var(--ds-background-accent-gray-subtlest-hovered, #
|
|
105
|
+
backgroundColor: "var(--ds-background-accent-gray-subtlest-hovered, #DDDEE1)"
|
|
106
106
|
}
|
|
107
107
|
});
|
|
108
108
|
|
|
@@ -116,5 +116,5 @@ function overflowShadow(_ref) {
|
|
|
116
116
|
var width = "var(--ds-space-100, 8px)";
|
|
117
117
|
var leftCoverWidthResolved = leftCoverWidth || width;
|
|
118
118
|
var rightCoverWidthResolved = rightCoverWidth || width;
|
|
119
|
-
return "\n linear-gradient(\n to right,\n ".concat("var(--ds-background-neutral, #
|
|
119
|
+
return "\n linear-gradient(\n to right,\n ".concat("var(--ds-background-neutral, #0515240F)", " ", leftCoverWidthResolved, ",\n transparent ").concat(leftCoverWidthResolved, "\n ),\n linear-gradient(\n to right,\n ", "var(--ds-surface-raised, #FFFFFF)", " ").concat(leftCoverWidthResolved, ",\n transparent ").concat(leftCoverWidthResolved, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-background-neutral, #0515240F)", " ").concat(rightCoverWidthResolved, ",\n transparent ").concat(rightCoverWidthResolved, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-surface-raised, #FFFFFF)", " ").concat(rightCoverWidthResolved, ",\n transparent ").concat(rightCoverWidthResolved, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-shadow-overflow-spread, #1E1F2129)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n ),\n linear-gradient(\n to left,\n ", "var(--ds-shadow-overflow-perimeter, #1E1F211f)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n ),\n linear-gradient(\n to right,\n ", "var(--ds-shadow-overflow-spread, #1E1F2129)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n ),\n linear-gradient(\n to right,\n ", "var(--ds-shadow-overflow-perimeter, #1E1F211f)", " 0,\n ", "var(--ds-UNSAFE-transparent, transparent)", " ").concat(width, "\n )\n");
|
|
120
120
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-code-block-advanced",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.9",
|
|
4
4
|
"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
"@atlaskit/editor-plugin-selection-marker": "^6.2.0",
|
|
38
38
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
39
39
|
"@atlaskit/editor-toolbar": "^0.17.0",
|
|
40
|
-
"@atlaskit/icon": "^
|
|
40
|
+
"@atlaskit/icon": "^29.0.0",
|
|
41
41
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
42
42
|
"@atlaskit/prosemirror-history": "^0.2.0",
|
|
43
|
-
"@atlaskit/tmp-editor-statsig": "^13.
|
|
43
|
+
"@atlaskit/tmp-editor-statsig": "^13.35.0",
|
|
44
44
|
"@atlaskit/tokens": "^8.0.0",
|
|
45
45
|
"@babel/runtime": "^7.0.0",
|
|
46
46
|
"@codemirror/autocomplete": "6.18.4",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"codemirror-lang-elixir": "4.0.0"
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
|
-
"@atlaskit/editor-common": "^110.
|
|
60
|
+
"@atlaskit/editor-common": "^110.27.0",
|
|
61
61
|
"react": "^18.2.0",
|
|
62
62
|
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
63
63
|
},
|