@kaizen/components 1.64.5 → 1.64.6

package/dist/cjs/Brand/Brand.cjs

@@ -2,6 +2,7 @@
 
 var tslib = require('tslib');
 var React = require('react');
+var classnames = require('classnames');
 var hostedAssets = require('../utils/hostedAssets.cjs');
 var BrandCollectiveIntelligence = require('./BrandCollectiveIntelligence/BrandCollectiveIntelligence.cjs');
 var Brand_module = require('./Brand.module.scss.cjs');
@@ -11,6 +12,7 @@ function _interopDefault(e) {
   };
 }
 var React__default = /*#__PURE__*/_interopDefault(React);
+var classnames__default = /*#__PURE__*/_interopDefault(classnames);
 var isSVG = function (variant, restProps) {
   return variant === "collective-intelligence";
 };
@@ -42,11 +44,10 @@ var Brand = function (_a) {
   }
   var alt = restProps.alt,
     classNameOverride = restProps.classNameOverride,
-    otherProps = tslib.__rest(restProps, ["alt", "classNameOverride"]);
+    style = restProps.style,
+    otherProps = tslib.__rest(restProps, ["alt", "classNameOverride", "style"]);
   var brandTheme = reversed ? "-reversed" : "-default";
-  return React__default.default.createElement("picture", tslib.__assign({
-    className: classNameOverride
-  }, otherProps), React__default.default.createElement("source", {
+  return React__default.default.createElement("picture", tslib.__assign({}, otherProps), React__default.default.createElement("source", {
     srcSet: hostedAssets.assetUrl("brand/".concat(variant, "-reversed.svg")),
     media: "(forced-colors: active) and (prefers-color-scheme: dark)"
   }), React__default.default.createElement("source", {
@@ -55,7 +56,8 @@ var Brand = function (_a) {
   }), React__default.default.createElement("img", {
     src: hostedAssets.assetUrl("brand/".concat(variant).concat(brandTheme, ".svg")),
     alt: alt,
-    className: Brand_module.img
+    className: classnames__default.default(Brand_module.img, classNameOverride),
+    style: style
   }));
 };
 Brand.displayName = "Brand";

package/dist/cjs/Filter/FilterSelect/FilterSelect.cjs

@@ -57,11 +57,6 @@ var FilterSelect = function (_a) {
     triggerProps = _c.triggerProps,
     menuProps = _c.menuProps;
   var buttonProps = button.useButton(triggerProps, triggerRef).buttonProps;
-  // The id is being remapped because the buttonProps id points to nowhere. This should ideally be refactored but will point the aria attributes tot he right components
-  var renderTriggerButtonProps = tslib.__assign(tslib.__assign({}, buttonProps), {
-    "aria-labelledby": undefined,
-    "aria-controls": menuProps.id
-  });
   return React__default.default.createElement(React__default.default.Fragment, null, React__default.default.createElement(select$1.HiddenSelect, {
     label: label,
     state: state,
@@ -75,19 +70,17 @@ var FilterSelect = function (_a) {
         selectedValue: ((_a = state.selectedItem) === null || _a === void 0 ? void 0 : _a.textValue) || undefined,
         label: label,
         isOpen: isOpen
-      }, renderTriggerButtonProps));
+      }, buttonProps));
     },
     onMount: setTriggerRef,
     classNameOverride: classNameOverride
-  }, React__default.default.createElement(React__default.default.Fragment, null, React__default.default.createElement(FilterContents.FilterContents, {
+  }, React__default.default.createElement(FilterContents.FilterContents, {
     classNameOverride: FilterSelect_module.filterContents
   }, React__default.default.createElement(SelectContext.SelectProvider, {
     state: state
   }, React__default.default.createElement(SelectPopoverContents.SelectPopoverContents, {
-    menuProps: tslib.__assign(tslib.__assign({}, menuProps), {
-      "aria-labelledby": buttonProps.id
-    })
-  }, children))))));
+    menuProps: menuProps
+  }, children)))));
 };
 FilterSelect.displayName = "FilterSelect";
 FilterSelect.Section = ListBoxSection.ListBoxSection;

package/dist/cjs/__future__/Select/subcomponents/ListBox/ListBox.cjs

