@atlaskit/user-picker 9.7.3 → 9.7.4

package/dist/es2019/components/EmailOption/main.js

@@ -4,7 +4,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import { jsx } from '@emotion/react';
 import { AddOptionAvatar } from '../AddOptionAvatar';
 import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
@@ -28,13 +27,13 @@ export class EmailOption extends React.PureComponent {
       } = this.props;
       return jsx("span", {
         key: "name",
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text, ${N800})`)
       }, id);
     });
 
     _defineProperty(this, "renderSecondaryText", label => {
       return jsx("span", {
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
       }, label);
     });
 

package/dist/es2019/components/ExternalUserOption/ExternalAvatarItemOption.js

@@ -1,7 +1,6 @@
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 import { B400 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 
 const outerWrapper = isDisabled => css({
   alignItems: 'center',
@@ -12,7 +11,7 @@ const outerWrapper = isDisabled => css({
   margin: 0,
   width: '100%',
   cursor: isDisabled ? 'not-allowed' : 'pointer',
-  opacity: isDisabled ? token('opacity.disabled', '0.4') : undefined
+  opacity: isDisabled ? "var(--ds-opacity-disabled, 0.4)" : undefined
 });
 
 const detailsWrapper = css({
@@ -31,14 +30,14 @@ const textSection = css({
 
 const getTextStyle = isSecondary => {
   const secondaryCssArgs = isSecondary ? {
-    color: token('color.text.selected', B400),
+    color: `var(--ds-text-selected, ${B400})`,
     fontSize: '0.85em'
   } : {};
   return css({
     display: 'flex',
     maxWidth: '100%',
     margin: 0,
-    color: token('color.text.selected', B400),
+    color: `var(--ds-text-selected, ${B400})`,
     ...{
       secondaryCssArgs
     },

package/dist/es2019/components/ExternalUserOption/InfoIcon.js

@@ -3,7 +3,6 @@ import { useCallback, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import EditorPanelIcon from '@atlaskit/icon/glyph/editor/panel';
 import { N50, N200 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 const wrapper = css({
   display: 'flex'
 });
@@ -19,6 +18,6 @@ export default (() => {
     testId: "source-icon",
     label: "",
     size: "large",
-    primaryColor: token('color.text.subtlest', isMouseHovered ? N200 : N50)
+    primaryColor: `var(--ds-text-subtlest, ${isMouseHovered ? N200 : N50})`
   }));
 });

package/dist/es2019/components/ExternalUserOption/main.js

@@ -4,7 +4,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import Tooltip from '@atlaskit/tooltip';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireEventInElementsChannel, userInfoEvent } from '../../analytics';
@@ -38,7 +37,7 @@ class ExternalUserOptionImpl extends React.PureComponent {
       } = this.props;
       return jsx("span", {
         key: "name",
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text, ${N800})`)
       }, name);
     });
 
