@atlaskit/editor-common 72.0.0 → 72.0.1

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.
Files changed (56) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/cjs/keymaps/index.js +1 -3
  3. package/dist/cjs/styles/shared/annotation.js +9 -11
  4. package/dist/cjs/styles/shared/blockquote.js +1 -3
  5. package/dist/cjs/styles/shared/code-block.js +11 -13
  6. package/dist/cjs/styles/shared/code-mark.js +2 -4
  7. package/dist/cjs/styles/shared/panel.js +24 -28
  8. package/dist/cjs/styles/shared/rule.js +2 -4
  9. package/dist/cjs/styles/shared/shadow.js +1 -3
  10. package/dist/cjs/styles/shared/table.js +22 -24
  11. package/dist/cjs/ui/Caption/index.js +2 -4
  12. package/dist/cjs/ui/DropList/index.js +5 -7
  13. package/dist/cjs/ui/Expand/index.js +17 -19
  14. package/dist/cjs/ui/Messages/index.js +3 -5
  15. package/dist/cjs/ui/UnsupportedBlock/index.js +1 -3
  16. package/dist/cjs/ui/UnsupportedInline/index.js +1 -3
  17. package/dist/cjs/ui-color/ColorPalette/index.js +1 -1
  18. package/dist/cjs/ui-menu/DropdownMenu/index.js +10 -12
  19. package/dist/cjs/version.json +1 -1
  20. package/dist/es2019/keymaps/index.js +1 -2
  21. package/dist/es2019/styles/shared/annotation.js +9 -10
  22. package/dist/es2019/styles/shared/blockquote.js +1 -2
  23. package/dist/es2019/styles/shared/code-block.js +11 -12
  24. package/dist/es2019/styles/shared/code-mark.js +2 -3
  25. package/dist/es2019/styles/shared/panel.js +24 -27
  26. package/dist/es2019/styles/shared/rule.js +2 -3
  27. package/dist/es2019/styles/shared/shadow.js +4 -5
  28. package/dist/es2019/styles/shared/table.js +22 -23
  29. package/dist/es2019/ui/Caption/index.js +2 -3
  30. package/dist/es2019/ui/DropList/index.js +5 -6
  31. package/dist/es2019/ui/Expand/index.js +17 -18
  32. package/dist/es2019/ui/Messages/index.js +3 -4
  33. package/dist/es2019/ui/UnsupportedBlock/index.js +2 -3
  34. package/dist/es2019/ui/UnsupportedInline/index.js +2 -3
  35. package/dist/es2019/ui-color/ColorPalette/index.js +2 -2
  36. package/dist/es2019/ui-menu/DropdownMenu/index.js +11 -12
  37. package/dist/es2019/version.json +1 -1
  38. package/dist/esm/keymaps/index.js +1 -2
  39. package/dist/esm/styles/shared/annotation.js +9 -10
  40. package/dist/esm/styles/shared/blockquote.js +1 -2
  41. package/dist/esm/styles/shared/code-block.js +11 -12
  42. package/dist/esm/styles/shared/code-mark.js +2 -3
  43. package/dist/esm/styles/shared/panel.js +24 -27
  44. package/dist/esm/styles/shared/rule.js +2 -3
  45. package/dist/esm/styles/shared/shadow.js +1 -2
  46. package/dist/esm/styles/shared/table.js +22 -23
  47. package/dist/esm/ui/Caption/index.js +2 -3
  48. package/dist/esm/ui/DropList/index.js +5 -6
  49. package/dist/esm/ui/Expand/index.js +17 -18
  50. package/dist/esm/ui/Messages/index.js +3 -4
  51. package/dist/esm/ui/UnsupportedBlock/index.js +1 -2
  52. package/dist/esm/ui/UnsupportedInline/index.js +1 -2
  53. package/dist/esm/ui-color/ColorPalette/index.js +2 -2
  54. package/dist/esm/ui-menu/DropdownMenu/index.js +10 -11
  55. package/dist/esm/version.json +1 -1
  56. package/package.json +3 -3
