@primer/components 0.0.0-202195162314 → 0.0.0-202195163539

package/lib/SelectMenu/SelectMenu.d.ts

@@ -32,11 +32,15 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
     Divider: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
     Filter: React.ForwardRefExoticComponent<Pick<{
         value?: string | undefined;
-    } & Pick<{
+    } & Omit<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "key" | keyof React.InputHTMLAttributes<HTMLInputElement>> & {
+        ref?: ((instance: HTMLInputElement | null) => void) | React.RefObject<HTMLInputElement> | null | undefined;
+    }, string | number | symbol> & {
         className?: string | undefined;
         icon?: React.ComponentType<{
             className?: string | undefined;
         }> | undefined;
+        inputComponent?: React.ComponentType<HTMLInputElement> | undefined;
+        wrapperRef?: React.RefObject<HTMLSpanElement> | undefined;
     } & Pick<{
         color?: string | undefined;
         maxWidth?: import("styled-system").ResponsiveValue<import("csstype").Property.MaxWidth<import("styled-system").TLengthStyledSystem>, Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>> | undefined;
@@ -315,7 +319,9 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
     } & {
         as?: string | React.ComponentType<any> | undefined;
         forwardedAs?: string | React.ComponentType<any> | undefined;
-    }, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "className" | "block" | "icon" | "sx" | "disabled" | "variant" | "contrast">, string | number | symbol> & React.RefAttributes<HTMLInputElement>, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
+    }, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "className" | "block" | "icon" | "sx" | "disabled" | "variant" | "contrast" | "inputComponent" | "wrapperRef"> & {
+        as?: "input" | undefined;
+    }, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
     Footer: import("styled-components").StyledComponent<"footer", any, SystemCommonProps & SxProp, never>;
     Item: React.ForwardRefExoticComponent<Pick<{
         as?: React.ElementType<any> | undefined;

package/lib/TextInput.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import { MaxWidthProps, MinWidthProps, WidthProps } from 'styled-system';
+import type * as Polymorphic from "@radix-ui/react-polymorphic";
 import { SxProp } from './sx';
 import { ComponentProps } from './utils/types';
-declare const Input: import("styled-components").StyledComponent<"input", any, {}, never>;
+import UnstyledTextInput from './_UnstyledTextInput';
 declare const Wrapper: import("styled-components").StyledComponent<"span", any, {
     disabled?: boolean | undefined;
     hasIcon?: boolean | undefined;
@@ -15,8 +16,10 @@ declare type NonPassthroughProps = {
     icon?: React.ComponentType<{
         className?: string;
     }>;
+    inputComponent?: React.ComponentType<HTMLInputElement>;
+    wrapperRef?: React.RefObject<HTMLSpanElement>;
 } & Pick<ComponentProps<typeof Wrapper>, 'block' | 'contrast' | 'disabled' | 'sx' | 'theme' | 'width' | 'maxWidth' | 'minWidth' | 'variant'>;
-declare type TextInputInternalProps = NonPassthroughProps & Omit<React.ComponentPropsWithoutRef<typeof Input>, keyof NonPassthroughProps>;
-declare const TextInput: React.ForwardRefExoticComponent<Pick<TextInputInternalProps, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
+declare type TextInputInternalProps = NonPassthroughProps & Omit<React.ComponentPropsWithoutRef<typeof UnstyledTextInput>, keyof NonPassthroughProps>;
+declare const TextInput: Polymorphic.ForwardRefComponent<"input", TextInputInternalProps>;
 export declare type TextInputProps = ComponentProps<typeof TextInput>;
 export default TextInput;

package/lib/TextInput.js

@@ -17,6 +17,8 @@ var _constants = require("./constants");
 
 var _sx = _interopRequireDefault(require("./sx"));
 
+var _UnstyledTextInput = _interopRequireDefault(require("./_UnstyledTextInput"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -42,25 +44,20 @@ const sizeVariants = (0, _styledSystem.variant)({
   }
 });
 
-const Input = _styledComponents.default.input.withConfig({
-  displayName: "TextInput__Input",
-  componentId: "sc-1apmpmt-0"
-})(["border:0;font-size:inherit;font-family:inherit;background-color:transparent;-webkit-appearance:none;color:inherit;width:100%;&:focus{outline:0;}"]);
-
 const Wrapper = _styledComponents.default.span.withConfig({
   displayName: "TextInput__Wrapper",
-  componentId: "sc-1apmpmt-1"
+  componentId: "sc-1apmpmt-0"
 })(["display:inline-flex;align-items:stretch;min-height:34px;font-size:", ";line-height:20px;color:", ";vertical-align:middle;background-repeat:no-repeat;background-position:right 8px center;border:1px solid ", ";border-radius:", ";outline:none;box-shadow:", ";", " .TextInput-icon{align-self:center;color:", ";margin:0 ", ";flex-shrink:0;}&:focus-within{border-color:", ";box-shadow:", ";}", " ", " ", " @media (min-width:", "){font-size:", ";}", " ", " ", " ", " ", ";"], (0, _constants.get)('fontSizes.1'), (0, _constants.get)('colors.fg.default'), (0, _constants.get)('colors.border.default'), (0, _constants.get)('radii.2'), (0, _constants.get)('shadows.primer.shadow.inset'), props => {
   if (props.hasIcon) {
     return (0, _styledComponents.css)(["padding:0;"]);
   } else {
     return (0, _styledComponents.css)(["padding:6px 12px;"]);
   }
-}, (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('space.2'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('shadows.primer.shadow.focus'), props => props.contrast && (0, _styledComponents.css)(["background-color:", ";"], (0, _constants.get)('colors.canvas.inset')), props => props.disabled && (0, _styledComponents.css)(["color:", ";background-color:", ";border-color:", ";"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.input.disabledBg'), (0, _constants.get)('colors.border.default')), props => props.block && (0, _styledComponents.css)(["display:block;width:100%;"]), (0, _constants.get)('breakpoints.1'), (0, _constants.get)('fontSizes.1'), _styledSystem.width, _styledSystem.minWidth, _styledSystem.maxWidth, sizeVariants, _sx.default); // Props that are not passed through to Input:
-
+}, (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('space.2'), (0, _constants.get)('colors.accent.emphasis'), (0, _constants.get)('shadows.primer.shadow.focus'), props => props.contrast && (0, _styledComponents.css)(["background-color:", ";"], (0, _constants.get)('colors.canvas.inset')), props => props.disabled && (0, _styledComponents.css)(["color:", ";background-color:", ";border-color:", ";"], (0, _constants.get)('colors.fg.muted'), (0, _constants.get)('colors.input.disabledBg'), (0, _constants.get)('colors.border.default')), props => props.block && (0, _styledComponents.css)(["display:block;width:100%;"]), (0, _constants.get)('breakpoints.1'), (0, _constants.get)('fontSizes.1'), _styledSystem.width, _styledSystem.minWidth, _styledSystem.maxWidth, sizeVariants, _sx.default);
 
 // using forwardRef is important so that other components (ex. SelectMenu) can autofocus the input
 const TextInput = /*#__PURE__*/_react.default.forwardRef(({
+  inputComponent: InputComponent,
   icon: IconComponent,
   block,
   className,
@@ -72,6 +69,7 @@ const TextInput = /*#__PURE__*/_react.default.forwardRef(({
   minWidth: minWidthProp,
   maxWidth: maxWidthProp,
   variant: variantProp,
+  wrapperRef,
   ...inputProps
 }, ref) => {
   // this class is necessary to style FilterSearch, plz no touchy!
@@ -87,10 +85,11 @@ const TextInput = /*#__PURE__*/_react.default.forwardRef(({
     width: widthProp,
     minWidth: minWidthProp,
     maxWidth: maxWidthProp,
-    variant: variantProp
+    variant: variantProp,
+    ref: wrapperRef
   }, IconComponent && /*#__PURE__*/_react.default.createElement(IconComponent, {
     className: "TextInput-icon"
-  }), /*#__PURE__*/_react.default.createElement(Input, _extends({
+  }), /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
     ref: ref,
     disabled: disabled
   }, inputProps)));

package/lib/TextInputWithTokens.d.ts

@@ -0,0 +1,43 @@
+import React, { ComponentPropsWithoutRef } from 'react';
+import { ComponentProps, MandateProps } from './utils/types';
+import Token, { TokenProps } from './Token/Token';
+import TokenLabel, { TokenLabelProps } from './Token/TokenLabel';
+import TokenProfile, { TokenProfileProps } from './Token/TokenProfile';
+import { TokenSizeKeys } from './Token/TokenBase';
+import { TextInputProps } from './TextInput';
+declare type AnyTokenProps = Partial<TokenProps & TokenLabelProps & TokenProfileProps>;
+declare type TokenDatum = MandateProps<AnyTokenProps, 'id' | 'text'>;
+declare type TextInputWithTokensInternalProps = {
+    /**
+     * The array of tokens to render
+     */
+    tokens: TokenDatum[];
+    /**
+     * The function that gets called when a token is removed
+     */
+    onTokenRemove: (tokenId: string | number) => void;
+    /**
+     * The component used to render each token
+     */
+    tokenComponent?: React.ComponentType<ComponentPropsWithoutRef<typeof Token> | ComponentPropsWithoutRef<typeof TokenLabel> | ComponentPropsWithoutRef<typeof TokenProfile>>;
+    /**
+     * The maximum height of the component. If the content in the input exceeds this height,
+     * it will scroll vertically
+     */
+    maxHeight?: React.CSSProperties['maxHeight'];
+    /**
+     * Whether tokens should render inline horizontally. By default, tokens wrap to new lines.
+     */
+    preventTokenWrapping?: boolean;
+    /**
+     * The size of the tokens
+     */
+    tokenSizeVariant?: TokenSizeKeys;
+    /**
+     * Whether the remove buttons should be rendered in the tokens
+     */
+    hideTokenRemoveButtons?: boolean;
+} & TextInputProps;
+declare const TextInputWithTokens: React.ForwardRefExoticComponent<Pick<TextInputWithTokensInternalProps, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
+export declare type TextInputWithTokensProps = ComponentProps<typeof TextInputWithTokens>;
+export default TextInputWithTokens;

package/lib/TextInputWithTokens.js

@@ -0,0 +1,236 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _props = require("@styled-system/props");
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _focusZone = require("./behaviors/focusZone");
+
+var _useCombinedRefs = require("./hooks/useCombinedRefs");
+
+var _useFocusZone = require("./hooks/useFocusZone");
+
+var _Token = _interopRequireDefault(require("./Token/Token"));
+
+var _TextInput = _interopRequireDefault(require("./TextInput"));
+
+var _hooks = require("./hooks");
+
+var _UnstyledTextInput = _interopRequireDefault(require("./_UnstyledTextInput"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+const InputWrapper = _styledComponents.default.div.withConfig({
+  displayName: "TextInputWithTokens__InputWrapper",
+  componentId: "sc-8z94t5-0"
+})(["order:1;flex-grow:1;"]);
+
+// using forwardRef is important so that other components (ex. Autocomplete) can use the ref
+const TextInputWithTokensComponent = /*#__PURE__*/_react.default.forwardRef(({
+  icon: IconComponent,
+  contrast,
+  className,
+  block,
+  disabled,
+  theme,
+  sx: sxProp,
+  tokens,
+  onTokenRemove,
+  tokenComponent: TokenComponent,
+  preventTokenWrapping,
+  tokenSizeVariant,
+  hideTokenRemoveButtons,
+  selectedTokenIdx,
+  setSelectedTokenIdx,
+  ...rest
+}, externalRef) => {
+  const ref = (0, _hooks.useProvidedRefOrCreate)(externalRef);
+  const {
+    onFocus,
+    onKeyDown,
+    ...inputPropsRest
+  } = (0, _props.omit)(rest);
+
+  const handleTokenFocus = tokenIndex => () => {
+    setSelectedTokenIdx(tokenIndex);
+  };
+
+  const handleTokenBlur = () => {
+    setSelectedTokenIdx(undefined);
+  };
+
+  const handleTokenKeyUp = e => {
+    if (e.key === 'Escape') {
+      var _ref$current;
+
+      ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.focus();
+    }
+  };
+
+  const handleInputFocus = e => {
+    onFocus && onFocus(e);
+    setSelectedTokenIdx(undefined);
+  };
+
+  const handleInputKeyDown = e => {
+    var _ref$current2;
+
+    if (onKeyDown) {
+      onKeyDown(e);
+    }
+
+    if (ref !== null && ref !== void 0 && (_ref$current2 = ref.current) !== null && _ref$current2 !== void 0 && _ref$current2.value) {
+      return;
+    }
+
+    const lastToken = tokens[tokens.length - 1];
+
+    if (e.key === 'Backspace' && lastToken) {
+      onTokenRemove(lastToken.id);
+
+      if (ref !== null && ref !== void 0 && ref.current) {
+        // TODO: eliminate the first hack by making changes to the Autocomplete component
+        //
+        // HACKS:
+        // 1. Directly setting `ref.current.value` instead of updating state because the autocomplete 
+        //    highlight behavior doesn't work correctly if we update the value with a setState action in onChange
+        // 2. Adding an extra space so that when I backspace, it doesn't delete the last letter
+        ref.current.value = `${lastToken.text} `;
+      } // HACK: for some reason we need to wait a tick for `.select()` to work
+
+
+      setTimeout(() => {
+        var _ref$current3;
+
+        ref === null || ref === void 0 ? void 0 : (_ref$current3 = ref.current) === null || _ref$current3 === void 0 ? void 0 : _ref$current3.select();
+      }, 1);
+    }
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(InputWrapper, {
+    key: "inputWrapper"
+  }, /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
+    ref: ref,
+    disabled: disabled,
+    onFocus: handleInputFocus,
+    onKeyDown: handleInputKeyDown,
+    type: "text",
+    sx: {
+      height: '100%'
+    }
+  }, inputPropsRest))), tokens !== null && tokens !== void 0 && tokens.length && TokenComponent ? tokens.map(({
+    id,
+    ...tokenRest
+  }, i) => /*#__PURE__*/_react.default.createElement(TokenComponent, _extends({
+    key: id,
+    onFocus: handleTokenFocus(i),
+    onBlur: handleTokenBlur,
+    onKeyUp: handleTokenKeyUp,
+    isSelected: selectedTokenIdx === i,
+    handleRemove: () => {
+      onTokenRemove(id);
+    },
+    hideRemoveButton: hideTokenRemoveButtons,
+    variant: tokenSizeVariant,
+    tabIndex: 0
+  }, tokenRest))) : null);
+});
+
+const TextInputWithTokens = /*#__PURE__*/_react.default.forwardRef(({
+  tokens,
+  onTokenRemove,
+  sx: sxProp,
+  ...props
+}, ref) => {
+  const localInputRef = (0, _react.useRef)(null);
+  const combinedInputRef = (0, _useCombinedRefs.useCombinedRefs)(localInputRef, ref);
+  const [selectedTokenIdx, setSelectedTokenIdx] = (0, _react.useState)();
+  const {
+    containerRef
+  } = (0, _useFocusZone.useFocusZone)({
+    focusOutBehavior: 'wrap',
+    bindKeys: _focusZone.FocusKeys.ArrowHorizontal | _focusZone.FocusKeys.HomeAndEnd,
+    focusableElementFilter: element => {
+      return !element.getAttributeNames().includes('aria-hidden');
+    },
+    getNextFocusable: direction => {
+      var _containerRef$current;
+
+      if (!selectedTokenIdx && selectedTokenIdx !== 0) {
+        return undefined;
+      }
+
+      let nextIndex = selectedTokenIdx + 1; // "+ 1" accounts for the first element: the text input
+
+      if (direction === 'next') {
+        nextIndex += 1;
+      }
+
+      if (direction === 'previous') {
+        nextIndex -= 1;
+      }
+
+      if (nextIndex > tokens.length || nextIndex < 1) {
+        return combinedInputRef.current || undefined;
+      }
+
+      return containerRef === null || containerRef === void 0 ? void 0 : (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.children[nextIndex];
+    }
+  }, [selectedTokenIdx]);
+
+  const handleTokenRemove = tokenId => {
+    onTokenRemove(tokenId);
+
+    if (selectedTokenIdx) {
+      var _containerRef$current2;
+
+      const nextElementToFocus = containerRef === null || containerRef === void 0 ? void 0 : (_containerRef$current2 = containerRef.current) === null || _containerRef$current2 === void 0 ? void 0 : _containerRef$current2.children[selectedTokenIdx];
+      nextElementToFocus.focus();
+    }
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_TextInput.default, _extends({
+    ref: combinedInputRef,
+    wrapperRef: containerRef,
+    as: TextInputWithTokensComponent,
+    selectedTokenIdx: selectedTokenIdx,
+    setSelectedTokenIdx: setSelectedTokenIdx,
+    tokens: tokens,
+    onTokenRemove: handleTokenRemove,
+    sx: {
+      'alignItems': 'center',
+      'flexWrap': props.preventTokenWrapping ? 'nowrap' : 'wrap',
+      'gap': '0.25rem',
+      '> *': {
+        'flexShrink': 0
+      },
+      ...(props.block ? {
+        display: 'flex',
+        width: '100%'
+      } : {}),
+      ...sxProp
+    }
+  }, props));
+});
+
+TextInputWithTokens.defaultProps = {
+  tokenComponent: _Token.default,
+  tokenSizeVariant: "xl",
+  hideTokenRemoveButtons: false
+};
+TextInputWithTokens.displayName = 'TextInputWithTokens';
+var _default = TextInputWithTokens;
+exports.default = _default;

package/lib/Token/Token.d.ts

@@ -4,11 +4,11 @@ export interface TokenProps extends TokenBaseProps {
     /**
      * A function that renders a component before the token text
      */
-    leadingVisual?: React.ComponentType<any>;
+    leadingVisual?: React.FunctionComponent<any>;
     /**
      * Whether the remove button should be rendered in the token
      */
     hideRemoveButton?: boolean;
 }
-declare const Token: React.ForwardRefExoticComponent<Pick<TokenProps, "sizes" | "color" | "content" | "height" | "translate" | "width" | "hidden" | "children" | "value" | "cite" | "data" | "form" | "label" | "slot" | "span" | "style" | "summary" | "title" | "pattern" | "text" | "list" | "default" | "type" | "name" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "start" | "step" | "size" | "wrap" | "open" | "max" | "media" | "method" | "min" | "target" | "crossOrigin" | "href" | "classID" | "useMap" | "wmode" | "download" | "hrefLang" | "rel" | "alt" | "coords" | "shape" | "autoPlay" | "controls" | "loop" | "mediaGroup" | "muted" | "playsInline" | "preload" | "src" | "autoFocus" | "disabled" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dateTime" | "acceptCharset" | "action" | "autoComplete" | "encType" | "noValidate" | "manifest" | "allowFullScreen" | "allowTransparency" | "frameBorder" | "marginHeight" | "marginWidth" | "sandbox" | "scrolling" | "seamless" | "srcDoc" | "srcSet" | "async" | "accept" | "capture" | "checked" | "maxLength" | "minLength" | "multiple" | "readOnly" | "required" | "challenge" | "keyType" | "keyParams" | "htmlFor" | "as" | "integrity" | "charSet" | "httpEquiv" | "high" | "low" | "optimum" | "reversed" | "selected" | "defer" | "nonce" | "scoped" | "cellPadding" | "cellSpacing" | "colSpan" | "headers" | "rowSpan" | "scope" | "cols" | "rows" | "kind" | "srcLang" | "poster" | "leadingVisual" | "onRemove" | "isSelected" | "hideRemoveButton"> & React.RefAttributes<HTMLAnchorElement | HTMLButtonElement | HTMLSpanElement>>;
+declare const Token: React.ForwardRefExoticComponent<Pick<TokenProps, "sizes" | "color" | "content" | "height" | "translate" | "width" | "hidden" | "children" | "value" | "cite" | "data" | "form" | "label" | "slot" | "span" | "style" | "summary" | "title" | "pattern" | "text" | "list" | "default" | "type" | "name" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "start" | "step" | "wrap" | "open" | "max" | "media" | "method" | "min" | "target" | "crossOrigin" | "href" | "classID" | "useMap" | "wmode" | "download" | "hrefLang" | "rel" | "alt" | "coords" | "shape" | "autoPlay" | "controls" | "loop" | "mediaGroup" | "muted" | "playsInline" | "preload" | "src" | "autoFocus" | "disabled" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dateTime" | "acceptCharset" | "action" | "autoComplete" | "encType" | "noValidate" | "manifest" | "allowFullScreen" | "allowTransparency" | "frameBorder" | "marginHeight" | "marginWidth" | "sandbox" | "scrolling" | "seamless" | "srcDoc" | "srcSet" | "async" | "accept" | "capture" | "checked" | "maxLength" | "minLength" | "multiple" | "readOnly" | "required" | "challenge" | "keyType" | "keyParams" | "htmlFor" | "as" | "integrity" | "charSet" | "httpEquiv" | "high" | "low" | "optimum" | "reversed" | "selected" | "defer" | "nonce" | "scoped" | "cellPadding" | "cellSpacing" | "colSpan" | "headers" | "rowSpan" | "scope" | "cols" | "rows" | "kind" | "srcLang" | "poster" | "variant" | "leadingVisual" | "handleRemove" | "isSelected" | "hideRemoveButton"> & React.RefAttributes<HTMLAnchorElement | HTMLButtonElement | HTMLSpanElement>>;
 export default Token;

package/lib/Token/Token.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _constants = require("../constants");
 
@@ -15,8 +15,6 @@ var _TokenBase = _interopRequireWildcard(require("./TokenBase"));
 
 var _RemoveTokenButton = _interopRequireDefault(require("./_RemoveTokenButton"));
 
-var _TokenTextContainer = _interopRequireDefault(require("./_TokenTextContainer"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -29,59 +27,49 @@ const tokenBorderWidthPx = 1;
 const DefaultTokenStyled = (0, _styledComponents.default)(_TokenBase.default).withConfig({
   displayName: "Token__DefaultTokenStyled",
   componentId: "sc-1dg52pw-0"
-})(["background-color:", ";border-color:", ";border-style:solid;border-width:1px;color:", ";max-width:100%;padding-right:", ";position:relative;", ""], (0, _constants.get)('colors.neutral.subtle'), props => props.isSelected ? (0, _constants.get)('colors.fg.default') : (0, _constants.get)('colors.border.subtle'), props => props.isSelected ? (0, _constants.get)('colors.fg.default') : (0, _constants.get)('colors.fg.muted'), props => !props.hideRemoveButton ? 0 : undefined, props => {
-  if (props.isTokenInteractive) {
-    return (0, _styledComponents.css)(["&:hover{background-color:", ";box-shadow:", ";color:", ";}"], (0, _constants.get)('colors.neutral.muted'), (0, _constants.get)('colors.shadow.medium'), (0, _constants.get)('colors.fg.default'));
-  }
-});
+})(["background-color:", ";border-color:", ";border-style:solid;border-width:1px;color:", ";max-width:100%;padding-right:", ";&:hover{background-color:", ";box-shadow:", ";color:", ";}"], (0, _constants.get)('colors.neutral.subtle'), props => props.isSelected ? (0, _constants.get)('colors.fg.default') : (0, _constants.get)('colors.border.subtle'), props => props.isSelected ? (0, _constants.get)('colors.fg.default') : (0, _constants.get)('colors.fg.muted'), props => !props.hideRemoveButton ? 0 : undefined, props => (0, _TokenBase.isTokenInteractive)(props) ? (0, _constants.get)('colors.neutral.muted') : undefined, props => (0, _TokenBase.isTokenInteractive)(props) ? (0, _constants.get)('colors.shadow.medium') : undefined, props => (0, _TokenBase.isTokenInteractive)(props) ? (0, _constants.get)('colors.fg.default') : undefined);
+const TokenTextContainer = (0, _styledComponents.default)('span').withConfig({
+  displayName: "Token__TokenTextContainer",
+  componentId: "sc-1dg52pw-1"
+})(["flex-grow:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"]);
 const LeadingVisualContainer = (0, _styledComponents.default)('span').withConfig({
   displayName: "Token__LeadingVisualContainer",
-  componentId: "sc-1dg52pw-1"
+  componentId: "sc-1dg52pw-2"
 })(["flex-shrink:0;line-height:0;"]);
 const Token = /*#__PURE__*/(0, _react.forwardRef)((props, forwardedRef) => {
   const {
     as,
-    onRemove,
+    handleRemove,
     id,
     leadingVisual: LeadingVisual,
     ref,
     text,
-    size,
+    variant,
     hideRemoveButton,
-    href,
-    onClick,
     ...rest
   } = props;
-  const hasMultipleActionTargets = (0, _TokenBase.isTokenInteractive)(props) && Boolean(onRemove) && !hideRemoveButton;
+  const hasMultipleActionTargets = (0, _TokenBase.isTokenInteractive)(props) && Boolean(handleRemove) && !hideRemoveButton;
 
-  const onRemoveClick = e => {
+  const handleRemoveClick = e => {
     e.stopPropagation();
-    onRemove && onRemove();
+    handleRemove && handleRemove();
   };
 
-  const interactiveTokenProps = {
-    as,
-    href,
-    onClick
-  };
   return /*#__PURE__*/_react.default.createElement(DefaultTokenStyled, _extends({
-    onRemove: onRemove,
-    hideRemoveButton: hideRemoveButton || !onRemove,
+    as: as,
+    handleRemove: handleRemove,
+    hideRemoveButton: hideRemoveButton || !handleRemove,
     id: id === null || id === void 0 ? void 0 : id.toString(),
     text: text,
     ref: forwardedRef,
-    size: size,
-    isTokenInteractive: (0, _TokenBase.isTokenInteractive)(props)
-  }, !hasMultipleActionTargets ? interactiveTokenProps : {}, rest), LeadingVisual ? /*#__PURE__*/_react.default.createElement(LeadingVisualContainer, null, /*#__PURE__*/_react.default.createElement(LeadingVisual, null)) : null, /*#__PURE__*/_react.default.createElement(_TokenTextContainer.default, hasMultipleActionTargets ? interactiveTokenProps : {}, text), !hideRemoveButton && onRemove ? /*#__PURE__*/_react.default.createElement(_RemoveTokenButton.default, {
+    variant: variant
+  }, rest), LeadingVisual ? /*#__PURE__*/_react.default.createElement(LeadingVisualContainer, null, /*#__PURE__*/_react.default.createElement(LeadingVisual, null)) : null, /*#__PURE__*/_react.default.createElement(TokenTextContainer, null, text), !hideRemoveButton && handleRemove ? /*#__PURE__*/_react.default.createElement(_RemoveTokenButton.default, {
     borderOffset: tokenBorderWidthPx,
-    onClick: onRemoveClick,
-    size: size,
-    isParentInteractive: (0, _TokenBase.isTokenInteractive)(props),
-    "aria-hidden": hasMultipleActionTargets ? 'true' : 'false',
-    sx: hasMultipleActionTargets ? {
-      position: 'relative',
-      zIndex: '1'
-    } : {}
+    parentTokenTag: as || 'span',
+    onClick: handleRemoveClick,
+    variant: variant,
+    parentTokenIsInteractive: (0, _TokenBase.isTokenInteractive)(props),
+    "aria-hidden": hasMultipleActionTargets ? "true" : "false"
   }) : null);
 });
 var _default = Token;

package/lib/Token/TokenBase.d.ts

@@ -1,15 +1,15 @@
 /// <reference types="react" />
 export declare type TokenSizeKeys = 'sm' | 'md' | 'lg' | 'xl';
-export declare const tokenSizes: Record<TokenSizeKeys, string>;
+export declare const tokenSizes: Record<TokenSizeKeys, number>;
 export declare const defaultTokenSize = "md";
 export interface TokenBaseProps extends Omit<React.HTMLProps<HTMLSpanElement | HTMLButtonElement | HTMLAnchorElement>, 'size' | 'id'> {
     as?: 'button' | 'a' | 'span';
-    onRemove?: () => void;
+    handleRemove?: () => void;
     isSelected?: boolean;
     tabIndex?: number;
     text: string;
     id?: number | string;
-    size?: TokenSizeKeys;
+    variant?: TokenSizeKeys;
 }
 export declare const isTokenInteractive: ({ as, onClick, onFocus, tabIndex }: TokenBaseProps) => boolean;
 declare const TokenBase: import("styled-components").StyledComponent<"span", any, TokenBaseProps, never>;