@atlaskit/editor-core 166.0.4 → 167.0.2

package/dist/es2019/ui/ConfigPanel/Fields/CheckboxGroup.js

@@ -5,6 +5,7 @@ import { Fragment, useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
 import { Checkbox as AKCheckbox } from '@atlaskit/checkbox';
 import { Field, Fieldset as AKFieldset } from '@atlaskit/form';
+import { token } from '@atlaskit/tokens';
 import { ValidationError } from '../types';
 import FieldMessages from '../FieldMessages';
 
@@ -15,7 +16,7 @@ function validate(value, isRequired) {
 }
 
 const requiredIndicator = css`
-  color: #bf2600;
+  color: ${token('color.text.danger', '#bf2600')};
 `;
 
 function CheckboxGroupInner({

package/dist/es2019/ui/ConfigPanel/Fields/Expand.js

@@ -3,13 +3,14 @@ import React, { useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { N40 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronRightIcon from '@atlaskit/icon/glyph/chevron-right';
 import Button from '@atlaskit/button';
 import { gridSize } from '@atlaskit/theme/constants';
 import { messages } from '../messages';
 export const expandContainer = css`
-  border-bottom: 1px solid ${N40};
+  border-bottom: 1px solid ${token('color.border', N40)};
 `;
 export const expandControl = css`
   display: flex;

package/dist/es2019/ui/ConfigPanel/Fields/Fieldset.js

@@ -14,8 +14,9 @@ import FormContent from '../FormContent';
 import { getNameFromDuplicateField, isDuplicateField } from '../utils';
 import { gridSize } from '@atlaskit/theme/constants';
 import { N40A } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 const actionsWrapper = css`
-  border-top: 1px solid ${N40A};
+  border-top: 1px solid ${token('color.border', N40A)};
   margin-top: ${gridSize() * 2}px;
   padding-top: ${gridSize() * 2}px;
 `;

package/dist/es2019/ui/ConfigPanel/Fields/common/RequiredIndicator.js

@@ -1,5 +1,6 @@
 import { css } from '@emotion/react';
 import { R500 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 export const requiredIndicator = css`
-  color: ${R500};
+  color: ${token('color.text.danger', R500)};
 `;

package/dist/es2019/ui/ConfigPanel/Header.js

@@ -7,6 +7,7 @@ import Button from '@atlaskit/button/custom-theme-button';
 import CrossIcon from '@atlaskit/icon/glyph/cross';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N200 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { messages } from './messages';
 const iconWidth = 40;
@@ -21,7 +22,7 @@ const itemIcon = css`
   width: ${iconWidth}px;
   height: ${iconWidth}px;
   overflow: hidden;
-  border: 1px solid rgba(223, 225, 229, 0.5); /* N60 at 50% */
+  border: 1px solid ${token('color.border', 'rgba(223, 225, 229, 0.5)')}; /* N60 at 50% */
   border-radius: ${borderRadius()}px;
   box-sizing: border-box;
 
@@ -54,7 +55,7 @@ const itemText = css`
   white-space: initial;
   .item-summary {
     font-size: ${relativeFontSizeToBase16(11.67)};
-    color: ${N200};
+    color: ${token('color.text.subtlest', N200)};
     margin-top: 4px;
 
     white-space: nowrap;

package/dist/es2019/ui/ConfigPanel/NestedForms/RemovableField.js

@@ -5,7 +5,8 @@ import { injectIntl } from 'react-intl-next';
 import { gridSize } from '@atlaskit/theme/constants';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import Tooltip from '@atlaskit/tooltip';
-import * as colors from '@atlaskit/theme/colors';
+import { N80, R300 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { messages } from '../messages';
 const removableFieldWrapper = css`
   position: relative;
@@ -20,10 +21,10 @@ const removeButtonWrapper = css`
   top: 0;
   cursor: pointer;
 
-  color: ${colors.N80};
+  color: ${token('color.icon.subtle', N80)};
 
   &:hover {
-    color: ${colors.R300};
+    color: ${token('color.icon.danger', R300)};
   }
 `;
 

package/dist/es2019/ui/ContentStyles/index.js

@@ -3,6 +3,7 @@ import React, { useMemo } from 'react';
 import { jsx, css, useTheme } from '@emotion/react';
 import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles, textColorStyles } from '@atlaskit/editor-common/styles';
 import { editorFontSize } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 import { unsupportedStyles } from '../../plugins/unsupported-content/styles';
 import { telepointerStyle } from '../../plugins/collab-edit/styles';
 import { gapCursorStyles } from '../../plugins/selection/gap-cursor/styles';
@@ -69,7 +70,7 @@ const contentStyles = props => {
   }
 
   .ProseMirror-selectednode:empty {
-    outline: 2px solid #8cf;
+    outline: 2px solid ${token('color.border.focused', '#8cf')};
   }
 
   ${placeholderTextStyles}
@@ -135,7 +136,7 @@ const contentStyles = props => {
 
   .pm-table-header-content-wrap,
   .pm-table-cell-content-wrap div.fabric-editor-block-mark {
-    p:first-child {
+    p:first-of-type {
       margin-top: 0;
     }
   }

package/dist/es2019/ui/ContextPanel/index.js

@@ -13,6 +13,7 @@ import { pluginKey as contextPanelPluginKey } from '../../plugins/context-panel'
 import { pluginKey as widthPluginKey } from '../../plugins/width';
 import WithEditorActions from '../WithEditorActions';
 import { getChildBreakoutModes } from '../../utils/document';
+import { token } from '@atlaskit/tokens';
 const ANIM_SPEED_MS = 500;
 const EDITOR_WIDTH = akEditorDefaultLayoutWidth + akEditorBreakoutPadding;
 const WIDE_EDITOR_WIDTH = akEditorWideLayoutWidth + akEditorBreakoutPadding;
@@ -42,7 +43,7 @@ export const panel = css`
   height: 100%;
   transition: width ${ANIM_SPEED_MS}ms ${akEditorSwoopCubicBezier};
   overflow: hidden;
-  box-shadow: inset 2px 0 0 0 ${N30};
+  box-shadow: inset 2px 0 0 0 ${token('color.border', N30)};
 `;
 export const content = css`
   transition: width 600ms ${akEditorSwoopCubicBezier};

package/dist/es2019/ui/DropdownMenu/index.js

@@ -21,6 +21,9 @@ const DropListWithOutsideListeners = withOuterListeners(DropList);
 /**
  * Hack for item to imitate old dropdown-menu selected styles
  */
+// TODO: https://product-fabric.atlassian.net/browse/DSP-4500
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 
 const itemWrapper = css`
   && > span,
@@ -29,6 +32,8 @@ const itemWrapper = css`
     color: #fff;
   }
 `;
+/* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
+
 const itemContentWrapper = css`
   margin-left: 8px;
 `;

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -18,6 +18,7 @@ import { getFeaturedQuickInsertItems, searchQuickInsertItems } from '../../plugi
 import { insertItem } from '../../plugins/quick-insert/commands';
 import ElementBrowser from './components/ElementBrowserLoader';
 import { ELEMENT_ITEM_HEIGHT } from './constants';
+import { token } from '@atlaskit/tokens';
 
 const InsertMenu = ({
   editorView,
@@ -154,11 +155,13 @@ const insertMenuWrapper = (theme, itemCount) => css`
   itemCount
 })}px;
   background-color: ${themed({
-  light: N0,
-  dark: DN50
+  light: token('elevation.surface.overlay', N0),
+  dark: token('elevation.surface.overlay', DN50)
 })(theme)};
   border-radius: ${borderRadius()}px;
-  box-shadow: 0 0 0 1px ${N30A}, 0 2px 1px ${N30A}, 0 0 20px -6px ${N60A};
+  box-shadow: ${token('elevation.shadow.overlay', `0 0 0 1px ${N30A},
+    0 2px 1px ${N30A},
+    0 0 20px -6px ${N60A}`)};
 `;
 
 const itemBefore = css`

package/dist/es2019/ui/ElementBrowser/ModalElementBrowser.js

@@ -12,6 +12,7 @@ import ElementBrowser from './components/ElementBrowserLoader';
 import { getCategories } from './categories';
 import { MODAL_WRAPPER_PADDING } from './constants';
 import { messages } from './messages';
+import { token } from '@atlaskit/tokens';
 const actions = css`
   display: inline-flex;
   margin: 0 -4px;
@@ -27,8 +28,8 @@ const wrapper = css`
   padding: ${MODAL_WRAPPER_PADDING}px ${MODAL_WRAPPER_PADDING}px 0 10px;
   overflow: hidden;
   background-color: ${themed({
-  light: N0,
-  dark: DN50
+  light: token('elevation.surface.overlay', N0),
+  dark: token('elevation.surface.overlay', DN50)
 })()};
   border-radius: ${borderRadius()}px;
 `;

package/dist/es2019/ui/ElementBrowser/components/CategoryList.js

@@ -9,6 +9,7 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { DEVICE_BREAKPOINT_NUMBERS, GRID_SIZE } from '../constants';
 import useFocus from '../hooks/use-focus';
 import { fireAnalyticsEvent, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, ACTION } from '../../../plugins/analytics';
+import { token } from '@atlaskit/tokens';
 
 function CategoryList({
   categories = [],
@@ -71,9 +72,9 @@ function CategoryListItem({
         marginLeft: '2px',
         height: '100%',
         width: '100%',
-        color: category.name !== selectedCategory ? N800 : B400,
+        color: category.name !== selectedCategory ? token('color.text', N800) : token('color.text.selected', B400),
         ...(category.name === selectedCategory && {
-          background: B50
+          background: token('color.background.selected', B50)
         })
       },
       ...rest

package/dist/es2019/ui/ElementBrowser/components/ElementList/ElementList.js

@@ -11,6 +11,7 @@ import Item from '@atlaskit/item';
 import { B100, N20, N200 } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '../../../../plugins/analytics';
 import IconFallback from '../../../../plugins/quick-insert/assets/fallback';
@@ -131,11 +132,16 @@ const getStyles = memoizeOne(mode => {
       }
     },
     borderRadius: GRID_SIZE / 2,
+    // TODO: apply a different background for when a selected item is hovered.
+    // Not possible due to current implementation of @atlaskit/item component.
     selected: {
-      background: N20
+      background: token('color.background.selected', N20)
     },
     hover: {
-      background: 'rgb(244, 245, 247)'
+      background: token('color.background.neutral.subtle.hovered', 'rgb(244, 245, 247)')
+    },
+    active: {
+      background: token('color.background.neutral.subtle.pressed', 'rgb(244, 245, 247)')
     },
     beforeItemSpacing: {
       default: GRID_SIZE * 1.5
@@ -293,7 +299,8 @@ const elementItemsWrapper = css`
     outline: none;
 
     :focus {
-      box-shadow: 0 0 0 ${ELEMENT_LIST_PADDING}px ${B100};
+      box-shadow: 0 0 0 ${ELEMENT_LIST_PADDING}px
+        ${token('color.border.focused', B100)};
     }
   }
   .ReactVirtualized__Collection__innerScrollContainer {
@@ -314,7 +321,7 @@ const elementItemWrapper = css`
      * manually setting it to take 100% of parent.
      */
   span {
-    span:nth-child(2) {
+    span:nth-of-type(2) {
       max-height: 100%;
     }
   }
@@ -344,7 +351,7 @@ const itemDescription = css`
 
   overflow: hidden;
   font-size: ${relativeFontSizeToBase16(11.67)};
-  color: ${N200};
+  color: ${token('color.text.subtle', N200)};
   margin-top: 2px;
 `;
 const itemText = css`

package/dist/es2019/ui/ElementBrowser/components/ElementList/EmptyState.js

@@ -3,6 +3,7 @@ import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import NotFoundIllustration from './NotFoundIllustration';
+import { token } from '@atlaskit/tokens';
 export default function EmptyState({
   onExternalLinkClick
 }) {
@@ -36,7 +37,7 @@ export default function EmptyState({
 const emptyStateHeading = css`
   font-size: 1.42857em;
   line-height: 1.2;
-  color: rgb(23, 43, 77);
+  color: ${token('color.text', 'rgb(23, 43, 77)')};
   font-weight: 500;
   letter-spacing: -0.008em;
   margin-top: 28px;

package/dist/es2019/ui/ElementBrowser/components/ElementList/NotFoundIllustration.js

@@ -1,3 +1,6 @@
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+// TODO: https://product-fabric.atlassian.net/browse/DSP-4249
+
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 const imageContainer = css`

package/dist/es2019/ui/ElementBrowser/components/ElementSearch.js

@@ -11,6 +11,7 @@ import { GRID_SIZE, SEARCH_ITEM_HEIGHT_WIDTH } from '../constants';
 import useFocus from '../hooks/use-focus';
 import { Modes } from '../types';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens';
 
 function ElementSearch({
   onSearch,
@@ -101,7 +102,7 @@ const wrapperInline = css`
 `;
 const elementBeforeInput = css`
   margin: 1px 6px 0 8px;
-  color: ${N200};
+  color: ${token('color.icon', N200)};
 
   // Custom SearchIcon style
   span,

package/dist/es2019/ui/ElementBrowser/constants.js

@@ -1,3 +1,4 @@
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
 import { gridSize } from '@atlaskit/theme/constants';
 export const GRID_SIZE = gridSize();
 export const DEVICE_BREAKPOINT_NUMBERS = {
@@ -16,7 +17,8 @@ export const SIDEBAR_HEADING_PADDING_LEFT = '12px';
 export const INLINE_SIDEBAR_HEIGHT = '54px';
 export const SEARCH_ITEM_MARGIN = '12px';
 export const SEARCH_ITEM_HEIGHT_WIDTH = '20px';
-export const SCROLLBAR_WIDTH = GRID_SIZE;
+export const SCROLLBAR_WIDTH = GRID_SIZE; // TODO: https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-365
+
 export const SCROLLBAR_THUMB_COLOR = '#eeeeee';
 export const SCROLLBAR_TRACK_COLOR = 'rgba(255, 255, 255, 0)';
 export const ELEMENT_LIST_PADDING = 2;

package/dist/es2019/ui/FloatingToolbar/styles.js

@@ -1,15 +1,15 @@
 import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
-import { N0 } from '@atlaskit/theme/colors';
-import { dropShadow } from '../styles';
+import { N0, N50A, N60A } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 export const container = height => css`
   border-radius: ${borderRadius()}px;
-  ${dropShadow}
+  box-shadow: ${token('elevation.shadow.overlay', `0 12px 24px -6px ${N50A}, 0 0 1px ${N60A}`)};
   display: flex;
   align-items: center;
   box-sizing: border-box;
   padding: 4px 8px;
-  background-color: ${N0};
+  background-color: ${token('color.background.input', N0)};
   ${height ? css`
         height: ${height}px;
       ` : ''};

package/dist/es2019/ui/LinkSearch/LinkSearchListItem.js

@@ -6,6 +6,7 @@ import { css, jsx } from '@emotion/react'; // AFP-2532 TODO: Fix automatic suppr
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 
 import { fontSizeSmall } from '@atlaskit/theme';
+import { token } from '@atlaskit/tokens';
 import { N20, N300, N800 } from '@atlaskit/theme/colors';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { getCorrectAltByIconUrl } from './listItemAlts';
@@ -19,20 +20,20 @@ export const container = css`
   margin-top: 0;
 `;
 export const containerSelected = css`
-  background-color: ${N20};
+  background-color: ${token('color.background.neutral.subtle.hovered', N20)};
 `;
 const nameWrapper = css`
   overflow: hidden;
 `;
 export const nameStyle = css`
-  color: ${N800};
+  color: ${token('color.text', N800)};
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   line-height: 20px;
 `;
 export const containerName = css`
-  color: ${N300};
+  color: ${token('color.text.subtlest', N300)};
   line-height: 14px;
   font-size: ${relativeFontSizeToBase16(fontSizeSmall())};
 `;

package/dist/es2019/ui/PanelTextInput/styles.js

@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
-import { N400, N800 } from '@atlaskit/theme/colors';
-import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles'; // Normal .className gets overridden by input[type=text] hence this hack to produce input.className
+import { N400, N100 } from '@atlaskit/theme/colors';
+import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+import { token } from '@atlaskit/tokens'; // Normal .className gets overridden by input[type=text] hence this hack to produce input.className
 
 export const panelTextInput = css`
   input& {
@@ -8,7 +9,7 @@ export const panelTextInput = css`
     border: 0;
     border-radius: 0;
     box-sizing: content-box;
-    color: ${N400};
+    color: ${token('color.text.subtle', N400)};
     flex-grow: 1;
     font-size: ${relativeFontSizeToBase16(13)};
     line-height: 20px;
@@ -25,8 +26,7 @@ export const panelTextInput = css`
     }
 
     &::placeholder {
-      color: ${N800};
-      opacity: 0.5;
+      color: ${token('color.text.subtlest', N100)};
     }
   }
 `;

package/dist/es2019/ui/PluginSlot/index.js

@@ -51,9 +51,10 @@ export default class PluginSlot extends React.Component {
       popupsBoundariesElement,
       popupsScrollableElement,
       containerElement,
-      disabled
+      disabled,
+      wrapperElement
     } = this.props;
-    return !(nextProps.editorView === editorView && nextProps.editorActions === editorActions && nextProps.items === items && nextProps.providerFactory === providerFactory && nextProps.eventDispatcher === eventDispatcher && nextProps.popupsMountPoint === popupsMountPoint && nextProps.popupsBoundariesElement === popupsBoundariesElement && nextProps.popupsScrollableElement === popupsScrollableElement && nextProps.containerElement === containerElement && nextProps.disabled === disabled);
+    return !(nextProps.editorView === editorView && nextProps.editorActions === editorActions && nextProps.items === items && nextProps.providerFactory === providerFactory && nextProps.eventDispatcher === eventDispatcher && nextProps.popupsMountPoint === popupsMountPoint && nextProps.popupsBoundariesElement === popupsBoundariesElement && nextProps.popupsScrollableElement === popupsScrollableElement && nextProps.containerElement === containerElement && nextProps.disabled === disabled && nextProps.wrapperElement === wrapperElement);
   }
 
   componentDidMount() {
@@ -84,7 +85,8 @@ export default class PluginSlot extends React.Component {
       popupsScrollableElement,
       containerElement,
       disabled,
-      dispatchAnalyticsEvent
+      dispatchAnalyticsEvent,
+      wrapperElement
     } = this.props;
 
     if (!items || !editorView) {
@@ -111,7 +113,8 @@ export default class PluginSlot extends React.Component {
         popupsBoundariesElement,
         popupsScrollableElement,
         containerElement,
-        disabled
+        disabled,
+        wrapperElement
       });
       return element && /*#__PURE__*/React.cloneElement(element, props);
     })));

package/dist/es2019/ui/Toolbar/ToolbarInner.js

@@ -56,7 +56,8 @@ export class ToolbarInner extends React.Component {
         isToolbarReducedSpacing,
         containerElement,
         isLastItem: key === items.length - 1,
-        dispatchAnalyticsEvent
+        dispatchAnalyticsEvent,
+        wrapperElement: null
       });
       return element && /*#__PURE__*/React.cloneElement(element, props);
     }));

package/dist/es2019/ui/Toolbar/ToolbarWithSizeDetector.js

@@ -9,6 +9,7 @@ import { useElementWidth } from './hooks';
 import { widthToToolbarSize, toolbarSizeToWidth } from './toolbar-size';
 import { Toolbar } from './Toolbar';
 import { ToolbarSize } from './types';
+import { isFullPage } from '../../utils/is-full-page';
 const toolbar = css`
   width: 100%;
   position: relative;
@@ -27,10 +28,11 @@ export const ToolbarWithSizeDetector = props => {
   });
   const toolbarSize = typeof width === 'undefined' && typeof elementWidth === 'undefined' ? undefined : widthToToolbarSize(width || elementWidth, props.appearance);
   const toolbarStyle = useMemo(() => {
-    const toolbarMinWidth = toolbarSizeToWidth(ToolbarSize.M, props.appearance);
+    const toolbarWidth = isFullPage(props.appearance) && props.twoLineEditorToolbar ? ToolbarSize.S : ToolbarSize.M;
+    const toolbarMinWidth = toolbarSizeToWidth(toolbarWidth, props.appearance);
     const minWidth = `min-width: ${props.hasMinWidth ? toolbarMinWidth : '254'}px`;
     return [toolbar, minWidth];
-  }, [props.appearance, props.hasMinWidth]);
+  }, [props.appearance, props.hasMinWidth, props.twoLineEditorToolbar]);
   return jsx("div", {
     css: toolbarStyle
   }, jsx(WidthObserver, {

package/dist/es2019/ui/ToolbarFeedback/styles.js

@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N60A, N400, P400 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 export const buttonContent = css`
   display: flex;
@@ -13,9 +14,9 @@ export const wrapper = css`
   margin-right: 0;
 `;
 export const confirmationPopup = css`
-  background: #fff;
+  background: ${token('elevation.surface.overlay', '#fff')};
   border-radius: ${borderRadius()}px;
-  box-shadow: 0 4px 8px -2px ${N60A}, 0 0 1px ${N60A};
+  box-shadow: ${token('elevation.shadow.overlay', `0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`)};
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
@@ -28,7 +29,7 @@ export const confirmationText = css`
   font-size: ${relativeFontSizeToBase16(14)};
   word-spacing: 4px;
   line-height: 22px;
-  color: ${N400};
+  color: ${token('color.text.subtle', N400)};
   margin-top: 30px;
   padding: 20px;
   & > div {
@@ -42,7 +43,7 @@ export const confirmationText = css`
   }
 `;
 export const confirmationHeader = css`
-  background-color: ${P400};
+  background-color: ${token('color.background.discovery.bold', P400)};
   height: 100px;
   width: 100%;
   display: inline-block;

package/dist/es2019/ui/WithFlash/index.js

@@ -4,20 +4,21 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { css, jsx, keyframes } from '@emotion/react';
 import { R100 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 const pulseBackground = keyframes`
   50% {
-    background-color: ${R100};
+    background-color: ${token('color.blanket.danger', R100)};
   }
 `;
 const pulseBackgroundReverse = keyframes`
   0% {
-    background-color: ${R100};
+    background-color: ${token('color.blanket.danger', R100)};
   }
   50% {
     background-color: auto;
   }
   100% {
-    background-color: ${R100};
+    background-color: ${token('color.blanket.danger', R100)};
   }
 `;
 const flashWrapper = css`

package/dist/es2019/ui/styles.js

@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
 import { gridSize, borderRadius } from '@atlaskit/theme/constants';
 import { N30, N100 } from '@atlaskit/theme/colors';
+import { token } from '@atlaskit/tokens';
 import { akEditorMobileMaxWidth, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 const akGridSize = gridSize() + 'px';
 export const buttonGroupStyle = css`
@@ -12,7 +13,7 @@ export const buttonGroupStyle = css`
   }
 `;
 export const separatorStyles = css`
-  background: ${N30};
+  background: ${token('color.border', N30)};
   width: 1px;
   height: 24px;
   display: inline-block;
@@ -58,9 +59,9 @@ export const buttonContentReducedSpacingStyle = css`
 `; // Taken from the style of inline dialog components
 
 export const dropShadow = css`
-  box-shadow: 0 0 1px rgba(9, 30, 66, 0.31),
-    0 4px 8px -2px rgba(9, 30, 66, 0.25);
-`; // TODO change to use emotion css
+  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)`)};
+`; // TODO: https://product-fabric.atlassian.net/browse/DSP-4494
 
 export const scrollbarStyles = `
   -ms-overflow-style: -ms-autohiding-scrollbar;
@@ -75,21 +76,21 @@ export const scrollbarStyles = `
   }
 
   &::-webkit-scrollbar-thumb {
-    background-color: rgba(0, 0, 0, 0);
+    background-color: ${token('color.background.neutral.subtle', 'rgba(0, 0, 0, 0)')};
   }
 
   &:hover::-webkit-scrollbar-thumb {
-    background-color: rgba(0, 0, 0, 0.2);
+    background-color: ${token('color.background.neutral.bold', 'rgba(0, 0, 0, 0.2)')};
     border-radius: ${akGridSize};
   }
 
   &::-webkit-scrollbar-thumb:hover {
-    background-color: rgba(0, 0, 0, 0.4);
+    background-color: ${token('color.background.neutral.bold.hovered', 'rgba(0, 0, 0, 0.4)')};
   }
 `;
 export const shortcutStyle = css`
-  background-color: rgba(223, 225, 229, 0.5); /* N60 at 50% */
-  color: ${N100};
+  background-color: ${token('color.background.neutral', 'rgba(223, 225, 229, 0.5)')}; /* N60 at 50% */
+  color: ${token('color.text.subtle', N100)};
   border-radius: ${borderRadius()}px;
   padding: 4px;
   line-height: 12px;