@primer/react 34.0.0 → 34.0.1

package/lib/NewButton/styles.js

@@ -0,0 +1,249 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getButtonStyles = exports.getBaseStyles = exports.getSizeStyles = exports.getVariantStyles = exports.TEXT_ROW_HEIGHT = void 0;
+const TEXT_ROW_HEIGHT = '20px'; // custom value off the scale
+
+exports.TEXT_ROW_HEIGHT = TEXT_ROW_HEIGHT;
+
+const getVariantStyles = (variant = 'default', theme) => {
+  const style = {
+    default: {
+      color: 'btn.text',
+      backgroundColor: 'btn.bg',
+      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadow}, ${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.insetShadow}`,
+      '&:hover:not([disabled])': {
+        backgroundColor: 'btn.hoverBg'
+      },
+      // focus must come before :active so that the active box shadow overrides
+      '&:focus:not([disabled])': {
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.focusShadow}`
+      },
+      '&:active:not([disabled])': {
+        backgroundColor: 'btn.selectedBg',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadowActive}`
+      },
+      '&:disabled': {
+        color: 'primer.fg.disabled',
+        backgroundColor: 'btn.disabledBg'
+      }
+    },
+    primary: {
+      color: 'btn.primary.text',
+      backgroundColor: 'btn.primary.bg',
+      borderColor: 'border.subtle',
+      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.primary.shadow}`,
+      '&:hover:not([disabled])': {
+        color: 'btn.primary.hoverText',
+        backgroundColor: 'btn.primary.hoverBg'
+      },
+      // focus must come before :active so that the active box shadow overrides
+      '&:focus:not([disabled])': {
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.primary.focusShadow}`
+      },
+      '&:active:not([disabled])': {
+        backgroundColor: 'btn.primary.selectedBg',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.primary.selectedShadow}`
+      },
+      '&:disabled': {
+        color: 'btn.primary.disabledText',
+        backgroundColor: 'btn.primary.disabledBg'
+      },
+      '[data-component="ButtonCounter"]': {
+        backgroundColor: 'btn.primary.counterBg',
+        color: 'btn.primary.text'
+      }
+    },
+    danger: {
+      color: 'btn.danger.text',
+      backgroundColor: 'btn.bg',
+      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadow}`,
+      '&:hover:not([disabled])': {
+        color: 'btn.danger.hoverText',
+        backgroundColor: 'btn.danger.hoverBg',
+        borderColor: 'btn.danger.hoverBorder',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.danger.hoverShadow}`,
+        '[data-component="ButtonCounter"]': {
+          backgroundColor: 'btn.danger.hoverCounterBg',
+          color: 'btn.danger.hoverText'
+        }
+      },
+      // focus must come before :active so that the active box shadow overrides
+      '&:focus:not([disabled])': {
+        borderColor: 'btn.danger.focusBorder',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.danger.focusShadow}`
+      },
+      '&:active:not([disabled])': {
+        color: 'btn.danger.selectedText',
+        backgroundColor: 'btn.danger.selectedBg',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.danger.selectedShadow}`,
+        borderColor: 'btn.danger.selectedBorder'
+      },
+      '&:disabled': {
+        color: 'btn.danger.disabledText',
+        backgroundColor: 'btn.danger.disabledBg',
+        borderColor: 'btn.danger.disabledBorder',
+        '[data-component="ButtonCounter"]': {
+          backgroundColor: 'btn.danger.disabledCounterBg'
+        }
+      },
+      '[data-component="ButtonCounter"]': {
+        color: 'btn.danger.text',
+        backgroundColor: 'btn.danger.counterBg'
+      }
+    },
+    invisible: {
+      color: 'accent.fg',
+      backgroundColor: 'transparent',
+      border: '0',
+      boxShadow: 'none',
+      '&:hover:not([disabled])': {
+        backgroundColor: 'btn.hoverBg'
+      },
+      // focus must come before :active so that the active box shadow overrides
+      '&:focus:not([disabled])': {
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.focusShadow}`
+      },
+      '&:active:not([disabled])': {
+        backgroundColor: 'btn.selectedBg'
+      },
+      '&:disabled': {
+        color: 'primer.fg.disabled'
+      }
+    },
+    outline: {
+      color: 'btn.outline.text',
+      boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.shadow}`,
+      '&:hover:not([disabled])': {
+        color: 'btn.outline.hoverText',
+        backgroundColor: 'btn.outline.hoverBg',
+        borderColor: 'outline.hoverBorder',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.hoverShadow}`,
+        '[data-component="ButtonCounter"]': {
+          backgroundColor: 'btn.outline.hoverCounterBg',
+          color: 'btn.outline.hoverText'
+        }
+      },
+      // focus must come before :active so that the active box shadow overrides
+      '&:focus:not([disabled])': {
+        borderColor: 'btn.outline.focusBorder',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.focusShadow}`
+      },
+      '&:active:not([disabled])': {
+        color: 'btn.outline.selectedText',
+        backgroundColor: 'btn.outline.selectedBg',
+        boxShadow: `${theme === null || theme === void 0 ? void 0 : theme.shadows.btn.outline.selectedShadow}`,
+        borderColor: 'btn.outline.selectedBorder'
+      },
+      '&:disabled': {
+        color: 'btn.outline.disabledText',
+        backgroundColor: 'btn.outline.disabledBg',
+        borderColor: 'btn.border',
+        '[data-component="ButtonCounter"]': {
+          backgroundColor: 'btn.outline.disabledCounterBg'
+        }
+      },
+      '[data-component="ButtonCounter"]': {
+        backgroundColor: 'btn.outline.counterBg',
+        color: 'btn.outline.text'
+      }
+    }
+  };
+  return style[variant];
+};
+
+exports.getVariantStyles = getVariantStyles;
+
+const getSizeStyles = (size = 'medium', variant = 'default', iconOnly) => {
+  let paddingY, paddingX, fontSize;
+
+  switch (size) {
+    case 'small':
+      paddingY = 3;
+      paddingX = 12;
+      fontSize = 0;
+      break;
+
+    case 'large':
+      paddingY = 9;
+      paddingX = 20;
+      fontSize = 2;
+      break;
+
+    case 'medium':
+    default:
+      paddingY = 5;
+      paddingX = 16;
+      fontSize = 1;
+  }
+
+  if (iconOnly) {
+    paddingX = paddingY + 2;
+  }
+
+  if (variant === 'invisible') {
+    paddingY = paddingY + 1;
+  }
+
+  return {
+    paddingY: `${paddingY}px`,
+    paddingX: `${paddingX}px`,
+    fontSize,
+    '[data-component="ButtonCounter"]': {
+      fontSize
+    }
+  };
+};
+
+exports.getSizeStyles = getSizeStyles;
+
+const getBaseStyles = theme => ({
+  borderRadius: '2',
+  border: '1px solid',
+  borderColor: theme === null || theme === void 0 ? void 0 : theme.colors.btn.border,
+  fontFamily: 'inherit',
+  fontWeight: 'bold',
+  lineHeight: TEXT_ROW_HEIGHT,
+  whiteSpace: 'nowrap',
+  verticalAlign: 'middle',
+  cursor: 'pointer',
+  appearance: 'none',
+  userSelect: 'none',
+  textDecoration: 'none',
+  textAlign: 'center',
+  '&:focus': {
+    outline: 'none'
+  },
+  '&:disabled': {
+    cursor: 'default'
+  },
+  '&:disabled svg': {
+    opacity: '0.6'
+  }
+});
+
+exports.getBaseStyles = getBaseStyles;
+
+const getButtonStyles = theme => {
+  const styles = { ...getBaseStyles(theme),
+    display: 'grid',
+    gridTemplateAreas: '"leadingIcon text trailingIcon"',
+    '& > :not(:last-child)': {
+      mr: '2'
+    },
+    '[data-component="leadingIcon"]': {
+      gridArea: 'leadingIcon'
+    },
+    '[data-component="text"]': {
+      gridArea: 'text'
+    },
+    '[data-component="trailingIcon"]': {
+      gridArea: 'trailingIcon'
+    }
+  };
+  return styles;
+};
+
+exports.getButtonStyles = getButtonStyles;

