@jobber/components 4.60.3 → 4.60.4

package/dist/Combobox-981633c1.js

@@ -0,0 +1,403 @@
+'use strict';
+
+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-f26246d1.js');
+require('@jobber/design');
+var useAssert = require('@jobber/hooks/useAssert');
+
+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);
+
+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);
+
+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);
+
+function ComboboxContentSearch(props) {
+    const searchRef = React.useRef(null);
+    React.useEffect(() => {
+        if (props.open) {
+            setTimeout(() => {
+                var _a;
+                (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+            }, 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" })))));
+    function clearSearch() {
+        var _a;
+        props.setSearchValue("");
+        (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+    function handleSearch(event) {
+        props.setSearchValue(event.target.value);
+    }
+}
+
+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  pointer-events: none;\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  pointer-events: none;\n}\n";
+var styles$4 = {"container":"SgMzjOcdE-E-","optionsList":"TwoTCjgcssc-","filterMessage":"_8T5M7MGwCRE-","emptyStateMessage":"_4y5NXkNeIQM-"};
+styleInject_es.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_es.styleInject(css_248z$3);
+
+const ComboboxContext = React__default["default"].createContext({});
+function ComboboxContextProvider(props) {
+    return (React__default["default"].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 } = React.useContext(ComboboxContext);
+    const isSelected = selected.some(selection => selection.id.toString() === props.id.toString());
+    return (React__default["default"].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__default["default"](styles$3.option) },
+        props.label,
+        isSelected && React__default["default"].createElement(Icon.Icon, { name: "checkmark", color: "blue" })));
+}
+
+function ComboboxContentList(props) {
+    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 &&
+            props.options.map(option => {
+                return (React__default["default"].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" },
+                "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))))));
+}
+function getZeroIndexStateText(subjectNoun) {
+    if (subjectNoun) {
+        return `You don't have any ${subjectNoun} yet`;
+    }
+    return "No options yet";
+}
+
+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_es.styleInject(css_248z$2);
+
+function ComboboxContentHeader(props) {
+    const hasSelected = props.selectedCount > 0;
+    const actionLabel = hasSelected ? "Clear" : "Select all";
+    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$2.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 }))));
+}
+function getLabel(hasSelected, count, subjectNoun) {
+    if (hasSelected) {
+        return `${count} selected`;
+    }
+    if (subjectNoun) {
+        return `Select ${subjectNoun}`;
+    }
+    return "Select";
+}
+
+function useComboboxContent(options, open, selected, searchValue) {
+    const { shouldScroll } = React.useContext(ComboboxContext);
+    const optionsListRef = React.useRef(null);
+    const filteredOptions = options.filter(option => option.label.toLowerCase().includes(searchValue.toLowerCase()));
+    React.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, selected]);
+    return {
+        filteredOptions,
+        optionsListRef,
+    };
+}
+function scrollToFirstSelected(firstSelected, shouldScroll) {
+    if (firstSelected) {
+        firstSelected.scrollIntoView({
+            block: "nearest",
+        });
+        shouldScroll.current = false;
+    }
+}
+
+// eslint-disable-next-line max-statements
+function useComboboxAccessibility(selectionCallback, filteredOptions, optionsListRef, open, wrapperRef) {
+    const { handleClose } = React.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, update, } = reactPopper.usePopper(wrapperRef.current, popperRef.current, {
+        modifiers: [
+            {
+                name: "flip",
+                options: {
+                    fallbackPlacements: ["top-start"],
+                },
+            },
+        ],
+        placement: "bottom-start",
+    });
+    React.useEffect(() => {
+        focusedIndex.current = null;
+        if (open) {
+            update === null || update === void 0 ? void 0 : update();
+        }
+    }, [open, filteredOptions.length]);
+    React.useEffect(() => {
+        var _a;
+        if (open) {
+            (_a = popperRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener("keydown", handleContentKeydown);
+        }
+        return () => {
+            var _a;
+            (_a = popperRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener("keydown", handleContentKeydown);
+        };
+    }, [open, optionsListRef, filteredOptions]);
+    useOnKeyDown.useOnKeyDown(() => {
+        if (open) {
+            handleClose();
+        }
+    }, "Escape");
+    function handleContentKeydown(event) {
+        var _a;
+        if (!hasOptionsVisible)
+            return;
+        if (event.key === "Enter" || event.key === " ") {
+            const activeElementInList = (_a = optionsListRef.current) === null || _a === void 0 ? void 0 : _a.contains(document.activeElement);
+            if (!activeElementInList)
+                return;
+            handleKeyboardSelection(event);
+        }
+        if (event.key === "ArrowDown") {
+            handleKeyboardNavigation(event, 1);
+        }
+        if (event.key === "ArrowUp") {
+            handleKeyboardNavigation(event, -1);
+        }
+    }
+    function handleKeyboardNavigation(event, indexChange) {
+        var _a;
+        const newIndex = focusedIndex.current === null ? 0 : focusedIndex.current + indexChange;
+        if (newIndex < 0 || newIndex >= filteredOptions.length)
+            return;
+        const optionElement = (_a = optionsListRef.current) === null || _a === void 0 ? void 0 : _a.children[newIndex];
+        optionElement === null || optionElement === void 0 ? void 0 : optionElement.focus();
+        focusedIndex.current = newIndex;
+        event.preventDefault();
+        event.stopPropagation();
+    }
+    function handleKeyboardSelection(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        if (focusedIndex.current !== null) {
+            selectionCallback(filteredOptions[focusedIndex.current]);
+        }
+    }
+    return {
+        popperRef,
+        popperStyles,
+        attributes,
+    };
+}
+
+function ComboboxContent(props) {
+    const optionsExist = props.options.length > 0;
+    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__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]: !props.open }), style: popperStyles.popper }, attributes.popper),
+        React__default["default"].createElement(ComboboxContentSearch, { open: props.open, placeholder: props.subjectNoun, searchValue: props.searchValue, setSearchValue: props.setSearchValue }),
+        props.multiselect && optionsExist && (React__default["default"].createElement(ComboboxContentHeader, { hasOptionsVisible: filteredOptions.length > 0, subjectNoun: props.subjectNoun, selectedCount: props.selected.length, onClearAll: () => {
+                props.selectedStateSetter([]);
+            }, onSelectAll: () => {
+                props.selectedStateSetter(filteredOptions);
+            } })),
+        React__default["default"].createElement(ComboboxContentList, { multiselect: props.multiselect, showEmptyState: !optionsExist, options: filteredOptions, selected: props.selected, optionsListRef: optionsListRef, searchValue: props.searchValue, subjectNoun: props.subjectNoun }),
+        props.actionElements && (React__default["default"].createElement("div", { className: styles$6.actions, role: "group" }, props.actionElements.map((child, index, childrenArray) => (React__default["default"].createElement("div", { key: index, className: classnames__default["default"]({
+                [styles$6.actionPadding]: index === childrenArray.length - 1,
+            }) }, child)))))));
+    return ReactDOM__default["default"].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_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 ComboboxTrigger({ label = "Select", selected, }) {
+    const { handleClose, open, setOpen } = React__default["default"].useContext(ComboboxContext);
+    const hasSelection = selected.length;
+    const selectedLabel = selected.map(option => option.label).join(", ");
+    return (React__default["default"].createElement(Chip.Chip, { variation: hasSelection ? "base" : "subtle", label: hasSelection ? selectedLabel : "", heading: label, onClick: () => {
+            if (open) {
+                handleClose();
+            }
+            else {
+                setOpen(true);
+            }
+        }, role: "combobox" }, !hasSelection && (React__default["default"].createElement(Chip.Chip.Suffix, null,
+        React__default["default"].createElement(Icon.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_es.styleInject(css_248z);
+
+function useMakeComboboxHandlers(setOpen, setSearchValue, selectedOptions, shouldScroll, selectedStateSetter, multiSelect, onClose) {
+    const handleClose = React.useCallback(() => {
+        setOpen(false);
+        setSearchValue("");
+        onClose && onClose();
+        if (selectedOptions.length > 0) {
+            shouldScroll.current = true;
+        }
+    }, [setOpen, setSearchValue, onClose, selectedOptions.length]);
+    const handleSelection = React.useCallback((selection) => {
+        if (multiSelect) {
+            handleMultiSelect(selectedStateSetter, selectedOptions, selection);
+        }
+        else {
+            handleSingleSelect(selectedStateSetter, selection);
+        }
+    }, [multiSelect, selectedStateSetter, selectedOptions]);
+    const handleSingleSelect = React.useCallback((selectCallback, selection) => {
+        selectCallback([selection]);
+        handleClose();
+    }, []);
+    return {
+        handleClose,
+        handleSelection,
+    };
+}
+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]);
+    }
+}
+
+function useCombobox(selected, onSelect, onClose, multiSelect) {
+    const wrapperRef = React.useRef(null);
+    const shouldScroll = React.useRef(false);
+    const [open, setOpen] = React.useState(false);
+    const [searchValue, setSearchValue] = React.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 { handleClose, 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, {
+            role: "combobox",
+            onClick: () => {
+                if (open) {
+                    handleClose();
+                }
+                else {
+                    setOpen(true);
+                }
+            },
+        });
+    }
+    return props.children;
+}
+
+const COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE = "Combobox must have exactly one Trigger element";
+function useComboboxValidation(children) {
+    const optionElements = getCompoundComponents(ComboboxOption, children);
+    const actionElements = getCompoundComponents(ComboboxAction, children);
+    const activatorElements = getCompoundComponents(ComboboxActivator, children);
+    const shouldThrowTriggerError = isInvalid(activatorElements);
+    useAssert.useAssert(shouldThrowTriggerError, COMBOBOX_TRIGGER_COUNT_ERROR_MESSAGE);
+    return {
+        optionElements,
+        triggerElement: activatorElements[0],
+        actionElements,
+    };
+}
+function isInvalid(activators) {
+    return activators.length > 1 ? true : false;
+}
+/**
+ * Return all instances child component that matches the `type` provided
+ */
+function getCompoundComponents(type, children) {
+    const childrenArray = React.Children.toArray(children);
+    const elements = childrenArray.filter((child) => React.isValidElement(child) && child.type === type);
+    return elements;
+}
+
+function Combobox(props) {
+    const { optionElements, triggerElement, actionElements } = useComboboxValidation(props.children);
+    const options = React.useMemo(() => (optionElements === null || optionElements === void 0 ? void 0 : optionElements.map(option => ({
+        id: option.props.id,
+        label: option.props.label,
+    }))) || [], [optionElements]);
+    const { selectedOptions, selectedStateSetter, shouldScroll, wrapperRef, searchValue, setSearchValue, open, setOpen, handleClose, handleSelection, } = useCombobox(props.selected, props.onSelect, props.onClose, props.multiSelect);
+    return (React__default["default"].createElement(ComboboxContextProvider, { selected: selectedOptions, selectionHandler: handleSelection, open: open, setOpen: setOpen, handleClose: handleClose, shouldScroll: shouldScroll },
+        React__default["default"].createElement("div", { ref: wrapperRef, className: styles.wrapper },
+            open && (React__default["default"].createElement("div", { className: styles.overlay, onClick: () => handleClose(), "data-testid": "ATL-Combobox-Overlay" })),
+            triggerElement || (React__default["default"].createElement(ComboboxTrigger, { label: props.label, selected: props.selected })),
+            React__default["default"].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 }))));
+}
+Combobox.Activator = ComboboxActivator;
+Combobox.Action = ComboboxAction;
+Combobox.Option = ComboboxOption;
+
+exports.Combobox = Combobox;
+exports.ComboboxContextProvider = ComboboxContextProvider;

