@jobber/components 4.58.5 → 4.59.1-st-spike-w.0

package/dist/Combobox/index.js

@@ -1,47 +1,36 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var tslib_es6 = require('../tslib.es6-5b8768b7.js');
-var React = require('react');
-var classnames = require('classnames');
-var ReactDOM = require('react-dom');
-var styleInject_es = require('../style-inject.es-9d2f5f4e.js');
-var Icon = require('../Icon-405a216c.js');
-var Text = require('../Text-54334431.js');
-var Typography = require('../Typography-83915c54.js');
-var Button = require('../Button-db6114a6.js');
-var useRefocusOnActivator = require('@jobber/hooks/useRefocusOnActivator');
-var useFocusTrap = require('@jobber/hooks/useFocusTrap');
-var reactPopper = require('react-popper');
-var useOnKeyDown = require('@jobber/hooks/useOnKeyDown');
-var Chip = require('../Chip-f8b8fd89.js');
-var useAssert = require('@jobber/hooks/useAssert');
-require('@jobber/design');
-require('react-router-dom');
-require('@jobber/hooks/useInView');
-require('../Avatar-1aa30ee1.js');
-require('color');
-require('../Tooltip-6b12f1c2.js');
-require('framer-motion');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
-var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
+import React, { useRef, useEffect, useContext, useCallback, useState, Children, isValidElement, useMemo } from 'react';
+import classnames from 'classnames';
+import ReactDOM from 'react-dom';
+import { s as styleInject } from '../style-inject.es-a0e1a0ba.js';
+import { I as Icon } from '../Icon-22723fe6.js';
+import { T as Text } from '../Text-703e2c21.js';
+import { T as Typography } from '../Typography-09952a2f.js';
+import { B as Button } from '../Button-319d8fa0.js';
+import { useRefocusOnActivator } from '@jobber/hooks/useRefocusOnActivator';
+import { useFocusTrap } from '@jobber/hooks/useFocusTrap';
+import { usePopper } from 'react-popper';
+import { useOnKeyDown } from '@jobber/hooks/useOnKeyDown';
+import { C as Chip } from '../Chip-40f5214c.js';
+import '@jobber/design';
+import { useAssert } from '@jobber/hooks/useAssert';
+import 'react-router-dom';
+import '@jobber/hooks/useInView';
+import '../Avatar-b2e862de.js';
+import 'color';
+import '../Tooltip-c80b9fb7.js';
+import 'framer-motion';
 
 var css_248z$6 = ".m1w5vdUZ6rQ- {\n  z-index: 1002;\n  z-index: var(--elevation-tooltip);\n  max-width: var(--popover--width);\n  min-width: calc((16px * 4) * 3.75);\n  min-width: calc(calc(16px * 4) * 3.75);\n  min-width: calc(var(--space-extravagant) * 3.75);\n  box-shadow: 0px calc(16px / 16) calc(16px / 4) 0px\n      rgba(0, 0, 0, 0.1),\n    0px calc(16px / 4) 12px 0px rgba(0, 0, 0, 0.05);\n  box-shadow: var(--shadow-base);\n  margin-top: calc(16px / 2);\n  margin-top: var(--space-small);\n  border: calc(16px / 16) solid rgb(225, 225, 225);\n  border: var(--border-base) solid var(--color-border);\n  border-radius: calc(16px / 2);\n  border-radius: var(--radius-larger);\n  overflow: scroll;\n  overflow-y: auto;\n  background: rgba(255, 255, 255, 1);\n  background: var(--color-surface);\n}\n\n/* CAUTION: Tests for content visibility assume this class' presence hides the content\n* so please be careful if you change this class name, or the css rules within.\n*/\n\n.m1w5vdUZ6rQ-.Zlkv2HA096A- {\n  display: none;\n  visibility: hidden;\n}\n\n.YQry-Rd6zfQ- {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-direction: column;\n      flex-direction: column;\n  position: sticky;\n  gap: calc(16px / 4);\n  gap: var(--space-smaller);\n  bottom: 0;\n  width: 100%;\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n}\n\n.TcpqL34s4lI- {\n  padding-bottom: calc(16px / 2);\n  padding-bottom: var(--space-small);\n}\n";
 var styles$6 = {"content":"m1w5vdUZ6rQ-","hidden":"Zlkv2HA096A-","actions":"YQry-Rd6zfQ-","actionPadding":"TcpqL34s4lI-"};
-styleInject_es.styleInject(css_248z$6);
+styleInject(css_248z$6);
 
 var css_248z$5 = ".MIyb-oFZg9w- {\n  position: relative;\n}\n\n.WZPK91I4aJs- {\n  width: 100%;\n  padding: calc(16px * 1);\n  padding: var(--space-base);\n  padding-right: calc((16px * 1.5) * 2.25);\n  padding-right: calc(calc(16px * 1.5) * 2.25);\n  padding-right: calc(var(--space-large) * 2.25);\n  border: none;\n  border-bottom: calc(16px / 16) solid rgb(225, 225, 225);\n  border-bottom: var(--border-base) solid var(--color-border);\n  font-family: \"Inter\", Helvetica, Arial, sans-serif;\n  font-family: var(--typography--fontFamily-normal);\n  font-size: calc((16px * 1) * 0.875);\n  font-size: calc(calc(16px * 1) * 0.875);\n  font-size: var(--typography--fontSize-base);\n}\n\n.WZPK91I4aJs-::-webkit-search-decoration,\n.WZPK91I4aJs-::-webkit-search-cancel-button,\n.WZPK91I4aJs-::-webkit-search-results-button,\n.WZPK91I4aJs-::-webkit-search-results-decoration {\n  -webkit-appearance: none;\n}\n\n.WZPK91I4aJs-:focus {\n  outline: none;\n}\n\n._7loHrVUe-Rk- {\n  display: -ms-flexbox;\n  display: flex;\n  position: absolute;\n  top: 50%;\n  right: calc(16px * 1);\n  right: var(--space-base);\n  z-index: 1002;\n  z-index: var(--elevation-tooltip);\n  width: calc(16px * 1.5);\n  width: var(--space-large);\n  height: calc(16px * 1.5);\n  height: var(--space-large);\n  padding: 0;\n  border: none;\n  border-radius: 100%;\n  border-radius: var(--radius-circle);\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n  cursor: pointer;\n  -webkit-transform: translateY(-50%);\n          transform: translateY(-50%);\n  -ms-flex-pack: center;\n      justify-content: center;\n  -ms-flex-align: center;\n      align-items: center;\n}\n\n._7loHrVUe-Rk-:focus {\n  box-shadow: 0px 0px calc(16px / 4) calc(16px / 8)\n    rgb(231, 213, 87);\n  box-shadow: var(--shadow-focus);\n}\n";
 var styles$5 = {"search":"MIyb-oFZg9w-","searchInput":"WZPK91I4aJs-","clearSearch":"_7loHrVUe-Rk-"};
