@primer/components 0.0.0-2021829202552 → 0.0.0-2021829233555

package/lib/FilteredActionList/FilteredActionList.js

@@ -7,8 +7,6 @@ exports.FilteredActionList = FilteredActionList;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _ssr = require("@react-aria/ssr");
-
 var _TextInput = _interopRequireDefault(require("../TextInput"));
 
 var _Box = _interopRequireDefault(require("../Box"));
@@ -29,7 +27,7 @@ var _useProvidedRefOrCreate = require("../hooks/useProvidedRefOrCreate");
 
 var _useScrollFlash = _interopRequireDefault(require("../hooks/useScrollFlash"));
 
-var _scrollIntoViewingArea = require("../utils/scrollIntoViewingArea");
+var _ssr = require("@react-aria/ssr");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -39,6 +37,34 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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); }
 
+function scrollIntoViewingArea(child, container, margin = 8, behavior = 'smooth') {
+  const {
+    top: childTop,
+    bottom: childBottom
+  } = child.getBoundingClientRect();
+  const {
+    top: containerTop,
+    bottom: containerBottom
+  } = container.getBoundingClientRect();
+  const isChildTopAboveViewingArea = childTop < containerTop + margin;
+  const isChildBottomBelowViewingArea = childBottom > containerBottom - margin;
+
+  if (isChildTopAboveViewingArea) {
+    const scrollHeightToChildTop = childTop - containerTop + container.scrollTop;
+    container.scrollTo({
+      behavior,
+      top: scrollHeightToChildTop - margin
+    });
+  } else if (isChildBottomBelowViewingArea) {
+    const scrollHeightToChildBottom = childBottom - containerBottom + container.scrollTop;
+    container.scrollTo({
+      behavior,
+      top: scrollHeightToChildBottom + margin
+    });
+  } // either completely in view or outside viewing area on both ends, don't scroll
+
+}
+
 const StyledHeader = _styledComponents.default.div.withConfig({
   displayName: "FilteredActionList__StyledHeader",
   componentId: "yg3jkv-0"
@@ -82,11 +108,10 @@ function FilteredActionList({
     },
     activeDescendantFocus: inputRef,
     onActiveDescendantChanged: (current, previous, directlyActivated) => {
-      console.log('onActiveDescendantChanged', current === null || current === void 0 ? void 0 : current.textContent);
       activeDescendantRef.current = current;
 
       if (current && scrollContainerRef.current && directlyActivated) {
-        (0, _scrollIntoViewingArea.scrollIntoViewingArea)(current, scrollContainerRef.current);
+        scrollIntoViewingArea(current, scrollContainerRef.current);
       }
     }
   }, [// List ref isn't set while loading.  Need to re-bind focus zone when it changes
@@ -94,7 +119,7 @@ function FilteredActionList({
   (0, _react.useEffect)(() => {
     // if items changed, we want to instantly move active descendant into view
     if (activeDescendantRef.current && scrollContainerRef.current) {
-      (0, _scrollIntoViewingArea.scrollIntoViewingArea)(activeDescendantRef.current, scrollContainerRef.current, 'vertical', undefined, undefined, 'auto');
+      scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, undefined, 'auto');
     }
   }, [items]);
   (0, _useScrollFlash.default)(scrollContainerRef);

package/lib/Overlay.d.ts

@@ -4,7 +4,7 @@ import { ComponentProps } from './utils/types';
 import { TouchOrMouseEvent } from './hooks';
 import { SxProp } from './sx';
 import { AnchorSide } from './behaviors/anchoredPosition';
-export declare type StyledOverlayProps = {
+declare type StyledOverlayProps = {
     width?: keyof typeof widthMap;
     height?: keyof typeof heightMap;
     maxHeight?: keyof Omit<typeof heightMap, 'auto' | 'initial'>;
@@ -40,7 +40,6 @@ export declare type OverlayProps = {
     top: number;
     left: number;
     portalContainerName?: string;
-    preventFocusOnOpen?: boolean;
 } & Omit<ComponentProps<typeof StyledOverlay>, 'visibility' | keyof SystemPositionProps>;
 /**
  * An `Overlay` is a flexible floating surface, used to display transient content such as menus,

package/lib/Overlay.js

@@ -113,7 +113,6 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
   left,
   anchorSide,
   portalContainerName,
-  preventFocusOnOpen,
   ...rest
 }, forwardedRef) => {
   const overlayRef = (0, _react.useRef)(null);
@@ -129,8 +128,7 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
     onEscape,
     ignoreClickRefs,
     onClickOutside,
-    initialFocusRef,
-    preventFocusOnOpen
+    initialFocusRef
   });
   (0, _react.useEffect)(() => {
     var _combinedRef$current;
@@ -159,8 +157,9 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
       easing: slideAnimationEasing
     });
   }, [anchorSide, slideAnimationDistance, slideAnimationEasing, visibility]);
-
-  const styledOverlay = /*#__PURE__*/_react.default.createElement(StyledOverlay, _extends({
+  return /*#__PURE__*/_react.default.createElement(_Portal.default, {
+    containerName: portalContainerName
+  }, /*#__PURE__*/_react.default.createElement(StyledOverlay, _extends({
     height: height,
     role: role
   }, rest, {
@@ -171,11 +170,7 @@ const Overlay = /*#__PURE__*/_react.default.forwardRef(({
       ...rest.style,
       '--styled-overlay-visibility': visibility
     }
-  }));
-
-  return /*#__PURE__*/_react.default.createElement(_Portal.default, {
-    containerName: portalContainerName
-  }, styledOverlay);
+  })));
 });
 
 Overlay.defaultProps = {

package/lib/SelectMenu/SelectMenu.d.ts

@@ -32,15 +32,11 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
     Divider: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
     Filter: React.ForwardRefExoticComponent<Pick<{
         value?: string | undefined;
-    } & 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> & {
+    } & Pick<{
         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;
@@ -319,9 +315,7 @@ 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" | "inputComponent" | "wrapperRef"> & {
-        as?: "input" | undefined;
-    }, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
+    }, 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>>;
     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,9 +1,8 @@
 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';
-import UnstyledTextInput from './_UnstyledTextInput';
+declare const Input: import("styled-components").StyledComponent<"input", any, {}, never>;
 declare const Wrapper: import("styled-components").StyledComponent<"span", any, {
     disabled?: boolean | undefined;
     hasIcon?: boolean | undefined;
@@ -16,10 +15,8 @@ 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 UnstyledTextInput>, keyof NonPassthroughProps>;
-declare const TextInput: Polymorphic.ForwardRefComponent<"input", TextInputInternalProps>;
+declare type TextInputInternalProps = NonPassthroughProps & Omit<React.ComponentPropsWithoutRef<typeof Input>, keyof NonPassthroughProps>;
+declare const TextInput: React.ForwardRefExoticComponent<Pick<TextInputInternalProps, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
 export declare type TextInputProps = ComponentProps<typeof TextInput>;
 export default TextInput;

package/lib/TextInput.js

@@ -17,8 +17,6 @@ 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; }
@@ -44,20 +42,25 @@ 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-0"
+  componentId: "sc-1apmpmt-1"
 })(["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);
+}, (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:
+
 
 // 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,
@@ -69,7 +72,6 @@ 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!
@@ -85,11 +87,10 @@ const TextInput = /*#__PURE__*/_react.default.forwardRef(({
     width: widthProp,
     minWidth: minWidthProp,
     maxWidth: maxWidthProp,
-    variant: variantProp,
-    ref: wrapperRef
+    variant: variantProp
   }, IconComponent && /*#__PURE__*/_react.default.createElement(IconComponent, {
     className: "TextInput-icon"
-  }), /*#__PURE__*/_react.default.createElement(_UnstyledTextInput.default, _extends({
+  }), /*#__PURE__*/_react.default.createElement(Input, _extends({
     ref: ref,
     disabled: disabled
   }, inputProps)));

package/lib/hooks/useOverlay.d.ts

@@ -7,9 +7,8 @@ export declare type UseOverlaySettings = {
     onEscape: (e: KeyboardEvent) => void;
     onClickOutside: (e: TouchOrMouseEvent) => void;
     overlayRef?: React.RefObject<HTMLDivElement>;
-    preventFocusOnOpen?: boolean;
 };
 export declare type OverlayReturnProps = {
     ref: React.RefObject<HTMLDivElement>;
 };
-export declare const useOverlay: ({ overlayRef: _overlayRef, returnFocusRef, initialFocusRef, onEscape, ignoreClickRefs, onClickOutside, preventFocusOnOpen }: UseOverlaySettings) => OverlayReturnProps;
+export declare const useOverlay: ({ overlayRef: _overlayRef, returnFocusRef, initialFocusRef, onEscape, ignoreClickRefs, onClickOutside }: UseOverlaySettings) => OverlayReturnProps;

package/lib/hooks/useOverlay.js

@@ -19,19 +19,14 @@ const useOverlay = ({
   initialFocusRef,
   onEscape,
   ignoreClickRefs,
-  onClickOutside,
-  preventFocusOnOpen
+  onClickOutside
 }) => {
   const overlayRef = (0, _useProvidedRefOrCreate.useProvidedRefOrCreate)(_overlayRef);
-
-  if (!preventFocusOnOpen) {
-    (0, _useOpenAndCloseFocus.useOpenAndCloseFocus)({
-      containerRef: overlayRef,
-      returnFocusRef,
-      initialFocusRef
-    });
-  }
-
+  (0, _useOpenAndCloseFocus.useOpenAndCloseFocus)({
+    containerRef: overlayRef,
+    returnFocusRef,
+    initialFocusRef
+  });
   (0, _useOnOutsideClick.useOnOutsideClick)({
     containerRef: overlayRef,
     ignoreClickRefs,

package/lib/index.d.ts

@@ -24,7 +24,6 @@ export { useConfirm } from './Dialog/ConfirmationDialog';
 export { ActionList } from './ActionList';
 export { ActionMenu } from './ActionMenu';
 export type { ActionMenuProps } from './ActionMenu';
-export { default as Autocomplete } from './Autocomplete';
 export { default as Avatar } from './Avatar';
 export type { AvatarProps } from './Avatar';
 export { default as AvatarPair } from './AvatarPair';
@@ -99,7 +98,6 @@ export { default as TabNav } from './TabNav';
 export type { TabNavProps, TabNavLinkProps } from './TabNav';
 export { default as TextInput } from './TextInput';
 export type { TextInputProps } from './TextInput';
-export { default as TextInputWithTokens } from './TextInputTokens';
 export { default as Text } from './Text';
 export type { TextProps } from './Text';
 export { default as Timeline } from './Timeline';

package/lib/index.js

@@ -153,12 +153,6 @@ Object.defineProperty(exports, "ActionMenu", {
     return _ActionMenu.ActionMenu;
   }
 });
-Object.defineProperty(exports, "Autocomplete", {
-  enumerable: true,
-  get: function () {
-    return _Autocomplete.default;
-  }
-});
 Object.defineProperty(exports, "Avatar", {
   enumerable: true,
   get: function () {
@@ -435,12 +429,6 @@ Object.defineProperty(exports, "TextInput", {
     return _TextInput.default;
   }
 });
-Object.defineProperty(exports, "TextInputWithTokens", {
-  enumerable: true,
-  get: function () {
-    return _TextInputTokens.default;
-  }
-});
 Object.defineProperty(exports, "Text", {
   enumerable: true,
   get: function () {
@@ -520,8 +508,6 @@ var _ActionList = require("./ActionList");
 
 var _ActionMenu = require("./ActionMenu");
 
-var _Autocomplete = _interopRequireDefault(require("./Autocomplete"));
-
 var _Avatar = _interopRequireDefault(require("./Avatar"));
 
 var _AvatarPair = _interopRequireDefault(require("./AvatarPair"));
@@ -596,8 +582,6 @@ var _TabNav = _interopRequireDefault(require("./TabNav"));
 
 var _TextInput = _interopRequireDefault(require("./TextInput"));
 
-var _TextInputTokens = _interopRequireDefault(require("./TextInputTokens"));
-
 var _Text = _interopRequireDefault(require("./Text"));
 
 var _Timeline = _interopRequireDefault(require("./Timeline"));

package/lib/utils/types.d.ts

@@ -12,6 +12,3 @@ export declare type ComponentProps<T> = T extends React.ComponentType<infer Prop
  */
 export declare type Flatten<T extends unknown> = T extends (infer U)[] ? U : never;
 export declare type AriaRole = 'alert' | 'alertdialog' | 'application' | 'article' | 'banner' | 'button' | 'cell' | 'checkbox' | 'columnheader' | 'combobox' | 'complementary' | 'contentinfo' | 'definition' | 'dialog' | 'directory' | 'document' | 'feed' | 'figure' | 'form' | 'grid' | 'gridcell' | 'group' | 'heading' | 'img' | 'link' | 'list' | 'listbox' | 'listitem' | 'log' | 'main' | 'marquee' | 'math' | 'menu' | 'menubar' | 'menuitem' | 'menuitemcheckbox ' | 'menuitemradio' | 'navigation' | 'none' | 'note' | 'option' | 'presentation' | 'progressbar' | 'radio' | 'radiogroup' | 'region' | 'row' | 'rowgroup' | 'rowheader' | 'scrollbar' | 'search' | 'searchbox' | 'separator' | 'slider' | 'spinbutton' | 'status' | 'switch' | 'tab' | 'table' | 'tablist' | 'tabpanel' | 'term' | 'textbox' | 'timer' | 'toolbar' | 'tooltip' | 'tree' | 'treegrid' | 'treeitem';
-export declare type MandateProps<T extends {}, K extends keyof T> = Omit<T, K> & {
-    [MK in K]-?: NonNullable<T[MK]>;
-};

package/lib-esm/FilteredActionList/FilteredActionList.js

@@ -1,7 +1,6 @@
 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); }
 
 import React, { useCallback, useEffect, useRef } from 'react';
-import { useSSRSafeId } from '@react-aria/ssr';
 import TextInput from '../TextInput';
 import Box from '../Box';
 import { ActionList } from '../ActionList';
@@ -12,7 +11,36 @@ import styled from 'styled-components';
 import { get } from '../constants';
 import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate';
 import useScrollFlash from '../hooks/useScrollFlash';
-import { scrollIntoViewingArea } from '../utils/scrollIntoViewingArea';
+import { useSSRSafeId } from '@react-aria/ssr';
+
+function scrollIntoViewingArea(child, container, margin = 8, behavior = 'smooth') {
+  const {
+    top: childTop,
+    bottom: childBottom
+  } = child.getBoundingClientRect();
+  const {
+    top: containerTop,
+    bottom: containerBottom
+  } = container.getBoundingClientRect();
+  const isChildTopAboveViewingArea = childTop < containerTop + margin;
+  const isChildBottomBelowViewingArea = childBottom > containerBottom - margin;
+
+  if (isChildTopAboveViewingArea) {
+    const scrollHeightToChildTop = childTop - containerTop + container.scrollTop;
+    container.scrollTo({
+      behavior,
+      top: scrollHeightToChildTop - margin
+    });
+  } else if (isChildBottomBelowViewingArea) {
+    const scrollHeightToChildBottom = childBottom - containerBottom + container.scrollTop;
+    container.scrollTo({
+      behavior,
+      top: scrollHeightToChildBottom + margin
+    });
+  } // either completely in view or outside viewing area on both ends, don't scroll
+
+}
+
 const StyledHeader = styled.div.withConfig({
   displayName: "FilteredActionList__StyledHeader",
   componentId: "yg3jkv-0"
@@ -55,7 +83,6 @@ export function FilteredActionList({
     },
     activeDescendantFocus: inputRef,
     onActiveDescendantChanged: (current, previous, directlyActivated) => {
-      console.log('onActiveDescendantChanged', current === null || current === void 0 ? void 0 : current.textContent);
       activeDescendantRef.current = current;
 
       if (current && scrollContainerRef.current && directlyActivated) {
@@ -67,7 +94,7 @@ export function FilteredActionList({
   useEffect(() => {
     // if items changed, we want to instantly move active descendant into view
     if (activeDescendantRef.current && scrollContainerRef.current) {
-      scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, 'vertical', undefined, undefined, 'auto');
+      scrollIntoViewingArea(activeDescendantRef.current, scrollContainerRef.current, undefined, 'auto');
     }
   }, [items]);
   useScrollFlash(scrollContainerRef);

package/lib-esm/Overlay.d.ts

@@ -4,7 +4,7 @@ import { ComponentProps } from './utils/types';
 import { TouchOrMouseEvent } from './hooks';
 import { SxProp } from './sx';
 import { AnchorSide } from './behaviors/anchoredPosition';
-export declare type StyledOverlayProps = {
+declare type StyledOverlayProps = {
     width?: keyof typeof widthMap;
     height?: keyof typeof heightMap;
     maxHeight?: keyof Omit<typeof heightMap, 'auto' | 'initial'>;
@@ -40,7 +40,6 @@ export declare type OverlayProps = {
     top: number;
     left: number;
     portalContainerName?: string;
-    preventFocusOnOpen?: boolean;
 } & Omit<ComponentProps<typeof StyledOverlay>, 'visibility' | keyof SystemPositionProps>;
 /**
  * An `Overlay` is a flexible floating surface, used to display transient content such as menus,

package/lib-esm/Overlay.js

@@ -92,7 +92,6 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
   left,
   anchorSide,
   portalContainerName,
-  preventFocusOnOpen,
   ...rest
 }, forwardedRef) => {
   const overlayRef = useRef(null);
@@ -108,8 +107,7 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
     onEscape,
     ignoreClickRefs,
     onClickOutside,
-    initialFocusRef,
-    preventFocusOnOpen
+    initialFocusRef
   });
   useEffect(() => {
     var _combinedRef$current;
@@ -138,7 +136,9 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
       easing: slideAnimationEasing
     });
   }, [anchorSide, slideAnimationDistance, slideAnimationEasing, visibility]);
-  const styledOverlay = /*#__PURE__*/React.createElement(StyledOverlay, _extends({
+  return /*#__PURE__*/React.createElement(Portal, {
+    containerName: portalContainerName
+  }, /*#__PURE__*/React.createElement(StyledOverlay, _extends({
     height: height,
     role: role
   }, rest, {
@@ -149,10 +149,7 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
       ...rest.style,
       '--styled-overlay-visibility': visibility
     }
-  }));
-  return /*#__PURE__*/React.createElement(Portal, {
-    containerName: portalContainerName
-  }, styledOverlay);
+  })));
 });
 Overlay.defaultProps = {
   height: 'auto',

package/lib-esm/SelectMenu/SelectMenu.d.ts

@@ -32,15 +32,11 @@ declare const _default: React.ForwardRefExoticComponent<Pick<SelectMenuInternalP
     Divider: import("styled-components").StyledComponent<"div", any, SystemCommonProps & SxProp, never>;
     Filter: React.ForwardRefExoticComponent<Pick<{
         value?: string | undefined;
-    } & 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> & {
+    } & Pick<{
         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;
@@ -319,9 +315,7 @@ 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" | "inputComponent" | "wrapperRef"> & {
-        as?: "input" | undefined;
-    }, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
+    }, 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>>;
     Footer: import("styled-components").StyledComponent<"footer", any, SystemCommonProps & SxProp, never>;
     Item: React.ForwardRefExoticComponent<Pick<{
         as?: React.ElementType<any> | undefined;

package/lib-esm/TextInput.d.ts

@@ -1,9 +1,8 @@
 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';
-import UnstyledTextInput from './_UnstyledTextInput';
+declare const Input: import("styled-components").StyledComponent<"input", any, {}, never>;
 declare const Wrapper: import("styled-components").StyledComponent<"span", any, {
     disabled?: boolean | undefined;
     hasIcon?: boolean | undefined;
@@ -16,10 +15,8 @@ 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 UnstyledTextInput>, keyof NonPassthroughProps>;
-declare const TextInput: Polymorphic.ForwardRefComponent<"input", TextInputInternalProps>;
+declare type TextInputInternalProps = NonPassthroughProps & Omit<React.ComponentPropsWithoutRef<typeof Input>, keyof NonPassthroughProps>;
+declare const TextInput: React.ForwardRefExoticComponent<Pick<TextInputInternalProps, string | number | symbol> & React.RefAttributes<HTMLInputElement>>;
 export declare type TextInputProps = ComponentProps<typeof TextInput>;
 export default TextInput;

package/lib-esm/TextInput.js

@@ -6,7 +6,6 @@ import styled, { css } from 'styled-components';
 import { maxWidth, minWidth, variant, width } from 'styled-system';
 import { get } from './constants';
 import sx from './sx';
-import UnstyledTextInput from './_UnstyledTextInput';
 const sizeVariants = variant({
   variants: {
     small: {
@@ -23,19 +22,23 @@ const sizeVariants = variant({
     }
   }
 });
+const Input = styled.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 = styled.span.withConfig({
   displayName: "TextInput__Wrapper",
-  componentId: "sc-1apmpmt-0"
+  componentId: "sc-1apmpmt-1"
 })(["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:", ";}", " ", " ", " ", " ", ";"], get('fontSizes.1'), get('colors.fg.default'), get('colors.border.default'), get('radii.2'), get('shadows.primer.shadow.inset'), props => {
   if (props.hasIcon) {
     return css(["padding:0;"]);
   } else {
     return css(["padding:6px 12px;"]);
   }
-}, get('colors.fg.muted'), get('space.2'), get('colors.accent.emphasis'), get('shadows.primer.shadow.focus'), props => props.contrast && css(["background-color:", ";"], get('colors.canvas.inset')), props => props.disabled && css(["color:", ";background-color:", ";border-color:", ";"], get('colors.fg.muted'), get('colors.input.disabledBg'), get('colors.border.default')), props => props.block && css(["display:block;width:100%;"]), get('breakpoints.1'), get('fontSizes.1'), width, minWidth, maxWidth, sizeVariants, sx);
+}, get('colors.fg.muted'), get('space.2'), get('colors.accent.emphasis'), get('shadows.primer.shadow.focus'), props => props.contrast && css(["background-color:", ";"], get('colors.canvas.inset')), props => props.disabled && css(["color:", ";background-color:", ";border-color:", ";"], get('colors.fg.muted'), get('colors.input.disabledBg'), get('colors.border.default')), props => props.block && css(["display:block;width:100%;"]), get('breakpoints.1'), get('fontSizes.1'), width, minWidth, maxWidth, sizeVariants, sx); // Props that are not passed through to Input:
+
 // using forwardRef is important so that other components (ex. SelectMenu) can autofocus the input
 const TextInput = /*#__PURE__*/React.forwardRef(({
-  inputComponent: InputComponent,
   icon: IconComponent,
   block,
   className,
@@ -47,7 +50,6 @@ const TextInput = /*#__PURE__*/React.forwardRef(({
   minWidth: minWidthProp,
   maxWidth: maxWidthProp,
   variant: variantProp,
-  wrapperRef,
   ...inputProps
 }, ref) => {
   // this class is necessary to style FilterSearch, plz no touchy!
@@ -63,11 +65,10 @@ const TextInput = /*#__PURE__*/React.forwardRef(({
     width: widthProp,
     minWidth: minWidthProp,
     maxWidth: maxWidthProp,
-    variant: variantProp,
-    ref: wrapperRef
+    variant: variantProp
   }, IconComponent && /*#__PURE__*/React.createElement(IconComponent, {
     className: "TextInput-icon"
-  }), /*#__PURE__*/React.createElement(UnstyledTextInput, _extends({
+  }), /*#__PURE__*/React.createElement(Input, _extends({
     ref: ref,
     disabled: disabled
   }, inputProps)));

package/lib-esm/hooks/useOverlay.d.ts

@@ -7,9 +7,8 @@ export declare type UseOverlaySettings = {
     onEscape: (e: KeyboardEvent) => void;
     onClickOutside: (e: TouchOrMouseEvent) => void;
     overlayRef?: React.RefObject<HTMLDivElement>;
-    preventFocusOnOpen?: boolean;
 };
 export declare type OverlayReturnProps = {
     ref: React.RefObject<HTMLDivElement>;
 };
-export declare const useOverlay: ({ overlayRef: _overlayRef, returnFocusRef, initialFocusRef, onEscape, ignoreClickRefs, onClickOutside, preventFocusOnOpen }: UseOverlaySettings) => OverlayReturnProps;
+export declare const useOverlay: ({ overlayRef: _overlayRef, returnFocusRef, initialFocusRef, onEscape, ignoreClickRefs, onClickOutside }: UseOverlaySettings) => OverlayReturnProps;

package/lib-esm/hooks/useOverlay.js

@@ -8,19 +8,14 @@ export const useOverlay = ({
   initialFocusRef,
   onEscape,
   ignoreClickRefs,
-  onClickOutside,
-  preventFocusOnOpen
+  onClickOutside
 }) => {
   const overlayRef = useProvidedRefOrCreate(_overlayRef);
-
-  if (!preventFocusOnOpen) {
-    useOpenAndCloseFocus({
-      containerRef: overlayRef,
-      returnFocusRef,
-      initialFocusRef
-    });
-  }
-
+  useOpenAndCloseFocus({
+    containerRef: overlayRef,
+    returnFocusRef,
+    initialFocusRef
+  });
   useOnOutsideClick({
     containerRef: overlayRef,
     ignoreClickRefs,