@kaizen/components 1.64.4 → 1.64.5

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

@@ -57,6 +57,11 @@ 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,
@@ -70,17 +75,19 @@ var FilterSelect = function (_a) {
         selectedValue: ((_a = state.selectedItem) === null || _a === void 0 ? void 0 : _a.textValue) || undefined,
         label: label,
         isOpen: isOpen
-      }, buttonProps));
+      }, renderTriggerButtonProps));
     },
     onMount: setTriggerRef,
     classNameOverride: classNameOverride
-  }, React__default.default.createElement(FilterContents.FilterContents, {
+  }, React__default.default.createElement(React__default.default.Fragment, null, 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: menuProps
-  }, children)))));
+    menuProps: tslib.__assign(tslib.__assign({}, menuProps), {
+      "aria-labelledby": buttonProps.id
+    })
+  }, children))))));
 };
 FilterSelect.displayName = "FilterSelect";
 FilterSelect.Section = ListBoxSection.ListBoxSection;

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

@@ -13,6 +13,19 @@ 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,
@@ -20,13 +33,37 @@ 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
+    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
   }), state, ref).listBoxProps;
-  return React__default.default.createElement("ul", tslib.__assign({
-    ref: ref,
-    className: classnames__default.default(ListBox_module.listBox, classNameOverride)
-  }, listBoxProps, restProps), children);
+  /**
+   * 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)
+  );
 };
 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: true,
+    autoFocus: false,
     restoreFocus: true
   }, React__default.default.createElement(overlays.DismissButton, {
     onDismiss: state.close

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

@@ -50,6 +50,11 @@ 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,
@@ -63,17 +68,19 @@ const FilterSelect = /*#__PURE__*/function () {
           selectedValue: ((_a = state.selectedItem) === null || _a === void 0 ? void 0 : _a.textValue) || undefined,
           label: label,
           isOpen: isOpen
-        }, buttonProps));
+        }, renderTriggerButtonProps));
       },
       onMount: setTriggerRef,
       classNameOverride: classNameOverride
-    }, /*#__PURE__*/React.createElement(FilterContents, {
+    }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FilterContents, {
       classNameOverride: styles.filterContents
     }, /*#__PURE__*/React.createElement(SelectProvider, {
       state: state
     }, /*#__PURE__*/React.createElement(SelectPopoverContents, {
-      menuProps: menuProps
-    }, children)))));
+      menuProps: __assign(__assign({}, menuProps), {
+        "aria-labelledby": buttonProps.id
+      })
+    }, children))))));
   };
   FilterSelect.displayName = "FilterSelect";
   FilterSelect.Section = ListBoxSection;

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

@@ -1,9 +1,22 @@
 import { __rest, __assign } from 'tslib';
-import React from 'react';
+import React, { useEffect } 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,
@@ -12,13 +25,38 @@ 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
+      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
     }), state, ref).listBoxProps;
