@jobber/components 4.45.6 → 4.46.1-JOB-79340.27

package/dist/{Chip-4d8e6370.js → Chips-2daf43ea.js}

@@ -1,20 +1,22 @@
 'use strict';
 
 var React = require('react');
-var uuid = require('uuid');
 var styleInject_es = require('./style-inject.es-9d2f5f4e.js');
 var classnames = require('classnames');
 var useAssert = require('@jobber/hooks/useAssert');
 var Icon = require('./Icon-405a216c.js');
 var Avatar = require('./Avatar-1aa30ee1.js');
-var Typography = require('./Typography-9bff9c91.js');
-var Tooltip = require('./Tooltip-59dbab5b.js');
+var Typography = require('./Typography-83915c54.js');
+var Tooltip = require('./Tooltip-d5257798.js');
+var ChipSelectable = require('./ChipSelectable-8e5509a1.js');
+require('@jobber/design');
 var sortBy = require('lodash/sortBy');
 var useLiveAnnounce = require('@jobber/hooks/useLiveAnnounce');
+var uuid = require('uuid');
 var debounce = require('lodash/debounce');
 var reactPopper = require('react-popper');
-var Text = require('./Text-59bde58c.js');
-var Button = require('./Button-d89f2271.js');
+var Text = require('./Text-54334431.js');
+var Button = require('./Button-db6114a6.js');
 var Spinner = require('./Spinner-9d8fc7ff.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -118,14 +120,20 @@ function InternalChip({ label, active = false, disabled = false, invalid = false
     }
 }
 
