@kaizen/components 1.64.3 → 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/Notification/InlineNotification/InlineNotification.cjs

@@ -17,7 +17,7 @@ var classnames__default = /*#__PURE__*/_interopDefault(classnames);
  * {@link https://cultureamp.atlassian.net/wiki/spaces/DesignSystem/pages/3082093392/Inline+Notification Guidance} |
  * {@link https://cultureamp.design/storybook/?path=/docs/components-notifications-inline-notification--docs Storybook}
  */
-var InlineNotification = function (_a) {
+var InlineNotification = React.forwardRef(function (_a, ref) {
   var isSubtle = _a.isSubtle,
     _b = _a.hideCloseIcon,
     hideCloseIcon = _b === void 0 ? false : _b,
@@ -28,8 +28,9 @@ var InlineNotification = function (_a) {
   return React__default.default.createElement(GenericNotification.GenericNotification, tslib.__assign({
     style: "inline",
     persistent: persistent || hideCloseIcon,
-    classNameOverride: classnames__default.default(classNameOverride, [isSubtle && GenericNotification_module.subtle])
+    classNameOverride: classnames__default.default(classNameOverride, [isSubtle && GenericNotification_module.subtle]),
+    ref: ref
   }, otherProps));
-};
+});
 InlineNotification.displayName = "InlineNotification";
 exports.InlineNotification = InlineNotification;

package/dist/cjs/Notification/subcomponents/GenericNotification/GenericNotification.cjs

@@ -3,6 +3,7 @@
 var tslib = require('tslib');
 var React = require('react');
 var classnames = require('classnames');
+var isRefObject = require('../../../utils/isRefObject.cjs');
 var CancelButton = require('../CancelButton/CancelButton.cjs');
 var NotificationHeading = require('../NotificationHeading/NotificationHeading.cjs');
 var NotificationIcon = require('../NotificationIcon/NotificationIcon.cjs');
@@ -14,7 +15,7 @@ function _interopDefault(e) {
 }
 var React__default = /*#__PURE__*/_interopDefault(React);
 var classnames__default = /*#__PURE__*/_interopDefault(classnames);
-var GenericNotification = function (_a) {
+var GenericNotification = React.forwardRef(function (_a, ref) {
   var type = _a.type,
     variant = _a.variant,
     style = _a.style,
@@ -34,7 +35,8 @@ var GenericNotification = function (_a) {
   var _d = React.useState(false),
     isRemoved = _d[0],
     setIsRemoved = _d[1];
-  var containerRef = React.useRef(null);
+  var fallbackRef = React.useRef(null);
+  var containerRef = isRefObject.isRefObject(ref) ? ref : fallbackRef;
   React.useEffect(function () {
     requestAnimationFrame(function () {
       if (containerRef.current) {
@@ -83,6 +85,6 @@ var GenericNotification = function (_a) {
       return setIsHidden(true);
     }
   }));
-};
+});
 GenericNotification.displayName = "GenericNotification";
 exports.GenericNotification = GenericNotification;

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/Notification/InlineNotification/InlineNotification.mjs

@@ -1,5 +1,5 @@
 import { __rest, __assign } from 'tslib';
-import React from 'react';
+import React, { forwardRef } from 'react';
 import classnames from 'classnames';
 import { GenericNotification } from '../subcomponents/GenericNotification/GenericNotification.mjs';
 import styles from '../subcomponents/GenericNotification/GenericNotification.module.scss.mjs';
@@ -9,7 +9,7 @@ import styles from '../subcomponents/GenericNotification/GenericNotification.mod
  * {@link https://cultureamp.design/storybook/?path=/docs/components-notifications-inline-notification--docs Storybook}
  */
 const InlineNotification = /*#__PURE__*/function () {
-  const InlineNotification = function (_a) {
+  const InlineNotification = /*#__PURE__*/forwardRef(function (_a, ref) {
     var isSubtle = _a.isSubtle,
       _b = _a.hideCloseIcon,
       hideCloseIcon = _b === void 0 ? false : _b,
@@ -20,9 +20,10 @@ const InlineNotification = /*#__PURE__*/function () {
     return /*#__PURE__*/React.createElement(GenericNotification, __assign({
       style: "inline",
       persistent: persistent || hideCloseIcon,
-      classNameOverride: classnames(classNameOverride, [isSubtle && styles.subtle])
+      classNameOverride: classnames(classNameOverride, [isSubtle && styles.subtle]),
+      ref: ref
     }, otherProps));
-  };
+  });
   InlineNotification.displayName = "InlineNotification";
   return InlineNotification;
 }();

package/dist/esm/Notification/subcomponents/GenericNotification/GenericNotification.mjs

@@ -1,12 +1,13 @@
 import { __rest, __assign } from 'tslib';
-import React, { useState, useRef, useEffect } from 'react';
+import React, { forwardRef, useState, useRef, useEffect } from 'react';
 import classnames from 'classnames';
+import { isRefObject } from '../../../utils/isRefObject.mjs';
 import { CancelButton } from '../CancelButton/CancelButton.mjs';
 import { NotificationHeading } from '../NotificationHeading/NotificationHeading.mjs';
 import { NotificationIconType, NotificationIconVariant } from '../NotificationIcon/NotificationIcon.mjs';
 import styles from './GenericNotification.module.scss.mjs';
 const GenericNotification = /*#__PURE__*/function () {
-  const GenericNotification = function (_a) {
+  const GenericNotification = /*#__PURE__*/forwardRef(function (_a, ref) {
     var type = _a.type,
       variant = _a.variant,
       style = _a.style,
@@ -26,7 +27,8 @@ const GenericNotification = /*#__PURE__*/function () {
     var _d = useState(false),
       isRemoved = _d[0],
       setIsRemoved = _d[1];
-    var containerRef = useRef(null);
+    var fallbackRef = useRef(null);
+    var containerRef = isRefObject(ref) ? ref : fallbackRef;
     useEffect(function () {
       requestAnimationFrame(function () {
         if (containerRef.current) {
@@ -75,7 +77,7 @@ const GenericNotification = /*#__PURE__*/function () {
         return setIsHidden(true);
       }
     }));
-  };
+  });
   GenericNotification.displayName = "GenericNotification";
   return GenericNotification;
 }();

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

@@ -27,73 +27,6 @@
 .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);
-}
-.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;
-}
-
-.MenuItem-module_iconWrapper__bRdQN {
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-}
-
-.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);
-}
-
-.MenuItem-module_item__DPerF[data-disabled] {
-  opacity: 0.3;
-}
-.Focusable-module_focusableWrapper__NfuIi {
-  display: inline-flex;
-}
 .Button-module_button__QOSYH {
   --button-min-height-width: var(--spacing-48);
   --button-padding-x: calc(
@@ -182,6 +115,73 @@
   --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);
+  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;
+}
+
+.MenuItem-module_iconWrapper__bRdQN {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+}
+
+.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);
+}
+
+.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 **/
@@ -5408,6 +5408,10 @@ input[type=range].InputRange-module_ratingScaleRange__gI-rs::-ms-thumb:not(:disa
   box-sizing: border-box;
   pointer-events: all;
 }
+.GenericNotification-module_notification__-JP1M:focus {
+  outline-offset: 1px;
+  outline: 2px solid var(--color-blue-500);
+}
 .GenericNotification-module_notification__-JP1M.GenericNotification-module_inline__OciO5, .GenericNotification-module_notification__-JP1M.GenericNotification-module_toast__GOVfC {
   margin-bottom: var(--spacing-24, 1.5rem);
   border-width: var(--border-width-1);

package/dist/types/Notification/InlineNotification/InlineNotification.d.ts

@@ -19,7 +19,4 @@ export type InlineNotificationProps = InlineNotificationBase & (GenericNotificat
  * {@link https://cultureamp.atlassian.net/wiki/spaces/DesignSystem/pages/3082093392/Inline+Notification Guidance} |
  * {@link https://cultureamp.design/storybook/?path=/docs/components-notifications-inline-notification--docs Storybook}
  */
-export declare const InlineNotification: {
-    ({ isSubtle, hideCloseIcon, persistent, classNameOverride, ...otherProps }: InlineNotificationProps): JSX.Element;
-    displayName: string;
-};
+export declare const InlineNotification: React.ForwardRefExoticComponent<InlineNotificationProps & React.RefAttributes<HTMLDivElement>>;

package/dist/types/Notification/subcomponents/GenericNotification/GenericNotification.d.ts

@@ -32,8 +32,5 @@ export type GenericNotificationVariant = {
     variant: NotificationVariant;
 };
 export type GenericNotificationProps = GenericNotificationBase & (GenericNotificationType | GenericNotificationVariant);
-export declare const GenericNotification: {
-    ({ type, variant, style, children, title, persistent, onHide, noBottomMargin, forceMultiline, headingProps, classNameOverride, ...restProps }: GenericNotificationProps): JSX.Element | null;
-    displayName: string;
-};
+export declare const GenericNotification: React.ForwardRefExoticComponent<GenericNotificationProps & React.RefAttributes<HTMLDivElement>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaizen/components",
-  "version": "1.64.3",
+  "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/Notification/InlineNotification/InlineNotification.tsx

@@ -1,4 +1,4 @@
-import React, { HTMLAttributes } from "react"
+import React, { forwardRef, HTMLAttributes } from "react"
 import classnames from "classnames"
 import { HeadingProps } from "~components/Heading"
 import { OverrideClassName } from "~components/types/OverrideClassName"
@@ -30,21 +30,30 @@ export type InlineNotificationProps = InlineNotificationBase &
  * {@link https://cultureamp.atlassian.net/wiki/spaces/DesignSystem/pages/3082093392/Inline+Notification Guidance} |
  * {@link https://cultureamp.design/storybook/?path=/docs/components-notifications-inline-notification--docs Storybook}
  */
-export const InlineNotification = ({
-  isSubtle,
-  hideCloseIcon = false,
-  persistent = false,
-  classNameOverride,
-  ...otherProps
-}: InlineNotificationProps): JSX.Element => (
-  <GenericNotification
-    style="inline"
-    persistent={persistent || hideCloseIcon}
-    classNameOverride={classnames(classNameOverride, [
-      isSubtle && styles.subtle,
-    ])}
-    {...otherProps}
-  />
+export const InlineNotification = forwardRef<
+  HTMLDivElement,
+  InlineNotificationProps
+>(
+  (
+    {
+      isSubtle,
+      hideCloseIcon = false,
+      persistent = false,
+      classNameOverride,
+      ...otherProps
+    },
+    ref
+  ): JSX.Element => (
+    <GenericNotification
+      style="inline"
+      persistent={persistent || hideCloseIcon}
+      classNameOverride={classnames(classNameOverride, [
+        isSubtle && styles.subtle,
+      ])}
+      ref={ref}
+      {...otherProps}
+    />
+  )
 )
 
 InlineNotification.displayName = "InlineNotification"

package/src/Notification/InlineNotification/_docs/InlineNotification.stickersheet.stories.tsx

@@ -131,6 +131,19 @@ const VARIANTS_PROPS: Array<{
       forceMultiline: true,
     },
   },
+  {
+    title: "Focus",
+    props: {
+      // @ts-ignore
+      "data-sb-pseudo-styles": "focus",
+      variant: "informative",
+      headingProps: {
+        variant: "heading-6",
+        tag: "span",
+        children: "Focused title",
+      },
+    },
+  },
 ]
 
 const TYPE_PROPS: Array<{
@@ -206,6 +219,11 @@ const StickerSheetTemplate: StickerSheetStory = {
       </StickerSheet>
     </>
   ),
+  parameters: {
+    pseudo: {
+      focus: '[data-sb-pseudo-styles="focus"]',
+    },
+  },
 }
 
 export const StickerSheetDefault: StickerSheetStory = {

package/src/Notification/subcomponents/GenericNotification/GenericNotification.stories.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react"
+import React, { useRef, useState } from "react"
 import { Meta, StoryObj } from "@storybook/react"
 import { userEvent, within, expect, waitFor } from "@storybook/test"
 import { GenericNotification } from "./index"
@@ -58,3 +58,46 @@ export const GenericNotificationTest: Story = {
     })
   },
 }
+
+export const RefTest: Story = {
+  render: () => {
+    const customRef = useRef<HTMLDivElement>(null)
+    const [isHidden, setIsHidden] = useState<boolean>(false)
+
+    return (
+      <div>
+        <span data-testid="hidden-state">{isHidden ? "Hidden" : "Shown"}</span>
+        <GenericNotification
+          ref={customRef}
+          variant="success"
+          style="inline"
+          title="Success"
+          data-testid="generic-notification"
+          onHide={() => setIsHidden(true)}
+        >
+          This is my positive notification
+        </GenericNotification>
+      </div>
+    )
+  },
+  name: "Test: still renders and closes properly when custom ref passed in",
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement)
+    const element = canvas.getByTestId("generic-notification")
+    const hiddenState = canvas.getByTestId("hidden-state")
+
+    await waitFor(() => {
+      expect(element).toBeInTheDocument()
+      expect(hiddenState).toHaveTextContent("Shown")
+    })
+
+    await userEvent.click(canvas.getByTestId("close-button"))
+
+    await waitFor(() => {
+      setTimeout(() => {
+        expect(hiddenState).toHaveTextContent("Hidden")
+        expect(element).not.toBeInTheDocument()
+      }, 1000)
+    })
+  },
+}

package/src/Notification/subcomponents/GenericNotification/GenericNotification.tsx

@@ -1,4 +1,10 @@
-import React, { HTMLAttributes, useEffect, useRef, useState } from "react"
+import React, {
+  forwardRef,
+  HTMLAttributes,
+  useEffect,
+  useRef,
+  useState,
+} from "react"
 import classnames from "classnames"
 import { HeadingProps } from "~components/Heading"
 import {
@@ -6,6 +12,7 @@ import {
   NotificationVariant,
 } from "~components/Notification/types"
 import { OverrideClassName } from "~components/types/OverrideClassName"
+import { isRefObject } from "~components/utils/isRefObject"
 import { CancelButton } from "../CancelButton"
 import { NotificationHeading } from "../NotificationHeading"
 import {
@@ -49,89 +56,103 @@ export type GenericNotificationVariant = {
 export type GenericNotificationProps = GenericNotificationBase &
   (GenericNotificationType | GenericNotificationVariant)
 
-export const GenericNotification = ({
-  type,
-  variant,
-  style,
-  children,
-  title,
-  persistent = false,
-  onHide,
-  noBottomMargin,
-  forceMultiline,
-  headingProps,
-  classNameOverride,
-  ...restProps
-}: GenericNotificationProps): JSX.Element | null => {
-  const [isHidden, setIsHidden] = useState<boolean>(true)
-  const [isRemoved, setIsRemoved] = useState<boolean>(false)
+export const GenericNotification = forwardRef<
+  HTMLDivElement,
+  GenericNotificationProps
+>(
+  (
+    {
+      type,
+      variant,
+      style,
+      children,
+      title,
+      persistent = false,
+      onHide,
+      noBottomMargin,
+      forceMultiline,
+      headingProps,
+      classNameOverride,
+      ...restProps
+    },
+    ref
+  ): JSX.Element | null => {
+    const [isHidden, setIsHidden] = useState<boolean>(true)
+    const [isRemoved, setIsRemoved] = useState<boolean>(false)
 
-  const containerRef = useRef<HTMLDivElement>(null)
+    const fallbackRef = useRef<HTMLDivElement>(null)
+    const containerRef = isRefObject(ref) ? ref : fallbackRef
 
-  useEffect(() => {
-    requestAnimationFrame(() => {
-      if (containerRef.current) {
-        setIsHidden(false)
-      }
-    })
-  }, [])
+    useEffect(() => {
+      requestAnimationFrame(() => {
+        if (containerRef.current) {
+          setIsHidden(false)
+        }
+      })
+    }, [])
 
-  const getMarginTop = (): string => {
-    if (isHidden && containerRef.current) {
-      return -containerRef.current.clientHeight + "px"
+    const getMarginTop = (): string => {
+      if (isHidden && containerRef.current) {
+        return -containerRef.current.clientHeight + "px"
+      }
+      return "0"
     }
-    return "0"
-  }
 
-  const onTransitionEnd = (e: React.TransitionEvent<HTMLDivElement>): void => {
-    // Be careful: this assumes the final CSS property to be animated is "margin-top".
-    if (isHidden && e.propertyName === "margin-top") {
-      setIsRemoved(true)
-      onHide?.()
+    const onTransitionEnd = (
+      e: React.TransitionEvent<HTMLDivElement>
+    ): void => {
+      // Be careful: this assumes the final CSS property to be animated is "margin-top".
+      if (isHidden && e.propertyName === "margin-top") {
+        setIsRemoved(true)
+        onHide?.()
+      }
     }
-  }
 
-  if (isRemoved) {
-    return null
-  }
+    if (isRemoved) {
+      return null
+    }
 
-  return (
-    <div
-      ref={containerRef}
-      className={classnames(
-        styles.notification,
-        variant ? styles[variant] : styles[type],
-        styles[style],
-        isHidden && styles.hidden,
-        noBottomMargin && styles.noBottomMargin,
-        classNameOverride,
-        persistent && styles.persistent
-      )}
-      style={{ marginTop: getMarginTop() }}
-      onTransitionEnd={onTransitionEnd}
-      {...restProps}
-    >
-      <div className={styles.icon}>
-        {type ? (
-          <NotificationIconType type={type} />
-        ) : (
-          <NotificationIconVariant variant={variant} />
-        )}
-      </div>
+    return (
       <div
+        ref={containerRef}
         className={classnames(
-          styles.textContainer,
-          forceMultiline && styles.forceMultiline
+          styles.notification,
+          variant ? styles[variant] : styles[type],
+          styles[style],
+          isHidden && styles.hidden,
+          noBottomMargin && styles.noBottomMargin,
+          classNameOverride,
+          persistent && styles.persistent
         )}
+        style={{ marginTop: getMarginTop() }}
+        onTransitionEnd={onTransitionEnd}
+        {...restProps}
       >
-        {style !== "global" && (
-          <NotificationHeading titleProp={title} headingProps={headingProps} />
-        )}
-        {children && <div className={styles.text}>{children}</div>}
+        <div className={styles.icon}>
+          {type ? (
+            <NotificationIconType type={type} />
+          ) : (
+            <NotificationIconVariant variant={variant} />
+          )}
+        </div>
+        <div
+          className={classnames(
+            styles.textContainer,
+            forceMultiline && styles.forceMultiline
+          )}
+        >
+          {style !== "global" && (
+            <NotificationHeading
+              titleProp={title}
+              headingProps={headingProps}
+            />
+          )}
+          {children && <div className={styles.text}>{children}</div>}
+        </div>
+        {!persistent && <CancelButton onClick={() => setIsHidden(true)} />}
       </div>
-      {!persistent && <CancelButton onClick={() => setIsHidden(true)} />}
-    </div>
-  )
-}
+    )
+  }
+)
 
 GenericNotification.displayName = "GenericNotification"

package/src/Notification/subcomponents/GenericNotification/_mixins.scss

@@ -22,6 +22,11 @@ $notification-slide-right: transform 300ms ease-out;
   box-sizing: border-box;
   pointer-events: all;
 
+  &:focus {
+    outline-offset: 1px;
+    outline: 2px solid var(--color-blue-500);
+  }
+
   // Variants
   &%ca-notification---inline,
   &%ca-notification---toast {

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} />