@pixum/combobox 5.10.4 → 5.10.6

package/lib/partials/ComboBoxOptionsSlot.js

@@ -1,32 +1,47 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx } from "react/jsx-runtime";
-import '../styles.css';
 import Menu from '@pixum/menu';
 import clsx from 'clsx';
+import styles from '../ComboBox.module.css';
 /**
- * Styled container for optionsSlot content.
+ * Styled container for `optionsSlot` content.
  *
- * Applies the standard ComboBox dropdown appearance — white background,
- * border, border-radius, box-shadow and top margin — so consumers don't
- * have to replicate it in every optionsSlot implementation.
+ * Applies the standard ComboBox dropdown appearance - background, border,
+ * border radius, box shadow and top margin - so consumers do not have to
+ * replicate it in every `optionsSlot` implementation. Every other prop
+ * (`role`, `aria-*`, ...) is forwarded, because the slot content owns its own
+ * accessibility semantics.
  *
- * Use it as the outermost wrapper of your optionsSlot:
+ * A slot replaces the built-in options list and therefore also its keyboard
+ * navigation: content rendered here has to bring its own key handling.
  *
  * ```tsx
  * import ComboBox, { ComboBoxOptionsSlot } from '@pixum/combobox'
  *
  * <ComboBox
  *   optionsSlot={
- *     <ComboBoxOptionsSlot>
+ *     <ComboBoxOptionsSlot role="listbox" aria-label="Pickup points">
  *       <MyCustomOptionsList />
  *     </ComboBoxOptionsSlot>
  *   }
  * />
  * ```
  *
- * @param children - The slot content to render inside the container
- * @returns A styled wrapper div matching the ComboBox dropdown look
+ * @param props - The props for the ComboBoxOptionsSlot component
+ * @returns A styled wrapper matching the ComboBox dropdown look
  */