package/dist/DataList/index.js

@@ -25,23 +25,20 @@ var ReactDOM = require('react-dom');
 var Checkbox = require('../Checkbox-bc4bc968.js');
 var reactRouterDom = require('react-router-dom');
 var AnimatedSwitcher = require('../AnimatedSwitcher-d1e1ddcf.js');
-var Popover = require('../Popover-7c966790.js');
-var Content = require('../Content-2ca1ffe1.js');
-var Chip = require('../Chip-4f12eec8.js');
-require('@jobber/hooks/useAssert');
-require('../Avatar-1aa30ee1.js');
-require('color');
-var Typography = require('../Typography-83915c54.js');
-require('react-popper');
+var Combobox = require('../Combobox-981633c1.js');
+var Chip = require('../Chip-f26246d1.js');
+var Icon = require('../Icon-405a216c.js');
 var debounce = require('lodash/debounce');
 var InputText = require('../InputText-ab237501.js');
 var Spinner = require('../Spinner-9d8fc7ff.js');
-var Icon = require('../Icon-405a216c.js');
+var Typography = require('../Typography-83915c54.js');
+require('../Content-2ca1ffe1.js');
+require('react-popper');
 require('uuid');
 require('react-hook-form');
-require('../ButtonDismiss-1ccb84ec.js');
-require('lodash/sortBy');
-require('@jobber/hooks/useLiveAnnounce');
+require('@jobber/hooks/useAssert');
+require('../Avatar-1aa30ee1.js');
+require('color');
 require('../FormField-fa9254dc.js');
 require('../InputValidation-377d6c62.js');
 