@@ -13,19 +13,6 @@ function _interopDefault(e) {
 }
 var React__default = /*#__PURE__*/_interopDefault(React);
 var classnames__default = /*#__PURE__*/_interopDefault(classnames);
-
-/** A util to retrieve the key of the correct focusable items based of the focus strategy
- * This is used to determine which element from the collection to focus to on open base on the keyboard event
- * ie: UpArrow will set the focusStrategy to "last"
- */
-var getOptionKeyFromCollection = function (state) {
-  if (state.selectedItem) {
-    return state.selectedItem.key;
-  } else if (state.focusStrategy === "last") {
-    return state.collection.getLastKey();
-  }
-  return state.collection.getFirstKey();
-};
 var ListBox = function (_a) {
   var children = _a.children,
     menuProps = _a.menuProps,
@@ -33,37 +20,13 @@ var ListBox = function (_a) {
     restProps = tslib.__rest(_a, ["children", "menuProps", "classNameOverride"]);
   var state = SelectContext.useSelectContext().state;
   var ref = React__default.default.useRef(null);
-  var _b = React__default.default.useState(false),
-    isListboxReady = _b[0],
-    setListboxReady = _b[1];
   var listBoxProps = listbox.useListBox(tslib.__assign(tslib.__assign({}, menuProps), {
-    disallowEmptySelection: true,
-    // This is to ensure that the listbox use React Aria's auto focus feature for Listbox, which creates a visual bug
-    autoFocus: false
+    disallowEmptySelection: true
   }), state, ref).listBoxProps;
-  /**
-   * This is a slightly hacky way to ensure the Listbox is aware of its position without using timeout.
-   * This solves the page from refocusing to the top of the DOM when it is opened for the first time with keyboard.
-   */
-  React.useEffect(function () {
-    setListboxReady(true);
-  }, []);
-  React.useEffect(function () {
-    if (isListboxReady) {
-      var optionKey = getOptionKeyFromCollection(state);
-      var focusToElement = document.querySelector("[data-key=\"".concat(optionKey, "\"]"));
-      if (focusToElement) {
-        focusToElement.focus();
-      }
-    }
-  }, [isListboxReady]);
-  return (
-    // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-    React__default.default.createElement("ul", tslib.__assign({
-      ref: ref,
-      className: classnames__default.default(ListBox_module.listBox, classNameOverride)
-    }, listBoxProps, restProps), children)
-  );
+  return React__default.default.createElement("ul", tslib.__assign({
+    ref: ref,
+    className: classnames__default.default(ListBox_module.listBox, classNameOverride)
+  }, listBoxProps, restProps), children);
 };
 ListBox.displayName = "ListBox";
 exports.ListBox = ListBox;

package/dist/cjs/__future__/Select/subcomponents/Overlay/Overlay.cjs