-export function ComboBoxOptionsSlot({ children, className = '', role = '', tag = 'ul', }) {
-    return (_jsx(Menu, { tag: tag, className: clsx(className, 'combobox__options-slot'), role: role, children: children }));
+export function ComboBoxOptionsSlot(_a) {
+    var { children, className, tag = 'ul' } = _a, rest = __rest(_a, ["children", "className", "tag"]);
+    return (_jsx(Menu, Object.assign({ tag: tag, className: clsx(styles.optionsSlot, className) }, rest, { children: children })));
 }
 //# sourceMappingURL=ComboBoxOptionsSlot.js.map

package/lib/partials/ComboBoxOptionsSlot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComboBoxOptionsSlot.js","sourceRoot":"","sources":["../../src/partials/ComboBoxOptionsSlot.tsx"],"names":[],"mappings":";AACA,OAAO,eAAe,CAAA;AACtB,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAA;AASvB;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAClC,QAAQ,EACR,SAAS,GAAG,EAAE,EACd,IAAI,GAAG,EAAE,EACT,GAAG,GAAG,IAAI,GACe;IACzB,OAAO,CACL,KAAC,IAAI,IACH,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,EACpD,IAAI,EAAE,IAAI,YAET,QAAQ,GACJ,CACR,CAAA;AACH,CAAC"}
+{"version":3,"file":"ComboBoxOptionsSlot.js","sourceRoot":"","sources":["../../src/partials/ComboBoxOptionsSlot.tsx"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAU3C;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAKT;QALS,EAClC,QAAQ,EACR,SAAS,EACT,GAAG,GAAG,IAAI,OAEe,EADtB,IAAI,cAJ2B,gCAKnC,CADQ;IAEP,OAAO,CACL,KAAC,IAAI,kBAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,IAAM,IAAI,cACrE,QAAQ,IACJ,CACR,CAAA;AACH,CAAC"}

package/lib/partials/index.d.ts

@@ -1,4 +1,5 @@
 export * from './ComboBoxOptions';
-export * from './ComboBoxOptionsWithGrouping';
+export * from './ComboBoxOptionsGroup';
 export * from './ComboBoxOptionsItems';
 export * from './ComboBoxOptionsSlot';
+export * from './ComboBoxNoResults';

package/lib/partials/index.js

@@ -1,5 +1,6 @@
 export * from './ComboBoxOptions';
-export * from './ComboBoxOptionsWithGrouping';
+export * from './ComboBoxOptionsGroup';
 export * from './ComboBoxOptionsItems';
 export * from './ComboBoxOptionsSlot';
+export * from './ComboBoxNoResults';
 //# sourceMappingURL=index.js.map

package/lib/partials/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/partials/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/partials/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA"}

package/lib/types.d.ts

@@ -1,78 +1,216 @@
-import { LeadingType, MenuItemProps } from '@pixum/menu-item';
-import { ThemeType } from '@pixum/theme-provider';
-import { InputModesType } from '@pixum/web-input';
+import type { LeadingType, MenuItemProps } from '@pixum/menu-item';
+import type { ThemeType } from '@pixum/theme-provider';
+import type { InputModesType } from '@pixum/web-input';
 /**
- * Props for the ComboBoxOptions component
+ * An option as handed in by the consumer.
+ *
+ * Everything a `MenuItem` understands is accepted and forwarded unchanged -
+ * the ComboBox only adds `key` and `disabled` on top. That keeps existing
+ * consumers working: they pass their MenuItem props as they always did, and
+ * props the ComboBox does not know about still reach the `MenuItem`.
+ */
+export interface ComboBoxOptionItemProps extends MenuItemProps {
+    /** Unique key for the option item */
+    key?: string;
+    /**
+     * Disabled options are rendered, but skipped by mouse and keyboard.
+     *
+     * Newly added. Consumer types that already carry a `disabled` field of a
+     * different type (e.g. `disabled: 'true' | 'false'`) are no longer
+     * assignable - widen it to `boolean` on the consumer side.
+     */
+    disabled?: boolean;
+}
+/** Options are accepted either as a flat list or grouped by a group headline. */
+export type ComboBoxOptionsInput = ComboBoxOptionItemProps[] | Record<string, ComboBoxOptionItemProps[]>;
+/**
+ * An option after normalisation. Flat and grouped options are reduced to this
+ * shape once, so keyboard navigation, rendering and ARIA ids all work on the
+ * very same list in the very same order.
+ */
+export interface ComboBoxOption {
+    /** The original option as handed in by the consumer. */
+    item: ComboBoxOptionItemProps;
+    /**
+     * Stable value of the option, reported by `onOptionItemClick` and compared
+     * against `value`. Resolved by `resolveOptionValue`: the option's `text` when
+     * it is a string, otherwise `key`, otherwise the render index.
+     */
+    value: string;
+    /** Position in render order. Drives the DOM id and the keyboard navigation. */
+    index: number;
+    /** DOM id, referenced by `aria-activedescendant`. */
+    id: string;
+    /** Group headline the option belongs to, `undefined` for flat lists. */
+    group?: string;
+    /** Whether the option can be activated. */
+    disabled: boolean;
+}
+/** Options of one render group, produced by `groupOptions`. */
+export interface ComboBoxOptionGroup {
+    /** Group headline, `undefined` for flat lists. */
+    group?: string;
+    /** Options of this group, still carrying their global render index. */
+    options: ComboBoxOption[];
+}
+/** ARIA props for the element that owns the `combobox` role. */
+export interface ComboBoxAriaProps {
+    role: 'combobox';
+    'aria-expanded': boolean;
+    'aria-haspopup': 'listbox';
+    'aria-controls': string | undefined;
+    'aria-activedescendant': string | undefined;
+    'aria-autocomplete': 'list' | 'none';
+}
+/** ARIA props for the element that owns the `listbox` role. */
+export interface ListboxAriaProps {
+    role: 'listbox';
+    id: string;
+    /** Only set for multi select; single select listboxes omit it. */
+    'aria-multiselectable'?: boolean;
+}
+/**
+ * Public options contract, kept for backwards compatibility.
+ *
+ * In the previous version this interface was the base of `ComboBoxProps` and
+ * the prop type of
+ * the exported options component. It describes the options as the *consumer*
+ * hands them in - not the normalised list the internal panel renders. The
+ * internal shape now lives in `ComboBoxOptionsPanelProps`.
+ *
+ * @deprecated Use `ComboBoxProps` (or `Pick<ComboBoxProps, 'options'>`)
+ * directly. Kept so existing imports do not silently change meaning; will be
+ * removed in the next major.
  */
 export interface ComboBoxOptionsProps {
-    /** Options to display in the combobox, can be grouped or a flat array */
-    options: Record<string, ComboBoxOptionItemProps[]> | ComboBoxOptionItemProps[];
-    /** Currently selected option value */
+    /** Options to display, either flat or grouped. */
+    options: ComboBoxOptionsInput;
+    /**
+     * Currently selected option value.
+     *
+     * @deprecated Use `value`. When both are set, `value` wins.
+     */
     selectedOption?: string;
-    /** Callback fired when an option is clicked */
+    /**
+     * Callback fired when an option is clicked.
+     *
+     * @deprecated Use `onOptionItemClick`. On `ComboBoxProps` this prop is
+     * narrowed to the trigger click handler `() => void`.
+     */
     onClick?: (value: string) => void;
-    /** Type of leading element to display (icon, avatar, etc.) */
+    /** Type of leading element to display (icon, avatar, checkbox …). */
+    leadingType?: LeadingType;
+    /** Additional details rendered below the options. */
+    optionDetails?: React.ReactNode;
+}
+/**
+ * Props of the rendered options panel - the internal, normalised shape.
+ *
+ * This is what `ComboBoxOptions` consumes. It is exported so custom panels can
+ * be typed against it, but it is not part of the consumer-facing API and may
+ * change without a major bump.
+ */
+export interface ComboBoxOptionsPanelProps {
+    /** Normalised options in render order. */
+    options: ComboBoxOption[];
+    /** ARIA props of the listbox element. */
+    listboxAriaProps: ListboxAriaProps;
+    /** Values that are currently selected. */
+    selectedValues: string[];
+    /** DOM id of the active option (`aria-activedescendant`). */
+    activeOptionId?: string;
+    /** Type of the leading element, e.g. a checkbox for multi select. */
     leadingType?: LeadingType;
-    /** Additional details to display below the options */
+    /** Additional details rendered as a sticky footer below the options. */
     optionDetails?: React.ReactNode;
+    /** Called with the value of the clicked option. */
+    onOptionClick: (value: string) => void;
 }
 /**
- * Props for the ComboBox component
+ * Props of the ComboBox component.
+ *
+ * Extends the deprecated `ComboBoxOptionsProps` so that consumers who built
+ * their own prop types on top of it keep compiling.
  */
 export interface ComboBoxProps extends ComboBoxOptionsProps {
-    /** Additional CSS class name for the component */
+    /** Additional CSS class name for the trigger field. */
     className?: string;
-    /** Name attribute for the input field */
+    /** Name attribute for the input field. */
     name?: string;
-    /** Headline text displayed in mobile bottom sheet */
+    /**
+     * ID attribute for the input field.
+     *
+     * @deprecated The trigger generates its own ids for the ARIA wiring; `id` is
+     * forwarded to the underlying input untouched and no longer used internally.
+     */
+    id?: string;
+    /** Headline text displayed in the mobile bottom sheet. */
     headline?: string;
-    /** Helper text displayed below the input */
+    /** Helper text displayed below the input field. */
     helperText?: string;
-    /** ID attribute for the input field */
-    id?: string;
-    /** Label text for the input field */
+    /** Label text for the input field. */
     label?: string;
-    /** Whether the dropdown/bottom sheet is currently open */
+    /** Options to display, either flat or grouped. */
+    options: ComboBoxOptionsInput;
+    /** Whether the popover / bottom sheet is currently open. */
     isOpen: boolean;
-    /** State setter function to control open/close state */
+    /** State setter that controls the open state. */
     setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
-    /** Callback fired when the search input value changes */
-    onChange?: (value: string) => void;
-    /** Callback fired when an option item is clicked */
+    /**
+     * Selected value: a string for single select, an array of strings when
+     * `multiple` is set.
+     *
+     * The array member is new in this version. Code that *reads* this prop back
+     * out of
+     * a props object has to narrow it (`Array.isArray(value)`).
+     */
+    value?: string | string[];
+    /** Allows selecting several options; combine with a checkbox `leadingType`. */
+    multiple?: boolean;
+    /** Called with the value of the selected (in multi select: toggled) option. */
     onOptionItemClick?: (value: string) => void;
-    /** Callback fired when user clicks outside the component */
+    /** Called when the search input value changes. */
+    onChange?: (value: string) => void;
+    /** Called when the user clicks outside of the component. */
     onOutsideClick?: () => void;
-    /** Callback fired when the input field is clicked */
+    /** Called when the trigger field is clicked. */
     onClick?: () => void;
-    /** Callback fired when the bottom sheet is closed */
+    /** Called when the bottom sheet has been closed. */
     onSheetClose?: () => void;
-    /** Placeholder text for the input field */
+    /** Placeholder text for the input field. */
     placeholder?: string;
-    /** Search pattern/regex for input validation */
+    /** Search pattern for input validation. */
     searchPattern?: string;
-    /** Current value of the combobox */
-    value?: string;
-    /** Text to display when no results are found */
+    /** Text to display when there is no option to show. */
     noResultsText?: string;
-    /** Input mode for mobile keyboards (text, numeric, etc.) */
+    /** Input mode for mobile keyboards. */
     inputMode?: InputModesType;
-    /** Whether to show the search input field */
+    /** Renders a search input inside the popover / bottom sheet. */
     withSearch?: boolean;
-    /** Whether the combobox is disabled */
+    /** Enter opens the closed list. Disable it inside forms with implicit submit. */
+    openOnEnter?: boolean;
+    /** Whether the combobox is disabled. */
     disabled?: boolean;
-    /** Show disabled style + horizontal shimmer animation while content is loading */
+    /** Disabled style plus shimmer animation while content is loading. */
     loading?: boolean;
-    /** Theme configuration for the component */
+    /** Type of the leading element of an option (icon, avatar, checkbox …). */
+    leadingType?: LeadingType;
+    /** Additional details rendered below the options. */
+    optionDetails?: React.ReactNode;
+    /** Theme configuration for the component. */
     theme?: ThemeType;
-    /** Custom slot that replaces the standard options/no-results block */
+    /** Custom slot that replaces the standard options / no-results block. */
     optionsSlot?: React.ReactNode;
-    /** Icon element displayed at the leading (left) side of the trigger input */
+    /**
+     * Icon element displayed at the leading side of the trigger input.
+     *
+     * Deliberately `ReactNode`, not `ReactElement`: fragments, strings and
+     * conditional `false` have always been accepted here.
+     */
     leadingIcon?: React.ReactNode;
-}
-/**
- * Props for individual ComboBox option items
- */
-export interface ComboBoxOptionItemProps extends MenuItemProps {
-    /** Unique key for the option item */
-    key?: string;
+    /**
+     * Formats the selected values for the trigger field.
+     * Defaults to the labels of the selected options joined by a comma.
+     */
+    renderValue?: (labels: string[]) => string;
 }

package/lib/utils/index.d.ts

@@ -1,2 +1 @@
-export * from './calculateListMaxHeight';
-export * from './scrollOptionToViewport';
+export * from './options';

package/lib/utils/index.js

@@ -1,3 +1,2 @@
-export * from './calculateListMaxHeight';
-export * from './scrollOptionToViewport';
+export * from './options';
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA"}

package/lib/utils/options.d.ts

@@ -0,0 +1,77 @@
+import type { MenuItemProps } from '@pixum/menu-item';
+import type { ComboBoxOption, ComboBoxOptionGroup, ComboBoxOptionItemProps, ComboBoxOptionsInput } from '../types';
+/**
+ * Resolves the stable value of an option.
+ *
+ * `MenuItemProps` does not guarantee a plain string `text`, so the value is
+ * resolved in three steps: the visible label first - that is the value existing
+ * consumers pass in as `value` and get back from `onOptionItemClick` -, then
+ * the explicit `key`, and finally the render index as a last resort so that
+ * options without a label still get a unique value.
+ *
+ * @param item - The option as handed in by the consumer
+ * @param index - Position of the option in render order
+ * @returns The stable value of the option
+ */
+export declare function resolveOptionValue(item: ComboBoxOptionItemProps, index: number): string;
+/**
+ * Returns the label of an option for the trigger field.
+ *
+ * Falls back to the resolved value when the option renders a custom node
+ * instead of a plain string.
+ *
+ * @param option - A normalised option
+ * @returns The label to display in the trigger field
+ */
+export declare function getOptionLabel(option: ComboBoxOption): string;
+/**
+ * Strips the ComboBox specific props from an option so the rest can be spread
+ * onto the `MenuItem`.
+ *
+ * `key` is a reserved React prop and `disabled` is handled by the option
+ * wrapper (`aria-disabled` plus the click guard); everything else belongs to
+ * `MenuItem` and is forwarded untouched.
+ *
+ * @param item - The option as handed in by the consumer
+ * @returns The props meant for the `MenuItem`
+ */
+export declare function toMenuItemProps({ key, disabled, ...menuItemProps }: ComboBoxOptionItemProps): MenuItemProps;
+/**
+ * Normalises flat and grouped options into one list in render order.
+ *
+ * The index of an entry is identical for both input shapes and is therefore
+ * used as the option DOM id that `aria-activedescendant` points at. Doing this
+ * once removes the offset arithmetic that grouped rendering used to need.
+ *
+ * @param options - Flat or grouped options as passed in by the consumer
+ * @param listboxId - Id of the listbox, used as prefix for the option ids
+ * @returns The normalised options in render order
+ */
+export declare function normaliseOptions(options: ComboBoxOptionsInput, listboxId: string): ComboBoxOption[];
+/**
+ * Splits normalised options back into their render groups while keeping the
+ * global indices intact, so that the list can be rendered with a single code
+ * path for flat and grouped options.
+ *
+ * @param options - Normalised options in render order
+ * @returns One entry per consecutive group
+ */
+export declare function groupOptions(options: ComboBoxOption[]): ComboBoxOptionGroup[];
+/**
+ * Normalises the `value` prop to an array, so that single and multi select
+ * share the same selection logic.
+ *
+ * @param value - Selected value(s) or `undefined`
+ * @returns The selected values as an array
+ */
+export declare function toValueArray(value: string | string[] | undefined): string[];
+/**
+ * Finds the first option that can be activated, starting at `start` and moving
+ * by `delta` with wrap-around. Disabled options are skipped.
+ *
+ * @param options - Normalised options
+ * @param start - Index to start from; use `-1` to start before the first option
+ * @param delta - Step width, negative values move backwards
+ * @returns The index of the next enabled option, or `null` when there is none
+ */
+export declare function findEnabledIndex(options: ComboBoxOption[], start: number, delta: number): number | null;

package/lib/utils/options.js

@@ -0,0 +1,145 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+/**
+ * Resolves the stable value of an option.
+ *
+ * `MenuItemProps` does not guarantee a plain string `text`, so the value is
+ * resolved in three steps: the visible label first - that is the value existing
+ * consumers pass in as `value` and get back from `onOptionItemClick` -, then
+ * the explicit `key`, and finally the render index as a last resort so that
+ * options without a label still get a unique value.
+ *
+ * @param item - The option as handed in by the consumer
+ * @param index - Position of the option in render order
+ * @returns The stable value of the option
+ */
+export function resolveOptionValue(item, index) {
+    if (typeof item.text === 'string' && item.text)
+        return item.text;
+    if (item.key)
+        return item.key;
+    return `option-${index}`;
+}
+/**
+ * Returns the label of an option for the trigger field.
+ *
+ * Falls back to the resolved value when the option renders a custom node
+ * instead of a plain string.
+ *
+ * @param option - A normalised option
+ * @returns The label to display in the trigger field
+ */
+export function getOptionLabel(option) {
+    if (typeof option.item.text === 'string' && option.item.text) {
+        return option.item.text;
+    }
+    return option.value;
+}
+/**
+ * Strips the ComboBox specific props from an option so the rest can be spread
+ * onto the `MenuItem`.
+ *
+ * `key` is a reserved React prop and `disabled` is handled by the option
+ * wrapper (`aria-disabled` plus the click guard); everything else belongs to
+ * `MenuItem` and is forwarded untouched.
+ *
+ * @param item - The option as handed in by the consumer
+ * @returns The props meant for the `MenuItem`
+ */
+export function toMenuItemProps(_a) {
+    var { key, disabled } = _a, menuItemProps = __rest(_a, ["key", "disabled"]);
+    return menuItemProps;
+}
+/**
+ * Normalises flat and grouped options into one list in render order.
+ *
+ * The index of an entry is identical for both input shapes and is therefore
+ * used as the option DOM id that `aria-activedescendant` points at. Doing this
+ * once removes the offset arithmetic that grouped rendering used to need.
+ *
+ * @param options - Flat or grouped options as passed in by the consumer
+ * @param listboxId - Id of the listbox, used as prefix for the option ids
+ * @returns The normalised options in render order
+ */
+export function normaliseOptions(options, listboxId) {
+    const groups = Array.isArray(options)
+        ? [['', options]]
+        : Object.entries(options);
+    const normalised = [];
+    groups.forEach(([group, items]) => {
+        items.forEach(item => {
+            const index = normalised.length;
+            normalised.push({
+                item,
+                group: group || undefined,
+                value: resolveOptionValue(item, index),
+                index,
+                id: `${listboxId}-option-${index}`,
+                disabled: item.disabled === true,
+            });
+        });
+    });
+    return normalised;
+}
+/**
+ * Splits normalised options back into their render groups while keeping the
+ * global indices intact, so that the list can be rendered with a single code
+ * path for flat and grouped options.
+ *
+ * @param options - Normalised options in render order
+ * @returns One entry per consecutive group
+ */
+export function groupOptions(options) {
+    return options.reduce((groups, option) => {
+        const current = groups[groups.length - 1];
+        if (current && current.group === option.group) {
+            current.options.push(option);
+            return groups;
+        }
+        groups.push({ group: option.group, options: [option] });
+        return groups;
+    }, []);
+}
+/**
+ * Normalises the `value` prop to an array, so that single and multi select
+ * share the same selection logic.
+ *
+ * @param value - Selected value(s) or `undefined`
+ * @returns The selected values as an array
+ */
+export function toValueArray(value) {
+    if (Array.isArray(value))
+        return value;
+    return value ? [value] : [];
+}
+/**
+ * Finds the first option that can be activated, starting at `start` and moving
+ * by `delta` with wrap-around. Disabled options are skipped.
+ *
+ * @param options - Normalised options
+ * @param start - Index to start from; use `-1` to start before the first option
+ * @param delta - Step width, negative values move backwards
+ * @returns The index of the next enabled option, or `null` when there is none
+ */
+export function findEnabledIndex(options, start, delta) {
+    const { length } = options;
+    if (length === 0)
+        return null;
+    let index = start;
+    for (let step = 0; step < length; step += 1) {
+        index = (index + delta + length) % length;
+        if (!options[index].disabled)
+            return index;
+    }
+    return null;
+}
+//# sourceMappingURL=options.js.map

package/lib/utils/options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/utils/options.ts"],"names":[],"mappings":";;;;;;;;;;;AAQA;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,kBAAkB,CAChC,IAA6B,EAC7B,KAAa;IAEb,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC,IAAI,CAAA;IAChE,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC,GAAG,CAAA;IAE7B,OAAO,UAAU,KAAK,EAAE,CAAA;AAC1B,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,MAAsB;IACnD,IAAI,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7D,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAA;IACzB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAA;AACrB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAAC,EAIN;QAJM,EAC9B,GAAG,EACH,QAAQ,OAEgB,EADrB,aAAa,cAHc,mBAI/B,CADiB;IAEhB,OAAO,aAAa,CAAA;AACtB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAA6B,EAC7B,SAAiB;IAEjB,MAAM,MAAM,GAA0C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1E,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAE3B,MAAM,UAAU,GAAqB,EAAE,CAAA;IAEvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;QAChC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAA;YAE/B,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI;gBACJ,KAAK,EAAE,KAAK,IAAI,SAAS;gBACzB,KAAK,EAAE,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC;gBACtC,KAAK;gBACL,EAAE,EAAE,GAAG,SAAS,WAAW,KAAK,EAAE;gBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ,KAAK,IAAI;aACjC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,UAAU,CAAA;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,OAAyB;IACpD,OAAO,OAAO,CAAC,MAAM,CAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;QAC9D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAEzC,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAE5B,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEvD,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,EAAE,CAAC,CAAA;AACR,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,KAAoC;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAEtC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AAC7B,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAyB,EACzB,KAAa,EACb,KAAa;IAEb,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC1B,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAE7B,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QAC5C,KAAK,GAAG,CAAC,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,GAAG,MAAM,CAAA;QAEzC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAA;IAC5C,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@pixum/combobox",
-  "version": "5.10.4",
+  "version": "5.10.6",
   "main": "lib/index.js",
   "module": "lib/index.js",
   "license": "UNLICENSED",
   "peerDependencies": {
-    "@pixum/bottom-sheet": "3.0.18",
-    "@pixum/menu": "3.0.14",
-    "@pixum/menu-item": "2.0.14",
-    "@pixum/text": ">=3.7.0",
-    "@pixum/theme-provider": "4.2.20",
-    "@pixum/web-input": "2.1.0"
+    "@pixum/bottom-sheet": "4.9.0",
+    "@pixum/menu": "4.4.0",
+    "@pixum/menu-item": "3.4.1",
+    "@pixum/text": "3.7.0",
+    "@pixum/theme-provider": "5.6.0",
+    "@pixum/web-input": "2.5.4"
   },
   "files": [
     "lib"
@@ -18,5 +18,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "c35ea45674d22f8c3d61a4dee262649498c425a3"
+  "gitHead": "11fc8bfc6bb1bad524fb54585d1e63d8399da7c9"
 }