@atlaskit/editor-core 166.0.4 → 167.0.0

package/dist/es2019/plugins/collab-edit/styles.js

@@ -2,13 +2,14 @@ import { css } from '@emotion/react';
 import { TELEPOINTER_DIM_CLASS } from './plugin-state';
 import { colors } from './utils';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 
 const telepointerColorStyle = (color, index) => `
   &.color-${index} {
     background-color: ${color.selection};
     &::after {
       background-color: ${color.solid};
-      color: #fff;
+      color: ${token('color.text.inverse', '#fff')};
       border-color: ${color.solid};
     }
   }
@@ -32,7 +33,7 @@ export const telepointerStyle = css`
       top: -14px;
       font-size: ${relativeFontSizeToBase16(9)};
       padding: 2px;
-      color: white;
+      color: ${token('color.text.inverse', 'white')};
       left: -1px;
       border-radius: 2px 2px 2px 0;
       line-height: initial;

package/dist/es2019/plugins/collab-edit/ui/styles.js

@@ -2,8 +2,9 @@ import { css } from '@emotion/react';
 import { gridSize } from '@atlaskit/theme/constants';
 import { N20 } from '@atlaskit/theme/colors';
 import { akEditorSmallZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 export const inviteTeamWrapper = css`
-  background: ${N20};
+  background: ${token('color.background.neutral', N20)};
   border-radius: 50%;
   min-width: ${gridSize() * 4}px;
   margin-left: -${gridSize() / 2}px;
@@ -37,11 +38,11 @@ export const badge = color => css`
   z-index: ${akEditorSmallZIndex};
   border-radius: 3px;
   background: ${color};
-  color: #fff;
+  color: ${token('color.text.inverse', '#fff')};
   font-size: ${relativeFontSizeToBase16(9)};
   line-height: 0;
   padding-top: 7px;
   text-align: center;
-  box-shadow: 0 0 1px #fff;
+  box-shadow: 0 0 1px ${token('color.border.inverse', '#fff')};
   box-sizing: border-box;
 `;

package/dist/es2019/plugins/collab-edit/utils.js

@@ -1,3 +1,4 @@
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 import { Selection, TextSelection } from 'prosemirror-state';
 import { Decoration } from 'prosemirror-view';
 import * as themeColors from '@atlaskit/theme/colors';

package/dist/es2019/plugins/date/ui/DatePicker/index.js

@@ -10,6 +10,7 @@ import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import Calendar from '@atlaskit/calendar';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N60A, N0 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import withOuterListeners from '../../../../ui/with-outer-listeners';
 const PopupWithListeners = withOuterListeners(Popup);
 import { INPUT_METHOD } from '../../../analytics/types/enums';
@@ -18,8 +19,8 @@ import DatePickerInput from './date-picker-input';
 const popupContentWrapper = css`
   padding: 2px;
   border-radius: ${borderRadius()}px;
-  box-shadow: 0 4px 8px -2px ${N60A}, 0 0 1px ${N60A};
-  background-color: ${N0};
+  box-shadow: ${token('elevation.shadow.overlay', `0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`)};
+  background-color: ${token('elevation.surface.overlay', N0)};
 `;
 
 class DatePicker extends React.Component {

package/dist/es2019/plugins/expand/ui/styles.js

@@ -2,40 +2,41 @@ import { css } from '@emotion/react';
 import { themed } from '@atlaskit/theme/components';
 import { gridSize } from '@atlaskit/theme/constants';
 import { R50, R300, N40A, N50A, N80A, DN50, R200 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { sharedExpandStyles } from '@atlaskit/editor-common/ui';
 import { SelectionStyle, getSelectionStyles, akLayoutGutterOffset, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { BreakoutCssClassName } from '../../breakout/constants';
 import { expandClassNames } from './class-names';
 const EXPAND_SELECTED_BACKGROUND = themed({
-  light: 'rgba(255, 255, 255, 0.6)',
-  dark: 'rgba(9, 10, 11, 0.29)'
+  light: token('color.background.neutral.subtle', 'rgba(255, 255, 255, 0.6)'),
+  dark: token('color.background.neutral.subtle', 'rgba(9, 10, 11, 0.29)')
 });
 
 const EXPAND_ICON_COLOR = props => css`
   color: ${themed({
-  light: N80A,
-  dark: '#d9dde3'
+  light: token('color.icon.subtle', N80A),
+  dark: token('color.icon.subtle', '#d9dde3')
 })(props)};
 `;
 
 const ACTIVE_STATE_BACKGROUND_COLOR = themed({
-  dark: `#0C294F4B`
+  dark: token('color.blanket.selected', `#0C294F4B`)
 });
 const ACTIVE_STATE_BORDER = themed({
-  dark: `1px solid #4794ff4B`
+  dark: `1px solid ${token('color.border.selected', `#4794ff4B`)}`
 });
 const ACTIVE_STATE_BORDER_RADIUS = themed({
   dark: '3px'
 });
 const DANGER_STATE_BACKGROUND_COLOR = themed({
-  light: R50,
-  dark: '#441C13'
+  light: token('color.background.danger', R50),
+  dark: token('color.background.danger', '#441C13')
 });
 const DANGER_STATE_BORDER = themed({
-  dark: `1px solid ${R200}`
+  dark: `1px solid ${token('color.border.danger', R200)}`
 });
 const DANGER_STATE_BORDER_COLOR = themed({
-  light: R300
+  light: token('color.border.danger', R300)
 });
 const DANGER_STATE_BORDER_RADIUS = themed({
   dark: '3px'
@@ -111,8 +112,8 @@ export const expandStyles = props => css`
   .${expandClassNames.expanded} {
     background: ${EXPAND_SELECTED_BACKGROUND(props)};
     border-color: ${themed({
-  light: N40A,
-  dark: DN50
+  light: token('color.border', N40A),
+  dark: token('color.border', DN50)
 })(props)};
 
     .${expandClassNames.content} {
@@ -153,8 +154,8 @@ export const expandStyles = props => css`
 
       &:hover {
         border-color: ${themed({
-  light: N50A,
-  dark: DN50
+  light: token('color.border', N50A),
+  dark: token('color.border', DN50)
 })(props)};
         background: ${EXPAND_SELECTED_BACKGROUND(props)};
       }

package/dist/es2019/plugins/extension/commands.js

@@ -28,10 +28,11 @@ export const clearEditingContext = createCommand({
     processParametersAfter: undefined
   }
 }, applyChange);
-export const forceAutoSave = value => createCommand({
+export const forceAutoSave = (resolve, reject) => createCommand({
   type: 'UPDATE_STATE',
   data: {
-    autoSaveResolve: value
+    autoSaveResolve: resolve,
+    autoSaveReject: reject
   }
 }, applyChange);
 export const showContextPanel = createCommand({

package/dist/es2019/plugins/extension/context-panel.js

@@ -29,6 +29,7 @@ export const getContextPanel = allowAutoSave => state => {
   const extensionState = getPluginState(state);
   const {
     autoSaveResolve,
+    autoSaveReject,
     showContextPanel,
     extensionProvider,
     processParametersBefore,
@@ -69,6 +70,7 @@ export const getContextPanel = allowAutoSave => state => {
             extensionProvider: extensionProvider,
             autoSave: allowAutoSave,
             autoSaveTrigger: autoSaveResolve,
+            autoSaveReject: autoSaveReject,
             onChange: async updatedParameters => {
               await onChangeAction(editorView, updatedParameters, parameters, nodeWithPos, onSaveStarted);
               onSaveEnded();
@@ -83,9 +85,15 @@ export const getContextPanel = allowAutoSave => state => {
             },
             onCancel: async () => {
               if (allowAutoSave) {
-                await new Promise(resolve => {
-                  forceAutoSave(resolve)(editorView.state, editorView.dispatch);
-                });
+                try {
+                  await new Promise((resolve, reject) => {
+                    forceAutoSave(resolve, reject)(editorView.state, editorView.dispatch);
+                  });
+                } catch (e) {
+                  // Even if the save failed, we should proceed with closing the panel
+                  // eslint-disable-next-line no-console
+                  console.error(`Autosave failed with error`, e);
+                }
               }
 
               clearEditingContext(editorView.state, editorView.dispatch);

package/dist/es2019/plugins/extension/ui/Extension/Extension/styles.js

@@ -3,6 +3,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { DN30, DN900, N30 } from '@atlaskit/theme/colors';
 import { wrapperDefault, padding } from '../styles';
+import { token } from '@atlaskit/tokens';
 const dataConsumerSelector = '[data-mark-type="dataConsumer"]';
 export const widerLayoutClassName = 'wider-layout';
 export const wrapperStyle = (theme, extensionWidth) => css`
@@ -45,13 +46,13 @@ export const header = css`
 export const content = theme => css`
   padding: ${padding}px;
   background: ${themed({
-  light: 'white',
-  dark: DN30
+  light: token('elevation.surface', 'white'),
+  dark: token('elevation.surface', DN30)
 })(theme)};
   color: ${themed({
-  dark: DN900
+  dark: token('color.text', DN900)
 })(theme)};
-  border: 1px solid ${N30};
+  border: 1px solid ${token('color.border', N30)};
   border-radius: ${borderRadius()}px;
   cursor: initial;
 `;

package/dist/es2019/plugins/extension/ui/Extension/InlineExtension/styles.js

@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { wrapperDefault } from '../styles';
+import { token } from '@atlaskit/tokens';
 export const wrapperStyle = theme => css`
   ${wrapperDefault(theme)}
 
@@ -22,6 +23,6 @@ export const wrapperStyle = theme => css`
 
   &.with-children {
     padding: 0;
-    background: white;
+    background: ${token('color.background.neutral.subtle', 'white')};
   }
 `;

package/dist/es2019/plugins/extension/ui/Extension/styles.js

@@ -4,29 +4,30 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N20, DN50, DN700, B200, N20A, N70 } from '@atlaskit/theme/colors';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 export const padding = gridSize();
 export const BODIED_EXT_PADDING = padding * 2;
 export const wrapperDefault = theme => css`
   background: ${themed({
-  light: N20,
-  dark: DN50
+  light: token('color.background.neutral', N20),
+  dark: token('color.background.neutral', DN50)
 })(theme)};
   border-radius: ${borderRadius()}px;
   color: ${themed({
-  dark: DN700
+  dark: token('color.text', DN700)
 })(theme)};
   position: relative;
   vertical-align: middle;
   font-size: ${relativeFontSizeToBase16(fontSize())};
 
   .ProseMirror-selectednode > span > & > .extension-overlay {
-    box-shadow: inset 0px 0px 0px 2px ${B200};
+    box-shadow: inset 0px 0px 0px 2px ${token('color.border.selected', B200)};
     opacity: 1;
   }
 
   &.with-overlay {
     .extension-overlay {
-      background: ${N20A};
+      background: ${token('color.background.neutral.hovered', N20A)};
       color: transparent;
     }
 
@@ -59,7 +60,7 @@ export const placeholderFallbackParams = css`
   display: inline-block;
   max-width: 200px;
   margin-left: 5px;
-  color: ${N70};
+  color: ${token('color.text.subtlest', N70)};
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;

package/dist/es2019/plugins/extension/ui/SaveIndicator/SaveIndicator.js

@@ -5,6 +5,7 @@ import { G300, N0 } from '@atlaskit/theme/colors';
 import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
 import { FormattedMessage } from 'react-intl-next';
 import { messages } from './messages';
+import { token } from '@atlaskit/tokens';
 
 const noop = () => {};
 
@@ -21,11 +22,10 @@ const saveIndicatorContent = css`
   align-items: center;
   padding: 6px 12px;
 
-  background: ${N0};
+  background: ${token('elevation.surface.overlay', N0)};
 
   /* E300 */
-  box-shadow: 0px 8px 12px rgba(9, 30, 66, 0.15),
-    0px 0px 1px rgba(9, 30, 66, 0.31);
+  box-shadow: ${token('elevation.shadow.overlay', `0px 8px 12px rgba(9, 30, 66, 0.15), 0px 0px 1px rgba(9, 30, 66, 0.31)`)};
   border-radius: 16px;
 `;
 const saveIndicatorText = css`
@@ -62,7 +62,7 @@ export const SaveIndicator = ({
     "data-testid": "save-indicator-content"
   }, jsx(CheckCircleIcon, {
     label: "Saving",
-    primaryColor: G300,
+    primaryColor: token('color.icon.success', G300),
     size: "small"
   }), jsx("span", {
     css: saveIndicatorText

package/dist/es2019/plugins/fake-text-cursor/styles.js

@@ -1,5 +1,6 @@
 import { css } from '@emotion/react';
 import { B75 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 export const fakeCursorStyles = css`
   .ProseMirror {
     .ProseMirror-fake-text-cursor {
@@ -13,14 +14,14 @@ export const fakeCursorStyles = css`
       display: inline;
       top: 0;
       position: absolute;
-      border-right: 1px solid rgba(0, 0, 0, 0.4);
+      border-right: 1px solid ${token('color.border', 'rgba(0, 0, 0, 0.4)')};
     }
 
     .ProseMirror-fake-text-selection {
       display: inline;
       pointer-events: none;
       position: relative;
-      background-color: ${B75};
+      background-color: ${token('color.background.selected', B75)};
     }
   }
 `;

package/dist/es2019/plugins/feature-flags-context/feature-flags-from-props.js

@@ -12,7 +12,7 @@ const safeNumberFeatureFlag = value => {
 
 
 export function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$featureFlags9, _props$featureFlags10, _props$allowTables5, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$collabEdit, _props$collabEdit2, _props$featureFlags34, _props$featureFlags35;
+  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$featureFlags9, _props$featureFlags10, _props$allowTables5, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$collabEdit, _props$collabEdit2, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37;
 
   const normalizedFeatureFlags = normalizeFeatureFlags(props.featureFlags);
   return { ...normalizedFeatureFlags,
@@ -49,6 +49,7 @@ export function createFeatureFlagsFromProps(props) {
     maxUnsafeChromeSpellcheckingVersion: safeNumberFeatureFlag((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.maxUnsafeChromeSpellcheckingVersion),
     useNativeCollabPlugin: Boolean(typeof ((_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.useNativePlugin) === 'boolean' ? !!((_props$collabEdit2 = props.collabEdit) !== null && _props$collabEdit2 !== void 0 && _props$collabEdit2.useNativePlugin) : false),
     chromeCursorHandlerFixedVersion: typeof ((_props$featureFlags34 = props.featureFlags) === null || _props$featureFlags34 === void 0 ? void 0 : _props$featureFlags34.chromeCursorHandlerFixedVersion) === 'string' ? Number(props.featureFlags.chromeCursorHandlerFixedVersion) || undefined : undefined,
-    viewChangingExperimentToolbarStyle: typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35['view-changing-experiment-toolbar-style']) === 'string' ? props.featureFlags['view-changing-experiment-toolbar-style'] || undefined : undefined
+    viewChangingExperimentToolbarStyle: typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35['view-changing-experiment-toolbar-style']) === 'string' ? props.featureFlags['view-changing-experiment-toolbar-style'] || undefined : undefined,
+    showHoverPreview: Boolean(typeof ((_props$featureFlags36 = props.featureFlags) === null || _props$featureFlags36 === void 0 ? void 0 : _props$featureFlags36.showHoverPreview) === 'boolean' ? !!((_props$featureFlags37 = props.featureFlags) !== null && _props$featureFlags37 !== void 0 && _props$featureFlags37.showHoverPreview) : false)
   };
 }

package/dist/es2019/plugins/find-replace/styles.js

@@ -1,16 +1,16 @@
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+// TODO: https://product-fabric.atlassian.net/browse/DSP-4290
 import { css } from '@emotion/react';
 import { B75, B200 } from '@atlaskit/theme/colors';
-export const searchMatchBgColour = B75;
-export const selectedSearchMatchBgColour = B200;
 export const searchMatchClass = 'search-match';
 export const selectedSearchMatchClass = 'selected-search-match';
 export const findReplaceStyles = css`
   .${searchMatchClass} {
-    background-color: ${searchMatchBgColour};
+    background-color: ${B75};
   }
 
   .${selectedSearchMatchClass} {
-    background-color: ${selectedSearchMatchBgColour};
+    background-color: ${B200};
     color: white;
   }
 `;

package/dist/es2019/plugins/find-replace/ui/styles.js

@@ -1,6 +1,7 @@
 /** @jsx jsx */
 import { css } from '@emotion/react';
 import { N60, N30A } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 export const replaceSectionButtonStyles = css({
   marginLeft: '4px'
@@ -8,7 +9,7 @@ export const replaceSectionButtonStyles = css({
 export const ruleStyles = css({
   width: '100%',
   border: 'none',
-  backgroundColor: `${N30A}`,
+  backgroundColor: `${token('color.border', N30A)}`,
   margin: '4px 0px',
   height: '1px',
   borderRadius: '1px'
@@ -35,7 +36,7 @@ export const sectionWrapperStyles = css`
   }
 `;
 export const countStyles = css({
-  color: `${N60}`,
+  color: `${token('color.text.subtlest', N60)}`,
   fontSize: `${relativeFontSizeToBase16(12)}`,
   flex: '0 0 auto',
   justifyContent: 'center',

package/dist/es2019/plugins/floating-toolbar/ui/DropdownMenu.js

@@ -9,6 +9,7 @@ import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import Tooltip from '@atlaskit/tooltip';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
+import { token } from '@atlaskit/tokens';
 export const menuItemDimensions = {
   width: 175,
   height: 32
@@ -96,7 +97,7 @@ class Dropdown extends Component {
 
     if (selected !== undefined) {
       return selected ? jsx(EditorDoneIcon, {
-        primaryColor: B400,
+        primaryColor: token('color.icon.selected', B400),
         size: "small",
         label: intl.formatMessage(messages.confirmModalOK)
       }) : jsx("span", {

package/dist/es2019/plugins/floating-toolbar/ui/EditorEmojiAddIcon.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { token } from '@atlaskit/tokens';
 export default function EditorEmojiAddIcon() {
   return /*#__PURE__*/React.createElement("svg", {
     width: 24,
@@ -9,7 +10,7 @@ export default function EditorEmojiAddIcon() {
   }, /*#__PURE__*/React.createElement("rect", {
     width: 24,
     height: 24,
-    fill: "white",
+    fill: token('color.background.neutral.subtle', 'white'),
     fillOpacity: "0.01"
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",

package/dist/es2019/plugins/floating-toolbar/ui/Separator.js

@@ -1,8 +1,9 @@
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 const separator = css`
-  background: ${N30};
+  background: ${token('color.border', N30)};
   width: 1px;
   height: 20px;
   margin: 0 4px;

package/dist/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -20,16 +20,16 @@ import { EmojiPickerButton } from './EmojiPickerButton';
 import Announcer from '../../../utils/announcer/announcer';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
+import { token } from '@atlaskit/tokens';
 const akGridSize = gridSize();
 
 const toolbarContainer = theme => css`
   background-color: ${themed({
-  light: 'white',
-  dark: DN70
+  light: token('elevation.surface.overlay', 'white'),
+  dark: token('elevation.surface.overlay', DN70)
 })(theme)};
   border-radius: ${borderRadius()}px;
-  box-shadow: 0 0 1px rgba(9, 30, 66, 0.31),
-    0 4px 8px -2px rgba(9, 30, 66, 0.25);
+  box-shadow: ${token('elevation.shadow.overlay', `0 0 1px rgba(9, 30, 66, 0.31), 0 4px 8px -2px rgba(9, 30, 66, 0.25)`)};
   padding: ${akGridSize / 2}px ${akGridSize}px;
   display: flex;
   line-height: 1;

package/dist/es2019/plugins/floating-toolbar/ui/styles.js

@@ -1,5 +1,6 @@
 import * as colors from '@atlaskit/theme/colors';
 import { hexToRgba } from '@atlaskit/adf-schema';
+import { token } from '@atlaskit/tokens';
 const background = {
   danger: {
     default: {
@@ -7,28 +8,28 @@ const background = {
       dark: 'inherit'
     },
     hover: {
-      light: colors.N30A,
-      dark: colors.N30A
+      light: token('color.background.neutral.subtle.hovered', colors.N30A),
+      dark: token('color.background.neutral.subtle.hovered', colors.N30A)
     },
     active: {
-      light: hexToRgba(colors.B75, 0.6),
-      dark: hexToRgba(colors.B75, 0.6)
+      light: token('color.background.neutral.pressed', `${hexToRgba(colors.B75, 0.6)}`),
+      dark: token('color.background.neutral.pressed', `${hexToRgba(colors.B75, 0.6)}`)
     }
   }
 };
 const color = {
   danger: {
     default: {
-      light: colors.N400,
-      dark: colors.DN400
+      light: token('color.icon', colors.N400),
+      dark: token('color.icon', colors.DN400)
     },
     hover: {
-      light: colors.R400,
-      dark: colors.R400
+      light: token('color.icon.danger', colors.R400),
+      dark: token('color.icon.danger', colors.R400)
     },
     active: {
-      light: colors.R400,
-      dark: colors.R400
+      light: token('color.icon.danger', colors.R400),
+      dark: token('color.icon.danger', colors.R400)
     }
   }
 };

package/dist/es2019/plugins/grid/styles.js

@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
 import { N30A, B200 } from '@atlaskit/theme/colors';
 import { akEditorGridLineZIndex } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 export const GRID_GUTTER = 12;
 export const gridStyles = css`
   .gridParent {
@@ -18,8 +19,9 @@ export const gridStyles = css`
     pointer-events: none;
   }
 
+  // TODO: https://product-fabric.atlassian.net/browse/DSP-4352
   .gridLine {
-    border-left: 1px solid ${N30A};
+    border-left: 1px solid ${token('color.border', N30A)};
     display: inline-block;
     box-sizing: border-box;
     height: 100%;
@@ -30,6 +32,6 @@ export const gridStyles = css`
   }
 
   .highlight {
-    border-left: 1px solid ${B200};
+    border-left: 1px solid ${token('color.border.focused', B200)};
   }
 `;

package/dist/es2019/plugins/help-dialog/ui/styles.js

@@ -2,6 +2,7 @@ import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
 import * as colors from '@atlaskit/theme/colors';
 import { akEditorUnitZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 export const header = css`
   z-index: ${akEditorUnitZIndex};
   min-height: 24px;
@@ -11,15 +12,15 @@ export const header = css`
   justify-content: space-between;
   align-items: center;
   box-shadow: 'none';
-  color: ${colors.N400};
-  background-color: ${colors.N0};
+  color: ${token('color.text', colors.N400)};
+  background-color: ${token('color.background.neutral.subtle', colors.N0)};
   border-radius: ${borderRadius()}px;
 `;
 export const footer = css`
   z-index: ${akEditorUnitZIndex};
   font-size: ${relativeFontSizeToBase16(14)};
   line-height: 20px;
-  color: ${colors.N300};
+  color: ${token('color.text.subtlest', colors.N300)};
   padding: 24px;
   text-align: right;
   box-shadow: 'none';
@@ -29,11 +30,11 @@ export const contentWrapper = css`
   border-bottom-right-radius: ${borderRadius()}px;
   overflow: auto;
   position: relative;
-  color: ${colors.N400};
-  background-color: ${colors.N0};
+  color: ${token('color.text.subtle', colors.N400)};
+  background-color: ${token('color.background.neutral.subtle', colors.N0)};
 `;
 export const line = css`
-  background: #fff;
+  background: ${token('color.background.neutral.subtle', '#fff')};
   content: '';
   display: block;
   height: 2px;
@@ -67,7 +68,7 @@ export const title = css`
   font-weight: 400;
 `;
 export const codeSm = css`
-  background-color: ${colors.N20};
+  background-color: ${token('color.background.neutral', colors.N20)};
   border-radius: ${borderRadius()}px;
   width: 24px;
   display: inline-block;
@@ -76,7 +77,7 @@ export const codeSm = css`
   text-align: center;
 `;
 export const codeMd = css`
-  background-color: ${colors.N20};
+  background-color: ${token('color.background.neutral', colors.N20)};
   border-radius: ${borderRadius()}px;
   display: inline-block;
   height: 24px;
@@ -85,7 +86,7 @@ export const codeMd = css`
   text-align: center;
 `;
 export const codeLg = css`
-  background-color: ${colors.N20};
+  background-color: ${token('color.background.neutral', colors.N20)};
   border-radius: ${borderRadius()}px;
   display: inline-block;
   height: 24px;