@@ -32,7 +32,7 @@ var Overlay = function (_a) {
     ref: overlayRef,
     className: classNameOverride
   }, overlayProps, restProps), React__default.default.createElement(focus.FocusScope, {
-    autoFocus: false,
+    autoFocus: true,
     restoreFocus: true
   }, React__default.default.createElement(overlays.DismissButton, {
     onDismiss: state.close

package/dist/esm/Brand/Brand.mjs

@@ -1,5 +1,6 @@
 import { __rest, __assign } from 'tslib';
 import React from 'react';
+import classnames from 'classnames';
 import { assetUrl } from '../utils/hostedAssets.mjs';
 import { BrandCollectiveIntelligence } from './BrandCollectiveIntelligence/BrandCollectiveIntelligence.mjs';
 import styles from './Brand.module.scss.mjs';
@@ -35,11 +36,10 @@ const Brand = /*#__PURE__*/function () {
     }
     var alt = restProps.alt,
       classNameOverride = restProps.classNameOverride,
-      otherProps = __rest(restProps, ["alt", "classNameOverride"]);
+      style = restProps.style,
+      otherProps = __rest(restProps, ["alt", "classNameOverride", "style"]);
     var brandTheme = reversed ? "-reversed" : "-default";
-    return /*#__PURE__*/React.createElement("picture", __assign({
-      className: classNameOverride
-    }, otherProps), /*#__PURE__*/React.createElement("source", {
+    return /*#__PURE__*/React.createElement("picture", __assign({}, otherProps), /*#__PURE__*/React.createElement("source", {
       srcSet: assetUrl("brand/".concat(variant, "-reversed.svg")),
       media: "(forced-colors: active) and (prefers-color-scheme: dark)"
     }), /*#__PURE__*/React.createElement("source", {
@@ -48,7 +48,8 @@ const Brand = /*#__PURE__*/function () {
     }), /*#__PURE__*/React.createElement("img", {
       src: assetUrl("brand/".concat(variant).concat(brandTheme, ".svg")),
       alt: alt,
-      className: styles.img
+      className: classnames(styles.img, classNameOverride),
+      style: style
     }));
   };
   Brand.displayName = "Brand";

package/dist/esm/Filter/FilterSelect/FilterSelect.mjs

@@ -50,11 +50,6 @@ const FilterSelect = /*#__PURE__*/function () {
       triggerProps = _c.triggerProps,
       menuProps = _c.menuProps;
     var buttonProps = useButton(triggerProps, triggerRef).buttonProps;
-    // The id is being remapped because the buttonProps id points to nowhere. This should ideally be refactored but will point the aria attributes tot he right components
-    var renderTriggerButtonProps = __assign(__assign({}, buttonProps), {
-      "aria-labelledby": undefined,
-      "aria-controls": menuProps.id
-    });
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HiddenSelect, {
       label: label,
       state: state,
@@ -68,19 +63,17 @@ const FilterSelect = /*#__PURE__*/function () {
           selectedValue: ((_a = state.selectedItem) === null || _a === void 0 ? void 0 : _a.textValue) || undefined,
           label: label,
           isOpen: isOpen
-        }, renderTriggerButtonProps));
+        }, buttonProps));
       },
       onMount: setTriggerRef,
       classNameOverride: classNameOverride
-    }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FilterContents, {
+    }, /*#__PURE__*/React.createElement(FilterContents, {
       classNameOverride: styles.filterContents
     }, /*#__PURE__*/React.createElement(SelectProvider, {
       state: state
     }, /*#__PURE__*/React.createElement(SelectPopoverContents, {
-      menuProps: __assign(__assign({}, menuProps), {
-        "aria-labelledby": buttonProps.id
-      })
-    }, children))))));
+      menuProps: menuProps
+    }, children)))));
   };
   FilterSelect.displayName = "FilterSelect";
   FilterSelect.Section = ListBoxSection;

package/dist/esm/__future__/Select/subcomponents/ListBox/ListBox.mjs

@@ -1,22 +1,9 @@
 import { __rest, __assign } from 'tslib';
-import React, { useEffect } from 'react';
+import React from 'react';
 import { useListBox } from '@react-aria/listbox';
 import classnames from 'classnames';
 import { useSelectContext } from '../../context/SelectContext.mjs';
 import styles from './ListBox.module.scss.mjs';