-    return /*#__PURE__*/React.createElement("ul", __assign({
-      ref: ref,
-      className: classnames(styles.listBox, classNameOverride)
-    }, listBoxProps, restProps), children);
+    /**
+     * 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)
+    );
   };
   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: true,
+      autoFocus: false,
       restoreFocus: true
     }, /*#__PURE__*/React.createElement(DismissButton, {
       onDismiss: state.close

package/dist/styles.css

@@ -1,93 +1,31 @@
 @layer tokens, normalize, reset;@layer tokens{:root{--theme-key:heart;--animation-easing-function-ease-in-out:cubic-bezier(0.455,0.03,0.515,0.955);--animation-easing-function-ease-in:cubic-bezier(0.55,0.085,0.68,0.53);--animation-easing-function-ease-out:cubic-bezier(0.25,0.46,0.45,0.94);--animation-easing-function-linear:linear;--animation-easing-function-bounce-in:cubic-bezier(0.485,0.155,0.24,1.245);--animation-easing-function-bounce-out:cubic-bezier(0.485,0.155,0.515,0.845);--animation-easing-function-bounce-in-out:cubic-bezier(0.76,-0.245,0.24,1.245);--animation-duration-instant:0ms;--animation-duration-immediate:100ms;--animation-duration-rapid:200ms;--animation-duration-fast:300ms;--animation-duration-slow:400ms;--animation-duration-deliberate:700ms;--border-solid-border-width:2px;--border-solid-border-radius:7px;--border-solid-border-style:solid;--border-solid-border-color:#e1e2ea;--border-solid-border-color-rgb:225,226,234;--border-dashed-border-width:2px;--border-dashed-border-radius:7px;--border-dashed-border-style:dashed;--border-borderless-border-width:2px;--border-borderless-border-radius:7px;--border-borderless-border-style:solid;--border-borderless-border-color:transparent;--border-borderless-border-color-rgb:0,0,0;--border-focus-ring-border-width:2px;--border-focus-ring-border-radius:10px;--border-focus-ring-border-style:solid;--border-width-1:1px;--color-purple-100:#f4edf8;--color-purple-100-rgb:244,237,248;--color-purple-200:#dfc9ea;--color-purple-200-rgb:223,201,234;--color-purple-300:#c9a5dd;--color-purple-300-rgb:201,165,221;--color-purple-400:#ae67b1;--color-purple-400-rgb:174,103,177;--color-purple-500:#844587;--color-purple-500-rgb:132,69,135;--color-purple-600:#5f3361;--color-purple-600-rgb:95,51,97;--color-purple-700:#4a234d;--color-purple-700-rgb:74,35,77;--color-purple-800:#2f2438;--color-purple-800-rgb:47,36,56;--color-blue-100:#e6f6ff;--color-blue-100-rgb:230,246,255;--color-blue-200:#bde2f5;--color-blue-200-rgb:189,226,245;--color-blue-300:#73c0e8;--color-blue-300-rgb:115,192,232;--color-blue-400:#008bd6;--color-blue-400-rgb:0,139,214;--color-blue-500:#0168b3;--color-blue-500-rgb:1,104,179;--color-blue-600:#004970;--color-blue-600-rgb:0,73,112;--color-blue-700:#003157;--color-blue-700-rgb:0,49,87;--color-green-100:#e8f8f4;--color-green-100-rgb:232,248,244;--color-green-200:#c4ede2;--color-green-200-rgb:196,237,226;--color-green-300:#8fdbc7;--color-green-300-rgb:143,219,199;--color-green-400:#5dcaad;--color-green-400-rgb:93,202,173;--color-green-500:#3f9a86;--color-green-500-rgb:63,154,134;--color-green-600:#2c7d67;--color-green-600-rgb:44,125,103;--color-green-700:#22594a;--color-green-700-rgb:34,89,74;--color-yellow-100:#fff9e4;--color-yellow-100-rgb:255,249,228;--color-yellow-200:#ffeeb3;--color-yellow-200-rgb:255,238,179;--color-yellow-300:#ffe36e;--color-yellow-300-rgb:255,227,110;--color-yellow-400:#ffca4d;--color-yellow-400-rgb:255,202,77;--color-yellow-500:#ffb600;--color-yellow-500-rgb:255,182,0;--color-yellow-600:#c68600;--color-yellow-600-rgb:198,134,0;--color-yellow-700:#876400;--color-yellow-700-rgb:135,100,0;--color-red-100:#fdeaee;--color-red-100-rgb:253,234,238;--color-red-200:#f9c2cb;--color-red-200-rgb:249,194,203;--color-red-300:#f597a8;--color-red-300-rgb:245,151,168;--color-red-400:#e0707d;--color-red-400-rgb:224,112,125;--color-red-500:#c93b55;--color-red-500-rgb:201,59,85;--color-red-600:#a82433;--color-red-600-rgb:168,36,51;--color-red-700:#6c1e20;--color-red-700-rgb:108,30,32;--color-orange-100:#fff0e8;--color-orange-100-rgb:255,240,232;--color-orange-200:#ffd1b9;--color-orange-200-rgb:255,209,185;--color-orange-300:#ffb08a;--color-orange-300-rgb:255,176,138;--color-orange-400:#ff9461;--color-orange-400-rgb:255,148,97;--color-orange-500:#e96c2f;--color-orange-500-rgb:233,108,47;--color-orange-600:#b74302;--color-orange-600-rgb:183,67,2;--color-orange-700:#903c00;--color-orange-700-rgb:144,60,0;--color-gray-100:#f9f9f9;--color-gray-100-rgb:249,249,249;--color-gray-200:#f4f4f5;--color-gray-200-rgb:244,244,245;--color-gray-300:#eaeaec;--color-gray-300-rgb:234,234,236;--color-gray-400:#cdcdd0;--color-gray-400-rgb:205,205,208;--color-gray-500:#878792;--color-gray-500-rgb:135,135,146;--color-gray-600:#524e56;--color-gray-600-rgb:82,78,86;--color-white:#fff;--color-white-rgb:255,255,255;--color-black:#000;--color-black-rgb:0,0,0;--data-viz-favorable:#7dd5bd;--data-viz-favorable-rgb:125,213,189;--data-viz-unfavorable:#e68d97;--data-viz-unfavorable-rgb:230,141,151;--layout-content-max-width:1392px;--layout-content-max-width-with-sidebar:1080px;--layout-content-side-margin:72px;--layout-mobile-actions-drawer-height:60px;--layout-navigation-bar-height:72px;--layout-breakpoints-medium:768px;--layout-breakpoints-large:1080px;--shadow-small-box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 3px 16px 0 rgba(0,0,0,.06);--shadow-large-box-shadow:0 3px 9px 0 rgba(0,0,0,.1),0 8px 40px 0 rgba(0,0,0,.08);--spacing-0:0;--spacing-1:.0625rem;--spacing-2:.125rem;--spacing-4:.25rem;--spacing-6:.375rem;--spacing-8:.5rem;--spacing-12:.75rem;--spacing-16:1rem;--spacing-20:1.25rem;--spacing-24:1.5rem;--spacing-32:2rem;--spacing-40:2.5rem;--spacing-48:3rem;--spacing-56:3.5rem;--spacing-64:4rem;--spacing-72:4.5rem;--spacing-80:5rem;--spacing-96:6rem;--spacing-112:7rem;--spacing-128:8rem;--spacing-160:10rem;--spacing-200:12.5rem;--spacing-240:15rem;--spacing-280:17.5rem;--spacing-320:20rem;--spacing-xs:0.375rem;--spacing-sm:0.75rem;--spacing-md:1.5rem;--spacing-lg:2.25rem;--spacing-xl:3rem;--spacing-xxl:3.75rem;--spacing-xxxl:4.5rem;--spacing-xxxxl:5.25rem;--spacing-xxxxxl:6rem;--typography-data-large-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-data-large-font-weight:700;--typography-data-large-font-size:5.25rem;--typography-data-large-line-height:5.25rem;--typography-data-large-letter-spacing:normal;--typography-data-large-units-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-data-large-units-font-weight:700;--typography-data-large-units-font-size:2.625rem;--typography-data-large-units-line-height:5.25rem;--typography-data-large-units-letter-spacing:normal;--typography-data-medium-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-data-medium-font-weight:700;--typography-data-medium-font-size:3rem;--typography-data-medium-line-height:5rem;--typography-data-medium-letter-spacing:normal;--typography-data-medium-units-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-data-medium-units-font-weight:700;--typography-data-medium-units-font-size:1.5rem;--typography-data-medium-units-line-height:5rem;--typography-data-medium-units-letter-spacing:normal;--typography-data-small-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-data-small-font-weight:700;--typography-data-small-font-size:1.5rem;--typography-data-small-line-height:1.5rem;--typography-data-small-letter-spacing:normal;--typography-data-small-units-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-data-small-units-font-weight:700;--typography-data-small-units-font-size:1.125rem;--typography-data-small-units-line-height:1.5rem;--typography-data-small-units-letter-spacing:normal;--typography-display-0-font-family:"Tiempos Headline",Georgia,serif;--typography-display-0-font-weight:800;--typography-display-0-font-size:4.5rem;--typography-display-0-line-height:5.25rem;--typography-display-0-letter-spacing:0em;--typography-heading-1-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-heading-1-font-weight:700;--typography-heading-1-font-size:2.125rem;--typography-heading-1-line-height:2.625rem;--typography-heading-1-letter-spacing:normal;--typography-heading-2-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-heading-2-font-weight:700;--typography-heading-2-font-size:1.75rem;--typography-heading-2-line-height:2.25rem;--typography-heading-2-letter-spacing:normal;--typography-heading-3-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-heading-3-font-weight:700;--typography-heading-3-font-size:1.375rem;--typography-heading-3-line-height:1.875rem;--typography-heading-3-letter-spacing:normal;--typography-heading-4-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-heading-4-font-weight:600;--typography-heading-4-font-size:1.125rem;--typography-heading-4-line-height:1.5rem;--typography-heading-4-letter-spacing:normal;--typography-heading-5-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-heading-5-font-weight:600;--typography-heading-5-font-size:1rem;--typography-heading-5-line-height:1.5rem;--typography-heading-5-letter-spacing:normal;--typography-heading-6-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-heading-6-font-weight:700;--typography-heading-6-font-size:0.875rem;--typography-heading-6-line-height:1.5rem;--typography-heading-6-letter-spacing:normal;--typography-paragraph-intro-lede-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-paragraph-intro-lede-font-weight:400;--typography-paragraph-intro-lede-font-size:1.25rem;--typography-paragraph-intro-lede-line-height:1.875rem;--typography-paragraph-intro-lede-letter-spacing:0;--typography-paragraph-intro-lede-max-width:975px;--typography-paragraph-body-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-paragraph-body-font-weight:400;--typography-paragraph-body-font-size:1rem;--typography-paragraph-body-line-height:1.5rem;--typography-paragraph-body-letter-spacing:normal;--typography-paragraph-body-max-width:780px;--typography-paragraph-small-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-paragraph-small-font-weight:400;--typography-paragraph-small-font-size:0.875rem;--typography-paragraph-small-line-height:1.125rem;--typography-paragraph-small-letter-spacing:normal;--typography-paragraph-small-max-width:680px;--typography-paragraph-extra-small-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-paragraph-extra-small-font-weight:400;--typography-paragraph-extra-small-font-size:0.75rem;--typography-paragraph-extra-small-line-height:1.125rem;--typography-paragraph-extra-small-letter-spacing:normal;--typography-paragraph-extra-small-max-width:600px;--typography-paragraph-bold-font-weight:600;--typography-button-primary-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-button-primary-font-weight:700;--typography-button-primary-font-size:1.125rem;--typography-button-primary-line-height:1.5rem;--typography-button-primary-letter-spacing:normal;--typography-button-secondary-font-family:"Inter","Noto Sans",Helvetica,Arial,sans-serif;--typography-button-secondary-font-weight:500;--typography-button-secondary-font-size:1rem;--typography-button-secondary-line-height:1.5rem;--typography-button-secondary-letter-spacing:normal}}@layer normalize{html{text-size-adjust:100%;line-height:1.15}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{appearance:none}::-webkit-file-upload-button{appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none}}@layer reset{@font-face{font-family:Tiempos Headline;font-weight:800;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/tiempos/tiempos-headline-bold.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/tiempos/tiempos-headline-bold.woff)}@font-face{font-family:Tiempos Headline;font-weight:500;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/tiempos/tiempos-headline-medium.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/tiempos/tiempos-headline-medium.woff)}@font-face{font-family:Greycliff CF;font-weight:300;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/greycliff/greycliff-cf-light.woff) format("woff")}@font-face{font-family:Greycliff CF;font-weight:400;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/greycliff/greycliff-cf-regular.woff) format("woff")}@font-face{font-family:Greycliff CF;font-weight:500;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/greycliff/greycliff-cf-medium.woff) format("woff")}@font-face{font-family:Greycliff CF;font-weight:600;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/greycliff/greycliff-cf-demi-bold.woff) format("woff")}@font-face{font-family:Greycliff CF;font-weight:700;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/greycliff/greycliff-cf-bold.woff) format("woff")}@font-face{font-family:Greycliff CF;font-weight:800;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/greycliff/greycliff-cf-extra-bold.woff) format("woff")}@font-face{font-family:Inter;font-weight:300;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-light.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-light.woff)}@font-face{font-family:Inter;font-weight:400;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-regular.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-regular.woff)}@font-face{font-family:Inter;font-weight:500;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-medium.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-medium.woff)}@font-face{font-family:Inter;font-weight:600;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-demi-bold.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-demi-bold.woff)}@font-face{font-family:Inter;font-weight:700;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-bold.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-bold.woff)}@font-face{font-family:Inter;font-weight:800;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-extra-bold.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/inter/inter-extra-bold.woff)}@font-face{font-family:IBM Plex Mono;src:url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/ibm-plex-mono/ibm-plex-mono-regular.woff2),url(https://d1e7r7b0lb8p4d.cloudfront.net/fonts/ibm-plex-mono/ibm-plex-mono-regular.woff)}}@layer reset{*,:after,:before{border-color:var(--border-solid-border-color,"currentColor");border-style:solid;border-width:0}}
 /** THIS IS AN AUTOGENERATED FILE **/
 /** THIS IS AN AUTOGENERATED FILE **/
-/** THIS IS AN AUTOGENERATED FILE **/
-/** THIS IS AN AUTOGENERATED FILE **/
-/** THIS IS AN AUTOGENERATED FILE **/
-/** THIS IS AN AUTOGENERATED FILE **/
-.Tooltip-module_tooltip__efL1m {
-  max-width: 200px;
-  padding: var(--spacing-8, 0.5rem) var(--spacing-12, 0.75rem);
-  color: var(--color-white, #ffffff);
-  text-align: center;
-  font-family: var(--typography-paragraph-extra-small-font-family, "Inter", "Noto Sans", Helvetica, Arial, sans-serif);
-  font-size: var(--typography-paragraph-extra-small-font-size, 0.75rem);
-  font-weight: var(--typography-paragraph-extra-small-font-weight, 400);
-  letter-spacing: var(--typography-paragraph-extra-small-letter-spacing, normal);
-  line-height: var(--typography-paragraph-extra-small-line-height, 1.125rem);
-  border-radius: var(--border-solid-border-radius, 7px);
-  box-shadow: var(--shadow-small-box-shadow, 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 3px 16px 0 rgba(0, 0, 0, 0.06));
-  background-color: var(--color-purple-800, #2f2438);
-  text-wrap: pretty;
-  /* fixes FF gap */
-  transform: translate3d(0, 0, 0);
-}
-.Tooltip-module_tooltip__efL1m.Tooltip-module_reversed__NnCbZ {
-  background-color: var(--color-white, #ffffff);
-  color: var(--color-purple-800, #2f2438);
-}
-.Tooltip-module_tooltip__efL1m[data-placement=top] {
-  --origin: translateY(4px);
-}
-.Tooltip-module_tooltip__efL1m[data-placement=bottom] {
-  --origin: translateY(-4px);
-}
-.Tooltip-module_tooltip__efL1m[data-placement=right] {
-  --origin: translateX(-4px);
-}
-.Tooltip-module_tooltip__efL1m[data-placement=left] {
-  --origin: translateX(4px);
+.OverlayArrow-module_overlayArrow__hoDyK {
+  display: flex;
+  padding: 8px;
 }
-.Tooltip-module_tooltip__efL1m[data-entering] {
-  animation: Tooltip-module_slide__lFdGA var(--animation-duration-fast, 300ms);
+.OverlayArrow-module_overlayArrow__hoDyK[data-placement=top], .OverlayArrow-module_overlayArrow__hoDyK[data-placement=bottom] {
+  padding: 0 8px;
 }
-.Tooltip-module_tooltip__efL1m[data-exiting] {
-  animation: Tooltip-module_slide__lFdGA var(--animation-duration-fast, 300ms) reverse var(--animation-easing-function-ease-in, cubic-bezier(0.55, 0.085, 0.68, 0.53));
+.OverlayArrow-module_overlayArrow__hoDyK[data-placement=left], .OverlayArrow-module_overlayArrow__hoDyK[data-placement=right] {
+  padding: 8px 0;
 }
-
-@keyframes Tooltip-module_slide__lFdGA {
-  from {
-    transform: var(--origin);
-    opacity: 0;
-  }
-  to {
-    transform: translateY(0);
-    opacity: 1;
-  }
+.OverlayArrow-module_overlayArrow__hoDyK path {
+  fill: var(--color-purple-800, #2f2438);
+  box-shadow: var(--shadow-small-box-shadow, 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 3px 16px 0 rgba(0, 0, 0, 0.06));
 }
-.MenuItem-module_item__DPerF {
-  font-family: var(--typography-paragraph-body-font-family);
-  font-size: var(--typography-paragraph-body-font-size);
-  letter-spacing: var(--typography-paragraph-body-letter-spacing);
-  font-weight: var(--typography-paragraph-body-font-weight);
-  line-height: var(--typography-paragraph-body-line-height);
-  color: rgba(var(--color-purple-800-rgb), 0.7);
-  padding: var(--spacing-6) var(--spacing-8);
-  border: var(--border-focus-ring-border-width) var(--border-focus-ring-border-style) transparent;
-  border-radius: 4px;
-  display: flex;
-  gap: 0 var(--spacing-8);
-  align-items: center;
-  margin-inline: var(--spacing-6);
-  text-decoration: none;
-  cursor: pointer;
+.OverlayArrow-module_overlayArrow__hoDyK[data-placement=right] svg {
+  transform: rotate(90deg);
 }
-
-.MenuItem-module_iconWrapper__bRdQN {
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
+.OverlayArrow-module_overlayArrow__hoDyK[data-placement=bottom] svg {
+  transform: rotate(180deg);
 }
-
-.MenuItem-module_item__DPerF[data-focused] {
-  background-color: var(--color-blue-100);
-  color: var(--color-blue-500);
-  outline: none;
-  border-color: var(--color-blue-500);
+.OverlayArrow-module_overlayArrow__hoDyK[data-placement=left] svg {
+  transform: rotate(270deg);
 }
-
-.MenuItem-module_item__DPerF[data-disabled] {
-  opacity: 0.3;
+.OverlayArrow-module_overlayArrow__hoDyK.OverlayArrow-module_reversed__-WGcR path {
+  fill: var(--color-white, #ffffff);
 }
 .Button-module_button__QOSYH {
   --button-min-height-width: var(--spacing-48);
@@ -177,9 +115,6 @@
   --button-icon-size: var(--spacing-16);
   gap: var(--spacing-8);
 }
-.Focusable-module_focusableWrapper__NfuIi {
-  display: inline-flex;
-}
 .Menu-module_menu__iHYqh {
   background-color: var(--color-white);
   color: var(--color-purple-800);
@@ -210,33 +145,98 @@
   display: block;
   margin-block: var(--spacing-6);
 }
-/** THIS IS AN AUTOGENERATED FILE **/
-/** THIS IS AN AUTOGENERATED FILE **/
-.OverlayArrow-module_overlayArrow__hoDyK {
+.MenuItem-module_item__DPerF {
+  font-family: var(--typography-paragraph-body-font-family);
+  font-size: var(--typography-paragraph-body-font-size);
+  letter-spacing: var(--typography-paragraph-body-letter-spacing);
+  font-weight: var(--typography-paragraph-body-font-weight);
+  line-height: var(--typography-paragraph-body-line-height);
+  color: rgba(var(--color-purple-800-rgb), 0.7);
+  padding: var(--spacing-6) var(--spacing-8);
+  border: var(--border-focus-ring-border-width) var(--border-focus-ring-border-style) transparent;
+  border-radius: 4px;
   display: flex;
-  padding: 8px;
+  gap: 0 var(--spacing-8);
+  align-items: center;
+  margin-inline: var(--spacing-6);
+  text-decoration: none;
+  cursor: pointer;
 }
-.OverlayArrow-module_overlayArrow__hoDyK[data-placement=top], .OverlayArrow-module_overlayArrow__hoDyK[data-placement=bottom] {
-  padding: 0 8px;
+
+.MenuItem-module_iconWrapper__bRdQN {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
 }
-.OverlayArrow-module_overlayArrow__hoDyK[data-placement=left], .OverlayArrow-module_overlayArrow__hoDyK[data-placement=right] {
-  padding: 8px 0;
+
+.MenuItem-module_item__DPerF[data-focused] {
+  background-color: var(--color-blue-100);
+  color: var(--color-blue-500);
+  outline: none;
+  border-color: var(--color-blue-500);
 }
-.OverlayArrow-module_overlayArrow__hoDyK path {
-  fill: var(--color-purple-800, #2f2438);
+
+.MenuItem-module_item__DPerF[data-disabled] {
+  opacity: 0.3;
+}
+.Focusable-module_focusableWrapper__NfuIi {
+  display: inline-flex;
+}
+/** THIS IS AN AUTOGENERATED FILE **/
+/** THIS IS AN AUTOGENERATED FILE **/
+/** THIS IS AN AUTOGENERATED FILE **/
+/** THIS IS AN AUTOGENERATED FILE **/
+/** THIS IS AN AUTOGENERATED FILE **/
+/** THIS IS AN AUTOGENERATED FILE **/
+.Tooltip-module_tooltip__efL1m {
+  max-width: 200px;
+  padding: var(--spacing-8, 0.5rem) var(--spacing-12, 0.75rem);
+  color: var(--color-white, #ffffff);
+  text-align: center;
+  font-family: var(--typography-paragraph-extra-small-font-family, "Inter", "Noto Sans", Helvetica, Arial, sans-serif);
+  font-size: var(--typography-paragraph-extra-small-font-size, 0.75rem);
+  font-weight: var(--typography-paragraph-extra-small-font-weight, 400);
+  letter-spacing: var(--typography-paragraph-extra-small-letter-spacing, normal);
+  line-height: var(--typography-paragraph-extra-small-line-height, 1.125rem);
+  border-radius: var(--border-solid-border-radius, 7px);
   box-shadow: var(--shadow-small-box-shadow, 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 3px 16px 0 rgba(0, 0, 0, 0.06));
+  background-color: var(--color-purple-800, #2f2438);
+  text-wrap: pretty;
+  /* fixes FF gap */
+  transform: translate3d(0, 0, 0);
 }
-.OverlayArrow-module_overlayArrow__hoDyK[data-placement=right] svg {
-  transform: rotate(90deg);
+.Tooltip-module_tooltip__efL1m.Tooltip-module_reversed__NnCbZ {
+  background-color: var(--color-white, #ffffff);
+  color: var(--color-purple-800, #2f2438);
 }
-.OverlayArrow-module_overlayArrow__hoDyK[data-placement=bottom] svg {
-  transform: rotate(180deg);
+.Tooltip-module_tooltip__efL1m[data-placement=top] {
+  --origin: translateY(4px);
 }
-.OverlayArrow-module_overlayArrow__hoDyK[data-placement=left] svg {
-  transform: rotate(270deg);
+.Tooltip-module_tooltip__efL1m[data-placement=bottom] {
+  --origin: translateY(-4px);
 }
-.OverlayArrow-module_overlayArrow__hoDyK.OverlayArrow-module_reversed__-WGcR path {
-  fill: var(--color-white, #ffffff);
+.Tooltip-module_tooltip__efL1m[data-placement=right] {
+  --origin: translateX(-4px);
+}
+.Tooltip-module_tooltip__efL1m[data-placement=left] {
+  --origin: translateX(4px);
+}
+.Tooltip-module_tooltip__efL1m[data-entering] {
+  animation: Tooltip-module_slide__lFdGA var(--animation-duration-fast, 300ms);
+}
+.Tooltip-module_tooltip__efL1m[data-exiting] {
+  animation: Tooltip-module_slide__lFdGA var(--animation-duration-fast, 300ms) reverse var(--animation-easing-function-ease-in, cubic-bezier(0.55, 0.085, 0.68, 0.53));
+}
+
+@keyframes Tooltip-module_slide__lFdGA {
+  from {
+    transform: var(--origin);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
 }
 .SVG-module_icon__8J5Ev {
   width: 20px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaizen/components",
-  "version": "1.64.4",
+  "version": "1.64.5",
   "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/package-bundler": "1.1.5",
-    "@kaizen/design-tokens": "10.6.1"
+    "@kaizen/design-tokens": "10.6.1",
+    "@kaizen/package-bundler": "1.1.5"
   },
   "peerDependencies": {
     "@cultureamp/i18n-react-intl": "^2.5.9",

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.queryByRole("listbox")).toBeVisible()
+      expect(screen.getByRole("listbox")).toBeVisible()
     })
   })
 
@@ -107,7 +107,7 @@ describe("<FilterSelect>", () => {
         render(<FilterSelectWrapper isOpen />)
         expect(screen.queryByRole("listbox")).toBeVisible()
         await waitFor(() => {
-          expect(screen.queryByRole("listbox")).toHaveFocus()
+          expect(screen.getAllByRole("option")[0]).toHaveFocus()
         })
       })
 

package/src/Filter/FilterSelect/FilterSelect.tsx

@@ -79,6 +79,12 @@ 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} />
@@ -90,19 +96,23 @@ export const FilterSelect = <Option extends SelectOption = SelectOption>({
             selectedValue: state.selectedItem?.textValue || undefined,
             label,
             isOpen,
-            ...buttonProps,
+            ...renderTriggerButtonProps,
           })
         }
         onMount={setTriggerRef}
         classNameOverride={classNameOverride}
       >
-        <FilterContents classNameOverride={styles.filterContents}>
-          <SelectProvider<Option> state={state}>
-            <SelectPopoverContents menuProps={menuProps}>
-              {children}
-            </SelectPopoverContents>
-          </SelectProvider>
-        </FilterContents>
+        <>
+          <FilterContents classNameOverride={styles.filterContents}>
+            <SelectProvider<Option> state={state}>
+              <SelectPopoverContents
+                menuProps={{ ...menuProps, "aria-labelledby": buttonProps.id }}
+              >
+                {children}
+              </SelectPopoverContents>
+            </SelectProvider>
+          </FilterContents>
+        </>
       </Filter>
     </>
   )

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

@@ -1,4 +1,5 @@
 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/__future__/Select/Select.spec.tsx

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

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

@@ -98,8 +98,6 @@ 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 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.
+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.
 
 <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,5 +1,6 @@
 import React from "react"
 import { Meta, StoryObj } from "@storybook/react"
+import { ContextModal } from "~components/Modal"
 import { Select } from "../Select"
 import { SelectOption } from "../types"
 import {
@@ -165,25 +166,41 @@ 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
-          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
+        <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
             {...args}
-            label="Inner portal"
-            selectedKey="batch-brew"
-            id="id--select-inner"
-            portalContainerId={portalContainerId}
-          />
+            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>
         </div>
       </>
     )

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

@@ -1,5 +1,6 @@
-import React, { HTMLAttributes } from "react"
+import React, { HTMLAttributes, Key, useEffect } 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"
@@ -14,6 +15,21 @@ 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,
@@ -22,13 +38,40 @@ 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 },
+    {
+      ...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,
+    },
     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 restoreFocus>
+      <FocusScope autoFocus={false} restoreFocus>
         <DismissButton onDismiss={state.close} />
         {children}
         <DismissButton onDismiss={state.close} />