@@ -732,30 +729,38 @@ function DataListHeader() {
 
 function DataListSort() {
     const { sorting, headers } = useDataListContext();
-    const divRef = React.useRef(null);
-    const [showPopover, setShowPopover] = React.useState(false);
     if (!sorting)
         return null;
     const { sortable, state, onSort } = sorting;
     const sortByOptions = getSortByOptions();
-    const canChangeOrder = !(state === null || state === void 0 ? void 0 : state.key);
-    return (React__default["default"].createElement(React__default["default"].Fragment, null,
-        React__default["default"].createElement("span", { ref: divRef },
-            React__default["default"].createElement(Button.Button, Object.assign({}, (!state && { icon: "add", iconOnRight: true }), { label: getButtonLabel(), variation: "subtle", onClick: () => setShowPopover(!showPopover) }))),
-        React__default["default"].createElement(Popover.Popover, { attachTo: divRef, open: showPopover, onRequestClose: () => setShowPopover(false) },
-            React__default["default"].createElement(Content.Content, null,
-                React__default["default"].createElement(Heading.Heading, { level: 5 }, "Sort by"),
-                React__default["default"].createElement(Chip.Chips, { selected: (state === null || state === void 0 ? void 0 : state.key) || "none", onChange: handleKeyChange }, sortByOptions.map(({ label, value }) => (React__default["default"].createElement(Chip.Chip, { key: label, label: label, value: value })))),
-                React__default["default"].createElement(Heading.Heading, { level: 5 }, "Ordered by"),
-                React__default["default"].createElement(Chip.Chips, { selected: state === null || state === void 0 ? void 0 : state.order, onChange: handleSortingChange },
-                    React__default["default"].createElement(Chip.Chip, { label: "Ascending", value: "asc", disabled: canChangeOrder }),
-                    React__default["default"].createElement(Chip.Chip, { label: "Descending", value: "desc", disabled: canChangeOrder }))))));
+    console.log({ state });
+    return (React__default["default"].createElement(Combobox.Combobox, { onSelect: selection => {
+            handleKeyChange(selection[0].id.toString());
+        }, selected: [
+            {
+                id: `${state === null || state === void 0 ? void 0 : state.key},${state === null || state === void 0 ? void 0 : state.order}`,
+                label: (state === null || state === void 0 ? void 0 : state.order) || "",
+            },
+        ] },
+        React__default["default"].createElement(Combobox.Combobox.Activator, null,
+            React__default["default"].createElement(Chip.Chip, { heading: "Sort", label: getButtonLabel(), variation: state ? "base" : "subtle" }, !state && (React__default["default"].createElement(Chip.Chip.Suffix, null,
+                React__default["default"].createElement(Icon.Icon, { name: "arrowDown", size: "small" }))))),
+        sortByOptions.map(({ label, value }) => {
+            return React__default["default"].createElement(Combobox.Combobox.Option, { key: value, id: value, label: label });
+        })));
     function getSortByOptions() {
         const options = sortable.reduce((acc, sort) => {
             const label = headers[sort];
             if (!label)
                 return acc;
-            acc.push({ label, value: sort.toString() });
+            if (label === "Last activity") {
+                acc.push({ label: "Last Activity (Newest)", value: `${sort},desc` });
+                acc.push({ label: "Last Activity (Oldest)", value: `${sort},asc` });
+            }
+            else {
+                acc.push({ label: `${label} (A-Z)`, value: `${sort},asc` });
+                acc.push({ label: `${label} (Z-A)`, value: `${sort},desc` });
+            }
             return acc;
         }, []);
         // Inject a none option as the first option
@@ -763,24 +768,17 @@ function DataListSort() {
         return options;
     }
     function getButtonLabel() {
-        const label = state && headers[state.key];
-        if (!label)
-            return "Sort by";
-        return `Sort by: ${label}, ${state.order}`;
+        const selectedOption = sortByOptions.find(option => option.value === `${state === null || state === void 0 ? void 0 : state.key},${state === null || state === void 0 ? void 0 : state.order}`);
+        return (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) || "";
     }
     function handleKeyChange(value) {
         if (value && value !== "none") {
-            onSort({ key: value, order: (state === null || state === void 0 ? void 0 : state.order) || "asc" });
+            const [key, order] = value.split(",");
+            onSort({ key, order: order });
             return;
         }
         onSort(undefined);
     }
-    function handleSortingChange(value) {
-        if ((state === null || state === void 0 ? void 0 : state.key) && value) {
-            onSort({ key: state.key, order: value });
-            return;
-        }
-    }
 }
 
 function useShowHeader() {

package/dist/Popover/index.js

@@ -2,12 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var Popover = require('../Popover-7c966790.js');
-require('react');
-require('react-popper');
-require('@jobber/hooks/useRefocusOnActivator');
-require('../style-inject.es-9d2f5f4e.js');
-require('../ButtonDismiss-1ccb84ec.js');
+var React = require('react');
+var reactPopper = require('react-popper');
+var useRefocusOnActivator = require('@jobber/hooks/useRefocusOnActivator');
+var styleInject_es = require('../style-inject.es-9d2f5f4e.js');
+var ButtonDismiss = require('../ButtonDismiss-1ccb84ec.js');
 require('../Button-db6114a6.js');
 require('classnames');
 require('react-router-dom');
@@ -15,6 +14,48 @@ require('../Icon-405a216c.js');
 require('@jobber/design');
 require('../Typography-83915c54.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-exports.Popover = Popover.Popover;
+var css_248z = ":root {\n  --card--base-padding: var(--space-base);\n  --popover--padding: var(--space-base);\n  --popover--width: calc(var(--base-unit) * 21.875);\n  --dismiss--button-padding: calc(var(--base-unit) / 4);\n}\n\n.oSlK4rLUvzE- {\n  display: -ms-flexbox;\n  display: flex;\n  position: \"relative\";\n  padding: calc(16px * 1);\n  padding: var(--popover--padding);\n  -ms-flex-pack: justify;\n      justify-content: space-between;\n  -ms-flex-align: center;\n      align-items: center;\n}\n\n.XVPpPb-7e30- {\n  float: right;\n  padding: calc(16px / 4);\n  padding: var(--dismiss--button-padding);\n  text-align: right;\n}\n\n.TDuYbqXaLW0- {\n  z-index: 1002;\n  z-index: var(--elevation-tooltip);\n  width: -webkit-max-content;\n  width: max-content;\n  max-width: calc(16px * 21.875);\n  max-width: var(--popover--width);\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  border: calc(16px / 16) solid rgb(225, 225, 225);\n  border: var(--border-base) solid var(--color-border);\n  border-radius: calc(16px / 8);\n  border-radius: var(--radius-base);\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  line-height: normal;\n  background: rgba(255, 255, 255, 1);\n  background: var(--color-surface);\n}\n\n.TDuYbqXaLW0- > * {\n  --public-content--padding: var(--card--base-padding);\n}\n\n.LJCpn0zf1e8- {\n  visibility: hidden;\n}\n\n.LJCpn0zf1e8-,\n.LJCpn0zf1e8-::before {\n  position: absolute;\n  width: 16px;\n  width: var(--base-unit);\n  height: 16px;\n  height: var(--base-unit);\n  background: inherit;\n}\n\n.LJCpn0zf1e8-::before {\n  content: \"\";\n  visibility: visible;\n  border: calc(16px / 16) solid rgb(225, 225, 225);\n  border: var(--border-base) solid var(--color-border);\n  -webkit-transform: rotate(45deg);\n          transform: rotate(45deg);\n  -webkit-transform-origin: center;\n          transform-origin: center;\n  -webkit-clip-path: polygon(-4px -4px, 15.3px 0, 0 15.3px);\n          clip-path: polygon(-4px -4px, 15.3px 0, 0 15.3px);\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"top\"] > .LJCpn0zf1e8- {\n  bottom: -5px;\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"top\"] > .LJCpn0zf1e8-::before {\n  -webkit-transform: rotate(-135deg);\n          transform: rotate(-135deg);\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"bottom\"] > .LJCpn0zf1e8- {\n  top: -7px;\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"left\"] > .LJCpn0zf1e8- {\n  right: -5px;\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"left\"] > .LJCpn0zf1e8-::before {\n  -webkit-transform: rotate(135deg);\n          transform: rotate(135deg);\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"right\"] > .LJCpn0zf1e8- {\n  left: -7px;\n}\n\n.TDuYbqXaLW0-[data-popper-placement^=\"right\"] > .LJCpn0zf1e8-::before {\n  -webkit-transform: rotate(-45deg);\n          transform: rotate(-45deg);\n}\n";
+var classes = {"header":"oSlK4rLUvzE-","dismissButton":"XVPpPb-7e30-","popover":"TDuYbqXaLW0-","arrow":"LJCpn0zf1e8-"};
+styleInject_es.styleInject(css_248z);
+
+function Popover({ onRequestClose, children, attachTo, open, preferredPlacement = "auto", }) {
+    const [popperElement, setPopperElement] = React.useState();
+    const [arrowElement, setArrowElement] = React.useState();
+    const { styles: popperStyles, attributes } = reactPopper.usePopper(attachTo instanceof Element ? attachTo : attachTo.current, popperElement, {
+        modifiers: buildModifiers(arrowElement),
+        placement: preferredPlacement,
+    });
+    useRefocusOnActivator.useRefocusOnActivator(open);
+    return (React__default["default"].createElement(React__default["default"].Fragment, null, open && (React__default["default"].createElement("div", Object.assign({ role: "dialog", ref: setPopperElement, style: popperStyles.popper, className: classes.popover }, attributes.popper),
+        React__default["default"].createElement("div", { className: classes.dismissButton },
+            React__default["default"].createElement(ButtonDismiss.ButtonDismiss, { onClick: onRequestClose, ariaLabel: "Close dialog" })),
+        children,
+        React__default["default"].createElement("div", { ref: setArrowElement, className: classes.arrow, style: popperStyles.arrow })))));
+}
+function buildModifiers(arrowElement) {
+    const modifiers = [
+        {
+            name: "arrow",
+            options: { element: arrowElement, padding: 10 },
+        },
+        {
+            name: "offset",
+            options: {
+                offset: [0, 10],
+            },
+        },
+        {
+            name: "flip",
+            options: {
+                fallbackPlacements: ["auto"],
+            },
+        },
+    ];
+    return modifiers;
+}
+
+exports.Popover = Popover;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/components",
-  "version": "4.60.3",
+  "version": "4.60.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -84,5 +84,5 @@
     "> 1%",
     "IE 10"
   ],
-  "gitHead": "3654473db6119c8489361d0a8797554bf0a21b7a"
+  "gitHead": "4965f5f31932673abb34aacb9bdd581aab33e3fe"
 }