@@ -8,7 +8,6 @@ import { akEditorLineHeight, akEditorSwoopCubicBezier, akLayoutGutterOffset, rel
8
8
  import * as colors from '@atlaskit/theme/colors';
9
9
  import { themed } from '@atlaskit/theme/components';
10
10
  import { fontSize, gridSize } from '@atlaskit/theme/constants';
11
- import { token } from '@atlaskit/tokens';
12
11
  export const messages = defineMessages({
13
12
  collapseNode: {
14
13
  id: 'fabric.editor.collapseNode',
@@ -32,16 +31,16 @@ export const messages = defineMessages({
32
31
  }
33
32
  });
34
33
  const BORDER_RADIUS = gridSize() / 2;
35
- const EXPAND_COLLAPSED_BACKGROUND = token('color.background.neutral.subtle', 'transparent');
34
+ const EXPAND_COLLAPSED_BACKGROUND = "var(--ds-background-neutral-subtle, transparent)";
36
35
  const EXPAND_SELECTED_BACKGROUND = themed({
37
- light: token('elevation.surface', 'rgba(255, 255, 255, 0.6)'),
38
- dark: token('elevation.surface', 'rgba(9, 10, 11, 0.29)')
36
+ light: "var(--ds-surface, rgba(255, 255, 255, 0.6))",
37
+ dark: "var(--ds-surface, rgba(9, 10, 11, 0.29))"
39
38
  });
40
- const EXPAND_FOCUSED_BORDER_COLOR = token('color.border.focused', colors.B300);
39
+ const EXPAND_FOCUSED_BORDER_COLOR = `var(--ds-border-focused, ${colors.B300})`;
41
40
  const EXPAND_COLLAPSED_BORDER_COLOR = 'transparent';
42
41
  const EXPAND_EXPANDED_BORDER_COLOR = themed({
43
- light: token('color.border', colors.N40A),
44
- dark: token('color.border', colors.DN50)
42
+ light: `var(--ds-border, ${colors.N40A})`,
43
+ dark: `var(--ds-border, ${colors.DN50})`
45
44
  });
46
45
  export const ExpandIconWrapper = ({
47
46
  children,
@@ -56,15 +55,15 @@ const expandIconWrapperStyle = props => css`
56
55
  cursor: pointer;
57
56
  display: flex;
58
57
  color: ${themed({
59
- light: token('color.icon', colors.N90),
60
- dark: token('color.icon', '#d9dde3')
58
+ light: `var(--ds-icon, ${colors.N90})`,
59
+ dark: "var(--ds-icon, #d9dde3)"
61
60
  })(props)};
62
61
  border-radius: ${gridSize() / 2}px;
63
62
  width: 24px;
64
63
  height: 24px;
65
64
 
66
65
  &:hover {
67
- background: ${token('color.background.neutral.subtle.hovered', colors.N30A)};
66
+ background: ${`var(--ds-background-neutral-subtle-hovered, ${colors.N30A})`};
68
67
  }
69
68
 
70
69
  svg {
@@ -123,8 +122,8 @@ const containerStyles = styleProps => {
123
122
  // https://product-fabric.atlassian.net/browse/DSP-4152
124
123
  border: 1px solid
125
124
  ${themed({
126
- light: token('color.border', colors.N50A),
127
- dark: token('color.border', colors.DN50)
125
+ light: `var(--ds-border, ${colors.N50A})`,
126
+ dark: `var(--ds-border, ${colors.DN50})`
128
127
  })(themeProps)};
129
128
  background: ${EXPAND_SELECTED_BACKGROUND(themeProps)};
130
129
  }
@@ -171,8 +170,8 @@ const titleInputStyles = props => css`
171
170
  line-height: ${akEditorLineHeight};
172
171
  font-weight: normal;
173
172
  color: ${themed({
174
- light: token('color.text.subtlest', colors.N200A),
175
- dark: token('color.text.subtlest', colors.DN600)
173
+ light: `var(--ds-text-subtlest, ${colors.N200A})`,
174
+ dark: `var(--ds-text-subtlest, ${colors.DN600})`
176
175
  })(props)};
177
176
  background: transparent;
178
177
  display: flex;
@@ -183,8 +182,8 @@ const titleInputStyles = props => css`
183
182
  &::placeholder {
184
183
  opacity: 0.6;
185
184
  color: ${themed({
186
- light: token('color.text.subtlest', colors.N200A),
187
- dark: token('color.text.subtlest', colors.DN600)
185
+ light: `var(--ds-text-subtlest, ${colors.N200A})`,
186
+ dark: `var(--ds-text-subtlest, ${colors.DN600})`
188
187
  })(props)};
189
188
  }
190
189
  `;
@@ -198,8 +197,8 @@ const titleContainerStyles = props => css`
198
197
  font-size: ${relativeFontSizeToBase16(fontSize())};
199
198
  width: 100%;
200
199
  color: ${themed({
201
- light: token('color.text.subtle', colors.N300A),
202
- dark: token('color.text.subtle', colors.DN600)
200
+ light: `var(--ds-text-subtle, ${colors.N300A})`,
201
+ dark: `var(--ds-text-subtle, ${colors.DN600})`
203
202
  })(props)};
204
203
  overflow: hidden;
205
204
  cursor: pointer;
@@ -5,17 +5,16 @@ import ErrorIcon from '@atlaskit/icon/glyph/error';
5
5
  import { G400, N200, R400 } from '@atlaskit/theme/colors';
6
6
  import { gridSize } from '@atlaskit/theme/constants';
7
7
  import { h200 } from '@atlaskit/theme/typography';
8
- import { token } from '@atlaskit/tokens';
9
8
  const errorColor = css`
10
- color: ${token('color.text.danger', R400)};
9
+ color: ${`var(--ds-text-danger, ${R400})`};
11
10
  `;
12
11
  const validColor = css`
13
- color: ${token('color.text.success', G400)};
12
+ color: ${`var(--ds-text-success, ${G400})`};
14
13
  `;
15
14
 
16
15
  const messageStyle = props => css`
17
16
  ${h200(props)} font-weight: normal;
18
- color: ${token('color.text.subtlest', N200)};
17
+ color: ${`var(--ds-text-subtlest, ${N200})`};
19
18
  margin-top: ${gridSize() / 2}px;
20
19
  display: flex;
21
20
  justify-content: baseline;
@@ -6,15 +6,14 @@ import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
6
6
  import QuestionsIcon from '@atlaskit/icon/glyph/question-circle';
7
7
  import { N30, N50 } from '@atlaskit/theme/colors';
8
8
  import { borderRadius, fontSize } from '@atlaskit/theme/constants';
9
- import { token } from '@atlaskit/tokens';
10
9
  import Tooltip from '@atlaskit/tooltip';
11
10
  import { ACTION_SUBJECT_ID } from '../../analytics';
12
11
  import { unsupportedContentMessages } from '../../messages/unsupportedContent';
13
12
  import { trackUnsupportedContentTooltipDisplayedFor } from '../../utils/track-unsupported-content';
14
13
  import { getUnsupportedContent } from '../unsupported-content-helper';
15
14
  const blockNodeStyle = css`
16
- background: ${token('color.background.disabled', N30)};
17
- border: 1px dashed ${token('color.border.disabled', N50)};
15
+ background: ${`var(--ds-background-disabled, ${N30})`};
16
+ border: 1px dashed ${`var(--ds-border-disabled, ${N50})`};
18
17
  border-radius: ${borderRadius()}px;
19
18
  box-sizing: border-box;
20
19
  cursor: default;
@@ -6,7 +6,6 @@ import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
6
6
  import QuestionsIcon from '@atlaskit/icon/glyph/question-circle';
7
7
  import { N30, N50 } from '@atlaskit/theme/colors';
8
8
  import { borderRadius, fontSize } from '@atlaskit/theme/constants';
9
- import { token } from '@atlaskit/tokens';
10
9
  import Tooltip from '@atlaskit/tooltip';
11
10
  import { ACTION_SUBJECT_ID } from '../../analytics';
12
11
  import { unsupportedContentMessages } from '../../messages/unsupportedContent';
@@ -14,8 +13,8 @@ import { trackUnsupportedContentTooltipDisplayedFor } from '../../utils/track-un
14
13
  import { getUnsupportedContent } from '../unsupported-content-helper';
15
14
  const inlineNodeStyle = css`
16
15
  align-items: center;
17
- background: ${token('color.background.disabled', N30)};
18
- border: 1px dashed ${token('color.border.disabled', N50)};
16
+ background: ${`var(--ds-background-disabled, ${N30})`};
17
+ border: 1px dashed ${`var(--ds-border-disabled, ${N50})`};
19
18
  border-radius: ${borderRadius()}px;
20
19
  box-sizing: border-box;
21
20
  cursor: default;
@@ -4,7 +4,7 @@ import { jsx } from '@emotion/react';
4
4
  import chromatism from 'chromatism';
5
5
  import { injectIntl } from 'react-intl-next';
6
6
  import { N0, N500 } from '@atlaskit/theme/colors';
7
- import { token, useThemeObserver } from '@atlaskit/tokens';
7
+ import { useThemeObserver } from '@atlaskit/tokens';
8
8
  import Color from './Color';
9
9
  import getColorMessage from './Palettes/getColorMessage';
10
10
  import { newDarkPalette, newLightPalette } from './Palettes/paletteMessagesTokenModeNames';
@@ -29,7 +29,7 @@ function getCheckMarkColor(color, textPalette) {
29
29
  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
30
30
 
31
31
 
32
- return contrastColor === N0 ? token('color.icon.inverse', N0) : token('color.icon', N500);
32
+ return contrastColor === N0 ? `var(--ds-icon-inverse, ${N0})` : `var(--ds-icon, ${N500})`;
33
33
  }
34
34
 
35
35
  const ColorPalette = props => {
@@ -8,7 +8,6 @@ import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
8
8
  import { CustomItem, MenuGroup } from '@atlaskit/menu';
9
9
  import { B100, DN600, DN80, N70, N900 } from '@atlaskit/theme/colors';
10
10
  import { themed } from '@atlaskit/theme/components';
11
- import { token } from '@atlaskit/tokens';
12
11
  import Tooltip from '@atlaskit/tooltip';
13
12
  import { withReactEditorViewOuterListeners } from '../../ui-react';
14
13
  import DropList from '../../ui/DropList';
@@ -21,7 +20,7 @@ const wrapper = css`
21
20
  }
22
21
  `;
23
22
  const focusedMenuItemStyle = css`
24
- box-shadow: inset 0px 0px 0px 2px ${token('color.border.focused', B100)};
23
+ box-shadow: inset 0px 0px 0px 2px ${`var(--ds-border-focused, ${B100})`};
25
24
  outline: none;
26
25
  `;
27
26
 
@@ -34,8 +33,8 @@ const buttonStyles = isActive => theme => {
34
33
  > span,
35
34
  > span:hover,
36
35
  > span:active {
37
- background: ${token('color.background.selected', '#6c798f')};
38
- color: ${token('color.text', '#fff')};
36
+ background: ${"var(--ds-background-selected, #6c798f)"};
37
+ color: ${"var(--ds-text, #fff)"};
39
38
  }
40
39
  :focus > span[aria-disabled='false'] {
41
40
  ${focusedMenuItemStyle};
@@ -49,24 +48,24 @@ const buttonStyles = isActive => theme => {
49
48
  return css`
50
49
  > span:hover[aria-disabled='false'] {
51
50
  color: ${themed({
52
- light: token('color.text', N900),
53
- dark: token('color.text', DN600)
51
+ light: `var(--ds-text, ${N900})`,
52
+ dark: `var(--ds-text, ${DN600})`
54
53
  })(theme)};
55
54
  background-color: ${themed({
56
- light: token('color.background.neutral.subtle.hovered', 'rgb(244, 245, 247)'),
57
- dark: token('color.background.neutral.subtle.hovered', 'rgb(59, 71, 92)')
55
+ light: "var(--ds-background-neutral-subtle-hovered, rgb(244, 245, 247))",
56
+ dark: "var(--ds-background-neutral-subtle-hovered, rgb(59, 71, 92))"
58
57
  })(theme)};
59
58
  }
60
59
  > span:active[aria-disabled='false'] {
61
60
  background-color: ${themed({
62
- light: token('color.background.neutral.subtle.pressed', 'rgb(179, 212, 255)'),
63
- dark: token('color.background.neutral.subtle.pressed', 'rgb(179, 212, 255)')
61
+ light: "var(--ds-background-neutral-subtle-pressed, rgb(179, 212, 255))",
62
+ dark: "var(--ds-background-neutral-subtle-pressed, rgb(179, 212, 255))"
64
63
  })(theme)};
65
64
  }
66
65
  > span[aria-disabled='true'] {
67
66
  color: ${themed({
68
- light: token('color.text.disabled', N70),
69
- dark: token('color.text.disabled', DN80)
67
+ light: `var(--ds-text-disabled, ${N70})`,
68
+ dark: `var(--ds-text-disabled, ${DN80})`
70
69
  })(theme)};
71
70
  }
72
71
  :focus > span[aria-disabled='false'] {
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "72.0.0",
3
+ "version": "72.0.1",
4
4
  "sideEffects": false
5
5
  }
@@ -7,7 +7,6 @@ var _templateObject;
7
7
  import React, { Fragment } from 'react';
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import { N400 } from '@atlaskit/theme/colors';
10
- import { token } from '@atlaskit/tokens';
11
10
  import { browser } from '../utils';
12
11
  export var addAltText = makeKeyMapWithCommon('Add Alt Text', 'Mod-Alt-y');
13
12
  export var toggleBold = makeKeyMapWithCommon('Bold', 'Mod-b');
@@ -78,7 +77,7 @@ var arrowKeysMap = {
78
77
  ARROWUP: "\u2191",
79
78
  ARROWDOWN: "\u2193"
80
79
  };
81
- var tooltipShortcutStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n border-radius: 2px;\n background-color: ", ";\n padding: 0 2px;\n\n /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n /* stylelint-disable-next-line */\n label: tooltip-shortcut;\n"])), token('color.background.inverse.subtle', N400));
80
+ var tooltipShortcutStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n border-radius: 2px;\n background-color: ", ";\n padding: 0 2px;\n\n /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n /* stylelint-disable-next-line */\n label: tooltip-shortcut;\n"])), "var(--ds-background-inverse-subtle, ".concat(N400, ")"));
82
81
  /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
83
82
 
84
83
  function formatShortcut(keymap) {
@@ -5,7 +5,6 @@ var _templateObject, _templateObject2, _templateObject3;
5
5
  import { css } from '@emotion/react';
6
6
  import { N60A, Y300, Y75 } from '@atlaskit/theme/colors';
7
7
  import { themed } from '@atlaskit/theme/components';
8
- import { token } from '@atlaskit/tokens';
9
8
  export var annotationPrefix = 'ak-editor-annotation';
10
9
  export var AnnotationSharedClassNames = {
11
10
  focus: "".concat(annotationPrefix, "-focus"),
@@ -21,18 +20,18 @@ var DY200 = '#82641c';
21
20
  export var AnnotationSharedCSSByState = function AnnotationSharedCSSByState(props) {
22
21
  return {
23
22
  focus: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n // Background is not coming through in confluence, suspecting to be caused by some specific combination of\n // emotion and token look up\n\n background: ", ";\n border-bottom: 2px solid\n ", ";\n // TODO: https://product-fabric.atlassian.net/browse/DSP-4147\n box-shadow: ", ";\n cursor: pointer;\n "])), themed({
24
- light: token('color.background.accent.yellow.subtler', Y75),
25
- dark: token('color.background.accent.yellow.subtler', DY75)
23
+ light: "var(--ds-background-accent-yellow-subtler, ".concat(Y75, ")"),
24
+ dark: "var(--ds-background-accent-yellow-subtler, ".concat(DY75, ")")
26
25
  })(props), themed({
27
- light: token('color.border.accent.yellow', Y300),
28
- dark: token('color.border.accent.yellow', DY300)
29
- })(props), token('elevation.shadow.overlay', "1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A))),
26
+ light: "var(--ds-border-accent-yellow, ".concat(Y300, ")"),
27
+ dark: "var(--ds-border-accent-yellow, ".concat(DY300, ")")
28
+ })(props), "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A), ")")),
30
29
  blur: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n background: ", ";\n border-bottom: 2px solid\n ", ";\n cursor: pointer;\n "])), themed({
31
- light: token('color.background.accent.yellow.subtlest', Y75a),
32
- dark: token('color.background.accent.yellow.subtlest', DY75a)
30
+ light: "var(--ds-background-accent-yellow-subtlest, ".concat(Y75a, ")"),
31
+ dark: "var(--ds-background-accent-yellow-subtlest, ".concat(DY75a, ")")
33
32
  })(props), themed({
34
- light: token('color.border.accent.yellow', Y200a),
35
- dark: token('color.border.accent.yellow', DY200)
33
+ light: "var(--ds-border-accent-yellow, ".concat(Y200a, ")"),
34
+ dark: "var(--ds-border-accent-yellow, ".concat(DY200, ")")
36
35
  })(props))
37
36
  };
38
37
  };
@@ -5,5 +5,4 @@ var _templateObject;
5
5
  import { css } from '@emotion/react';
6
6
  import { akEditorBlockquoteBorderColor, blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
7
7
  import { gridSize } from '@atlaskit/theme/constants';
8
- import { token } from '@atlaskit/tokens';
9
- export var blockquoteSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n & blockquote {\n box-sizing: border-box;\n padding-left: ", "px;\n border-left: 2px solid\n ", ";\n margin: ", " 0 0 0;\n margin-right: 0;\n\n [dir='rtl'] & {\n padding-left: 0;\n padding-right: ", "px;\n }\n\n &:first-child {\n margin-top: 0;\n }\n\n &::before {\n content: '';\n }\n\n &::after {\n content: none;\n }\n\n & p {\n display: block;\n }\n\n & table,\n & table:last-child {\n display: inline-table;\n }\n }\n"])), gridSize() * 2, token('color.border', akEditorBlockquoteBorderColor), blockNodesVerticalMargin, gridSize() * 2);
8
+ export var blockquoteSharedStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n & blockquote {\n box-sizing: border-box;\n padding-left: ", "px;\n border-left: 2px solid\n ", ";\n margin: ", " 0 0 0;\n margin-right: 0;\n\n [dir='rtl'] & {\n padding-left: 0;\n padding-right: ", "px;\n }\n\n &:first-child {\n margin-top: 0;\n }\n\n &::before {\n content: '';\n }\n\n &::after {\n content: none;\n }\n\n & p {\n display: block;\n }\n\n & table,\n & table:last-child {\n display: inline-table;\n }\n }\n"])), gridSize() * 2, "var(--ds-border, ".concat(akEditorBlockquoteBorderColor, ")"), blockNodesVerticalMargin, gridSize() * 2);
@@ -7,7 +7,6 @@ import { akEditorCodeFontFamily, akEditorLineHeight, akEditorTableCellMinWidth,
7
7
  import { DN20, DN400, DN50, DN800, N20, N30, N400, N800 } from '@atlaskit/theme/colors';
8
8
  import { themed } from '@atlaskit/theme/components';
9
9
  import { borderRadius, fontSize, gridSize } from '@atlaskit/theme/constants';
10
- import { token } from '@atlaskit/tokens';
11
10
  export var CodeBlockSharedCssClassName = {
12
11
  CODEBLOCK_CONTAINER: 'code-block',
13
12
  CODEBLOCK_START: 'code-block--start',
@@ -18,24 +17,24 @@ export var CodeBlockSharedCssClassName = {
18
17
  DS_CODEBLOCK: '[data-ds--code--code-block]'
19
18
  };
20
19
  export var codeBlockSharedStyles = function codeBlockSharedStyles(props) {
21
- return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .", " {\n position: relative;\n background-color: ", ";\n border-radius: ", "px;\n margin: ", " 0 0 0;\n font-family: ", ";\n min-width: ", "px;\n cursor: pointer;\n\n --ds--code--bg-color: transparent;\n\n /* This is necessary to allow for arrow key navigation in/out of code blocks in Firefox. */\n white-space: normal;\n\n .", " {\n position: absolute;\n visibility: hidden;\n height: 1.5rem;\n top: 0px;\n left: 0px;\n }\n\n .", " {\n position: absolute;\n visibility: hidden;\n height: 1.5rem;\n bottom: 0px;\n right: 0px;\n }\n\n .", " {\n background-color: ", ";\n display: flex;\n border-radius: ", "px;\n width: 100%;\n counter-reset: line;\n overflow-x: auto;\n\n background-image: ", ";\n\n background-repeat: no-repeat;\n background-attachment: local, local, local, local, scroll, scroll, scroll,\n scroll;\n background-size: ", "px 100%, ", "px 100%,\n ", "px 100%, ", "px 100%, ", "px 100%,\n 1px 100%, ", "px 100%, 1px 100%;\n background-position: 0 0, 0 0, 100% 0, 100% 0, 100% 0, 100% 0, 0 0, 0 0;\n\n /* Be careful if refactoring this; it is needed to keep arrow key navigation in Firefox consistent with other browsers. */\n overflow-y: hidden;\n }\n\n .", " {\n flex-shrink: 0;\n text-align: right;\n background-color: ", ";\n padding: ", "px;\n position: relative;\n\n span {\n display: block;\n line-height: 0;\n font-size: 0;\n\n ::before {\n display: inline-block;\n content: counter(line);\n counter-increment: line;\n color: ", ";\n font-size: ", ";\n line-height: 1.5rem;\n }\n }\n }\n\n .", " {\n display: flex;\n flex: 1;\n\n code {\n flex-grow: 1;\n tab-size: 4;\n cursor: text;\n color: ", ";\n border-radius: ", "px;\n margin: ", "px;\n white-space: pre;\n font-size: ", ";\n line-height: 1.5rem;\n }\n }\n }\n"])), CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, token('elevation.surface.raised', 'transparent'), borderRadius(), blockNodesVerticalMargin, akEditorCodeFontFamily, akEditorTableCellMinWidth, CodeBlockSharedCssClassName.CODEBLOCK_START, CodeBlockSharedCssClassName.CODEBLOCK_END, CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER, themed({
22
- light: token('color.background.neutral', N20),
23
- dark: token('color.background.neutral', DN50)
20
+ return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .", " {\n position: relative;\n background-color: ", ";\n border-radius: ", "px;\n margin: ", " 0 0 0;\n font-family: ", ";\n min-width: ", "px;\n cursor: pointer;\n\n --ds--code--bg-color: transparent;\n\n /* This is necessary to allow for arrow key navigation in/out of code blocks in Firefox. */\n white-space: normal;\n\n .", " {\n position: absolute;\n visibility: hidden;\n height: 1.5rem;\n top: 0px;\n left: 0px;\n }\n\n .", " {\n position: absolute;\n visibility: hidden;\n height: 1.5rem;\n bottom: 0px;\n right: 0px;\n }\n\n .", " {\n background-color: ", ";\n display: flex;\n border-radius: ", "px;\n width: 100%;\n counter-reset: line;\n overflow-x: auto;\n\n background-image: ", ";\n\n background-repeat: no-repeat;\n background-attachment: local, local, local, local, scroll, scroll, scroll,\n scroll;\n background-size: ", "px 100%, ", "px 100%,\n ", "px 100%, ", "px 100%, ", "px 100%,\n 1px 100%, ", "px 100%, 1px 100%;\n background-position: 0 0, 0 0, 100% 0, 100% 0, 100% 0, 100% 0, 0 0, 0 0;\n\n /* Be careful if refactoring this; it is needed to keep arrow key navigation in Firefox consistent with other browsers. */\n overflow-y: hidden;\n }\n\n .", " {\n flex-shrink: 0;\n text-align: right;\n background-color: ", ";\n padding: ", "px;\n position: relative;\n\n span {\n display: block;\n line-height: 0;\n font-size: 0;\n\n ::before {\n display: inline-block;\n content: counter(line);\n counter-increment: line;\n color: ", ";\n font-size: ", ";\n line-height: 1.5rem;\n }\n }\n }\n\n .", " {\n display: flex;\n flex: 1;\n\n code {\n flex-grow: 1;\n tab-size: 4;\n cursor: text;\n color: ", ";\n border-radius: ", "px;\n margin: ", "px;\n white-space: pre;\n font-size: ", ";\n line-height: 1.5rem;\n }\n }\n }\n"])), CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, "var(--ds-surface-raised, transparent)", borderRadius(), blockNodesVerticalMargin, akEditorCodeFontFamily, akEditorTableCellMinWidth, CodeBlockSharedCssClassName.CODEBLOCK_START, CodeBlockSharedCssClassName.CODEBLOCK_END, CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER, themed({
21
+ light: "var(--ds-background-neutral, ".concat(N20, ")"),
22
+ dark: "var(--ds-background-neutral, ".concat(DN50, ")")
24
23
  })(props), borderRadius(), overflowShadow({
25
24
  background: themed({
26
- light: token('color.background.neutral', N20),
27
- dark: token('color.background.neutral', DN50)
25
+ light: "var(--ds-background-neutral, ".concat(N20, ")"),
26
+ dark: "var(--ds-background-neutral, ".concat(DN50, ")")
28
27
  })(props),
29
28
  leftCoverWidth: "".concat(gridSize() * 3, "px")
30
29
  }), gridSize() * 3, gridSize() * 3, gridSize(), gridSize(), gridSize(), gridSize(), CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER, themed({
31
- light: token('color.background.neutral', N30),
32
- dark: token('color.background.neutral', DN20)
30
+ light: "var(--ds-background-neutral, ".concat(N30, ")"),
31
+ dark: "var(--ds-background-neutral, ".concat(DN20, ")")
33
32
  })(props), gridSize(), themed({
34
- light: token('color.text.subtlest', N400),
35
- dark: token('color.text.subtlest', DN400)
33
+ light: "var(--ds-text-subtlest, ".concat(N400, ")"),
34
+ dark: "var(--ds-text-subtlest, ".concat(DN400, ")")
36
35
  })(props), relativeFontSizeToBase16(fontSize()), CodeBlockSharedCssClassName.CODEBLOCK_CONTENT, themed({
37
- light: token('color.text', N800),
38
- dark: token('color.text', DN800)
36
+ light: "var(--ds-text, ".concat(N800, ")"),
37
+ dark: "var(--ds-text, ".concat(DN800, ")")
39
38
  })(props), borderRadius(), gridSize(), relativeFontSizeToBase16(fontSize()));
40
39
  };
41
40
  export var codeBlockInListSafariFix = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n ::before {\n content: ' ';\n line-height: ", ";\n }\n\n > p:first-child,\n > .code-block:first-child,\n > .ProseMirror-gapcursor:first-child + .code-block {\n margin-top: -", "em !important;\n }\n"])), akEditorLineHeight, akEditorLineHeight);
@@ -6,11 +6,10 @@ import { css } from '@emotion/react';
6
6
  import { getCodeStyles } from '@atlaskit/code/inline';
7
7
  import { DN70, N30A } from '@atlaskit/theme/colors';
8
8
  import { getTheme, themed } from '@atlaskit/theme/components';
9
- import { token } from '@atlaskit/tokens';
10
9
  export var codeMarkSharedStyles = function codeMarkSharedStyles(props) {
11
10
  var theme = getTheme(props);
12
11
  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .code {\n --ds--code--bg-color: ", ";\n ", "\n }\n "])), themed({
13
- light: token('color.background.neutral', N30A),
14
- dark: token('color.background.neutral', DN70)
12
+ light: "var(--ds-background-neutral, ".concat(N30A, ")"),
13
+ dark: "var(--ds-background-neutral, ".concat(DN70, ")")
15
14
  })(props), getCodeStyles(theme));
16
15
  };
@@ -13,16 +13,7 @@ import { emojiImage, emojiSprite } from '@atlaskit/emoji';
13
13
  import * as colors from '@atlaskit/theme/colors';
14
14
  import { themed } from '@atlaskit/theme/components';
15
15
  import { borderRadius, gridSize } from '@atlaskit/theme/constants';
16
- import { token } from '@atlaskit/tokens';
17
- var tokenPanelColor = {
18
- info: 'color.background.information',
19
- note: 'color.background.discovery',
20
- tip: 'color.background.success',
21
- success: 'color.background.success',
22
- warning: 'color.background.warning',
23
- error: 'color.background.danger'
24
- };
25
- var lightPanelColor = {
16
+ var lightPanelColors = {
26
17
  info: colors.B50,
27
18
  note: colors.P50,
28
19
  tip: colors.G50,
@@ -93,20 +84,28 @@ export var darkPanelColors = {
93
84
  TextColor: '#D9DDE3'
94
85
  };
95
86
  var lightIconColor = {
96
- info: token('color.icon.information', colors.B400),
97
- note: token('color.icon.discovery', colors.P400),
98
- tip: token('color.icon.success', colors.G400),
99
- success: token('color.icon.success', colors.G400),
100
- warning: token('color.icon.warning', colors.Y400),
101
- error: token('color.icon.danger', colors.R400)
87
+ info: "var(--ds-icon-information, ".concat(colors.B400, ")"),
88
+ note: "var(--ds-icon-discovery, ".concat(colors.P400, ")"),
89
+ tip: "var(--ds-icon-success, ".concat(colors.G400, ")"),
90
+ success: "var(--ds-icon-success, ".concat(colors.G400, ")"),
91
+ warning: "var(--ds-icon-warning, ".concat(colors.Y400, ")"),
92
+ error: "var(--ds-icon-danger, ".concat(colors.R400, ")")
102
93
  };
103
94
  var darkIconColor = {
104
- info: token('color.icon.information', colors.B100),
105
- note: token('color.icon.discovery', colors.P100),
106
- tip: token('color.icon.success', colors.G200),
107
- success: token('color.icon.success', colors.G200),
108
- warning: token('color.icon.warning', colors.Y100),
109
- error: token('color.icon.danger', colors.R200)
95
+ info: "var(--ds-icon-information, ".concat(colors.B100, ")"),
96
+ note: "var(--ds-icon-discovery, ".concat(colors.P100, ")"),
97
+ tip: "var(--ds-icon-success, ".concat(colors.G200, ")"),
98
+ success: "var(--ds-icon-success, ".concat(colors.G200, ")"),
99
+ warning: "var(--ds-icon-warning, ".concat(colors.Y100, ")"),
100
+ error: "var(--ds-icon-danger, ".concat(colors.R200, ")")
101
+ };
102
+ var tokenDarkPanelColors = {
103
+ info: "var(--ds-background-information, ".concat(darkPanelColors['info'], ")"),
104
+ note: "var(--ds-background-discovery, ".concat(darkPanelColors['note'], ")"),
105
+ tip: "var(--ds-background-success, ".concat(darkPanelColors['tip'], ")"),
106
+ success: "var(--ds-background-success, ".concat(darkPanelColors['success'], ")"),
107
+ warning: "var(--ds-background-warning, ".concat(darkPanelColors['warning'], ")"),
108
+ error: "var(--ds-background-danger, ".concat(darkPanelColors['error'], ")")
110
109
  }; // New custom icons are a little smaller than predefined icons.
111
110
  // To fix alignment issues with custom icons, vertical alignment is updated.
112
111
 
@@ -177,7 +176,7 @@ var iconDynamicStyles = function iconDynamicStyles(panelType) {
177
176
 
178
177
  export var getPanelTypeBackgroundNoTokens = function getPanelTypeBackgroundNoTokens(panelType) {
179
178
  var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
180
- var light = lightPanelColor[panelType];
179
+ var light = lightPanelColors[panelType];
181
180
  var dark = darkPanelColors[panelType];
182
181
  var background = themed({
183
182
  light: light,
@@ -187,11 +186,9 @@ export var getPanelTypeBackgroundNoTokens = function getPanelTypeBackgroundNoTok
187
186
  };
188
187
  export var getPanelTypeBackground = function getPanelTypeBackground(panelType) {
189
188
  var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
190
- // TODO: https://product-fabric.atlassian.net/browse/DSP-4066
189
+ var light = hexToEditorBackgroundPaletteColor(lightPanelColors[panelType]); // hexToEditorBackgroundPaletteColor has a light mode as a fallback color - for legacy dark mode we define the tokens locally
191
190
 
192
- /* eslint-disable @atlaskit/design-system/no-unsafe-design-token-usage */
193
- var light = hexToEditorBackgroundPaletteColor(lightPanelColor[panelType]);
194
- var dark = token(tokenPanelColor[panelType], darkPanelColors[panelType]);
191
+ var dark = tokenDarkPanelColors[panelType];
195
192
  var background = themed({
196
193
  light: light,
197
194
  dark: dark
@@ -6,10 +6,9 @@ import { css } from '@emotion/react';
6
6
  import { akEditorLineHeight } from '@atlaskit/editor-shared-styles';
7
7
  import { DN50, N30A } from '@atlaskit/theme/colors';
8
8
  import { themed } from '@atlaskit/theme/components';
9
- import { token } from '@atlaskit/tokens';
10
9
  var divider = themed({
11
- light: token('color.border', N30A),
12
- dark: token('color.border', DN50)
10
+ light: "var(--ds-border, ".concat(N30A, ")"),
11
+ dark: "var(--ds-border, ".concat(DN50, ")")
13
12
  }); // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
14
13
 
15
14
  export var ruleSharedStyles = function ruleSharedStyles(props) {
@@ -6,7 +6,6 @@ var _templateObject;
6
6
  import { css } from '@emotion/react';
7
7
  import { akEditorShadowZIndex } from '@atlaskit/editor-shared-styles';
8
8
  import { N40A } from '@atlaskit/theme/colors';
9
- import { token } from '@atlaskit/tokens';
10
9
  import { shadowClassNames } from '../../ui/OverflowShadow';
11
10
  import { shadowObserverClassNames } from '../../ui/OverflowShadow/shadowObserver';
12
11
  var shadowWidth = 8;
@@ -24,5 +23,5 @@ var shadowWidth = 8;
24
23
  * background-attachment: local, local, scroll, scroll;
25
24
  */
26
25
 
27
- var shadowSharedStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n &\n .", "::before,\n .", "::after,\n .", "::before,\n .", "::after {\n display: none;\n position: absolute;\n pointer-events: none;\n z-index: ", ";\n width: ", "px;\n content: '';\n /* Scrollbar is outside the content in IE, inset in other browsers. */\n height: calc(100%);\n }\n\n & .", ", .", " {\n position: relative;\n }\n\n & .", "::before {\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 100%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n top: 0px;\n left: 0;\n display: block;\n }\n\n & .", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 100%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n left: calc(100% - ", "px);\n top: 0px;\n display: block;\n }\n\n & .", " {\n height: 100%;\n width: 0px;\n min-width: 0px;\n }\n\n & .", " {\n height: 100%;\n width: 0px;\n min-width: 0px;\n }\n"])), shadowClassNames.RIGHT_SHADOW, shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, shadowClassNames.LEFT_SHADOW, akEditorShadowZIndex, shadowWidth, shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, shadowClassNames.LEFT_SHADOW, token('elevation.shadow.overflow.spread', N40A), token('elevation.shadow.overflow.perimeter', 'transparent'), shadowClassNames.RIGHT_SHADOW, token('elevation.shadow.overflow.spread', N40A), token('elevation.shadow.overflow.perimeter', 'transparent'), shadowWidth, shadowObserverClassNames.SENTINEL_LEFT, shadowObserverClassNames.SENTINEL_RIGHT);
26
+ var shadowSharedStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n &\n .", "::before,\n .", "::after,\n .", "::before,\n .", "::after {\n display: none;\n position: absolute;\n pointer-events: none;\n z-index: ", ";\n width: ", "px;\n content: '';\n /* Scrollbar is outside the content in IE, inset in other browsers. */\n height: calc(100%);\n }\n\n & .", ", .", " {\n position: relative;\n }\n\n & .", "::before {\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 100%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n top: 0px;\n left: 0;\n display: block;\n }\n\n & .", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 100%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n left: calc(100% - ", "px);\n top: 0px;\n display: block;\n }\n\n & .", " {\n height: 100%;\n width: 0px;\n min-width: 0px;\n }\n\n & .", " {\n height: 100%;\n width: 0px;\n min-width: 0px;\n }\n"])), shadowClassNames.RIGHT_SHADOW, shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, shadowClassNames.LEFT_SHADOW, akEditorShadowZIndex, shadowWidth, shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, shadowClassNames.LEFT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", shadowWidth, shadowObserverClassNames.SENTINEL_LEFT, shadowObserverClassNames.SENTINEL_RIGHT);
28
27
  export { shadowSharedStyle };
@@ -9,7 +9,6 @@ import { akEditorBreakoutPadding, akEditorFullWidthLayoutWidth, akEditorSelected
9
9
  import { DN20 } from '@atlaskit/theme/colors';
10
10
  import { themed } from '@atlaskit/theme/components';
11
11
  import { gridSize } from '@atlaskit/theme/constants';
12
- import { token } from '@atlaskit/tokens';
13
12
  import browser from '../../utils/browser';
14
13
  import { CodeBlockSharedCssClassName } from './code-block';
15
14
  export var tableMarginTop = 24;
@@ -38,43 +37,43 @@ export var TableSharedCssClassName = {
38
37
 
39
38
  var tableSharedStyle = function tableSharedStyle(props) {
40
39
  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .", " {\n position: relative;\n margin: 0 auto ", "px;\n box-sizing: border-box;\n\n /**\n * Fix block top alignment inside table cells.\n */\n .decisionItemView-content-wrap:first-of-type > div {\n margin-top: 0;\n }\n }\n .", "[data-number-column='true'] {\n padding-left: ", "px;\n clear: both;\n }\n .", " > table {\n margin: ", "px 0 0 0;\n }\n\n .", " > table,\n .", " > table {\n margin: ", "px ", "px 0 0;\n }\n\n /* avoid applying styles to nested tables (possible via extensions) */\n .", " > table,\n .", " > table,\n .", " > table {\n border-collapse: collapse;\n border: ", "px solid\n ", ";\n table-layout: fixed;\n font-size: 1em;\n width: 100%;\n\n &[data-autosize='true'] {\n table-layout: auto;\n }\n\n & {\n * {\n box-sizing: border-box;\n }\n hr {\n box-sizing: content-box;\n }\n\n tbody {\n border-bottom: none;\n }\n th td {\n background-color: ", ";\n }\n th,\n td {\n min-width: ", "px;\n font-weight: normal;\n vertical-align: top;\n border: 1px solid\n ", ";\n border-right-width: 0;\n border-bottom-width: 0;\n padding: ", "px;\n /* https://stackoverflow.com/questions/7517127/borders-not-shown-in-firefox-with-border-collapse-on-table-position-relative-o */\n ", "\n\n ", ";\n\n > :first-child:not(style),\n > style:first-child + * {\n margin-top: 0;\n }\n\n > .ProseMirror-gapcursor:first-child + *,\n > style:first-child + .ProseMirror-gapcursor + * {\n margin-top: 0;\n }\n\n > .ProseMirror-gapcursor:first-child + span + *,\n > style:first-child + .ProseMirror-gapcursor + span + * {\n margin-top: 0;\n }\n\n th p:not(:first-of-type),\n td p:not(:first-of-type) {\n margin-top: 12px;\n }\n }\n th {\n background-color: ", ";\n text-align: left;\n\n /* only apply this styling to codeblocks in default background headercells */\n /* TODO this needs to be overhauled as it relies on unsafe selectors */\n &:not([style]):not(.danger) {\n .", ":not(.danger) {\n background-color: ", ";\n\n :not(.", ") {\n box-shadow: 0px 0px 0px 1px\n ", ";\n }\n\n .", " {\n background-image: ", ";\n\n background-color: ", ";\n }\n\n .", " {\n background-color: ", ";\n }\n\n /* this is only relevant to the element taken care of by renderer */\n > [data-ds--code--code-block] {\n background-image: ", "!important;\n\n background-color: ", "!important;\n\n // selector lives inside @atlaskit/code\n --ds--code--line-number-bg-color: ", ";\n }\n }\n }\n }\n }\n }\n"])), TableSharedCssClassName.TABLE_CONTAINER, tableMarginBottom, TableSharedCssClassName.TABLE_CONTAINER, akEditorTableNumberColumnWidth - 1, TableSharedCssClassName.TABLE_NODE_WRAPPER, tableMarginTop, TableSharedCssClassName.TABLE_CONTAINER, TableSharedCssClassName.TABLE_STICKY_WRAPPER, tableMarginTop, tableMarginSides, TableSharedCssClassName.TABLE_CONTAINER, TableSharedCssClassName.TABLE_NODE_WRAPPER, TableSharedCssClassName.TABLE_STICKY_WRAPPER, tableCellBorderWidth, themed({
41
- light: token('color.border', akEditorTableBorder),
42
- dark: token('color.border', akEditorTableBorderDark)
43
- })(props), token('color.background.neutral.subtle', 'white'), tableCellMinWidth, themed({
44
- light: token('color.border', akEditorTableBorder),
45
- dark: token('color.border', akEditorTableBorderDark)
40
+ light: "var(--ds-border, ".concat(akEditorTableBorder, ")"),
41
+ dark: "var(--ds-border, ".concat(akEditorTableBorderDark, ")")
42
+ })(props), "var(--ds-background-neutral-subtle, white)", tableCellMinWidth, themed({
43
+ light: "var(--ds-border, ".concat(akEditorTableBorder, ")"),
44
+ dark: "var(--ds-border, ".concat(akEditorTableBorderDark, ")")
46
45
  })(props), tableCellPadding, browser.gecko || browser.ie || browser.mac && browser.chrome ? 'background-clip: padding-box;' : '', themed({
47
46
  dark: getTableCellBackgroundDarkModeColors
48
47
  })(props), themed({
49
- light: token('color.background.neutral', akEditorTableToolbar),
50
- dark: token('color.background.neutral', akEditorTableToolbarDark)
48
+ light: "var(--ds-background-neutral, ".concat(akEditorTableToolbar, ")"),
49
+ dark: "var(--ds-background-neutral, ".concat(akEditorTableToolbarDark, ")")
51
50
  })(props), CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, themed({
52
- light: token('elevation.surface.raised', 'rgb(235, 237, 240)'),
53
- dark: token('elevation.surface.raised', 'rgb(36, 47, 66)')
54
- })(props), akEditorSelectedNodeClassName, token('color.border', 'transparent'), CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER, overflowShadow({
51
+ light: "var(--ds-surface-raised, rgb(235, 237, 240))",
52
+ dark: "var(--ds-surface-raised, rgb(36, 47, 66))"
53
+ })(props), akEditorSelectedNodeClassName, "var(--ds-border, transparent)", CodeBlockSharedCssClassName.CODEBLOCK_CONTENT_WRAPPER, overflowShadow({
55
54
  background: themed({
56
- light: token('color.background.neutral', 'rgb(235, 237, 240)'),
57
- dark: token('color.background.neutral', 'rgb(36, 47, 66)')
55
+ light: "var(--ds-background-neutral, rgb(235, 237, 240))",
56
+ dark: "var(--ds-background-neutral, rgb(36, 47, 66))"
58
57
  })(props),
59
58
  leftCoverWidth: "".concat(gridSize() * 3, "px")
60
59
  }), themed({
61
- light: token('color.background.neutral', 'rgb(235, 237, 240)'),
62
- dark: token('color.background.neutral', 'rgb(36, 47, 66)')
60
+ light: "var(--ds-background-neutral, rgb(235, 237, 240))",
61
+ dark: "var(--ds-background-neutral, rgb(36, 47, 66))"
63
62
  })(props), CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER, themed({
64
- light: token('color.background.neutral', 'rgb(226, 229, 233)'),
65
- dark: token('color.background.neutral', DN20)
63
+ light: "var(--ds-background-neutral, rgb(226, 229, 233))",
64
+ dark: "var(--ds-background-neutral, ".concat(DN20, ")")
66
65
  })(props), overflowShadow({
67
66
  background: themed({
68
- light: token('color.background.neutral', 'rgb(235, 237, 240)'),
69
- dark: token('color.background.neutral', 'rgb(36, 47, 66)')
67
+ light: "var(--ds-background-neutral, rgb(235, 237, 240))",
68
+ dark: "var(--ds-background-neutral, rgb(36, 47, 66))"
70
69
  })(props),
71
70
  leftCoverWidth: "".concat(gridSize() * 3, "px")
72
71
  }), themed({
73
- light: token('color.background.neutral', 'rgb(235, 237, 240)'),
74
- dark: token('color.background.neutral', 'rgb(36, 47, 66)')
72
+ light: "var(--ds-background-neutral, rgb(235, 237, 240))",
73
+ dark: "var(--ds-background-neutral, rgb(36, 47, 66))"
75
74
  })(props), themed({
76
- light: token('color.background.neutral', 'rgb(226, 229, 233)'),
77
- dark: token('color.background.neutral', DN20)
75
+ light: "var(--ds-background-neutral, rgb(226, 229, 233))",
76
+ dark: "var(--ds-background-neutral, ".concat(DN20, ")")
78
77
  })(props));
79
78
  };
80
79
 
@@ -17,10 +17,9 @@ import React from 'react';
17
17
  import { css, jsx } from '@emotion/react';
18
18
  import { injectIntl } from 'react-intl-next';
19
19
  import { N200, N400 } from '@atlaskit/theme/colors';
20
- import { token } from '@atlaskit/tokens';
21
20
  import { messages } from './messages';
22
- var captionWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n margin-top: 8px;\n text-align: center;\n position: relative;\n color: ", ";\n"])), token('color.text.subtle', N400));
23
- var placeholderStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n color: ", ";\n position: absolute;\n top: 0;\n width: 100%;\n"])), token('color.text.subtlest', N200));
21
+ var captionWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n margin-top: 8px;\n text-align: center;\n position: relative;\n color: ", ";\n"])), "var(--ds-text-subtle, ".concat(N400, ")"));
22
+ var placeholderStyle = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n color: ", ";\n position: absolute;\n top: 0;\n width: 100%;\n"])), "var(--ds-text-subtlest, ".concat(N200, ")"));
24
23
  export var CaptionComponent = /*#__PURE__*/function (_React$Component) {
25
24
  _inherits(CaptionComponent, _React$Component);
26
25