@atlaskit/editor-common 94.9.3 → 94.10.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.
- package/CHANGELOG.md +8 -0
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/styles/shared/headings.js +25 -8
- package/dist/cjs/ugc-tokens/editor-ugc-token-names.js +33 -15
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/styles/shared/headings.js +25 -8
- package/dist/es2019/ugc-tokens/editor-ugc-token-names.js +33 -15
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/styles/shared/headings.js +25 -8
- package/dist/esm/ugc-tokens/editor-ugc-token-names.js +33 -15
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/types/ugc-tokens/editor-ugc-token-names.d.ts +6 -0
- package/dist/types-ts4.5/ugc-tokens/editor-ugc-token-names.d.ts +6 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 94.10.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#159372](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159372)
|
|
8
|
+
[`a76bccb5634a4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a76bccb5634a4) -
|
|
9
|
+
add custom tokens for editor bold ugc headings
|
|
10
|
+
|
|
3
11
|
## 94.9.3
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
18
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
19
19
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
20
|
-
var packageVersion = "94.
|
|
20
|
+
var packageVersion = "94.10.0";
|
|
21
21
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
22
22
|
// Remove URL as it has UGC
|
|
23
23
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -48,37 +48,54 @@ var headingWithAlignmentStyles = function headingWithAlignmentStyles() {
|
|
|
48
48
|
// @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
|
|
49
49
|
// text sizing prototype: http://proto/fabricrender/
|
|
50
50
|
var headingsSharedStyles = exports.headingsSharedStyles = function headingsSharedStyles(typographyTheme) {
|
|
51
|
-
|
|
52
|
-
if (isADSTokenMigrationEnabled) {
|
|
51
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_typography_ugc')) {
|
|
53
52
|
return (0, _react.css)(_objectSpread({
|
|
54
53
|
'& h1': {
|
|
55
54
|
font: (0, _getEditorUgcToken.default)('editor.font.heading.h1', typographyTheme),
|
|
56
55
|
marginBottom: 0,
|
|
57
|
-
marginTop: '1.667em'
|
|
56
|
+
marginTop: '1.667em',
|
|
57
|
+
'& strong': {
|
|
58
|
+
fontWeight: (0, _getEditorUgcToken.default)('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
59
|
+
}
|
|
58
60
|
},
|
|
59
61
|
'& h2': {
|
|
60
62
|
font: (0, _getEditorUgcToken.default)('editor.font.heading.h2', typographyTheme),
|
|
61
63
|
marginTop: '1.8em',
|
|
62
|
-
marginBottom: 0
|
|
64
|
+
marginBottom: 0,
|
|
65
|
+
'& strong': {
|
|
66
|
+
fontWeight: (0, _getEditorUgcToken.default)('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
67
|
+
}
|
|
63
68
|
},
|
|
64
69
|
'& h3': {
|
|
65
70
|
font: (0, _getEditorUgcToken.default)('editor.font.heading.h3', typographyTheme),
|
|
66
71
|
marginTop: '2em',
|
|
67
|
-
marginBottom: 0
|
|
72
|
+
marginBottom: 0,
|
|
73
|
+
'& strong': {
|
|
74
|
+
fontWeight: (0, _getEditorUgcToken.default)('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
75
|
+
}
|
|
68
76
|
},
|
|
69
77
|
'& h4': {
|
|
70
78
|
font: (0, _getEditorUgcToken.default)('editor.font.heading.h4', typographyTheme),
|
|
71
|
-
marginTop: '1.357em'
|
|
79
|
+
marginTop: '1.357em',
|
|
80
|
+
'& strong': {
|
|
81
|
+
fontWeight: (0, _getEditorUgcToken.default)('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
82
|
+
}
|
|
72
83
|
},
|
|
73
84
|
'& h5': {
|
|
74
85
|
font: (0, _getEditorUgcToken.default)('editor.font.heading.h5', typographyTheme),
|
|
75
86
|
marginTop: '1.667em',
|
|
76
|
-
textTransform: 'none'
|
|
87
|
+
textTransform: 'none',
|
|
88
|
+
'& strong': {
|
|
89
|
+
fontWeight: (0, _getEditorUgcToken.default)('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
90
|
+
}
|
|
77
91
|
},
|
|
78
92
|
'& h6': {
|
|
79
93
|
font: (0, _getEditorUgcToken.default)('editor.font.heading.h6', typographyTheme),
|
|
80
94
|
marginTop: '1.455em',
|
|
81
|
-
textTransform: 'none'
|
|
95
|
+
textTransform: 'none',
|
|
96
|
+
'& strong': {
|
|
97
|
+
fontWeight: (0, _getEditorUgcToken.default)('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
98
|
+
}
|
|
82
99
|
}
|
|
83
100
|
}, headingWithAlignmentStyles()));
|
|
84
101
|
} else {
|
|
@@ -11,23 +11,41 @@ var editorUGCTokens = exports.editorUGCTokens = {
|
|
|
11
11
|
'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
12
12
|
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
13
13
|
'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
14
|
-
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
14
|
+
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
15
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
16
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
17
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
18
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
19
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
20
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
15
21
|
};
|
|
16
22
|
var editorUGCTokensModernized = exports.editorUGCTokensModernized = {
|
|
17
|
-
'editor.font.heading.h1': 'normal
|
|
18
|
-
'editor.font.heading.h2': 'normal
|
|
19
|
-
'editor.font.heading.h3': 'normal
|
|
20
|
-
'editor.font.heading.h4': 'normal
|
|
21
|
-
'editor.font.heading.h5': 'normal
|
|
22
|
-
'editor.font.heading.h6': 'normal
|
|
23
|
-
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
23
|
+
'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
24
|
+
'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
25
|
+
'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
26
|
+
'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
27
|
+
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
28
|
+
'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
29
|
+
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
30
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
31
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
32
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
33
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
34
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
35
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
24
36
|
};
|
|
25
37
|
var editorUGCTokensRefreshed = exports.editorUGCTokensRefreshed = {
|
|
26
|
-
'editor.font.heading.h1': 'normal
|
|
27
|
-
'editor.font.heading.h2': 'normal
|
|
28
|
-
'editor.font.heading.h3': 'normal
|
|
29
|
-
'editor.font.heading.h4': 'normal
|
|
30
|
-
'editor.font.heading.h5': 'normal
|
|
31
|
-
'editor.font.heading.h6': 'normal
|
|
32
|
-
'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
38
|
+
'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
39
|
+
'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
40
|
+
'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
41
|
+
'editor.font.heading.h4': 'normal 600 1em/1.14286 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
42
|
+
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
43
|
+
'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
44
|
+
'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
45
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
46
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
47
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
48
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
49
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
50
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
33
51
|
};
|
|
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
24
24
|
* @jsx jsx
|
|
25
25
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
26
26
|
var packageName = "@atlaskit/editor-common";
|
|
27
|
-
var packageVersion = "94.
|
|
27
|
+
var packageVersion = "94.10.0";
|
|
28
28
|
var halfFocusRing = 1;
|
|
29
29
|
var dropOffset = '0, 8';
|
|
30
30
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isFedRamp } from './environment';
|
|
2
2
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
3
3
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
4
|
-
const packageVersion = "94.
|
|
4
|
+
const packageVersion = "94.10.0";
|
|
5
5
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
6
6
|
// Remove URL as it has UGC
|
|
7
7
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -41,37 +41,54 @@ fg('platform_editor_heading_margin_fix') ? {
|
|
|
41
41
|
// @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
|
|
42
42
|
// text sizing prototype: http://proto/fabricrender/
|
|
43
43
|
export const headingsSharedStyles = typographyTheme => {
|
|
44
|
-
|
|
45
|
-
if (isADSTokenMigrationEnabled) {
|
|
44
|
+
if (fg('platform_editor_typography_ugc')) {
|
|
46
45
|
return css({
|
|
47
46
|
'& h1': {
|
|
48
47
|
font: editorUGCToken('editor.font.heading.h1', typographyTheme),
|
|
49
48
|
marginBottom: 0,
|
|
50
|
-
marginTop: '1.667em'
|
|
49
|
+
marginTop: '1.667em',
|
|
50
|
+
'& strong': {
|
|
51
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
52
|
+
}
|
|
51
53
|
},
|
|
52
54
|
'& h2': {
|
|
53
55
|
font: editorUGCToken('editor.font.heading.h2', typographyTheme),
|
|
54
56
|
marginTop: '1.8em',
|
|
55
|
-
marginBottom: 0
|
|
57
|
+
marginBottom: 0,
|
|
58
|
+
'& strong': {
|
|
59
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
60
|
+
}
|
|
56
61
|
},
|
|
57
62
|
'& h3': {
|
|
58
63
|
font: editorUGCToken('editor.font.heading.h3', typographyTheme),
|
|
59
64
|
marginTop: '2em',
|
|
60
|
-
marginBottom: 0
|
|
65
|
+
marginBottom: 0,
|
|
66
|
+
'& strong': {
|
|
67
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
68
|
+
}
|
|
61
69
|
},
|
|
62
70
|
'& h4': {
|
|
63
71
|
font: editorUGCToken('editor.font.heading.h4', typographyTheme),
|
|
64
|
-
marginTop: '1.357em'
|
|
72
|
+
marginTop: '1.357em',
|
|
73
|
+
'& strong': {
|
|
74
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
75
|
+
}
|
|
65
76
|
},
|
|
66
77
|
'& h5': {
|
|
67
78
|
font: editorUGCToken('editor.font.heading.h5', typographyTheme),
|
|
68
79
|
marginTop: '1.667em',
|
|
69
|
-
textTransform: 'none'
|
|
80
|
+
textTransform: 'none',
|
|
81
|
+
'& strong': {
|
|
82
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
83
|
+
}
|
|
70
84
|
},
|
|
71
85
|
'& h6': {
|
|
72
86
|
font: editorUGCToken('editor.font.heading.h6', typographyTheme),
|
|
73
87
|
marginTop: '1.455em',
|
|
74
|
-
textTransform: 'none'
|
|
88
|
+
textTransform: 'none',
|
|
89
|
+
'& strong': {
|
|
90
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
91
|
+
}
|
|
75
92
|
},
|
|
76
93
|
...headingWithAlignmentStyles()
|
|
77
94
|
});
|
|
@@ -5,23 +5,41 @@ export const editorUGCTokens = {
|
|
|
5
5
|
'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
6
6
|
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
7
7
|
'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
8
|
-
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
8
|
+
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
9
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
10
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
11
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
12
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
13
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
14
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
9
15
|
};
|
|
10
16
|
export const editorUGCTokensModernized = {
|
|
11
|
-
'editor.font.heading.h1': 'normal
|
|
12
|
-
'editor.font.heading.h2': 'normal
|
|
13
|
-
'editor.font.heading.h3': 'normal
|
|
14
|
-
'editor.font.heading.h4': 'normal
|
|
15
|
-
'editor.font.heading.h5': 'normal
|
|
16
|
-
'editor.font.heading.h6': 'normal
|
|
17
|
-
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
17
|
+
'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
18
|
+
'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
19
|
+
'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
20
|
+
'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
21
|
+
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
22
|
+
'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
23
|
+
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
24
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
25
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
26
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
27
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
28
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
29
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
18
30
|
};
|
|
19
31
|
export const editorUGCTokensRefreshed = {
|
|
20
|
-
'editor.font.heading.h1': 'normal
|
|
21
|
-
'editor.font.heading.h2': 'normal
|
|
22
|
-
'editor.font.heading.h3': 'normal
|
|
23
|
-
'editor.font.heading.h4': 'normal
|
|
24
|
-
'editor.font.heading.h5': 'normal
|
|
25
|
-
'editor.font.heading.h6': 'normal
|
|
26
|
-
'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
32
|
+
'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
33
|
+
'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
34
|
+
'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
35
|
+
'editor.font.heading.h4': 'normal 600 1em/1.14286 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
36
|
+
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
37
|
+
'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
38
|
+
'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
39
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
40
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
41
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
42
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
43
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
44
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
27
45
|
};
|
|
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
13
13
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
14
14
|
import Layer from '../Layer';
|
|
15
15
|
const packageName = "@atlaskit/editor-common";
|
|
16
|
-
const packageVersion = "94.
|
|
16
|
+
const packageVersion = "94.10.0";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
class DropList extends Component {
|
|
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { isFedRamp } from './environment';
|
|
8
8
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
9
9
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
10
|
-
var packageVersion = "94.
|
|
10
|
+
var packageVersion = "94.10.0";
|
|
11
11
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
12
12
|
// Remove URL as it has UGC
|
|
13
13
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -47,37 +47,54 @@ var headingWithAlignmentStyles = function headingWithAlignmentStyles() {
|
|
|
47
47
|
// @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
|
|
48
48
|
// text sizing prototype: http://proto/fabricrender/
|
|
49
49
|
export var headingsSharedStyles = function headingsSharedStyles(typographyTheme) {
|
|
50
|
-
|
|
51
|
-
if (isADSTokenMigrationEnabled) {
|
|
50
|
+
if (fg('platform_editor_typography_ugc')) {
|
|
52
51
|
return css(_objectSpread({
|
|
53
52
|
'& h1': {
|
|
54
53
|
font: editorUGCToken('editor.font.heading.h1', typographyTheme),
|
|
55
54
|
marginBottom: 0,
|
|
56
|
-
marginTop: '1.667em'
|
|
55
|
+
marginTop: '1.667em',
|
|
56
|
+
'& strong': {
|
|
57
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
58
|
+
}
|
|
57
59
|
},
|
|
58
60
|
'& h2': {
|
|
59
61
|
font: editorUGCToken('editor.font.heading.h2', typographyTheme),
|
|
60
62
|
marginTop: '1.8em',
|
|
61
|
-
marginBottom: 0
|
|
63
|
+
marginBottom: 0,
|
|
64
|
+
'& strong': {
|
|
65
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
66
|
+
}
|
|
62
67
|
},
|
|
63
68
|
'& h3': {
|
|
64
69
|
font: editorUGCToken('editor.font.heading.h3', typographyTheme),
|
|
65
70
|
marginTop: '2em',
|
|
66
|
-
marginBottom: 0
|
|
71
|
+
marginBottom: 0,
|
|
72
|
+
'& strong': {
|
|
73
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
74
|
+
}
|
|
67
75
|
},
|
|
68
76
|
'& h4': {
|
|
69
77
|
font: editorUGCToken('editor.font.heading.h4', typographyTheme),
|
|
70
|
-
marginTop: '1.357em'
|
|
78
|
+
marginTop: '1.357em',
|
|
79
|
+
'& strong': {
|
|
80
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
81
|
+
}
|
|
71
82
|
},
|
|
72
83
|
'& h5': {
|
|
73
84
|
font: editorUGCToken('editor.font.heading.h5', typographyTheme),
|
|
74
85
|
marginTop: '1.667em',
|
|
75
|
-
textTransform: 'none'
|
|
86
|
+
textTransform: 'none',
|
|
87
|
+
'& strong': {
|
|
88
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
89
|
+
}
|
|
76
90
|
},
|
|
77
91
|
'& h6': {
|
|
78
92
|
font: editorUGCToken('editor.font.heading.h6', typographyTheme),
|
|
79
93
|
marginTop: '1.455em',
|
|
80
|
-
textTransform: 'none'
|
|
94
|
+
textTransform: 'none',
|
|
95
|
+
'& strong': {
|
|
96
|
+
fontWeight: editorUGCToken('editor.font.weight.heading.h1.bold', typographyTheme)
|
|
97
|
+
}
|
|
81
98
|
}
|
|
82
99
|
}, headingWithAlignmentStyles()));
|
|
83
100
|
} else {
|
|
@@ -5,23 +5,41 @@ export var editorUGCTokens = {
|
|
|
5
5
|
'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
6
6
|
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
7
7
|
'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
8
|
-
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
8
|
+
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
9
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
10
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
11
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
12
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
13
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
14
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
9
15
|
};
|
|
10
16
|
export var editorUGCTokensModernized = {
|
|
11
|
-
'editor.font.heading.h1': 'normal
|
|
12
|
-
'editor.font.heading.h2': 'normal
|
|
13
|
-
'editor.font.heading.h3': 'normal
|
|
14
|
-
'editor.font.heading.h4': 'normal
|
|
15
|
-
'editor.font.heading.h5': 'normal
|
|
16
|
-
'editor.font.heading.h6': 'normal
|
|
17
|
-
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
17
|
+
'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
18
|
+
'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
19
|
+
'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
20
|
+
'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
21
|
+
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
22
|
+
'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
23
|
+
'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
24
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
25
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
26
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
27
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
28
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
29
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
18
30
|
};
|
|
19
31
|
export var editorUGCTokensRefreshed = {
|
|
20
|
-
'editor.font.heading.h1': 'normal
|
|
21
|
-
'editor.font.heading.h2': 'normal
|
|
22
|
-
'editor.font.heading.h3': 'normal
|
|
23
|
-
'editor.font.heading.h4': 'normal
|
|
24
|
-
'editor.font.heading.h5': 'normal
|
|
25
|
-
'editor.font.heading.h6': 'normal
|
|
26
|
-
'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif'
|
|
32
|
+
'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
33
|
+
'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
34
|
+
'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
35
|
+
'editor.font.heading.h4': 'normal 600 1em/1.14286 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
36
|
+
'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
37
|
+
'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
38
|
+
'editor.font.body': 'normal 400 1em/1.714 "Inter Variable", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
|
|
39
|
+
'editor.font.weight.heading.h1.bold': '700',
|
|
40
|
+
'editor.font.weight.heading.h2.bold': '700',
|
|
41
|
+
'editor.font.weight.heading.h3.bold': '700',
|
|
42
|
+
'editor.font.weight.heading.h4.bold': '700',
|
|
43
|
+
'editor.font.weight.heading.h5.bold': '700',
|
|
44
|
+
'editor.font.weight.heading.h6.bold': '700'
|
|
27
45
|
};
|
|
@@ -21,7 +21,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
21
21
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
22
22
|
import Layer from '../Layer';
|
|
23
23
|
var packageName = "@atlaskit/editor-common";
|
|
24
|
-
var packageVersion = "94.
|
|
24
|
+
var packageVersion = "94.10.0";
|
|
25
25
|
var halfFocusRing = 1;
|
|
26
26
|
var dropOffset = '0, 8';
|
|
27
27
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -5,6 +5,12 @@ export type EditorUGCTokens = {
|
|
|
5
5
|
'editor.font.heading.h4': string;
|
|
6
6
|
'editor.font.heading.h5': string;
|
|
7
7
|
'editor.font.heading.h6': string;
|
|
8
|
+
'editor.font.weight.heading.h1.bold': string;
|
|
9
|
+
'editor.font.weight.heading.h2.bold': string;
|
|
10
|
+
'editor.font.weight.heading.h3.bold': string;
|
|
11
|
+
'editor.font.weight.heading.h4.bold': string;
|
|
12
|
+
'editor.font.weight.heading.h5.bold': string;
|
|
13
|
+
'editor.font.weight.heading.h6.bold': string;
|
|
8
14
|
'editor.font.body': string;
|
|
9
15
|
};
|
|
10
16
|
export declare const editorUGCTokens: EditorUGCTokens;
|
|
@@ -5,6 +5,12 @@ export type EditorUGCTokens = {
|
|
|
5
5
|
'editor.font.heading.h4': string;
|
|
6
6
|
'editor.font.heading.h5': string;
|
|
7
7
|
'editor.font.heading.h6': string;
|
|
8
|
+
'editor.font.weight.heading.h1.bold': string;
|
|
9
|
+
'editor.font.weight.heading.h2.bold': string;
|
|
10
|
+
'editor.font.weight.heading.h3.bold': string;
|
|
11
|
+
'editor.font.weight.heading.h4.bold': string;
|
|
12
|
+
'editor.font.weight.heading.h5.bold': string;
|
|
13
|
+
'editor.font.weight.heading.h6.bold': string;
|
|
8
14
|
'editor.font.body': string;
|
|
9
15
|
};
|
|
10
16
|
export declare const editorUGCTokens: EditorUGCTokens;
|
package/package.json
CHANGED