@@ -54,7 +53,7 @@ class ExternalUserOptionImpl extends React.PureComponent {
       const [emailUser, emailDomain] = email.split('@');
       const emailDomainWithAt = `@${emailDomain}`;
       return jsx("span", {
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
       }, emailUser, jsx("span", {
         css: emailDomainWrapper
       }, emailDomainWithAt));

package/dist/es2019/components/GroupOption/main.js

@@ -5,7 +5,6 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import { css, jsx } from '@emotion/react';
 import { N20, B400, N800, N200 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import PeopleIcon from '@atlaskit/icon/glyph/people';
 import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
 import { messages } from '../i18n';
@@ -13,7 +12,7 @@ import { HighlightText } from '../HighlightText';
 export const groupOptionIconWrapper = css({
   padding: '2px',
   '> span': {
-    backgroundColor: token('color.background.neutral', N20),
+    backgroundColor: `var(--ds-background-neutral, ${N20})`,
     borderRadius: '50%',
     padding: '4px'
   }
@@ -32,7 +31,7 @@ export class GroupOption extends React.PureComponent {
       } = this.props;
       return [jsx("span", {
         key: "name",
-        css: textWrapper(isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text, ${N800})`)
       }, jsx(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -50,7 +49,7 @@ export class GroupOption extends React.PureComponent {
         isSelected
       } = this.props;
       return jsx("span", {
-        css: textWrapper(isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
       }, jsx(FormattedMessage, messages.groupByline));
     });
 

package/dist/es2019/components/PopupControl.js

@@ -1,7 +1,6 @@
 /** @jsx jsx */
 import React from 'react';
 import { themed } from '@atlaskit/theme/components';
-import { token } from '@atlaskit/tokens';
 import { gridSize } from '@atlaskit/theme/constants';
 import { components } from '@atlaskit/select';
 import { css, jsx } from '@emotion/react';
@@ -17,8 +16,8 @@ const controlWrapper = css({
   padding: `0px ${spacing}px ${spacing}px`
 });
 const getColor = themed({
-  light: token('color.text.subtlest', N200),
-  dark: token('color.text.subtlest', DN90)
+  light: `var(--ds-text-subtlest, ${N200})`,
+  dark: `var(--ds-text-subtlest, ${DN90})`
 });
 
 const getLabelStyle = () => {

package/dist/es2019/components/TeamOption/main.js

@@ -3,7 +3,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 /** @jsx jsx */
 import { B400, N800, N200 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import { jsx } from '@emotion/react';
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
@@ -24,7 +23,7 @@ export class TeamOption extends React.PureComponent {
       } = this.props;
       return [jsx("span", {
         key: "name",
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text, ${N800})`)
       }, jsx(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -67,7 +66,7 @@ export class TeamOption extends React.PureComponent {
     });
 
     _defineProperty(this, "getBylineComponent", (isSelected, message) => jsx("span", {
-      css: textWrapper(isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+      css: textWrapper(isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
     }, message));
 
     _defineProperty(this, "renderAvatar", () => {
@@ -96,7 +95,7 @@ export class TeamOption extends React.PureComponent {
       }
 
       return jsx("span", {
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
       }, this.props.team.byline);
     });
   }

package/dist/es2019/components/UserOption.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 /** @jsx jsx */
 import { B400, N800, N200 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import { jsx } from '@emotion/react';
 import React from 'react';
 import { AvatarItemOption, textWrapper } from './AvatarItemOption';
@@ -23,7 +22,7 @@ export class UserOption extends React.PureComponent {
       } = this.props;
       const result = [jsx("span", {
         key: "name",
-        css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text, ${N800})`)
       }, jsx(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -32,7 +31,7 @@ export class UserOption extends React.PureComponent {
         result.push(jsx(React.Fragment, {
           key: "publicName"
         }, ' ', jsx("span", {
-          css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+          css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
         }, "(", jsx(HighlightText, {
           highlights: highlight && highlight.publicName
         }, publicName), ")")));
@@ -42,7 +41,7 @@ export class UserOption extends React.PureComponent {
     });
 
     _defineProperty(this, "renderSecondaryText", () => this.props.user.byline ? jsx("span", {
-      css: textWrapper(this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+      css: textWrapper(this.props.isSelected ? `var(--ds-text-selected, ${B400})` : `var(--ds-text-subtlest, ${N200})`)
     }, this.props.user.byline) : undefined);
 
     _defineProperty(this, "renderAvatar", () => {

package/dist/es2019/components/assets/github.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { token } from '@atlaskit/tokens';
 export function GitHubIcon(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
     width: "12",
@@ -12,6 +11,6 @@ export function GitHubIcon(props) {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M11.9778 0C5.3635 0 0 5.45261 0 12.179C0 17.5601 3.432 22.1253 8.19114 23.7357C8.78975 23.8484 9.00952 23.4715 9.00952 23.1498C9.00952 22.8594 8.99841 21.9 8.99326 20.8823C5.66103 21.6191 4.95789 19.4454 4.95789 19.4454C4.41303 18.0376 3.62796 17.6633 3.62796 17.6633C2.54122 16.9074 3.70988 16.923 3.70988 16.923C4.91266 17.0089 5.54598 18.178 5.54598 18.178C6.61428 20.0399 8.34803 19.5016 9.03154 19.1904C9.13904 18.4033 9.44945 17.866 9.792 17.5619C7.13157 17.2539 4.33487 16.2096 4.33487 11.5429C4.33487 10.2133 4.80278 9.12682 5.56899 8.27391C5.44463 7.96716 5.03464 6.72844 5.68502 5.05087C5.68502 5.05087 6.69084 4.72354 8.97976 6.29927C9.9352 6.02942 10.9599 5.89409 11.9778 5.88945C12.9957 5.89409 14.0212 6.02942 14.9784 6.29927C17.2645 4.72354 18.269 5.05087 18.269 5.05087C18.9209 6.72844 18.5107 7.96716 18.3864 8.27391C19.1544 9.12682 19.6191 10.2133 19.6191 11.5429C19.6191 16.2207 16.8171 17.2507 14.1499 17.5522C14.5795 17.9301 14.9623 18.6713 14.9623 19.8076C14.9623 21.4371 14.9484 22.7487 14.9484 23.1498C14.9484 23.4739 15.164 23.8537 15.7712 23.7341C20.5277 22.1219 23.9554 17.5582 23.9554 12.179C23.9554 5.45261 18.5927 0 11.9778 0Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }));
 }

package/dist/es2019/components/assets/google.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { token } from '@atlaskit/tokens';
 export function GoogleIcon(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
     width: "12",
@@ -12,21 +11,21 @@ export function GoogleIcon(props) {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M8.32062 3.21332L10.014 1.55999C8.97396 0.593331 7.62063 0 6.00062 0C3.65396 0 1.62729 1.34666 0.640625 3.30665L2.58062 4.81331C3.06729 3.36665 4.41396 2.31999 6.00062 2.31999C7.12729 2.31999 7.88729 2.80665 8.32062 3.21332Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M11.76 6.13291C11.76 5.63958 11.72 5.27958 11.6333 4.90625H6V7.13291H9.30667C9.24 7.68624 8.88 8.51957 8.08 9.07957L9.97333 10.5462C11.1067 9.49956 11.76 7.95957 11.76 6.13291V6.13291V6.13291Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M2.58667 7.18662C2.46 6.81329 2.38667 6.41329 2.38667 5.99996C2.38667 5.58663 2.46 5.18663 2.58 4.8133L0.64 3.30664C0.233333 4.11997 0 5.0333 0 5.99996C0 6.96662 0.233333 7.87995 0.64 8.69328L2.58667 7.18662V7.18662Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M6.00079 12.0008C7.62079 12.0008 8.98079 11.4675 9.97413 10.5475L8.08079 9.08083C7.57413 9.43416 6.89413 9.68082 6.00079 9.68082C4.41413 9.68082 3.06746 8.63416 2.58746 7.1875L0.647461 8.69416C1.63413 10.6542 3.65413 12.0008 6.00079 12.0008V12.0008V12.0008Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }));
 }

package/dist/es2019/components/assets/microsoft.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { token } from '@atlaskit/tokens';
 export function MicrosoftIcon(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
     width: "12",
@@ -12,21 +11,21 @@ export function MicrosoftIcon(props) {
     clipPath: "url(#clip0)"
   }, /*#__PURE__*/React.createElement("path", {
     d: "M0 0H5.70233V5.7023H0V0Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M6.29785 0H12.0002V5.7023H6.29785V0Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M0 6.29688H5.70233V11.9992H0V6.29688Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M6.29785 6.29688H12.0002V11.9992H6.29785V6.29688Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   })), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("clipPath", {
     id: "clip0"
   }, /*#__PURE__*/React.createElement("rect", {
     width: "12",
     height: "11.9999",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }))));
 }

package/dist/es2019/components/assets/slack.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { token } from '@atlaskit/tokens';
 export function SlackIcon(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
     width: "12",
@@ -12,33 +11,33 @@ export function SlackIcon(props) {
     clipPath: "url(#clip0)"
   }, /*#__PURE__*/React.createElement("path", {
     d: "M2.51653 7.5688C2.51653 8.26133 1.9508 8.82706 1.25826 8.82706C0.565731 8.82706 0 8.26133 0 7.5688C0 6.87627 0.565731 6.31055 1.25826 6.31055H2.51653V7.5688Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M3.15039 7.5688C3.15039 6.87627 3.71612 6.31055 4.40865 6.31055C5.10119 6.31055 5.66692 6.87627 5.66692 7.5688V10.7193C5.66692 11.4119 5.10119 11.9776 4.40865 11.9776C3.71612 11.9776 3.15039 11.4119 3.15039 10.7193V7.5688Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M4.40865 2.51651C3.71612 2.51651 3.15039 1.95079 3.15039 1.25826C3.15039 0.565728 3.71612 0 4.40865 0C5.10119 0 5.66692 0.565728 5.66692 1.25826V2.51651H4.40865Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M4.4088 3.15039C5.10133 3.15039 5.66706 3.71612 5.66706 4.40865C5.66706 5.10118 5.10133 5.6669 4.4088 5.6669H1.25826C0.565731 5.6669 0 5.10118 0 4.40865C0 3.71612 0.565731 3.15039 1.25826 3.15039H4.4088Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M9.46094 4.40865C9.46094 3.71612 10.0267 3.15039 10.7192 3.15039C11.4117 3.15039 11.9775 3.71612 11.9775 4.40865C11.9775 5.10118 11.4117 5.6669 10.7192 5.6669H9.46094V4.40865Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M8.8261 4.40878C8.8261 5.10131 8.26036 5.66704 7.56783 5.66704C6.8753 5.66704 6.30957 5.10131 6.30957 4.40878V1.25826C6.30957 0.565728 6.8753 0 7.56783 0C8.26036 0 8.8261 0.565728 8.8261 1.25826V4.40878Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M7.56881 9.46094C8.26134 9.46094 8.82707 10.0267 8.82707 10.7192C8.82707 11.4117 8.26134 11.9775 7.56881 11.9775C6.87628 11.9775 6.31055 11.4117 6.31055 10.7192V9.46094H7.56881Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }), /*#__PURE__*/React.createElement("path", {
     d: "M7.56881 8.82706C6.87628 8.82706 6.31055 8.26133 6.31055 7.5688C6.31055 6.87627 6.87628 6.31055 7.56881 6.31055H10.7193C11.4119 6.31055 11.9776 6.87627 11.9776 7.5688C11.9776 8.26133 11.4119 8.82706 10.7193 8.82706H7.56881Z",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   })), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("clipPath", {
     id: "clip0"
   }, /*#__PURE__*/React.createElement("rect", {
     width: "12",
     height: "11.9999",
-    fill: token('color.text.inverse', 'white')
+    fill: "var(--ds-text-inverse, white)"
   }))));
 }

package/dist/es2019/components/styles.js

@@ -1,5 +1,4 @@
 import { B100, N0, N10, N20, N30, N40, N100, R50, R400 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import memoizeOne from 'memoize-one';
 import { mergeStyles } from '@atlaskit/select';
 export const BORDER_PADDING = 6;
@@ -16,14 +15,14 @@ export const getStyles = memoizeOne((width, isMulti, isCompact, overrideStyles)
       const isMulti = state.selectProps.isMulti;
       return { ...css,
         width,
-        borderColor: state.isFocused ? token('color.border.focused', css.borderColor) : state.selectProps.subtle || state.selectProps.noBorder ? 'transparent' : token('color.border.input', N40),
-        backgroundColor: state.isFocused ? token('color.background.input', css['backgroundColor']) : state.selectProps.subtle ? 'transparent' : state.selectProps.textFieldBackgroundColor ? token('color.background.input', N10) : token('color.background.input', N20),
+        borderColor: state.isFocused ? `var(--ds-border-focused, ${css.borderColor})` : state.selectProps.subtle || state.selectProps.noBorder ? 'transparent' : `var(--ds-border-input, ${N40})`,
+        backgroundColor: state.isFocused ? `var(--ds-background-input, ${css['backgroundColor']})` : state.selectProps.subtle ? 'transparent' : state.selectProps.textFieldBackgroundColor ? `var(--ds-background-input, ${N10})` : `var(--ds-background-input, ${N20})`,
         '&:hover .fabric-user-picker__clear-indicator': {
           opacity: 1
         },
         ':hover': { ...css[':hover'],
-          borderColor: state.isFocused ? css[':hover'] ? token('color.border.focused', css[':hover'].borderColor) : token('color.border.focused', B100) : state.selectProps.subtle ? 'transparent' : token('color.border.input', N40),
-          backgroundColor: state.selectProps.subtle && state.selectProps.hoveringClearIndicator ? token('color.background.danger', R50) : state.isFocused ? css[':hover'] ? token('color.background.input', css[':hover'].backgroundColor) : token('color.background.input', N0) : state.isDisabled ? token('color.background.disabled', N10) : token('color.background.input.hovered', N30)
+          borderColor: state.isFocused ? css[':hover'] ? `var(--ds-border-focused, ${css[':hover'].borderColor})` : `var(--ds-border-focused, ${B100})` : state.selectProps.subtle ? 'transparent' : `var(--ds-border-input, ${N40})`,
+          backgroundColor: state.selectProps.subtle && state.selectProps.hoveringClearIndicator ? `var(--ds-background-danger, ${R50})` : state.isFocused ? css[':hover'] ? `var(--ds-background-input, ${css[':hover'].backgroundColor})` : `var(--ds-background-input, ${N0})` : state.isDisabled ? `var(--ds-background-disabled, ${N10})` : `var(--ds-background-input-hovered, ${N30})`
         },
         padding: 0,
         minHeight: isCompact ? 'none' : 44,
@@ -50,7 +49,7 @@ export const getStyles = memoizeOne((width, isMulti, isCompact, overrideStyles)
       paddingTop: 0,
       padding: 0,
       ':hover': {
-        color: token('color.icon.danger', R400)
+        color: `var(--ds-icon-danger, ${R400})`
       }
     }),
     indicatorsContainer: css => ({ ...css,
@@ -126,14 +125,14 @@ export const getStyles = memoizeOne((width, isMulti, isCompact, overrideStyles)
       paddingLeft: state.selectProps.isMulti ? 0 : `${BORDER_PADDING}px`,
       '& input::placeholder': {
         /* Chrome, Firefox, Opera, Safari 10.1+ */
-        color: token('color.text.subtlest', N100),
+        color: `var(--ds-text-subtlest, ${N100})`,
         opacity: 1
         /* Firefox */
 
       },
       '& input:-ms-input-placeholder': {
         /* Internet Explorer 10-11 */
-        color: token('color.text.subtlest', N100)
+        color: `var(--ds-text-subtlest, ${N100})`
       }
     }),
     singleValue: css => ({ ...css,

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "9.7.3",
+	"version": "9.7.4",
 	"sideEffects": false
 }

package/dist/esm/components/AddOptionAvatar.js

@@ -1,7 +1,6 @@
 /** @jsx jsx */
 import EmailIcon from '@atlaskit/icon/glyph/email';
 import { N40, N500 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import React from 'react';
 import { css, jsx } from '@emotion/react';
 
@@ -9,7 +8,7 @@ var getEmailAvatarWrapperStyle = function getEmailAvatarWrapperStyle(isLozenge)
   var padding = isLozenge ? 0 : 4;
   return css({
     padding: "".concat(padding, "px"),
-    backgroundColor: token('color.background.neutral', N40),
+    backgroundColor: "var(--ds-background-neutral, ".concat(N40, ")"),
     borderRadius: '50%',
     display: 'flex',
     alignItems: 'center'
@@ -24,6 +23,6 @@ export var AddOptionAvatar = function AddOptionAvatar(_ref) {
   }, jsx(EmailIcon, {
     label: label,
     size: isLozenge ? 'small' : 'medium',
-    primaryColor: token('color.text.subtle', N500)
+    primaryColor: "var(--ds-text-subtle, ".concat(N500, ")")
   }));
 };

package/dist/esm/components/AvatarItemOption.js

@@ -9,7 +9,6 @@ import React from 'react';
 import { gridSize } from '@atlaskit/theme/constants';
 import { css, jsx } from '@emotion/react';
 import Lozenge from '@atlaskit/lozenge';
-import { token } from '@atlaskit/tokens';
 import { isLozengeText } from './utils';
 var AsyncTooltip = /*#__PURE__*/React.lazy(function () {
   return import(
@@ -31,7 +30,7 @@ var wrapper = function wrapper(isDisabled) {
     margin: 0,
     width: '100%',
     cursor: isDisabled ? 'not-allowed' : 'pointer',
-    opacity: isDisabled ? token('opacity.disabled', '0.4') : undefined
+    opacity: isDisabled ? "var(--ds-opacity-disabled, 0.4)" : undefined
   });
 };
 

package/dist/esm/components/CustomOption/main.js

@@ -12,7 +12,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 /** @jsx jsx */
 import { B400, N800, N200 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import { jsx } from '@emotion/react';
 import React from 'react';
 import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
@@ -40,7 +39,7 @@ export var CustomOption = /*#__PURE__*/function (_React$PureComponent) {
           highlight = _this$props$data.highlight;
       return [jsx("span", {
         key: "name",
-        css: textWrapper(_this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(_this.props.isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text, ".concat(N800, ")"))
       }, jsx(HighlightText, {
         highlights: highlight && highlight.name
       }, name))];
@@ -48,7 +47,7 @@ export var CustomOption = /*#__PURE__*/function (_React$PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "getBylineComponent", function (isSelected, message) {
       return jsx("span", {
-        css: textWrapper(isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text-subtlest, ".concat(N200, ")"))
       }, message);
     });
 

package/dist/esm/components/EmailOption/main.js

@@ -14,7 +14,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import { jsx } from '@emotion/react';
 import { AddOptionAvatar } from '../AddOptionAvatar';
 import { AvatarItemOption, textWrapper } from '../AvatarItemOption';
@@ -50,13 +49,13 @@ export var EmailOption = /*#__PURE__*/function (_React$PureComponent) {
       var id = _this.props.email.id;
       return jsx("span", {
         key: "name",
-        css: textWrapper(_this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(_this.props.isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text, ".concat(N800, ")"))
       }, id);
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderSecondaryText", function (label) {
       return jsx("span", {
-        css: textWrapper(_this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(_this.props.isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text-subtlest, ".concat(N200, ")"))
       }, label);
     });
 

package/dist/esm/components/ExternalUserOption/ExternalAvatarItemOption.js

@@ -7,7 +7,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 import { B400 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 
 var outerWrapper = function outerWrapper(isDisabled) {
   return css({
@@ -19,7 +18,7 @@ var outerWrapper = function outerWrapper(isDisabled) {
     margin: 0,
     width: '100%',
     cursor: isDisabled ? 'not-allowed' : 'pointer',
-    opacity: isDisabled ? token('opacity.disabled', '0.4') : undefined
+    opacity: isDisabled ? "var(--ds-opacity-disabled, 0.4)" : undefined
   });
 };
 
@@ -39,14 +38,14 @@ var textSection = css({
 
 var getTextStyle = function getTextStyle(isSecondary) {
   var secondaryCssArgs = isSecondary ? {
-    color: token('color.text.selected', B400),
+    color: "var(--ds-text-selected, ".concat(B400, ")"),
     fontSize: '0.85em'
   } : {};
   return css(_objectSpread(_objectSpread({
     display: 'flex',
     maxWidth: '100%',
     margin: 0,
-    color: token('color.text.selected', B400)
+    color: "var(--ds-text-selected, ".concat(B400, ")")
   }, {
     secondaryCssArgs: secondaryCssArgs
   }), {}, {

package/dist/esm/components/ExternalUserOption/InfoIcon.js

@@ -5,7 +5,6 @@ import { useCallback, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import EditorPanelIcon from '@atlaskit/icon/glyph/editor/panel';
 import { N50, N200 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 var wrapper = css({
   display: 'flex'
 });
@@ -29,6 +28,6 @@ export default (function () {
     testId: "source-icon",
     label: "",
     size: "large",
-    primaryColor: token('color.text.subtlest', isMouseHovered ? N200 : N50)
+    primaryColor: "var(--ds-text-subtlest, ".concat(isMouseHovered ? N200 : N50, ")")
   }));
 });

package/dist/esm/components/ExternalUserOption/main.js

@@ -15,7 +15,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 import Tooltip from '@atlaskit/tooltip';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireEventInElementsChannel, userInfoEvent } from '../../analytics';
@@ -57,7 +56,7 @@ var ExternalUserOptionImpl = /*#__PURE__*/function (_React$PureComponent) {
       var name = _this.props.user.name;
       return jsx("span", {
         key: "name",
-        css: textWrapper(_this.props.isSelected ? token('color.text.selected', B400) : token('color.text', N800))
+        css: textWrapper(_this.props.isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text, ".concat(N800, ")"))
       }, name);
     });
 
@@ -75,7 +74,7 @@ var ExternalUserOptionImpl = /*#__PURE__*/function (_React$PureComponent) {
 
       var emailDomainWithAt = "@".concat(emailDomain);
       return jsx("span", {
-        css: textWrapper(_this.props.isSelected ? token('color.text.selected', B400) : token('color.text.subtlest', N200))
+        css: textWrapper(_this.props.isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : "var(--ds-text-subtlest, ".concat(N200, ")"))
       }, emailUser, jsx("span", {
         css: emailDomainWrapper
       }, emailDomainWithAt));