-styleInject_es.styleInject(css_248z$5);
+styleInject(css_248z$5);
 
 function ComboboxContentSearch(props) {
-    const searchRef = React.useRef(null);
-    React.useEffect(() => {
+    const searchRef = useRef(null);
+    useEffect(() => {
         if (props.open) {
             setTimeout(() => {
                 var _a;
@@ -49,10 +38,10 @@ function ComboboxContentSearch(props) {
             }, 0);
         }
     }, [props.open]);
-    return (React__default["default"].createElement("div", { className: styles$5.search },
-        React__default["default"].createElement("input", { type: "search", ref: searchRef, className: styles$5.searchInput, placeholder: props.placeholder ? `Search ${props.placeholder}` : "Search", onChange: (event) => handleSearch(event), value: props.searchValue }),
-        props.searchValue && (React__default["default"].createElement("button", { className: styles$5.clearSearch, onClick: clearSearch, type: "button", "data-testid": "ATL-Combobox-Content-Search-Clear", "aria-label": "Clear search" },
-            React__default["default"].createElement(Icon.Icon, { name: "remove", size: "small" })))));
+    return (React.createElement("div", { className: styles$5.search },
+        React.createElement("input", { type: "search", ref: searchRef, className: styles$5.searchInput, placeholder: props.placeholder ? `Search ${props.placeholder}` : "Search", onChange: (event) => handleSearch(event), value: props.searchValue }),
+        props.searchValue && (React.createElement("button", { className: styles$5.clearSearch, onClick: clearSearch, type: "button", "data-testid": "ATL-Combobox-Content-Search-Clear", "aria-label": "Clear search" },
+            React.createElement(Icon, { name: "remove", size: "small" })))));
     function clearSearch() {
         var _a;
         props.setSearchValue("");
@@ -63,31 +52,47 @@ function ComboboxContentSearch(props) {
     }
 }
 
-var css_248z$4 = ".SgMzjOcdE-E- {\n  position: relative;\n  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n}\n\n.TwoTCjgcssc- {\n  display: -ms-flexbox;\n  display: flex;\n  max-height: calc((16px / 2) * 33.33);\n  max-height: calc(calc(16px / 2) * 33.33);\n  max-height: calc(var(--space-small) * 33.33);\n  margin: 0;\n  padding: 0;\n  overflow: scroll;\n  list-style: none;\n  -ms-flex-direction: column;\n      flex-direction: column;\n  gap: calc(16px / 4);\n  gap: var(--space-smaller);\n}\n\n._2LVD-wjMRfQ- {\n  display: -ms-flexbox;\n  display: flex;\n  min-height: calc((calc(16px * 3) - calc(16px / 4)));\n  min-height: calc((var(--space-largest) - var(--space-smaller)));\n  box-sizing: border-box;\n  margin: 0 calc(16px / 2);\n  margin: 0 var(--space-small);\n  padding: calc(16px / 2);\n  padding: var(--space-small);\n  border-radius: calc(16px / 4);\n  border-radius: var(--radius-large);\n  color: rgb(1, 41, 57);\n  color: var(--color-heading);\n  font-weight: 500;\n  cursor: pointer;\n  transition: all 200ms;\n  transition: all var(--timing-base);\n  -ms-flex-pack: justify;\n      justify-content: space-between;\n  -ms-flex-align: center;\n      align-items: center;\n}\n\n._2LVD-wjMRfQ-:hover,\n._2LVD-wjMRfQ-:focus {\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n._2LVD-wjMRfQ-:focus {\n  box-shadow: 0px 0px calc(16px / 4) calc(16px / 8)\n    rgb(231, 213, 87);\n  box-shadow: var(--shadow-focus);\n}\n\n._8T5M7MGwCRE-,\n._4y5NXkNeIQM- {\n  padding: calc(16px / 2) calc(16px * 1);\n  padding: var(--space-small) var(--space-base);\n}\n\n.SgMzjOcdE-E-::after {\n  content: \"\";\n  display: block;\n  position: absolute;\n  right: 0;\n  bottom: calc(16px / 2);\n  bottom: var(--space-small);\n  left: 0;\n  height: calc(16px * 1);\n  height: var(--space-base);\n  background: linear-gradient(\n    180deg,\n    rgba(255, 255, 255, 0) 0%,\n    rgb(255, 255, 255) 100%\n  );\n}\n\n.SgMzjOcdE-E-::before {\n  content: \"\";\n  display: block;\n  position: absolute;\n  top: calc(16px / 2);\n  top: var(--space-small);\n  right: 0;\n  left: 0;\n  height: calc(16px * 1);\n  height: var(--space-base);\n  background: linear-gradient(\n    to bottom,\n    rgba(255, 255, 255, 1),\n    rgba(255, 255, 255, 0)\n  );\n}\n";
-var styles$4 = {"container":"SgMzjOcdE-E-","optionsList":"TwoTCjgcssc-","option":"_2LVD-wjMRfQ-","filterMessage":"_8T5M7MGwCRE-","emptyStateMessage":"_4y5NXkNeIQM-"};
-styleInject_es.styleInject(css_248z$4);
+var css_248z$4 = ".SgMzjOcdE-E- {\n  position: relative;\n  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n}\n\n.TwoTCjgcssc- {\n  display: -ms-flexbox;\n  display: flex;\n  max-height: calc((16px / 2) * 33.33);\n  max-height: calc(calc(16px / 2) * 33.33);\n  max-height: calc(var(--space-small) * 33.33);\n  margin: 0;\n  padding: 0;\n  overflow: scroll;\n  list-style: none;\n  -ms-flex-direction: column;\n      flex-direction: column;\n  gap: calc(16px / 4);\n  gap: var(--space-smaller);\n}\n\n._8T5M7MGwCRE-,\n._4y5NXkNeIQM- {\n  padding: calc(16px / 2) calc(16px * 1);\n  padding: var(--space-small) var(--space-base);\n}\n\n.SgMzjOcdE-E-::after {\n  content: \"\";\n  display: block;\n  position: absolute;\n  right: 0;\n  bottom: calc(16px / 2);\n  bottom: var(--space-small);\n  left: 0;\n  height: calc(16px * 1);\n  height: var(--space-base);\n  background: linear-gradient(\n    180deg,\n    rgba(255, 255, 255, 0) 0%,\n    rgb(255, 255, 255) 100%\n  );\n}\n\n.SgMzjOcdE-E-::before {\n  content: \"\";\n  display: block;\n  position: absolute;\n  top: calc(16px / 2);\n  top: var(--space-small);\n  right: 0;\n  left: 0;\n  height: calc(16px * 1);\n  height: var(--space-base);\n  background: linear-gradient(\n    to bottom,\n    rgba(255, 255, 255, 1),\n    rgba(255, 255, 255, 0)\n  );\n}\n";
+var styles$4 = {"container":"SgMzjOcdE-E-","optionsList":"TwoTCjgcssc-","filterMessage":"_8T5M7MGwCRE-","emptyStateMessage":"_4y5NXkNeIQM-"};
+styleInject(css_248z$4);
+
+var css_248z$3 = "._5QdRGmaNHvc- {\n  display: -ms-flexbox;\n  display: flex;\n  min-height: calc((calc(16px * 3) - calc(16px / 4)));\n  min-height: calc((var(--space-largest) - var(--space-smaller)));\n  box-sizing: border-box;\n  margin: 0 calc(16px / 2);\n  margin: 0 var(--space-small);\n  padding: calc(16px / 2);\n  padding: var(--space-small);\n  border-radius: calc(16px / 4);\n  border-radius: var(--radius-large);\n  color: rgb(1, 41, 57);\n  color: var(--color-heading);\n  font-weight: 500;\n  cursor: pointer;\n  transition: all 200ms;\n  transition: all var(--timing-base);\n  -ms-flex-pack: justify;\n      justify-content: space-between;\n  -ms-flex-align: center;\n      align-items: center;\n}\n\n._5QdRGmaNHvc-:hover,\n._5QdRGmaNHvc-:focus {\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n._5QdRGmaNHvc-:focus {\n  box-shadow: 0px 0px calc(16px / 4) calc(16px / 8)\n    rgb(231, 213, 87);\n  box-shadow: var(--shadow-focus);\n}\n";
+var styles$3 = {"option":"_5QdRGmaNHvc-"};
+styleInject(css_248z$3);
+
+const ComboboxContext = React.createContext({});
+function ComboboxContextProvider(props) {
+    return (React.createElement(ComboboxContext.Provider, { value: {
+            open: props.open,
+            setOpen: props.setOpen,
+            selected: props.selected,
+            selectionHandler: props.selectionHandler,
+            handleClose: props.handleClose,
+            shouldScroll: props.shouldScroll,
+        } }, props.children));
+}
+
+function ComboboxOption(props) {
+    const { selected, selectionHandler } = useContext(ComboboxContext);
+    const isSelected = selected.some(selection => selection.id.toString() === props.id.toString());
+    return (React.createElement("li", { key: props.id, tabIndex: -1, "data-selected": isSelected, role: "option", "aria-selected": isSelected, onClick: () => selectionHandler &&
+            selectionHandler({ id: props.id, label: props.label }), className: classnames(styles$3.option) },
+        props.label,
+        isSelected && React.createElement(Icon, { name: "checkmark", color: "blue" })));
+}
 
 function ComboboxContentList(props) {
-    let hasSeenFirstSelected = false;
-    return (React__default["default"].createElement("div", { className: styles$4.container },
-        !props.showEmptyState && props.options.length > 0 && (React__default["default"].createElement("ul", { className: styles$4.optionsList, role: "listbox", "aria-multiselectable": props.multiselect, ref: props.optionsListRef }, !props.showEmptyState &&
+    return (React.createElement("div", { className: styles$4.container },
+        !props.showEmptyState && props.options.length > 0 && (React.createElement("ul", { className: styles$4.optionsList, role: "listbox", "aria-multiselectable": props.multiselect, ref: props.optionsListRef }, !props.showEmptyState &&
             props.options.map(option => {
-                const isSelected = props.selected.some(selection => selection.id.toString() === option.id.toString());
-                return (React__default["default"].createElement("li", { ref: listItem => {
-                        if (isSelected && !hasSeenFirstSelected) {
-                            props.setFirstSelectedElement(listItem);
-                            hasSeenFirstSelected = true;
-                        }
-                    }, key: option.id, tabIndex: -1, role: "option", "aria-selected": isSelected, onClick: () => props.selectionHandler(option), className: classnames__default["default"](styles$4.option) },
-                    option.label,
-                    isSelected && React__default["default"].createElement(Icon.Icon, { name: "checkmark", color: "blue" })));
+                return (React.createElement(ComboboxOption, { key: option.id, id: option.id, label: option.label }));
             }))),
-        !props.showEmptyState && props.options.length === 0 && (React__default["default"].createElement("div", { className: styles$4.filterMessage },
-            React__default["default"].createElement(Text.Text, { variation: "subdued" },
+        !props.showEmptyState && props.options.length === 0 && (React.createElement("div", { className: styles$4.filterMessage },
+            React.createElement(Text, { variation: "subdued" },
                 "No results for ",
                 `“${props.searchValue}”`))),
-        props.showEmptyState && (React__default["default"].createElement("div", { className: styles$4.emptyStateMessage },
-            React__default["default"].createElement(Text.Text, { variation: "subdued" }, getZeroIndexStateText(props.subjectNoun))))));
+        props.showEmptyState && (React.createElement("div", { className: styles$4.emptyStateMessage },
+            React.createElement(Text, { variation: "subdued" }, getZeroIndexStateText(props.subjectNoun))))));
 }
 function getZeroIndexStateText(subjectNoun) {
     if (subjectNoun) {
@@ -96,9 +101,9 @@ function getZeroIndexStateText(subjectNoun) {
     return "No options yet";
 }
 
-var css_248z$3 = ".Q-mwo-g5Fi8- {\n  display: -ms-flexbox;\n  display: flex;\n  padding: calc(16px * 1) calc(16px / 2) 0 calc(16px * 1);\n  padding: var(--space-base) var(--space-small) 0 var(--space-base);\n  -ms-flex-pack: justify;\n      justify-content: space-between;\n  gap: calc(16px / 4);\n  gap: var(--space-smaller);\n}\n";
-var styles$3 = {"header":"Q-mwo-g5Fi8-"};
-styleInject_es.styleInject(css_248z$3);
+var css_248z$2 = ".Q-mwo-g5Fi8- {\n  display: -ms-flexbox;\n  display: flex;\n  padding: calc(16px * 1) calc(16px / 2) 0 calc(16px * 1);\n  padding: var(--space-base) var(--space-small) 0 var(--space-base);\n  -ms-flex-pack: justify;\n      justify-content: space-between;\n  gap: calc(16px / 4);\n  gap: var(--space-smaller);\n}\n";
+var styles$2 = {"header":"Q-mwo-g5Fi8-"};
+styleInject(css_248z$2);
 
 function ComboboxContentHeader(props) {
     const hasSelected = props.selectedCount > 0;
@@ -106,9 +111,9 @@ function ComboboxContentHeader(props) {
     const label = getLabel(hasSelected, props.selectedCount, props.subjectNoun);
     const handleSelectAll = hasSelected ? props.onClearAll : props.onSelectAll;
     const showAction = hasSelected || props.hasOptionsVisible;
-    return (React__default["default"].createElement("div", { className: styles$3.header, "data-testid": "ATL-Combobox-Header" },
-        React__default["default"].createElement(Typography.Typography, { textColor: "heading", fontWeight: "semiBold" }, label),
-        showAction && (React__default["default"].createElement(Button.Button, { size: "small", label: actionLabel, type: "tertiary", onClick: handleSelectAll }))));
+    return (React.createElement("div", { className: styles$2.header, "data-testid": "ATL-Combobox-Header" },
+        React.createElement(Typography, { textColor: "heading", fontWeight: "semiBold" }, label),
+        showAction && (React.createElement(Button, { size: "small", label: actionLabel, type: "tertiary", onClick: handleSelectAll }))));
 }
 function getLabel(hasSelected, count, subjectNoun) {
     if (hasSelected) {
@@ -120,63 +125,43 @@ function getLabel(hasSelected, count, subjectNoun) {
     return "Select";
 }
 
-var css_248z$2 = ".W8qMZnORYxI- {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 6;\n  z-index: var(--elevation-menu);\n  background-color: transparent;\n}\n";
-var styles$2 = {"overlay":"W8qMZnORYxI-"};
-styleInject_es.styleInject(css_248z$2);
-
-const ComboboxContext = React__default["default"].createContext({});
-function ComboboxContextProvider(props) {
-    const multiselect = props.multiselect || false;
-    const [open, setOpen] = React.useState(false);
-    const wrapperRef = React.useRef(null);
-    return (React__default["default"].createElement(ComboboxContext.Provider, { value: { multiselect, open, setOpen, wrapperRef } },
-        React__default["default"].createElement("div", { ref: wrapperRef },
-            open && (React__default["default"].createElement("div", { className: styles$2.overlay, onClick: () => setOpen(false), "data-testid": "ATL-Combobox-Overlay" })),
-            props.children)));
-}
-
-function useComboboxContent(options, open, selected, onClose, onSelect) {
-    const [searchValue, setSearchValue] = React.useState("");
-    const [firstSelectedElement, setFirstSelectedElement] = React.useState(null);
-    const optionsListRef = React.useRef(null);
+function useComboboxContent(options, open, selected, searchValue) {
+    const { shouldScroll } = useContext(ComboboxContext);
+    const optionsListRef = useRef(null);
     const filteredOptions = options.filter(option => option.label.toLowerCase().includes(searchValue.toLowerCase()));
-    const [internalSelected, setInternalSelected] = React.useState(selected);
-    const selectedOptions = onClose ? internalSelected : selected;
-    const optionsSelectionHandler = onSelect ? onSelect : setInternalSelected;
-    React.useEffect(() => {
-        if (!open && onClose) {
-            onClose(selectedOptions);
-        }
-    }, [open, onClose, selectedOptions]);
-    React.useEffect(() => {
-        if (open && firstSelectedElement) {
-            firstSelectedElement === null || firstSelectedElement === void 0 ? void 0 : firstSelectedElement.scrollIntoView({
-                block: "nearest",
+    useEffect(() => {
+        var _a;
+        if (open && shouldScroll.current && optionsListRef.current) {
+            const firstSelected = Array.from((_a = optionsListRef === null || optionsListRef === void 0 ? void 0 : optionsListRef.current) === null || _a === void 0 ? void 0 : _a.children).find(child => {
+                if (child instanceof HTMLElement) {
+                    return child.dataset.selected === "true";
+                }
             });
+            scrollToFirstSelected(firstSelected, shouldScroll);
         }
-    }, [open, firstSelectedElement]);
-    React.useEffect(() => {
-        if (selectedOptions.length === 0) {
-            setFirstSelectedElement(null);
-        }
-    }, [selectedOptions]);
+    }, [open, selected]);
     return {
-        searchValue,
-        setSearchValue,
-        setFirstSelectedElement,
         filteredOptions,
         optionsListRef,
-        selectedOptions,
-        optionsSelectionHandler,
     };
 }
+function scrollToFirstSelected(firstSelected, shouldScroll) {
+    if (firstSelected) {
+        firstSelected.scrollIntoView({
+            block: "nearest",
+        });
+        shouldScroll.current = false;
+    }
+}
 
-function useComboboxAccessibility(selectionCallback, filteredOptions, optionsListRef, open, setOpen, wrapperRef) {
+// eslint-disable-next-line max-statements
+function useComboboxAccessibility(selectionCallback, filteredOptions, optionsListRef, open, wrapperRef) {
+    const { handleClose } = useContext(ComboboxContext);
     const hasOptionsVisible = open && filteredOptions.length > 0;
-    const focusedIndex = React.useRef(null);
-    useRefocusOnActivator.useRefocusOnActivator(open);
-    const popperRef = useFocusTrap.useFocusTrap(open);
-    const { styles: popperStyles, attributes } = reactPopper.usePopper(wrapperRef.current, popperRef.current, {
+    const focusedIndex = useRef(null);
+    useRefocusOnActivator(open);
+    const popperRef = useFocusTrap(open);
+    const { styles: popperStyles, attributes } = usePopper(wrapperRef.current, popperRef.current, {
         modifiers: [
             {
                 name: "flip",
@@ -187,10 +172,10 @@ function useComboboxAccessibility(selectionCallback, filteredOptions, optionsLis
         ],
         placement: "bottom-start",
     });
-    React.useEffect(() => {
+    useEffect(() => {
         focusedIndex.current = null;
     }, [open, filteredOptions.length]);
-    React.useEffect(() => {
+    useEffect(() => {
         var _a;
         if (open) {
             (_a = popperRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener("keydown", handleContentKeydown);
@@ -200,9 +185,9 @@ function useComboboxAccessibility(selectionCallback, filteredOptions, optionsLis
             (_a = popperRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener("keydown", handleContentKeydown);
         };
     }, [open, optionsListRef, filteredOptions]);
-    useOnKeyDown.useOnKeyDown(() => {
+    useOnKeyDown(() => {
         if (open) {
-            setOpen(false);
+            handleClose();
         }
     }, "Escape");
     function handleContentKeydown(event) {
@@ -248,35 +233,77 @@ function useComboboxAccessibility(selectionCallback, filteredOptions, optionsLis
 }
 
 function ComboboxContent(props) {
-    const { open, setOpen, wrapperRef, multiselect } = React__default["default"].useContext(ComboboxContext);
     const optionsExist = props.options.length > 0;
-    const { searchValue, setSearchValue, setFirstSelectedElement, filteredOptions, optionsListRef, selectedOptions, optionsSelectionHandler, } = useComboboxContent(props.options, open, props.selected, props.onClose, props.onSelect);
-    const { popperRef, popperStyles, attributes } = useComboboxAccessibility(handleSelection, filteredOptions, optionsListRef, open, setOpen, wrapperRef);
-    const template = (React__default["default"].createElement("div", Object.assign({ ref: popperRef, id: "ATL-Combobox-Content", "data-testid": "ATL-Combobox-Content", tabIndex: 0, className: classnames__default["default"](styles$6.content, { [styles$6.hidden]: !open }), style: popperStyles.popper }, attributes.popper),
-        React__default["default"].createElement(ComboboxContentSearch, { open: open, placeholder: props.subjectNoun, searchValue: searchValue, setSearchValue: setSearchValue }),
-        multiselect && optionsExist && (React__default["default"].createElement(ComboboxContentHeader, { hasOptionsVisible: filteredOptions.length > 0, subjectNoun: props.subjectNoun, selectedCount: selectedOptions.length, onClearAll: () => {
-                optionsSelectionHandler([]);
+    const { filteredOptions, optionsListRef } = useComboboxContent(props.options, props.open, props.selected, props.searchValue);
+    const { popperRef, popperStyles, attributes } = useComboboxAccessibility(props.handleSelection, filteredOptions, optionsListRef, props.open, props.wrapperRef);
+    const template = (React.createElement("div", Object.assign({ ref: popperRef, id: "ATL-Combobox-Content", "data-testid": "ATL-Combobox-Content", tabIndex: 0, className: classnames(styles$6.content, { [styles$6.hidden]: !props.open }), style: popperStyles.popper }, attributes.popper),
+        React.createElement(ComboboxContentSearch, { open: props.open, placeholder: props.subjectNoun, searchValue: props.searchValue, setSearchValue: props.setSearchValue }),
+        props.multiselect && optionsExist && (React.createElement(ComboboxContentHeader, { hasOptionsVisible: filteredOptions.length > 0, subjectNoun: props.subjectNoun, selectedCount: props.selected.length, onClearAll: () => {
+                props.selectedStateSetter([]);
             }, onSelectAll: () => {
-                optionsSelectionHandler(filteredOptions);
+                props.selectedStateSetter(filteredOptions);
             } })),
-        React__default["default"].createElement(ComboboxContentList, { multiselect: multiselect, showEmptyState: !optionsExist, options: filteredOptions, selected: selectedOptions, optionsListRef: optionsListRef, setFirstSelectedElement: setFirstSelectedElement, selectionHandler: handleSelection, searchValue: searchValue, subjectNoun: props.subjectNoun }),
-        props.children && (React__default["default"].createElement("div", { className: styles$6.actions, role: "group" }, React__default["default"].Children.toArray(props.children).map((child, index, childrenArray) => (React__default["default"].createElement("div", { key: index, className: classnames__default["default"]({
+        React.createElement(ComboboxContentList, { multiselect: props.multiselect, showEmptyState: !optionsExist, options: filteredOptions, selected: props.selected, optionsListRef: optionsListRef, searchValue: props.searchValue, subjectNoun: props.subjectNoun }),
+        props.actionElements && (React.createElement("div", { className: styles$6.actions, role: "group" }, props.actionElements.map((child, index, childrenArray) => (React.createElement("div", { key: index, className: classnames({
                 [styles$6.actionPadding]: index === childrenArray.length - 1,
             }) }, child)))))));
-    return ReactDOM__default["default"].createPortal(template, document.body);
-    function handleSelection(selection) {
-        if (multiselect) {
-            handleMultiSelect(optionsSelectionHandler, selectedOptions, selection);
+    return ReactDOM.createPortal(template, document.body);
+}
+
+var css_248z$1 = ".Ow9wSNnGP-g- {\n  width: 100%;\n  box-sizing: border-box;\n  padding: 0 calc(16px / 2);\n  padding: 0 var(--space-small);\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n}\n\n.ncp0nKHQ7d8- {\n  position: relative;\n  width: 100%;\n  min-height: calc((calc(16px * 3) - calc(16px / 2)));\n  min-height: calc((var(--space-largest) - var(--space-small)));\n  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n  border: none;\n  border-radius: calc(16px / 4);\n  border-radius: var(--radius-large);\n  text-align: left;\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n  cursor: pointer;\n  transition: all 200ms;\n  transition: all var(--timing-base);\n}\n\n.ncp0nKHQ7d8-:focus {\n  box-shadow: 0px 0px calc(16px / 4) calc(16px / 8)\n    rgb(231, 213, 87);\n  box-shadow: var(--shadow-focus);\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n.ncp0nKHQ7d8-:hover {\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n.ncp0nKHQ7d8- span {\n  margin-left: calc(16px / 2);\n  margin-left: var(--space-small);\n}\n";
+var styles$1 = {"actionContainer":"Ow9wSNnGP-g-","actionButton":"ncp0nKHQ7d8-"};
+styleInject(css_248z$1);
+
+function ComboboxAction(props) {
+    return (React.createElement("div", { className: styles$1.actionContainer },
+        React.createElement("button", { className: styles$1.actionButton, onClick: props.onClick, type: "button", "aria-label": props.label },
+            React.createElement(Typography, { element: "span", size: "base", textColor: "green", fontWeight: "semiBold" }, props.label))));
+}
+
+function ComboboxTrigger({ label = "Select", selected, }) {
+    const { handleClose, open, setOpen } = React.useContext(ComboboxContext);
+    const hasSelection = selected.length;
+    const selectedLabel = selected.map(option => option.label).join(", ");
+    return (React.createElement(Chip, { variation: hasSelection ? "base" : "subtle", label: hasSelection ? selectedLabel : "", heading: label, onClick: () => {
+            if (open) {
+                handleClose();
+            }
+            else {
+                setOpen(true);
+            }
+        }, role: "combobox" }, !hasSelection && (React.createElement(Chip.Suffix, null,
+        React.createElement(Icon, { name: "add", size: "small" })))));
+}
+
+var css_248z = ".W8qMZnORYxI- {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 6;\n  z-index: var(--elevation-menu);\n  background-color: transparent;\n}\n\n._-0dkolvLF-Y- {\n  display: inline-block;\n}\n";
+var styles = {"overlay":"W8qMZnORYxI-","wrapper":"_-0dkolvLF-Y-"};
+styleInject(css_248z);
+
+function useMakeComboboxHandlers(setOpen, setSearchValue, selectedOptions, shouldScroll, selectedStateSetter, multiSelect, onClose) {
+    const handleClose = useCallback(() => {
+        setOpen(false);
+        setSearchValue("");
+        onClose && onClose();
+        if (selectedOptions.length > 0) {
+            shouldScroll.current = true;
+        }
+    }, [setOpen, setSearchValue, onClose, selectedOptions.length]);
+    const handleSelection = useCallback((selection) => {
+        if (multiSelect) {
+            handleMultiSelect(selectedStateSetter, selectedOptions, selection);
         }
         else {
-            handleSingleSelect(optionsSelectionHandler, selection);
+            handleSingleSelect(selectedStateSetter, selection);
         }
-    }
-    function handleSingleSelect(selectCallback, selection) {
+    }, [multiSelect, selectedStateSetter, selectedOptions]);
+    const handleSingleSelect = useCallback((selectCallback, selection) => {
         selectCallback([selection]);
-        setSearchValue("");
-        setOpen(false);
-    }
+        handleClose();
+    }, []);
+    return {
+        handleClose,
+        handleSelection,
+    };
 }
 function handleMultiSelect(selectCallback, selected, selection) {
     if (selected.some(s => s.id === selection.id)) {
@@ -287,139 +314,84 @@ function handleMultiSelect(selectCallback, selected, selection) {
     }
 }
 
-var css_248z$1 = ".Ow9wSNnGP-g- {\n  width: 100%;\n  box-sizing: border-box;\n  padding: 0 calc(16px / 2);\n  padding: 0 var(--space-small);\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n}\n\n.ncp0nKHQ7d8- {\n  position: relative;\n  width: 100%;\n  min-height: calc((calc(16px * 3) - calc(16px / 2)));\n  min-height: calc((var(--space-largest) - var(--space-small)));\n  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n  border: none;\n  border-radius: calc(16px / 4);\n  border-radius: var(--radius-large);\n  text-align: left;\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n  cursor: pointer;\n  transition: all 200ms;\n  transition: all var(--timing-base);\n}\n\n.ncp0nKHQ7d8-:focus {\n  box-shadow: 0px 0px calc(16px / 4) calc(16px / 8)\n    rgb(231, 213, 87);\n  box-shadow: var(--shadow-focus);\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n.ncp0nKHQ7d8-:hover {\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n.ncp0nKHQ7d8- span {\n  margin-left: calc(16px / 2);\n  margin-left: var(--space-small);\n}\n";
-var styles$1 = {"actionContainer":"Ow9wSNnGP-g-","actionButton":"ncp0nKHQ7d8-"};
-styleInject_es.styleInject(css_248z$1);
-
-function ComboboxAction(props) {
-    return (React__default["default"].createElement("div", { className: styles$1.actionContainer },
-        React__default["default"].createElement("button", { className: styles$1.actionButton, onClick: props.onClick, type: "button", "aria-label": props.label },
-            React__default["default"].createElement(Typography.Typography, { element: "span", size: "base", textColor: "green", fontWeight: "semiBold" }, props.label))));
-}
-
-function ComboboxTriggerButton(props) {
-    const { open, setOpen } = React__default["default"].useContext(ComboboxContext);
-    return (React__default["default"].createElement(Button.Button, { role: "combobox", "aria-expanded": open, "aria-haspopup": "listbox", "aria-controls": "ATL-Combobox-Content", "aria-autocomplete": "list", label: props.label, variation: props.variation, type: props.type, onClick: () => setOpen(!open), icon: props.icon, iconOnRight: props.iconOnRight }));
-}
-
-var css_248z = ".NtYpU6bZMtM- {\n  display: -ms-inline-flexbox;\n  display: inline-flex;\n  padding: calc(16px / 2) calc(16px * 1);\n  padding: var(--space-small) var(--space-base);\n  border: calc(16px / 16) solid rgb(225, 225, 225);\n  border: var(--border-base) solid var(--color-border);\n  border-radius: calc((16px / 4) * 5);\n  border-radius: calc(calc(16px / 4) * 5);\n  border-radius: calc(var(--radius-large) * 5);\n  font-size: calc((16px * 1) * 0.875);\n  font-size: calc(calc(16px * 1) * 0.875);\n  font-size: var(--typography--fontSize-base);\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n  gap: calc(16px / 2);\n  gap: var(--space-small);\n}\n\n.NtYpU6bZMtM-:focus {\n  box-shadow: 0px 0px calc(16px / 4) calc(16px / 8)\n    rgb(231, 213, 87);\n  box-shadow: var(--shadow-focus);\n}\n\n.ftceU-6iBO0- {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-pack: center;\n      justify-content: center;\n  -ms-flex-align: center;\n      align-items: center;\n}\n";
-var styles = {"trigger":"NtYpU6bZMtM-","triggerIcon":"ftceU-6iBO0-"};
-styleInject_es.styleInject(css_248z);
-
-function ComboboxTriggerChip(props) {
-    const { open, setOpen } = React__default["default"].useContext(ComboboxContext);
-    return (React__default["default"].createElement("button", { className: styles.trigger, role: "combobox", type: "button", "aria-expanded": open, "aria-haspopup": "listbox", "aria-controls": "ATL-Combobox-Content", "aria-autocomplete": "list", onClick: () => {
-            setOpen(!open);
-        } },
-        React__default["default"].createElement(Typography.Typography, { fontWeight: "semiBold", textColor: "heading" }, props.label),
-        React__default["default"].createElement("div", { className: styles.triggerIcon },
-            React__default["default"].createElement(Icon.Icon, { color: "surfaceReverse", name: "add", size: "small" }))));
-}
-
-function ComboboxTrigger(_a) {
-    var { selected } = _a, props = tslib_es6.__rest(_a, ["selected"]);
-    const { open, setOpen, multiselect } = React__default["default"].useContext(ComboboxContext);
-    const hasSelection = selected.length;
-    const selectedLabel = selected.map(option => option.label).join(", ");
-    const renderHeading = multiselect || !hasSelection;
-    return (React__default["default"].createElement(Chip.Chip, { variation: hasSelection ? "base" : "subtle", label: hasSelection ? selectedLabel : "", heading: renderHeading ? props.label : "", onClick: () => setOpen(!open), role: "combobox" }, !hasSelection && (React__default["default"].createElement(Chip.Chip.Suffix, null,
-        React__default["default"].createElement(Icon.Icon, { name: "add", size: "small" })))));
+function useCombobox(selected, onSelect, onClose, multiSelect) {
+    const wrapperRef = useRef(null);
+    const shouldScroll = useRef(false);
+    const [open, setOpen] = useState(false);
+    const [searchValue, setSearchValue] = useState("");
+    const { handleClose, handleSelection } = useMakeComboboxHandlers(setOpen, setSearchValue, selected, shouldScroll, onSelect, multiSelect, onClose);
+    return {
+        wrapperRef,
+        searchValue,
+        setSearchValue,
+        open,
+        setOpen,
+        selectedOptions: selected,
+        selectedStateSetter: onSelect,
+        shouldScroll,
+        handleClose,
+        handleSelection,
+    };
 }
 
 function ComboboxActivator(props) {
-    const { open, setOpen } = React__default["default"].useContext(ComboboxContext);
-    if (props.children.type === Button.Button || props.children.type === Chip.Chip) {
-        return React__default["default"].cloneElement(props.children, {
+    const { handleClose, open, setOpen } = React.useContext(ComboboxContext);
+    if (props.children.type === Button || props.children.type === Chip) {
+        return React.cloneElement(props.children, {
             role: "combobox",
-            onClick: () => setOpen(!open),
+            onClick: () => {
+                if (open) {
+                    handleClose();
+                }
+                else {
+                    setOpen(true);
+                }
+            },
         });
     }
     return props.children;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function ComboboxOption(_) {
-    useAssert.useAssert(true, "Combobox.Option can only be used inside a Combobox component");
-    return null;
-}
-
-const COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE = "Combobox can only have one Trigger or Activator element";
-const COMBOBOX_OPTION_AND_CONTENT_EXISTS_ERROR = "Combobox prefers using Combobox.Option and Combobox.Action as the direct child of Combobox instead of Combobox.Content";
+const COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE = "Combobox must have exactly one Trigger element";
 function useComboboxValidation(children) {
-    const childrenArray = React__default["default"].Children.toArray(children);
-    let triggerElement, contentElement, multipleTriggersFound = false;
-    const optionElements = [];
-    const actionElements = [];
-    childrenArray.forEach(child => {
-        if (isTriggerElement(child)) {
-            if (triggerElement) {
-                multipleTriggersFound = true;
-            }
-            triggerElement = child;
-        }
-        if (isContentElement(child)) {
-            contentElement = child;
-        }
-        if (isOptionElement(child)) {
-            optionElements.push(child);
-        }
-        if (isActionElement(child)) {
-            actionElements.push(child);
-        }
-    });
-    useAssert.useAssert(multipleTriggersFound, COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE);
-    useAssert.useAssert(Boolean((optionElements.length || actionElements.length) && contentElement), COMBOBOX_OPTION_AND_CONTENT_EXISTS_ERROR);
+    const optionElements = getCompoundComponents(ComboboxOption, children);
+    const actionElements = getCompoundComponents(ComboboxAction, children);
+    const activatorElements = getCompoundComponents(ComboboxActivator, children);
+    const shouldThrowTriggerError = isInvalid(activatorElements);
+    useAssert(shouldThrowTriggerError, COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE);
     return {
-        contentElement,
-        triggerElement,
         optionElements,
+        triggerElement: activatorElements[0],
         actionElements,
     };
 }
-function isTriggerElement(child) {
-    return (React__default["default"].isValidElement(child) &&
-        (child.type === ComboboxTriggerButton ||
-            child.type === ComboboxTriggerChip ||
-            child.type === ComboboxActivator));
+function isInvalid(activators) {
+    return activators.length > 1 ? true : false;
 }
-function isContentElement(child) {
-    return React__default["default"].isValidElement(child) && child.type === ComboboxContent;
-}
-function isOptionElement(child) {
-    return React__default["default"].isValidElement(child) && child.type === ComboboxOption;
-}
-function isActionElement(child) {
-    return React__default["default"].isValidElement(child) && child.type === ComboboxAction;
+/**
+ * Return all instances child component that matches the `type` provided
+ */
+function getCompoundComponents(type, children) {
+    const childrenArray = Children.toArray(children);
+    const elements = childrenArray.filter((child) => isValidElement(child) && child.type === type);
+    return elements;
 }
 
-function Combobox(_a) {
-    var { multiSelect = false, label = "Select", selected = [] } = _a, props = tslib_es6.__rest(_a, ["multiSelect", "label", "selected"]);
-    const { contentElement, triggerElement, optionElements, actionElements } = useComboboxValidation(props.children);
-    const buildOptions = optionElements.map(option => ({
+function Combobox(props) {
+    const { optionElements, triggerElement, actionElements } = useComboboxValidation(props.children);
+    const options = useMemo(() => (optionElements === null || optionElements === void 0 ? void 0 : optionElements.map(option => ({
         id: option.props.id,
         label: option.props.label,
-    }));
-    return (React__default["default"].createElement(ComboboxContextProvider, { multiselect: multiSelect },
-        triggerElement || React__default["default"].createElement(ComboboxTrigger, { label: label, selected: selected }),
-        contentElement || (
-        // @ts-expect-error - Suppress the XOR error with onClose|onSelect until we finish the refactor on JOB-81416
-        React__default["default"].createElement(ComboboxContent, Object.assign({ options: buildOptions, selected: selected }, props), actionElements))));
+    }))) || [], [optionElements]);
+    const { selectedOptions, selectedStateSetter, shouldScroll, wrapperRef, searchValue, setSearchValue, open, setOpen, handleClose, handleSelection, } = useCombobox(props.selected, props.onSelect, props.onClose, props.multiSelect);
+    return (React.createElement(ComboboxContextProvider, { selected: selectedOptions, selectionHandler: handleSelection, open: open, setOpen: setOpen, handleClose: handleClose, shouldScroll: shouldScroll },
+        React.createElement("div", { ref: wrapperRef, className: styles.wrapper },
+            open && (React.createElement("div", { className: styles.overlay, onClick: () => handleClose(), "data-testid": "ATL-Combobox-Overlay" })),
+            triggerElement || (React.createElement(ComboboxTrigger, { label: props.label, selected: props.selected })),
+            React.createElement(ComboboxContent, { multiselect: props.multiSelect, searchPlaceholder: props.searchPlaceholder, subjectNoun: props.subjectNoun, selected: selectedOptions, actionElements: actionElements, selectedStateSetter: selectedStateSetter, handleSelection: handleSelection, searchValue: searchValue, setSearchValue: setSearchValue, wrapperRef: wrapperRef, open: open, setOpen: setOpen, options: options }))));
 }
-/**
- * @deprecated Use Combobox.Activator instead
- */
-Combobox.TriggerButton = ComboboxTriggerButton;
-/**
- * @deprecated Use Combobox.Activator instead
- */
-Combobox.TriggerChip = ComboboxTriggerChip;
 Combobox.Activator = ComboboxActivator;
-/**
- * @deprecated Use individual Combobox.Option instead
- */
-Combobox.Content = ComboboxContent;
 Combobox.Action = ComboboxAction;
 Combobox.Option = ComboboxOption;
 
-exports.Combobox = Combobox;
-exports.ComboboxContextProvider = ComboboxContextProvider;
+export { Combobox, ComboboxContextProvider };