package/lib/NewButton/types.d.ts

@@ -1,9 +1,11 @@
-import React, { HTMLAttributes } from 'react';
+import React, { HTMLAttributes, ComponentPropsWithRef } from 'react';
 import { IconProps } from '@primer/octicons-react';
 import { SxProp } from '../sx';
+export declare const StyledButton: import("styled-components").StyledComponent<"button", any, SxProp, never>;
 export declare type VariantType = 'default' | 'primary' | 'invisible' | 'danger' | 'outline';
 export declare type Size = 'small' | 'medium' | 'large';
-export declare type ButtonProps = {
+declare type StyledButtonProps = ComponentPropsWithRef<typeof StyledButton>;
+export declare type ButtonBaseProps = {
     /**
      * Determine's the styles on a button one of 'default' | 'primary' | 'invisible' | 'danger'
      */
@@ -13,9 +15,11 @@ export declare type ButtonProps = {
      */
     size?: Size;
     /**
-     * This is to be used if it is an icon-only button. Will make text visually hidden
+     * Items that are disabled can not be clicked, selected, or navigated through.
      */
-    icon?: React.FunctionComponent<IconProps>;
+    disabled?: boolean;
+} & SxProp & HTMLAttributes<HTMLButtonElement> & StyledButtonProps;
+export declare type ButtonProps = {
     /**
      * The leading icon comes before button content
      */
@@ -24,9 +28,25 @@ export declare type ButtonProps = {
      * The trailing icon comes after button content
      */
     trailingIcon?: React.FunctionComponent<IconProps>;
+    children: React.ReactNode;
+} & ButtonBaseProps;
+export declare type IconButtonProps = {
     /**
-     * Items that are disabled can not be clicked, selected, or navigated through.
+     * This is to be used if it is an icon-only button. Will make text visually hidden
      */
-    disabled?: boolean;
-    children: React.ReactNode;
-} & SxProp & HTMLAttributes<HTMLButtonElement>;
+    icon: React.FunctionComponent<IconProps>;
+    iconLabel: string;
+} & ButtonBaseProps;
+export declare type LinkButtonProps = {
+    underline?: boolean;
+    download?: string;
+    href?: string;
+    hrefLang?: string;
+    media?: string;
+    ping?: string;
+    rel?: string;
+    target?: string;
+    type?: string;
+    referrerPolicy?: React.AnchorHTMLAttributes<HTMLAnchorElement>['referrerPolicy'];
+};
+export {};

package/lib/NewButton/types.js

@@ -1 +1,19 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StyledButton = void 0;
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _sx = _interopRequireDefault(require("../sx"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const StyledButton = _styledComponents.default.button.withConfig({
+  displayName: "types__StyledButton",
+  componentId: "sc-15vtwkc-0"
+})(_sx.default);
+
+exports.StyledButton = StyledButton;

package/lib/Overlay.d.ts

@@ -2,7 +2,7 @@ import React, { ComponentPropsWithRef } from 'react';
 import { AriaRole, Merge } from './utils/types';
 import { TouchOrMouseEvent } from './hooks';
 import { SxProp } from './sx';
-import { AnchorSide } from './behaviors/anchoredPosition';
+import type { AnchorSide } from '@primer/behaviors';
 import { ForwardRefComponent as PolymorphicForwardRefComponent } from '@radix-ui/react-polymorphic';
 declare type StyledOverlayProps = {
     width?: keyof typeof widthMap;

package/lib/SelectMenu/SelectMenu.d.ts

@@ -40,11 +40,17 @@ 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" | "block" | "icon" | "variant" | "sx" | "className" | "disabled" | "contrast"> & {
+    }, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "size" | "block" | "icon" | "variant" | "sx" | "className" | "disabled" | "leadingVisual" | "trailingVisual" | "contrast"> & {
         className?: string | undefined;
         icon?: React.ComponentType<{
             className?: string | undefined;
         }> | undefined;
+        leadingVisual?: string | React.ComponentType<{
+            className?: string | undefined;
+        }> | undefined;
+        trailingVisual?: string | React.ComponentType<{
+            className?: string | undefined;
+        }> | undefined;
     } & Pick<{
         color?: string | undefined;
         property?: string | undefined;
@@ -58,6 +64,7 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
         slot?: string | undefined;
         style?: React.CSSProperties | undefined;
         title?: string | undefined;
+        size?: "small" | "large" | undefined;
         block?: boolean | undefined;
         variant?: "small" | "large" | undefined;
         role?: React.AriaRole | undefined;
@@ -312,11 +319,13 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
         onTransitionEndCapture?: React.TransitionEventHandler<HTMLSpanElement> | undefined;
         css?: import("@emotion/core").InterpolationWithTheme<any>;
         disabled?: boolean | undefined;
-        hasIcon?: boolean | undefined;
+        validationStatus?: "error" | "warning" | undefined;
+        hasLeadingVisual?: boolean | undefined;
+        hasTrailingVisual?: boolean | undefined;
         contrast?: boolean | undefined;
     } & {
         theme?: any;
-    }, "maxWidth" | "minWidth" | "width" | "theme" | "block" | "variant" | "sx" | "disabled" | "contrast">, string | number | symbol> & React.RefAttributes<HTMLInputElement>, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
+    }, "maxWidth" | "minWidth" | "width" | "size" | "block" | "variant" | "sx" | "disabled" | "contrast">, string | number | symbol> & React.RefAttributes<HTMLInputElement>, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
     Footer: import("styled-components").StyledComponent<"footer", any, SxProp, never>;
     Item: React.ForwardRefExoticComponent<Pick<{
         as?: React.ElementType<any> | undefined;

package/lib/TextInput.d.ts

@@ -4,10 +4,17 @@ import UnstyledTextInput from './_UnstyledTextInput';
 import TextInputWrapper from './_TextInputWrapper';
 declare type NonPassthroughProps = {
     className?: string;
+    /** @deprecated Use `leadingVisual` or `trailingVisual` prop instead */
     icon?: React.ComponentType<{
         className?: string;
     }>;
-} & Pick<ComponentProps<typeof TextInputWrapper>, 'block' | 'contrast' | 'disabled' | 'sx' | 'theme' | 'width' | 'maxWidth' | 'minWidth' | 'variant'>;
+    leadingVisual?: string | React.ComponentType<{
+        className?: string;
+    }>;
+    trailingVisual?: string | React.ComponentType<{
+        className?: string;
+    }>;
+} & Pick<ComponentProps<typeof TextInputWrapper>, 'block' | 'contrast' | 'disabled' | 'sx' | 'width' | 'maxWidth' | 'minWidth' | 'variant' | 'size'>;
 declare type TextInputInternalProps = Merge<React.ComponentPropsWithoutRef<typeof UnstyledTextInput>, NonPassthroughProps>;
 declare const TextInput: React.ForwardRefExoticComponent<Pick<TextInputInternalProps, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
 export declare type TextInputProps = ComponentProps<typeof TextInput>;

package/lib/TextInput.js

@@ -20,16 +20,21 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 // using forwardRef is important so that other components (ex. SelectMenu) can autofocus the input
 const TextInput = /*#__PURE__*/_react.default.forwardRef(({
   icon: IconComponent,
+  leadingVisual: LeadingVisual,
+  trailingVisual: TrailingVisual,
   block,
   className,
   contrast,
   disabled,
+  validationStatus,
   sx: sxProp,
-  theme,
+  size: sizeProp,
+  // start deprecated props
   width: widthProp,
   minWidth: minWidthProp,
   maxWidth: maxWidthProp,
   variant: variantProp,
+  // end deprecated props
   ...inputProps
 }, ref) => {
   // this class is necessary to style FilterSearch, plz no touchy!
@@ -37,21 +42,29 @@ const TextInput = /*#__PURE__*/_react.default.forwardRef(({
   return /*#__PURE__*/_react.default.createElement(_TextInputWrapper.default, {
     block: block,
     className: wrapperClasses,
+    validationStatus: validationStatus,
     contrast: contrast,
     disabled: disabled,
-    hasIcon: !!IconComponent,
     sx: sxProp,
-    theme: theme,
+    size: sizeProp,
     width: widthProp,
     minWidth: minWidthProp,
     maxWidth: maxWidthProp,
-    variant: variantProp
+    variant: variantProp,
+    hasLeadingVisual: Boolean(LeadingVisual),
+    hasTrailingVisual: Boolean(TrailingVisual)
   }, IconComponent && /*#__PURE__*/_react.default.createElement(IconComponent, {
     className: "TextInput-icon"
-  }), /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
+  }), LeadingVisual && /*#__PURE__*/_react.default.createElement("span", {
+    className: "TextInput-icon"
+  }, typeof LeadingVisual === 'function' ? /*#__PURE__*/_react.default.createElement(LeadingVisual, null) : LeadingVisual), /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
     ref: ref,
     disabled: disabled
-  }, inputProps)));
+  }, inputProps, {
+    "data-component": "input"
+  })), TrailingVisual && /*#__PURE__*/_react.default.createElement("span", {
+    className: "TextInput-icon"
+  }, typeof TrailingVisual === 'function' ? /*#__PURE__*/_react.default.createElement(TrailingVisual, null) : TrailingVisual));
 });
 
 TextInput.defaultProps = {

package/lib/TextInputWithTokens.d.ts

@@ -45,11 +45,17 @@ declare const TextInputWithTokens: React.ForwardRefExoticComponent<Pick<{
 } & {
     as?: string | React.ComponentType<any> | undefined;
     forwardedAs?: string | React.ComponentType<any> | undefined;
-}, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "theme" | "block" | "icon" | "variant" | "sx" | "className" | "disabled" | "contrast"> & {
+}, string | number | symbol>, "maxWidth" | "minWidth" | "width" | "size" | "block" | "icon" | "variant" | "sx" | "className" | "disabled" | "leadingVisual" | "trailingVisual" | "contrast"> & {
     className?: string | undefined;
     icon?: React.ComponentType<{
         className?: string | undefined;
     }> | undefined;
+    leadingVisual?: string | React.ComponentType<{
+        className?: string | undefined;
+    }> | undefined;
+    trailingVisual?: string | React.ComponentType<{
+        className?: string | undefined;
+    }> | undefined;
 } & Pick<{
     color?: string | undefined;
     property?: string | undefined;
@@ -63,6 +69,7 @@ declare const TextInputWithTokens: React.ForwardRefExoticComponent<Pick<{
     slot?: string | undefined;
     style?: React.CSSProperties | undefined;
     title?: string | undefined;
+    size?: "small" | "large" | undefined;
     block?: boolean | undefined;
     variant?: "small" | "large" | undefined;
     role?: React.AriaRole | undefined;
@@ -317,11 +324,13 @@ declare const TextInputWithTokens: React.ForwardRefExoticComponent<Pick<{
     onTransitionEndCapture?: React.TransitionEventHandler<HTMLSpanElement> | undefined;
     css?: import("@emotion/core").InterpolationWithTheme<any>;
     disabled?: boolean | undefined;
-    hasIcon?: boolean | undefined;
+    validationStatus?: "error" | "warning" | undefined;
+    hasLeadingVisual?: boolean | undefined;
+    hasTrailingVisual?: boolean | undefined;
     contrast?: boolean | undefined;
 } & {
     theme?: any;
-}, "maxWidth" | "minWidth" | "width" | "theme" | "block" | "variant" | "sx" | "disabled" | "contrast">, string | number | symbol> & React.RefAttributes<HTMLInputElement> & {
+}, "maxWidth" | "minWidth" | "width" | "size" | "block" | "variant" | "sx" | "disabled" | "contrast">, string | number | symbol> & React.RefAttributes<HTMLInputElement> & {
     selectedTokenIndex: number | undefined;
     setSelectedTokenIndex: React.Dispatch<React.SetStateAction<number | undefined>>;
 }, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;

package/lib/TextInputWithTokens.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _props = require("@styled-system/props");
 
-var _focusZone = require("./behaviors/focusZone");
+var _behaviors = require("@primer/behaviors");
 
 var _useCombinedRefs = require("./hooks/useCombinedRefs");
 
@@ -21,13 +21,13 @@ var _hooks = require("./hooks");
 
 var _UnstyledTextInput = _interopRequireDefault(require("./_UnstyledTextInput"));
 
-var _TextInputWrapper = _interopRequireDefault(require("./_TextInputWrapper"));
+var _TextInputWrapper = _interopRequireWildcard(require("./_TextInputWrapper"));
 
 var _Box = _interopRequireDefault(require("./Box"));
 
 var _Text = _interopRequireDefault(require("./Text"));
 
-var _iterateFocusableElements = require("./utils/iterateFocusableElements");
+var _utils = require("@primer/behaviors/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -81,7 +81,7 @@ function TextInputWithTokensInnerComponent({
     containerRef
   } = (0, _useFocusZone.useFocusZone)({
     focusOutBehavior: 'wrap',
-    bindKeys: _focusZone.FocusKeys.ArrowHorizontal | _focusZone.FocusKeys.HomeAndEnd,
+    bindKeys: _behaviors.FocusKeys.ArrowHorizontal | _behaviors.FocusKeys.HomeAndEnd,
     focusableElementFilter: element => {
       return !element.getAttributeNames().includes('aria-hidden');
     },
@@ -119,7 +119,7 @@ function TextInputWithTokensInnerComponent({
       const nextElementToFocus = (_containerRef$current2 = containerRef.current) === null || _containerRef$current2 === void 0 ? void 0 : _containerRef$current2.children[selectedTokenIndex || 0]; // when removing the first token by keying "Backspace" or "Delete",
       // `nextFocusableElement` is the div that wraps the input
 
-      const firstFocusable = nextElementToFocus && (0, _iterateFocusableElements.isFocusable)(nextElementToFocus) ? nextElementToFocus : Array.from(((_containerRef$current3 = containerRef.current) === null || _containerRef$current3 === void 0 ? void 0 : _containerRef$current3.children) || []).find(el => (0, _iterateFocusableElements.isFocusable)(el));
+      const firstFocusable = nextElementToFocus && (0, _utils.isFocusable)(nextElementToFocus) ? nextElementToFocus : Array.from(((_containerRef$current3 = containerRef.current) === null || _containerRef$current3 === void 0 ? void 0 : _containerRef$current3.children) || []).find(el => (0, _utils.isFocusable)(el));
 
       if (firstFocusable) {
         firstFocusable.focus();
@@ -229,14 +229,17 @@ function TextInputWithTokensInnerComponent({
     className: className,
     contrast: contrast,
     disabled: disabled,
-    hasIcon: !!IconComponent,
+    hasLeadingVisual: Boolean(IconComponent),
     theme: theme,
     width: widthProp,
     minWidth: minWidthProp,
     maxWidth: maxWidthProp,
     variant: variantProp,
     onClick: focusInput,
-    sx: { ...(block ? {
+    sx: {
+      paddingLeft: _TextInputWrapper.textInputHorizPadding,
+      py: `calc(${_TextInputWrapper.textInputHorizPadding} / 2)`,
+      ...(block ? {
         display: 'flex',
         width: '100%'
       } : {}),
@@ -264,14 +267,14 @@ function TextInputWithTokensInnerComponent({
         marginBottom: '0.25rem'
       }
     }
-  }, /*#__PURE__*/_react.default.createElement(_Box.default, {
+  }, IconComponent && /*#__PURE__*/_react.default.createElement(IconComponent, {
+    className: "TextInput-icon"
+  }), /*#__PURE__*/_react.default.createElement(_Box.default, {
     sx: {
       order: 1,
       flexGrow: 1
     }
-  }, IconComponent && /*#__PURE__*/_react.default.createElement(IconComponent, {
-    className: "TextInput-icon"
-  }), /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
+  }, /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
     ref: combinedInputRef,
     disabled: disabled,
     onFocus: handleInputFocus,

package/lib/_TextInputWrapper.d.ts

@@ -1,10 +1,15 @@
 import { MaxWidthProps, MinWidthProps, WidthProps } from 'styled-system';
 import { SxProp } from './sx';
+export declare const textInputHorizPadding = "12px";
 declare const TextInputWrapper: import("styled-components").StyledComponent<"span", any, {
     disabled?: boolean | undefined;
-    hasIcon?: boolean | undefined;
+    hasLeadingVisual?: boolean | undefined;
+    hasTrailingVisual?: boolean | undefined;
     block?: boolean | undefined;
     contrast?: boolean | undefined;
+    validationStatus?: "error" | "warning" | undefined;
+    /** @deprecated Use `size` prop instead */
     variant?: "small" | "large" | undefined;
+    size?: "small" | "large" | undefined;
 } & WidthProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.Width<import("styled-system").TLengthStyledSystem>> & MinWidthProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.MinWidth<import("styled-system").TLengthStyledSystem>> & MaxWidthProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, import("csstype").Property.MaxWidth<import("styled-system").TLengthStyledSystem>> & SxProp, never>;
 export default TextInputWrapper;