-
-/** A util to retrieve the key of the correct focusable items based of the focus strategy
- * This is used to determine which element from the collection to focus to on open base on the keyboard event
- * ie: UpArrow will set the focusStrategy to "last"
- */
-var getOptionKeyFromCollection = function (state) {
-  if (state.selectedItem) {
-    return state.selectedItem.key;
-  } else if (state.focusStrategy === "last") {
-    return state.collection.getLastKey();
-  }
-  return state.collection.getFirstKey();
-};
 const ListBox = /*#__PURE__*/function () {
   const ListBox = function (_a) {
     var children = _a.children,
@@ -25,38 +12,13 @@ const ListBox = /*#__PURE__*/function () {
       restProps = __rest(_a, ["children", "menuProps", "classNameOverride"]);
     var state = useSelectContext().state;
     var ref = React.useRef(null);
-    var _b = React.useState(false),
-      isListboxReady = _b[0],
-      setListboxReady = _b[1];
     var listBoxProps = useListBox(__assign(__assign({}, menuProps), {
-      disallowEmptySelection: true,
-      // This is to ensure that the listbox use React Aria's auto focus feature for Listbox, which creates a visual bug
-      autoFocus: false
+      disallowEmptySelection: true
     }), state, ref).listBoxProps;
-    /**
-     * This is a slightly hacky way to ensure the Listbox is aware of its position without using timeout.
-     * This solves the page from refocusing to the top of the DOM when it is opened for the first time with keyboard.
-     */
-    useEffect(function () {
-      setListboxReady(true);
-    }, []);
-    useEffect(function () {
-      if (isListboxReady) {
-        var optionKey = getOptionKeyFromCollection(state);
-        var focusToElement = document.querySelector("[data-key=\"".concat(optionKey, "\"]"));
-        if (focusToElement) {
-          focusToElement.focus();
-        }
-      }
-    }, [isListboxReady]);
-    return (
-      /*#__PURE__*/
-      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-      React.createElement("ul", __assign({
-        ref: ref,
-        className: classnames(styles.listBox, classNameOverride)
-      }, listBoxProps, restProps), children)
-    );
+    return /*#__PURE__*/React.createElement("ul", __assign({
+      ref: ref,
+      className: classnames(styles.listBox, classNameOverride)
+    }, listBoxProps, restProps), children);
   };
   ListBox.displayName = "ListBox";
   return ListBox;

package/dist/esm/__future__/Select/subcomponents/Overlay/Overlay.mjs

@@ -25,7 +25,7 @@ const Overlay = /*#__PURE__*/function () {
       ref: overlayRef,
       className: classNameOverride
     }, overlayProps, restProps), /*#__PURE__*/React.createElement(FocusScope, {
-      autoFocus: false,
+      autoFocus: true,
       restoreFocus: true
     }, /*#__PURE__*/React.createElement(DismissButton, {
       onDismiss: state.close

package/dist/styles.css

@@ -27,6 +27,36 @@
 .OverlayArrow-module_overlayArrow__hoDyK.OverlayArrow-module_reversed__-WGcR path {
   fill: var(--color-white, #ffffff);
 }
+.Menu-module_menu__iHYqh {
+  background-color: var(--color-white);
+  color: var(--color-purple-800);
+  width: 248px;
+  max-height: 22rem;
+  overflow: auto;
+  padding-block: var(--spacing-6);
+  outline: none;
+  border-radius: var(--border-solid-border-radius);
+  box-shadow: var(--shadow-large-box-shadow);
+}
+
+.Menu-module_menu__iHYqh .react-aria-Header {
+  font-family: var(--typography-heading-6-font-family);
+  font-size: var(--typography-heading-6-font-size);
+  letter-spacing: var(--typography-heading-6-letter-spacing);
+  font-weight: var(--typography-heading-6-font-weight);
+  line-height: var(--typography-heading-6-line-height);
+  padding: var(--spacing-6) 10px;
+  margin-inline: var(--spacing-6);
+}
+
+.Menu-module_menu__iHYqh section:not(:last-of-type)::after {
+  width: 100%;
+  height: 1px;
+  background-color: var(--border-solid-border-color);
+  content: "";
+  display: block;
+  margin-block: var(--spacing-6);
+}
 .Button-module_button__QOSYH {
   --button-min-height-width: var(--spacing-48);
   --button-padding-x: calc(
@@ -115,36 +145,6 @@
   --button-icon-size: var(--spacing-16);
   gap: var(--spacing-8);
 }
-.Menu-module_menu__iHYqh {
-  background-color: var(--color-white);
-  color: var(--color-purple-800);
-  width: 248px;
-  max-height: 22rem;
-  overflow: auto;
-  padding-block: var(--spacing-6);
-  outline: none;
-  border-radius: var(--border-solid-border-radius);
-  box-shadow: var(--shadow-large-box-shadow);
-}
-
-.Menu-module_menu__iHYqh .react-aria-Header {
-  font-family: var(--typography-heading-6-font-family);
-  font-size: var(--typography-heading-6-font-size);
-  letter-spacing: var(--typography-heading-6-letter-spacing);
-  font-weight: var(--typography-heading-6-font-weight);
-  line-height: var(--typography-heading-6-line-height);
-  padding: var(--spacing-6) 10px;
-  margin-inline: var(--spacing-6);
-}
-
-.Menu-module_menu__iHYqh section:not(:last-of-type)::after {
-  width: 100%;
-  height: 1px;
-  background-color: var(--border-solid-border-color);
-  content: "";
-  display: block;
-  margin-block: var(--spacing-6);
-}
 .MenuItem-module_item__DPerF {
   font-family: var(--typography-paragraph-body-font-family);
   font-size: var(--typography-paragraph-body-font-size);
@@ -12384,19 +12384,18 @@ input[type=range].InputRange-module_ratingScaleRange__gI-rs::-ms-thumb:not(:disa
 }
 
 .Branding-module_branding__g3OoE {
-  justify-content: center;
   grid-area: branding;
   display: flex;
-  flex-grow: 1;
+  justify-content: center;
   padding-top: var(--spacing-4);
 
-  @media (width >= 768px) {
+  @media (width >=768px) {
     justify-content: unset;
   }
 }
 
 .Branding-module_logo__yLHfs {
-  flex-basis: 7.5rem;
+  width: 7.5rem;
 }
 
 .Root-module_root__-1P72 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaizen/components",
-  "version": "1.64.5",
+  "version": "1.64.6",
   "description": "Kaizen component library",
   "author": "Geoffrey Chong <geoff.chong@cultureamp.com>",
   "homepage": "https://cultureamp.design",
@@ -120,8 +120,8 @@
     "svgo": "^3.3.2",
     "tslib": "^2.6.3",
     "tsx": "^4.17.0",
-    "@kaizen/design-tokens": "10.6.1",
-    "@kaizen/package-bundler": "1.1.5"
+    "@kaizen/package-bundler": "1.1.5",
+    "@kaizen/design-tokens": "10.6.1"
   },
   "peerDependencies": {
     "@cultureamp/i18n-react-intl": "^2.5.9",

package/src/Brand/Brand.tsx

@@ -1,4 +1,5 @@
 import React, { HTMLAttributes, SVGAttributes } from "react"
+import classnames from "classnames"
 import { OverrideClassName } from "~components/types/OverrideClassName"
 import { assetUrl } from "~components/utils/hostedAssets"
 import { BrandCollectiveIntelligence } from "./BrandCollectiveIntelligence"
@@ -58,11 +59,11 @@ export const Brand = ({
     )
   }
 
-  const { alt, classNameOverride, ...otherProps } = restProps
+  const { alt, classNameOverride, style, ...otherProps } = restProps
   const brandTheme = reversed ? "-reversed" : "-default"
 
   return (
-    <picture className={classNameOverride} {...otherProps}>
+    <picture {...otherProps}>
       <source
         srcSet={assetUrl(`brand/${variant}-reversed.svg`)}
         media="(forced-colors: active) and (prefers-color-scheme: dark)"
@@ -74,7 +75,8 @@ export const Brand = ({
       <img
         src={assetUrl(`brand/${variant}${brandTheme}.svg`)}
         alt={alt}
-        className={styles.img}
+        className={classnames(styles.img, classNameOverride)}
+        style={style}
       />
     </picture>
   )

package/src/Filter/FilterSelect/FilterSelect.spec.tsx

@@ -48,7 +48,7 @@ describe("<FilterSelect>", () => {
   it("shows the options initially when isOpen is true", async () => {
     render(<FilterSelectWrapper isOpen />)
     await waitFor(() => {
-      expect(screen.getByRole("listbox")).toBeVisible()
+      expect(screen.queryByRole("listbox")).toBeVisible()
     })
   })
 
@@ -107,7 +107,7 @@ describe("<FilterSelect>", () => {
         render(<FilterSelectWrapper isOpen />)
         expect(screen.queryByRole("listbox")).toBeVisible()
         await waitFor(() => {
-          expect(screen.getAllByRole("option")[0]).toHaveFocus()
+          expect(screen.queryByRole("listbox")).toHaveFocus()
         })
       })
 

package/src/Filter/FilterSelect/FilterSelect.tsx

@@ -79,12 +79,6 @@ export const FilterSelect = <Option extends SelectOption = SelectOption>({
 
   const { buttonProps } = useButton(triggerProps, triggerRef)
 
-  // The id is being remapped because the buttonProps id points to nowhere. This should ideally be refactored but will point the aria attributes tot he right components
-  const renderTriggerButtonProps = {
-    ...buttonProps,
-    "aria-labelledby": undefined,
-    "aria-controls": menuProps.id,
-  }
   return (
     <>
       <HiddenSelect label={label} state={state} triggerRef={triggerRef} />
@@ -96,23 +90,19 @@ export const FilterSelect = <Option extends SelectOption = SelectOption>({
             selectedValue: state.selectedItem?.textValue || undefined,
             label,
             isOpen,
-            ...renderTriggerButtonProps,
+            ...buttonProps,
           })
         }
         onMount={setTriggerRef}
         classNameOverride={classNameOverride}
       >
-        <>
-          <FilterContents classNameOverride={styles.filterContents}>
-            <SelectProvider<Option> state={state}>
-              <SelectPopoverContents
-                menuProps={{ ...menuProps, "aria-labelledby": buttonProps.id }}
-              >
-                {children}
-              </SelectPopoverContents>
-            </SelectProvider>
-          </FilterContents>
-        </>
+        <FilterContents classNameOverride={styles.filterContents}>
+          <SelectProvider<Option> state={state}>
+            <SelectPopoverContents menuProps={menuProps}>
+              {children}
+            </SelectPopoverContents>
+          </SelectProvider>
+        </FilterContents>
       </Filter>
     </>
   )

package/src/Filter/FilterSelect/_docs/FilterSelect.stories.tsx

@@ -1,5 +1,4 @@
 import React, { useState } from "react"
-import { Story } from "@storybook/blocks"
 import { Meta, StoryObj } from "@storybook/react"
 import { fn } from "@storybook/test"
 import { renderTriggerControls } from "~components/Filter/_docs/controls/renderTriggerControls"

package/src/Workflow/subcomponents/Header/components/Branding/Branding.module.css

@@ -1,15 +1,14 @@
 .branding {
-  justify-content: center;
   grid-area: branding;
   display: flex;
-  flex-grow: 1;
+  justify-content: center;
   padding-top: var(--spacing-4);
 
-  @media (width >= 768px) {
+  @media (width >=768px) {
     justify-content: unset;
   }
 }
 
 .logo {
-  flex-basis: 7.5rem;
+  width: 7.5rem;
 }

package/src/__future__/Select/Select.spec.tsx

@@ -194,13 +194,11 @@ describe("<Select />", () => {
       })
 
       describe("Given the menu is opened", () => {
-        it("focuses on the first item", async () => {
-          const { getByRole, getAllByRole } = render(
-            <SelectWrapper defaultOpen />
-          )
+        it("focuses the listbox initially", async () => {
+          const { getByRole } = render(<SelectWrapper defaultOpen />)
           expect(getByRole("listbox")).toBeVisible()
           await waitFor(() => {
-            expect(getAllByRole("option")[0]).toHaveFocus()
+            expect(getByRole("listbox")).toHaveFocus()
           })
         })
         it("is closed when hits the escape key", async () => {

package/src/__future__/Select/_docs/Select.mdx

@@ -98,6 +98,8 @@ Set `isFullWidth` to `true` to have the Select span the full width of its contai
 
 By default, the Select's popover will attach itself to the `body` of the document using React's `createPortal`.
 
-You can change the default behavior by providing a `portalContainerId` to attach this to different element in the DOM. This can help to resolve issues that may arise with `z-index` or having a Select in a modal.
+You can change the default behaviour by providing a `portalContainerId` to attach this to different element in the DOM. This can help to resolve issues that may arise with `z-index` or having a Select in a modal.
 
 <Canvas of={SelectStories.PortalContainer} />
+
+There is currently a known issue whereby a selected option will cause the page to scroll to the top of the window on open (click on [default to see example](https://cultureamp.design/?path=/docs/components-select-future--docs#portals)). This can be solved by setting a `portalContainerId` to the closest parent of the Select.

package/src/__future__/Select/_docs/Select.stories.tsx

@@ -1,6 +1,5 @@
 import React from "react"
 import { Meta, StoryObj } from "@storybook/react"
-import { ContextModal } from "~components/Modal"
 import { Select } from "../Select"
 import { SelectOption } from "../types"
 import {
@@ -166,41 +165,25 @@ export const FullWidth: Story = {
 export const PortalContainer: Story = {
   render: args => {
     const portalContainerId = "id--portal-container"
-
-    const [isOpen, setIsOpen] = React.useState(false)
-
-    const handleOpen = (): void => setIsOpen(true)
-    const handleClose = (): void => setIsOpen(false)
     return (
       <>
-        <div className=" h-[500px] mb-24 block bg-gray-100 flex flex-col gap-16 justify-center items-center">
-          Page content
-          <button
-            type="button"
-            className="border border-gray-500"
-            onClick={handleOpen}
-          >
-            Open Modal
-          </button>
-          <ContextModal
+        <div
+          id={portalContainerId}
+          className="flex gap-24 bg-gray-200 p-12 overflow-hidden h-[200px] relative"
+        >
+          <Select
+            {...args}
+            label="Default"
+            selectedKey="batch-brew"
+            id="id--select-default"
+          />
+          <Select
             {...args}
-            isOpen={isOpen}
-            onConfirm={handleClose}
-            onDismiss={handleClose}
-            title="Select test"
-          >
-            <div
-              className="flex gap-24 bg-gray-200 p-12 h-[500px] relative"
-              id={portalContainerId}
-            >
-              <Select
-                {...args}
-                label="Select within a modal"
-                id="id--select-inner"
-                portalContainerId={portalContainerId}
-              />
-            </div>
-          </ContextModal>
+            label="Inner portal"
+            selectedKey="batch-brew"
+            id="id--select-inner"
+            portalContainerId={portalContainerId}
+          />
         </div>
       </>
     )

package/src/__future__/Select/subcomponents/ListBox/ListBox.tsx

@@ -1,6 +1,5 @@
-import React, { HTMLAttributes, Key, useEffect } from "react"
+import React, { HTMLAttributes } from "react"
 import { AriaListBoxOptions, useListBox } from "@react-aria/listbox"
-import { SelectState } from "@react-stately/select"
 import classnames from "classnames"
 import { OverrideClassName } from "~components/types/OverrideClassName"
 import { useSelectContext } from "../../context"
@@ -15,21 +14,6 @@ export type SingleListBoxProps<Option extends SelectOption> = OverrideClassName<
   menuProps: AriaListBoxOptions<SelectItem<Option>>
 }
 
-/** A util to retrieve the key of the correct focusable items based of the focus strategy
- * This is used to determine which element from the collection to focus to on open base on the keyboard event
- * ie: UpArrow will set the focusStrategy to "last"
- */
-const getOptionKeyFromCollection = (
-  state: SelectState<SelectItem<any>>
-): Key | null => {
-  if (state.selectedItem) {
-    return state.selectedItem.key
-  } else if (state.focusStrategy === "last") {
-    return state.collection.getLastKey()
-  }
-  return state.collection.getFirstKey()
-}
-
 export const ListBox = <Option extends SelectOption>({
   children,
   menuProps,
@@ -38,40 +22,13 @@ export const ListBox = <Option extends SelectOption>({
 }: SingleListBoxProps<Option>): JSX.Element => {
   const { state } = useSelectContext<Option>()
   const ref = React.useRef<HTMLUListElement>(null)
-  const [isListboxReady, setListboxReady] = React.useState(false)
   const { listBoxProps } = useListBox(
-    {
-      ...menuProps,
-      disallowEmptySelection: true,
-      // This is to ensure that the listbox use React Aria's auto focus feature for Listbox, which creates a visual bug
-      autoFocus: false,
-    },
+    { ...menuProps, disallowEmptySelection: true },
     state,
     ref
   )
 
-  /**
-   * This is a slightly hacky way to ensure the Listbox is aware of its position without using timeout.
-   * This solves the page from refocusing to the top of the DOM when it is opened for the first time with keyboard.
-   */
-  useEffect(() => {
-    setListboxReady(true)
-  }, [])
-
-  useEffect(() => {
-    if (isListboxReady) {
-      const optionKey = getOptionKeyFromCollection(state)
-      const focusToElement = document.querySelector(
-        `[data-key="${optionKey}"]`
-      ) as HTMLElement
-      if (focusToElement) {
-        focusToElement.focus()
-      }
-    }
-  }, [isListboxReady])
-
   return (
-    // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
     <ul
       ref={ref}
       className={classnames(styles.listBox, classNameOverride)}

package/src/__future__/Select/subcomponents/Overlay/Overlay.tsx

@@ -36,7 +36,7 @@ export const Overlay = <Option extends SelectOption>({
       {...restProps}
     >
       {/* eslint-disable-next-line jsx-a11y/no-autofocus */}
-      <FocusScope autoFocus={false} restoreFocus>
+      <FocusScope autoFocus restoreFocus>
         <DismissButton onDismiss={state.close} />
         {children}
         <DismissButton onDismiss={state.close} />