-function InternalChipSingleSelect({ children, selected, name = uuid.v1(), onChange, onClick, }) {
+function InternalChipSingleSelect({ children, selected, onChange, onClick, }) {
     return (React__default["default"].createElement("div", { className: styles$1.wrapper, "data-testid": "singleselect-chips" }, React__default["default"].Children.map(children, child => {
-        const isSelected = child.props.value === selected;
-        return (React__default["default"].createElement("label", null,
-            React__default["default"].createElement("input", { type: "radio", checked: isSelected, className: styles$1.input, name: name, onClick: handleClick(child.props.value), onKeyUp: handleKeyUp(isSelected, child.props.value), onChange: () => {
-                    /* No op. onClick handles the change to allow deselecting. */
-                }, disabled: child.props.disabled }),
-            React__default["default"].createElement(InternalChip, Object.assign({}, child.props, { active: isSelected }))));
+        const isSelected = (child === null || child === void 0 ? void 0 : child.props.value) === selected || (child === null || child === void 0 ? void 0 : child.props.label) === selected;
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            React__default["default"].createElement("label", { style: { display: "none" } },
+                React__default["default"].createElement("input", { type: "radio", checked: isSelected, className: styles$1.input, onClick: handleClick((child === null || child === void 0 ? void 0 : child.props.value) || ""), onKeyUp: handleKeyUp(isSelected, (child === null || child === void 0 ? void 0 : child.props.value) || ""), onChange: () => {
+                        /* No op. onClick handles the change to allow deselecting. */
+                    }, disabled: child === null || child === void 0 ? void 0 : child.props.disabled }),
+                React__default["default"].createElement(InternalChip, Object.assign({}, child === null || child === void 0 ? void 0 : child.props, { label: (child === null || child === void 0 ? void 0 : child.props.label) || "", active: isSelected }))),
+            React__default["default"].createElement(ChipSelectable.ChipSelectable, Object.assign({}, child === null || child === void 0 ? void 0 : child.props, { label: (child === null || child === void 0 ? void 0 : child.props.label) || "", selected: isSelected, onClick: clickedItem => {
+                    onChange(clickedItem);
+                    onClick &&
+                        onClick({}, child === null || child === void 0 ? void 0 : child.props.value);
+                }, onKeyDown: handleKeyUp(isSelected, (child === null || child === void 0 ? void 0 : child.props.value) || "") }))));
     })));
     function handleKeyUp(active, value) {
         if (!active)
@@ -150,47 +158,50 @@ function InternalChipSingleSelect({ children, selected, name = uuid.v1(), onChan
 }
 
 function InternalChipMultiSelect({ children, selected, onChange, onClick, }) {
+    const toggleSelectedChip = (val, ev) => {
+        const newChips = [...(selected || [])];
+        const indexOfItem = newChips.findIndex(d => d === val);
+        if (indexOfItem !== -1) {
+            newChips.splice(indexOfItem, 1);
+        }
+        else {
+            newChips.push(val);
+        }
+        onChange(newChips);
+        onClick && onClick(ev, val);
+    };
     return (React__default["default"].createElement("div", { className: styles$1.wrapper, "data-testid": "multiselect-chips" }, React__default["default"].Children.map(children, chip => {
-        const isChipActive = isChipSelected(chip.props.value);
-        return (React__default["default"].createElement("label", null,
-            React__default["default"].createElement("input", { type: "checkbox", checked: isChipActive, className: styles$1.input, onClick: handleClick(chip.props.value), onChange: handleChange(chip.props.value), disabled: chip.props.disabled }),
-            React__default["default"].createElement(InternalChip, Object.assign({}, chip.props, { active: isChipActive, suffix: checkmarkIcon(isChipActive) }))));
+        const isChipActive = selected === null || selected === void 0 ? void 0 : selected.includes((chip === null || chip === void 0 ? void 0 : chip.props.value) || (chip === null || chip === void 0 ? void 0 : chip.props.label));
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            React__default["default"].createElement("label", { style: { display: "none" } },
+                React__default["default"].createElement("input", { type: "checkbox", checked: isChipActive, className: styles$1.input, onClick: chip && handleClick(chip.props.value), onChange: chip && handleChange(chip.props.value), disabled: chip === null || chip === void 0 ? void 0 : chip.props.disabled })),
+            chip && (React__default["default"].createElement(ChipSelectable.ChipSelectable, Object.assign({}, chip.props, { selected: isChipActive, onClick: toggleSelectedChip })))));
+        function isChipSelected(value) {
+            return selected === null || selected === void 0 ? void 0 : selected.includes(value);
+        }
+        function handleClick(value) {
+            return (event) => onClick === null || onClick === void 0 ? void 0 : onClick(event, value);
+        }
+        function handleChange(value) {
+            return () => {
+                if (isChipSelected(value)) {
+                    handleDeselect(value);
+                }
+                else {
+                    handleSelect(value);
+                }
+            };
+        }
+        function handleSelect(value) {
+            const newVal = [...(selected || []), value];
+            onChange(newVal);
+        }
+        function handleDeselect(value) {
+            const values = selected;
+            const newVal = values === null || values === void 0 ? void 0 : values.filter(val => val !== value);
+            onChange(newVal || []);
+        }
     })));
-    function isChipSelected(value) {
-        return selected.includes(value);
-    }
-    function handleClick(value) {
-        return (event) => onClick === null || onClick === void 0 ? void 0 : onClick(event, value);
-    }
-    function handleChange(value) {
-        return () => {
-            if (isChipSelected(value)) {
-                handleDeselect(value);
-            }
-            else {
-                handleSelect(value);
-            }
-        };
-    }
-    function handleSelect(value) {
-        const newVal = [...selected, value];
-        onChange(newVal);
-    }
-    function handleDeselect(value) {
-        const values = selected;
-        const newVal = values.filter(val => val !== value);
-        onChange(newVal);
-    }
-    function checkmarkIcon(show) {
-        // Ideally, we should be returning a fragment `<></>` when a function
-        // returns a component / element. However, this one needs to return nothing
-        // to prevent it from randomly rendering a suffix.
-        //
-        // DO NOT COPY!
-        if (!show)
-            return;
-        return React__default["default"].createElement(Icon.Icon, { name: "checkmark" });
-    }
 }
 
 var css_248z = ".sCNIjluCskc- {\n  display: -ms-flexbox;\n  display: flex;\n  position: relative;\n  box-sizing: border-box;\n  border: calc(16px / 16) solid transparent;\n  border: var(--border-base) solid transparent;\n  border-radius: calc(16px / 8);\n  border-radius: var(--radius-base);\n  transition: all 200ms;\n  transition: all var(--timing-base);\n  gap: calc(16px / 2);\n  gap: var(--space-small);\n  -ms-flex-wrap: wrap;\n      flex-wrap: wrap;\n  -ms-flex-align: center;\n      align-items: center;\n}\n\n.MFUlz1WQLdk- {\n  -ms-flex: 1;\n      flex: 1;\n  min-width: 120px;\n  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n  border: none;\n  border-radius: 0;\n  color: inherit;\n  font-family: inherit;\n  font-size: inherit;\n  font-size: calc(calc(16px * 1) * 0.875);\n  font-size: var(--typography--fontSize-base);\n  line-height: 1.25;\n  line-height: var(--typography--lineHeight-base);\n  background: transparent;\n  -webkit-appearance: none;\n          appearance: none;\n}\n\n.MFUlz1WQLdk-:focus {\n  outline: none;\n}\n\n.V9eYJdjPAeY- {\n  position: relative;\n  z-index: 6;\n  z-index: var(--elevation-menu);\n  width: 100%;\n}\n\n.LdytkOeCU9c- {\n  max-height: 320px;\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  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n  border-radius: calc(16px / 8);\n  border-radius: var(--radius-base);\n  overflow-y: scroll;\n  background-color: rgba(255, 255, 255, 1);\n  background-color: var(--color-surface);\n}\n\n.y7Cz2u8BuNE-,\n._-7bmao8Q9As- {\n  display: -ms-flexbox;\n  display: flex;\n  width: 100%;\n  padding: calc(16px / 2);\n  padding: var(--space-small);\n  border: none;\n  background-color: transparent;\n  cursor: pointer;\n  -webkit-appearance: none;\n          appearance: none;\n  -ms-flex-align: center;\n      align-items: center;\n  gap: calc(16px / 2);\n  gap: var(--space-small);\n}\n\n.y7Cz2u8BuNE-: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.y7Cz2u8BuNE-:focus,\n.iCwWdcmtInc- {\n  outline: none;\n  background-color: rgb(250, 246, 219);\n  background-color: var(--color-surface--hover);\n}\n\n._-7bmao8Q9As- {\n  -ms-flex-pack: center;\n      justify-content: center;\n}\n";
@@ -199,19 +210,20 @@ styleInject_es.styleInject(css_248z);
 
 function useInternalChipDismissible({ children, selected, onChange, onClick, onCustomAdd, }) {
     const ref = React.useRef(null);
-    const chipOptions = children.map(chip => chip.props);
-    const visibleChipOptions = chipOptions.filter(chip => selected.includes(chip.value));
-    const sortedVisibleChipOptions = sortBy__default["default"](visibleChipOptions, chip => selected.indexOf(chip.value));
-    const availableChipOptions = chipOptions.filter(chip => !selected.includes(chip.value));
+    const chipOptions = children === null || children === void 0 ? void 0 : children.map(chip => chip.props);
+    const visibleChipOptions = chipOptions === null || chipOptions === void 0 ? void 0 : chipOptions.filter(chip => selected === null || selected === void 0 ? void 0 : selected.includes(chip.value));
+    const sortedVisibleChipOptions = sortBy__default["default"](visibleChipOptions, chip => selected === null || selected === void 0 ? void 0 : selected.indexOf(chip.value));
+    const availableChipOptions = chipOptions === null || chipOptions === void 0 ? void 0 : chipOptions.filter(chip => !(selected === null || selected === void 0 ? void 0 : selected.includes(chip.value)));
     const { liveAnnounce } = useLiveAnnounce.useLiveAnnounce();
     const actions = {
         handleChipRemove: (value) => {
             return () => {
                 liveAnnounce(`${value} Removed`);
-                onChange(selected.filter(val => val !== value));
+                onChange((selected === null || selected === void 0 ? void 0 : selected.filter(val => val !== value)) || []);
+                onClick && onClick({}, value);
             };
         },
-        handleChipAdd: (value) => onChange([...selected, value]),
+        handleChipAdd: (value) => onChange([...(selected || []), value]),
         handleCustomAdd: onCustomAdd,
         handleChipClick: (value) => {
             if (onClick === undefined)
@@ -268,7 +280,7 @@ function useInternalChipDismissibleInput({ options, isLoadingMore = false, onCus
     const [shouldCancelBlur, setShouldCancelBlur] = React.useState(false);
     const [shouldCancelEnter, setShouldCancelEnter] = React.useState(false);
     const canAddCustomOption = onCustomOptionSelect !== undefined && !isLoadingMore;
-    const maxOptionIndex = allOptions.length - 1;
+    const maxOptionIndex = (allOptions === null || allOptions === void 0 ? void 0 : allOptions.length) - 1;
     const { liveAnnounce } = useLiveAnnounce.useLiveAnnounce();
     React.useEffect(() => {
         setAllOptions(generateOptions(options, searchValue, canAddCustomOption));
@@ -276,8 +288,8 @@ function useInternalChipDismissibleInput({ options, isLoadingMore = false, onCus
     const computed = {
         menuId,
         inputRef: React.useRef(null),
-        activeOption: allOptions[activeIndex],
-        hasAvailableOptions: allOptions.length > 0,
+        activeOption: allOptions === null || allOptions === void 0 ? void 0 : allOptions[activeIndex],
+        hasAvailableOptions: (allOptions === null || allOptions === void 0 ? void 0 : allOptions.length) > 0,
         nextOptionIndex: activeIndex < maxOptionIndex ? activeIndex + 1 : 0,
         previousOptionIndex: activeIndex > 0 ? activeIndex - 1 : maxOptionIndex,
     };
@@ -365,16 +377,14 @@ function useInternalChipDismissibleInput({ options, isLoadingMore = false, onCus
         shouldCancelBlur });
 }
 function generateOptions(options, searchValue, canAddCustomOption) {
-    const allOptions = options
-        .filter(option => option.label.toLowerCase().match(searchValue.trim().toLowerCase()))
-        .map(opt => (Object.assign(Object.assign({}, opt), { custom: false })));
+    const allOptions = options === null || options === void 0 ? void 0 : options.filter(option => option.label.toLowerCase().match(searchValue.trim().toLowerCase())).map(opt => (Object.assign(Object.assign({}, opt), { custom: false })));
     const { shouldAddCustomOption, customOption } = generateCustomOption(allOptions, searchValue, canAddCustomOption);
     shouldAddCustomOption && allOptions.push(customOption);
     return allOptions;
 }
 function generateCustomOption(options, searchValue, canAddCustomOption) {
     function shouldAddCustomOption() {
-        const isMatchingOption = options.some(option => option.label.toLowerCase() === searchValue.trim().toLowerCase());
+        const isMatchingOption = options === null || options === void 0 ? void 0 : options.some(option => option.label.toLowerCase() === searchValue.trim().toLowerCase());
         return !!searchValue && !isMatchingOption;
     }
     return {
@@ -472,7 +482,7 @@ function InternalChipDismissibleInput(props) {
         React__default["default"].createElement("input", { ref: inputRef, className: styles.input, type: "text", role: "combobox", "aria-label": "Press up and down arrow to cycle through the options or type to narrow down the results", "aria-autocomplete": "list", "aria-owns": menuId, "aria-expanded": hasAvailableOptions, "aria-activedescendant": generateDescendantId(activeIndex), value: searchValue, onChange: handleSearchChange, onKeyDown: handleKeyDown, onBlur: debounce__default["default"](handleBlur, 200), onFocus: handleOpenMenu, autoFocus: true }),
         (hasAvailableOptions || isLoadingMore) && (React__default["default"].createElement("div", Object.assign({ ref: setPositionedElementRef, className: styles.menu, style: popperStyles.popper }, attributes.popper),
             React__default["default"].createElement("div", { ref: menuRef, role: "listbox", id: menuId, className: styles.menuList, "data-testid": "chip-menu" },
-                allOptions.map((option, i) => (React__default["default"].createElement("button", { key: option.value, role: "option", id: generateDescendantId(i), className: classnames__default["default"](styles.menuListOption, {
+                allOptions.map((option, i) => (React__default["default"].createElement("button", { key: option.value, role: "option", type: "button", id: generateDescendantId(i), className: classnames__default["default"](styles.menuListOption, {
                         [styles.activeOption]: activeIndex === i,
                     }), onClick: () => handleSelectOption(option), onMouseEnter: handleSetActiveOnMouseOver(i), onMouseDown: handleCancelBlur, onMouseUp: handleEnableBlur },
                     React__default["default"].createElement("span", { "aria-hidden": true }, option.prefix),
@@ -483,10 +493,12 @@ function InternalChipDismissibleInput(props) {
 }
 
 function InternalChipDismissible(props) {
-    const { availableChipOptions, ref: wrapperRef, sortedVisibleChipOptions, handleChipAdd, handleChipClick, handleChipKeyDown, handleChipRemove, handleCustomAdd, handleWrapperKeyDown, } = useInternalChipDismissible(props);
+    const { availableChipOptions, ref: wrapperRef, sortedVisibleChipOptions, handleChipAdd, handleChipKeyDown, handleChipRemove, handleCustomAdd, handleWrapperKeyDown, } = useInternalChipDismissible(props);
     return (React__default["default"].createElement("div", { ref: wrapperRef, className: styles.wrapper, "data-testid": "dismissible-chips", onKeyDown: handleWrapperKeyDown, role: "listbox" },
-        sortedVisibleChipOptions.map(chip => (React__default["default"].createElement(InternalChip, Object.assign({ key: chip.value }, chip, { onKeyDown: handleChipKeyDown(chip.value), onClick: handleChipClick(chip.value), ariaLabel: `${chip.label}. Press delete or backspace to remove ${chip.label}`, tabIndex: 0, suffix: React__default["default"].createElement(InternalChipButton, { icon: "remove", invalid: chip.invalid, disabled: chip.disabled, label: chip.label, onClick: handleChipRemove(chip.value) }) })))),
-        React__default["default"].createElement(InternalChipDismissibleInput, { activator: props.activator, attachTo: wrapperRef, isLoadingMore: props.isLoadingMore, options: availableChipOptions, onOptionSelect: handleChipAdd, onCustomOptionSelect: handleCustomAdd, onSearch: props.onSearch, onLoadMore: props.onLoadMore })));
+        sortedVisibleChipOptions.map(chip => (React__default["default"].createElement(ChipSelectable.Chip, Object.assign({ key: chip.value }, chip, { value: chip.label, onKeyDown: handleChipKeyDown(chip.value), onClick: handleChipRemove(chip.value), role: "radio", "data-testid": props.dataTestId || "remove-chip-button", ariaLabel: `${chip.label}. Press delete or backspace to remove ${chip.label}`, tabIndex: 0 }),
+            React__default["default"].createElement(ChipSelectable.Chip.Suffix, null,
+                React__default["default"].createElement(Icon.Icon, { name: "cross", size: "small" }))))),
+        React__default["default"].createElement(InternalChipDismissibleInput, { activator: props.activator, type: props.type, attachTo: wrapperRef, isLoadingMore: props.isLoadingMore, options: availableChipOptions || [], onOptionSelect: handleChipAdd, onCustomOptionSelect: handleCustomAdd, onSearch: props.onSearch, onLoadMore: props.onLoadMore })));
 }
 
 function Chips(props) {
@@ -496,19 +508,13 @@ function Chips(props) {
         case "multiselect":
             return React__default["default"].createElement(InternalChipMultiSelect, Object.assign({}, props));
         default:
-            return React__default["default"].createElement(InternalChipSingleSelect, Object.assign({}, props));
+            return (React__default["default"].createElement(InternalChipSingleSelect, Object.assign({}, props, { type: "singleselect", selected: props.selected })));
     }
 }
 
-// Only need the component to pass in the data as a react children
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function Chip(props) {
-    // Throw error when <Chip /> gets used outside of the <Chips />
-    useAssert.useAssert(true, "`<Chip>` component can only be used inside `<Chips>`");
-    return React__default["default"].createElement(React__default["default"].Fragment, null);
-}
-
-exports.Chip = Chip;
 exports.Chips = Chips;
 exports.InternalChip = InternalChip;
 exports.InternalChipButton = InternalChipButton;
+exports.InternalChipDismissible = InternalChipDismissible;
+exports.InternalChipMultiSelect = InternalChipMultiSelect;
+exports.InternalChipSingleSelect = InternalChipSingleSelect;

package/dist/Combobox/Combobox.d.ts

@@ -4,6 +4,12 @@ import { ComboboxAction } from "./components/ComboboxAction";
 import { ComboboxTriggerButton, ComboboxTriggerChip } from "./components/ComboboxTrigger";
 export interface ComboboxProps {
     readonly children: ReactElement | ReactElement[];
+    /**
+     * When `true`, `Combobox` will allow for multiple selections
+     *
+     * @default false
+     */
+    readonly multiSelect?: boolean;
 }
 export declare const COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE = "Combobox can only have one Trigger element";
 export declare const COMBOBOX_REQUIRED_CHILDREN_ERROR_MESSAGE = "Combobox must have a Trigger and Combobox.Content element";

package/dist/Combobox/ComboboxProvider.d.ts

@@ -1,10 +1,12 @@
 import React, { RefObject } from "react";
 export declare const ComboboxContext: React.Context<{
+    multiselect: boolean;
     open: boolean;
     setOpen: (open: boolean) => void;
     wrapperRef: RefObject<HTMLDivElement>;
 }>;
 export interface ComboboxProviderProps {
     readonly children: React.ReactNode;
+    readonly multiselect?: boolean;
 }
 export declare function ComboboxContextProvider(props: ComboboxProviderProps): JSX.Element;

package/dist/Combobox/components/ComboboxContent/ComboboxContent.d.ts

@@ -1,14 +1,24 @@
 import { ReactElement } from "react";
+import { XOR } from "ts-xor";
 import { ComboboxOption } from "../../Combobox.types";
-interface ComboboxContentProps {
+interface ComboboxCloseProps {
     /**
-     * List of selectable options to display.
+     * Callback function invoked upon the selection of an option. Provides the selected option(s) as an argument.
      */
-    readonly options: ComboboxOption[];
+    readonly onSelect: (selection: ComboboxOption[]) => void;
+}
+interface ComoboboxSelectProps {
+    /**
+     *
+     * Callback function invoked upon the Combobox menu closing. Provides the selected option(s) as an argument.
+     */
+    readonly onClose: (selection: ComboboxOption[]) => void;
+}
+interface ComboboxContentBaseProps {
     /**
-     * Callback function invoked upon the selection of an option. Provides the selected option as an argument.
+     * List of selectable options to display.
      */
-    readonly onSelect: (selection: ComboboxOption) => void;
+    readonly options: ComboboxOption[];
     /**
      * Optional action button(s) to display at the bottom of the list.
      */
@@ -22,12 +32,13 @@ interface ComboboxContentProps {
      * @default ""
      * @type string
      */
-    readonly selected: ComboboxOption | null;
+    readonly selected: ComboboxOption[];
     /**
      * The encapsulating noun for the content of the combobox. Used
      * in the empty state, and search placeholder. Should be pluralized.
      */
     readonly subjectNoun?: string;
 }
+type ComboboxContentProps = ComboboxContentBaseProps & XOR<ComboboxCloseProps, ComoboboxSelectProps>;
 export declare function ComboboxContent(props: ComboboxContentProps): JSX.Element;
 export {};

package/dist/Combobox/components/ComboboxContent/ComboboxList.d.ts

@@ -1,14 +1,15 @@
 import React, { SetStateAction } from "react";
 import { ComboboxOption } from "../../Combobox.types";
 interface ComboboxListProps {
-    options: ComboboxOption[];
-    showEmptyState: boolean;
-    selected: ComboboxOption | null;
-    optionsListRef: React.RefObject<HTMLUListElement>;
-    setSelectedElement: React.Dispatch<SetStateAction<HTMLElement | null>>;
-    selectionHandler: (option: ComboboxOption) => void;
-    searchValue: string;
-    subjectNoun?: string;
+    readonly options: ComboboxOption[];
+    readonly showEmptyState: boolean;
+    readonly selected: ComboboxOption[];
+    readonly optionsListRef: React.RefObject<HTMLUListElement>;
+    readonly setFirstSelectedElement: React.Dispatch<SetStateAction<HTMLElement | null>>;
+    readonly selectionHandler: (option: ComboboxOption) => void;
+    readonly searchValue: string;
+    readonly multiselect: boolean;
+    readonly subjectNoun?: string;
 }
 export declare function ComboboxList(props: ComboboxListProps): JSX.Element;
 export {};

package/dist/Combobox/components/ComboboxContent/ComboboxSearch.d.ts

@@ -1,7 +1,7 @@
 import { Dispatch, SetStateAction } from "react";
 export declare function ComboboxSearch(props: {
-    placeholder?: string;
-    searchValue: string;
-    open: boolean;
-    setSearchValue: Dispatch<SetStateAction<string>>;
+    readonly placeholder?: string;
+    readonly searchValue: string;
+    readonly open: boolean;
+    readonly setSearchValue: Dispatch<SetStateAction<string>>;
 }): JSX.Element;

package/dist/Combobox/hooks/useComboboxContent.d.ts

@@ -1,9 +1,13 @@
 /// <reference types="react" />
 import { ComboboxOption } from "../Combobox.types";
-export declare function useComboboxContent(options: ComboboxOption[], open: boolean): {
+interface useComboboxContent {
     searchValue: string;
     setSearchValue: React.Dispatch<React.SetStateAction<string>>;
-    setSelectedElement: React.Dispatch<React.SetStateAction<HTMLElement | null>>;
+    setFirstSelectedElement: React.Dispatch<React.SetStateAction<HTMLElement | null>>;
     filteredOptions: ComboboxOption[];
     optionsListRef: React.RefObject<HTMLUListElement>;
-};
+    selectedOptions: ComboboxOption[];
+    setInternalSelected: (selected: ComboboxOption[]) => void;
+}
+export declare function useComboboxContent(options: ComboboxOption[], open: boolean, selected: ComboboxOption[], onClose: ((selection: ComboboxOption[]) => void) | undefined): useComboboxContent;
+export {};

package/dist/Combobox/index.js

@@ -8,13 +8,13 @@ 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-59bde58c.js');
+var Text = require('../Text-54334431.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 Typography = require('../Typography-9bff9c91.js');
-var Button = require('../Button-d89f2271.js');
+var Typography = require('../Typography-83915c54.js');
+var Button = require('../Button-db6114a6.js');
 require('@jobber/design');
 require('react-router-dom');
 
@@ -24,11 +24,11 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 
-var css_248z$5 = ".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-::before {\n  content: \"\";\n  display: block;\n  position: absolute;\n  top: calc((16px * 1.5) * -1);\n  top: calc(calc(16px * 1.5) * -1);\n  top: calc(var(--space-large) * -1);\n  right: 0;\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.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 css_248z$5 = ".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$5 = {"content":"m1w5vdUZ6rQ-","hidden":"Zlkv2HA096A-","actions":"YQry-Rd6zfQ-","actionPadding":"TcpqL34s4lI-"};
 styleInject_es.styleInject(css_248z$5);
 
-var css_248z$4 = ".ifwwZOYTf8U- {\n  position: relative;\n}\n\n.gIbHknFkZLI- {\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.dZmEG-amk2U- {\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}\n\n.dZmEG-amk2U-: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.ifwwZOYTf8U-::after {\n  content: \"\";\n  display: block;\n  position: absolute;\n  right: 0;\n  bottom: calc((16px * 1.5) * -1);\n  bottom: calc(calc(16px * 1.5) * -1);\n  bottom: calc(var(--space-large) * -1);\n  left: 0;\n  height: calc(16px * 1);\n  height: var(--space-base);\n  background-image: linear-gradient(\n    to bottom,\n    rgba(255, 255, 255, 1),\n    rgba(255, 255, 255, 0)\n  );\n}\n";
+var css_248z$4 = ".ifwwZOYTf8U- {\n  position: relative;\n}\n\n.gIbHknFkZLI- {\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.dZmEG-amk2U- {\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}\n\n.dZmEG-amk2U-: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$4 = {"search":"ifwwZOYTf8U-","searchInput":"gIbHknFkZLI-","clearSearch":"dZmEG-amk2U-"};
 styleInject_es.styleInject(css_248z$4);
 
@@ -44,7 +44,7 @@ function ComboboxSearch(props) {
     }, [props.open]);
     return (React__default["default"].createElement("div", { className: styles$4.search },
         React__default["default"].createElement("input", { type: "search", ref: searchRef, className: styles$4.searchInput, placeholder: props.placeholder ? `Search ${props.placeholder}` : "Search", onChange: (event) => handleSearch(event), value: props.searchValue }),
-        props.searchValue && (React__default["default"].createElement("button", { className: styles$4.clearSearch, onClick: clearSearch, "data-testid": "ATL-Combobox-Content-Search-Clear", "aria-label": "Clear search" },
+        props.searchValue && (React__default["default"].createElement("button", { className: styles$4.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" })))));
     function clearSearch() {
         var _a;
@@ -56,22 +56,22 @@ function ComboboxSearch(props) {
     }
 }
 
-var css_248z$3 = "._5n7VvEn39-Y- {\n  padding: calc(16px / 2);\n  padding: var(--space-small);\n}\n\n.KhX5VfZjAog- {\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.NNCJVHYx6lc- {\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  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  -ms-flex-pack: justify;\n      justify-content: space-between;\n  -ms-flex-align: center;\n      align-items: center;\n  transition: all 200ms;\n  transition: all var(--timing-base);\n}\n\n.IvTItlT0MOQ-,\n.NNCJVHYx6lc-:hover,\n.NNCJVHYx6lc-:focus {\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n.NNCJVHYx6lc-: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._2IRm1sf-TUU-,\n.DTuoA8WPNzc- {\n  padding: calc(16px / 2);\n  padding: var(--space-small);\n}\n";
-var styles$3 = {"container":"_5n7VvEn39-Y-","optionsList":"KhX5VfZjAog-","option":"NNCJVHYx6lc-","selectedOption":"IvTItlT0MOQ-","filterMessage":"_2IRm1sf-TUU-","emptyStateMessage":"DTuoA8WPNzc-"};
+var css_248z$3 = "._5n7VvEn39-Y- {\n  position: relative;\n  padding: calc(16px / 2) 0;\n  padding: var(--space-small) 0;\n}\n\n.KhX5VfZjAog- {\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.NNCJVHYx6lc- {\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.NNCJVHYx6lc-:hover,\n.NNCJVHYx6lc-:focus {\n  background-color: rgb(244, 244, 244);\n  background-color: var(--color-surface--background);\n}\n\n.NNCJVHYx6lc-: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._2IRm1sf-TUU-,\n.DTuoA8WPNzc- {\n  padding: calc(16px / 2) calc(16px * 1);\n  padding: var(--space-small) var(--space-base);\n}\n\n._5n7VvEn39-Y-::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._5n7VvEn39-Y-::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$3 = {"container":"_5n7VvEn39-Y-","optionsList":"KhX5VfZjAog-","option":"NNCJVHYx6lc-","filterMessage":"_2IRm1sf-TUU-","emptyStateMessage":"DTuoA8WPNzc-"};
 styleInject_es.styleInject(css_248z$3);
 
 function ComboboxList(props) {
+    let hasSeenFirstSelected = false;
     return (React__default["default"].createElement("div", { className: styles$3.container },
-        !props.showEmptyState && props.options.length > 0 && (React__default["default"].createElement("ul", { className: styles$3.optionsList, role: "listbox", ref: props.optionsListRef }, !props.showEmptyState &&
+        !props.showEmptyState && props.options.length > 0 && (React__default["default"].createElement("ul", { className: styles$3.optionsList, role: "listbox", "aria-multiselectable": props.multiselect, ref: props.optionsListRef }, !props.showEmptyState &&
             props.options.map(option => {
-                var _a;
-                const isSelected = option.id.toString() === ((_a = props.selected) === null || _a === void 0 ? void 0 : _a.id.toString());
+                const isSelected = props.selected.some(selection => selection.id.toString() === option.id.toString());
                 return (React__default["default"].createElement("li", { ref: listItem => {
-                        if (isSelected)
-                            props.setSelectedElement(listItem);
-                    }, key: option.id, tabIndex: -1, role: "option", "aria-selected": isSelected, onClick: () => props.selectionHandler(option), className: classnames__default["default"](styles$3.option, {
-                        [styles$3.selectedOption]: isSelected,
-                    }) },
+                        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$3.option) },
                     option.label,
                     isSelected && React__default["default"].createElement(Icon.Icon, { name: "checkmark", color: "blue" })));
             }))),
@@ -95,32 +95,47 @@ 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: { open, setOpen, wrapperRef } },
+    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) {
+function useComboboxContent(options, open, selected, onClose) {
     const [searchValue, setSearchValue] = React.useState("");
-    const [selectedElement, setSelectedElement] = React.useState(null);
+    const [firstSelectedElement, setFirstSelectedElement] = React.useState(null);
     const optionsListRef = React.useRef(null);
     const filteredOptions = options.filter(option => option.label.toLowerCase().includes(searchValue.toLowerCase()));
+    const [internalSelected, setInternalSelected] = React.useState(selected);
+    const selectedOptions = onClose ? internalSelected : selected;
+    React.useEffect(() => {
+        if (!open && onClose) {
+            onClose(selectedOptions);
+        }
+    }, [open, onClose, selectedOptions]);
     React.useEffect(() => {
-        if (open && selectedElement) {
-            selectedElement === null || selectedElement === void 0 ? void 0 : selectedElement.scrollIntoView({
+        if (open && firstSelectedElement) {
+            firstSelectedElement === null || firstSelectedElement === void 0 ? void 0 : firstSelectedElement.scrollIntoView({
                 block: "nearest",
             });
         }
-    }, [open, selectedElement]);
+    }, [open, firstSelectedElement]);
+    React.useEffect(() => {
+        if (selectedOptions.length === 0) {
+            setFirstSelectedElement(null);
+        }
+    }, [selectedOptions]);
     return {
         searchValue,
         setSearchValue,
-        setSelectedElement,
+        setFirstSelectedElement,
         filteredOptions,
         optionsListRef,
+        selectedOptions,
+        setInternalSelected,
     };
 }
 
@@ -201,23 +216,42 @@ function useComboboxAccessibility(selectionCallback, filteredOptions, optionsLis
 }
 
 function ComboboxContent(props) {
-    const { open, setOpen, wrapperRef } = React__default["default"].useContext(ComboboxContext);
+    const { open, setOpen, wrapperRef, multiselect } = React__default["default"].useContext(ComboboxContext);
     const optionsExist = props.options.length > 0;
-    const { searchValue, setSearchValue, setSelectedElement, filteredOptions, optionsListRef, } = useComboboxContent(props.options, open);
+    const { searchValue, setSearchValue, setFirstSelectedElement, filteredOptions, optionsListRef, selectedOptions, setInternalSelected, } = useComboboxContent(props.options, open, props.selected, props.onClose);
     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$5.content, { [styles$5.hidden]: !open }), style: popperStyles.popper }, attributes.popper),
         React__default["default"].createElement(ComboboxSearch, { open: open, placeholder: props.subjectNoun, searchValue: searchValue, setSearchValue: setSearchValue }),
-        React__default["default"].createElement(ComboboxList, { showEmptyState: !optionsExist, options: filteredOptions, selected: props.selected, optionsListRef: optionsListRef, setSelectedElement: setSelectedElement, selectionHandler: handleSelection, searchValue: searchValue, subjectNoun: props.subjectNoun }),
+        React__default["default"].createElement(ComboboxList, { 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$5.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"]({
                 [styles$5.actionPadding]: index === childrenArray.length - 1,
             }) }, child)))))));
     return ReactDOM__default["default"].createPortal(template, document.body);
     function handleSelection(selection) {
-        props.onSelect(selection);
+        const callbackHandler = props.onSelect
+            ? props.onSelect
+            : setInternalSelected;
+        if (multiselect) {
+            handleMultiSelect(callbackHandler, selectedOptions, selection);
+        }
+        else {
+            handleSingleSelect(callbackHandler, selection);
+        }
+    }
+    function handleSingleSelect(selectCallback, selection) {
+        selectCallback([selection]);
         setSearchValue("");
         setOpen(false);
     }
 }
+function handleMultiSelect(selectCallback, selected, selection) {
+    if (selected.some(s => s.id === selection.id)) {
+        selectCallback(selected.filter(s => s.id !== selection.id));
+    }
+    else {
+        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-"};
@@ -225,7 +259,7 @@ 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, "aria-label": props.label },
+        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))));
 }
 
@@ -240,7 +274,7 @@ 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", "aria-expanded": open, "aria-haspopup": "listbox", "aria-controls": "ATL-Combobox-Content", "aria-autocomplete": "list", onClick: () => {
+    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),
@@ -252,7 +286,7 @@ const COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE = "Combobox can only have one Trigger
 const COMBOBOX_REQUIRED_CHILDREN_ERROR_MESSAGE = "Combobox must have a Trigger and Combobox.Content element";
 const Combobox = (props) => {
     const { contentElement, triggerElement } = useComboboxValidation(props.children);
-    return (React__default["default"].createElement(ComboboxContextProvider, null,
+    return (React__default["default"].createElement(ComboboxContextProvider, { multiselect: props.multiSelect },
         triggerElement,
         contentElement));
 };