@pixum/combobox 5.10.4-alpha.18 → 5.10.4-alpha.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/lib/ComboBox.d.ts +32 -6
  2. package/lib/ComboBox.js +217 -77
  3. package/lib/ComboBox.js.map +1 -1
  4. package/lib/ComboBox.module.css +7 -1
  5. package/lib/ComboBox.test.js +1 -0
  6. package/lib/ComboBox.test.js.map +1 -1
  7. package/lib/hooks/index.d.ts +2 -0
  8. package/lib/hooks/index.js +2 -0
  9. package/lib/hooks/index.js.map +1 -1
  10. package/lib/hooks/useComboBox.js +1 -0
  11. package/lib/hooks/useComboBox.js.map +1 -1
  12. package/lib/hooks/useComboBoxFocus.js +1 -0
  13. package/lib/hooks/useComboBoxFocus.js.map +1 -1
  14. package/lib/hooks/useIsDesktopScreenWidth.d.ts +5 -0
  15. package/lib/hooks/useIsDesktopScreenWidth.js +34 -24
  16. package/lib/hooks/useIsDesktopScreenWidth.js.map +1 -1
  17. package/lib/index.d.ts +4 -4
  18. package/lib/index.js +2 -3
  19. package/lib/index.js.map +1 -1
  20. package/lib/partials/ComboBoxOptions.d.ts +16 -5
  21. package/lib/partials/ComboBoxOptions.js +25 -21
  22. package/lib/partials/ComboBoxOptions.js.map +1 -1
  23. package/lib/partials/ComboBoxOptionsItems.d.ts +32 -17
  24. package/lib/partials/ComboBoxOptionsItems.js +46 -14
  25. package/lib/partials/ComboBoxOptionsItems.js.map +1 -1
  26. package/lib/partials/ComboBoxOptionsSlot.d.ts +17 -16
  27. package/lib/partials/ComboBoxOptionsSlot.js +26 -11
  28. package/lib/partials/ComboBoxOptionsSlot.js.map +1 -1
  29. package/lib/partials/index.d.ts +2 -1
  30. package/lib/partials/index.js +2 -1
  31. package/lib/partials/index.js.map +1 -1
  32. package/lib/types.d.ts +183 -45
  33. package/lib/utils/index.d.ts +1 -2
  34. package/lib/utils/index.js +1 -2
  35. package/lib/utils/index.js.map +1 -1
  36. package/lib/utils/options.d.ts +38 -1
  37. package/lib/utils/options.js +62 -2
  38. package/lib/utils/options.js.map +1 -1
  39. package/package.json +8 -8
  40. package/lib/ComboboxOptions/Options.d.ts +0 -11
  41. package/lib/ComboboxOptions/Options.js +0 -19
  42. package/lib/ComboboxOptions/Options.js.map +0 -1
  43. package/lib/ComboboxOptions/OptionsGroup.d.ts +0 -12
  44. package/lib/ComboboxOptions/OptionsGroup.js +0 -8
  45. package/lib/ComboboxOptions/OptionsGroup.js.map +0 -1
  46. package/lib/ComboboxOptions/index.d.ts +0 -4
  47. package/lib/ComboboxOptions/index.js +0 -19
  48. package/lib/ComboboxOptions/index.js.map +0 -1
  49. package/lib/helper/calculateListMaxHeight.d.ts +0 -1
  50. package/lib/helper/calculateListMaxHeight.js +0 -8
  51. package/lib/helper/calculateListMaxHeight.js.map +0 -1
  52. package/lib/helper/scrollOptionToViewport.d.ts +0 -1
  53. package/lib/helper/scrollOptionToViewport.js +0 -19
  54. package/lib/helper/scrollOptionToViewport.js.map +0 -1
  55. package/lib/helper/useIsDesktopScreenWidth.d.ts +0 -2
  56. package/lib/helper/useIsDesktopScreenWidth.js +0 -20
  57. package/lib/helper/useIsDesktopScreenWidth.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"useIsDesktopScreenWidth.js","sourceRoot":"","sources":["../../src/hooks/useIsDesktopScreenWidth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAE3C;;;;;GAKG;AAEH,SAAS,SAAS;IAChB,OAAO,OAAO,MAAM,KAAK,WAAW,CAAA;AACtC,CAAC;AAED;;;;GAIG;AACH,SAAS,sBAAsB;IAC7B,IAAI,SAAS,EAAE,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,UAAU,IAAI,GAAG,CAAA;IACjC,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAU,sBAAsB,CAAC,CAAA;IAE3E,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,YAAY,CAAC,MAAM,CAAC,UAAU,IAAI,GAAG,CAAC,CAAA;QACxC,CAAC,CAAA;QAED,eAAe,EAAE,CAAA;QACjB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QAElD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QACvD,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,SAAS,CAAA;AAClB,CAAC"}
1
+ {"version":3,"file":"useIsDesktopScreenWidth.js","sourceRoot":"","sources":["../../src/hooks/useIsDesktopScreenWidth.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,mBAAmB,GAAG,oBAAoB,CAAA;AAEhD;;;;;;GAMG;AACH,SAAS,SAAS,CAAC,aAAyB;IAC1C,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACxD,OAAO,GAAG,EAAE,GAAE,CAAC,CAAA;IACjB,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA;IAC7D,cAAc,CAAC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;IAExD,OAAO,GAAG,EAAE,CAAC,cAAc,CAAC,mBAAmB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;AAC1E,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW;IAClB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,UAAU;QAAE,OAAO,KAAK,CAAA;IAErE,OAAO,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAA;AACvD,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB;IACxB,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB;IACrC,OAAO,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAA;AACxE,CAAC"}
package/lib/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ComboBox } from './ComboBox';
2
- export default ComboBox;
3
- export * from './types';
4
- export { ComboBoxOptionsSlot } from './partials';
1
+ export { ComboBox, default } from './ComboBox';
2
+ export { ComboBoxOptionsSlot, type ComboBoxOptionsSlotProps } from './partials';
3
+ export { useComboBox, useIsDesktopScreenWidth } from './hooks';
4
+ export type { ComboBoxAriaProps, ComboBoxOption, ComboBoxOptionGroup, ComboBoxOptionItemProps, ComboBoxOptionsInput, ComboBoxOptionsProps, ComboBoxOptionsPanelProps, ComboBoxProps, ListboxAriaProps, } from './types';
package/lib/index.js CHANGED
@@ -1,5 +1,4 @@
1
- import { ComboBox } from './ComboBox';
2
- export default ComboBox;
3
- export * from './types';
1
+ export { ComboBox, default } from './ComboBox';
4
2
  export { ComboBoxOptionsSlot } from './partials';
3
+ export { useComboBox, useIsDesktopScreenWidth } from './hooks';
5
4
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,eAAe,QAAQ,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,mBAAmB,EAAiC,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA"}
@@ -1,10 +1,21 @@
1
- import type { ComboBoxOptionsProps } from '../types';
1
+ import type { ComboBoxOptionsPanelProps } from '../types';
2
2
  /**
3
- * ComboBoxOptions component that renders a list of options in a menu.
4
- * Handles both grouped and ungrouped options and automatically scrolls to the selected option.
3
+ * Renders the options panel of the ComboBox.
4
+ *
5
+ * The panel is split in two: the `Menu` provides the visible box, the element
6
+ * inside it carries the `listbox` role and is the only part that scrolls. That
7
+ * keeps `optionDetails` a real footer - it stays visible without
8
+ * `position: sticky` and can no longer cover the active option - and it keeps
9
+ * the listbox free of anything that is not an option or a group, as ARIA
10
+ * requires.
11
+ *
12
+ * Flat and grouped options share one render path: the options arrive already
13
+ * normalised, `groupOptions` only splits them into their visual groups again.
14
+ * The listbox is not focusable - the focus stays in the input field, the active
15
+ * option is announced through `aria-activedescendant`.
5
16
  *
6
17
  * @param props - The props for the ComboBoxOptions component
7
- * @returns A menu containing the combobox options
18
+ * @returns The options panel
8
19
  */
9
- export declare function ComboBoxOptions({ options, onClick, selectedOption, leadingType, optionDetails, }: ComboBoxOptionsProps): import("react/jsx-runtime").JSX.Element;
20
+ export declare function ComboBoxOptions({ options, listboxAriaProps, selectedValues, activeOptionId, leadingType, optionDetails, onOptionClick, }: ComboBoxOptionsPanelProps): import("react/jsx-runtime").JSX.Element;
10
21
  export default ComboBoxOptions;
@@ -1,29 +1,33 @@
1
- import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { useEffect } from 'react';
1
+ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
3
2
  import Menu from '@pixum/menu';
4
- import { useIsDesktopScreenWidth } from '../hooks';
5
- import { scrollOptionToViewport } from '../utils';
6
- import { ComboxBoxOptionsWithGrouping } from './ComboBoxOptionsWithGrouping';
7
- import { ComboBoxOptionsItems } from './ComboBoxOptionsItems';
3
+ import Text, { TEXT_VARIANT } from '@pixum/text';
4
+ import clsx from 'clsx';
5
+ import { groupOptions } from '../utils';
6
+ import { ComboBoxOptionsGroup } from './ComboBoxOptionsGroup';
7
+ import styles from '../ComboBox.module.css';
8
8
  /**
9
- * ComboBoxOptions component that renders a list of options in a menu.
10
- * Handles both grouped and ungrouped options and automatically scrolls to the selected option.
9
+ * Renders the options panel of the ComboBox.
10
+ *
11
+ * The panel is split in two: the `Menu` provides the visible box, the element
12
+ * inside it carries the `listbox` role and is the only part that scrolls. That
13
+ * keeps `optionDetails` a real footer - it stays visible without
14
+ * `position: sticky` and can no longer cover the active option - and it keeps
15
+ * the listbox free of anything that is not an option or a group, as ARIA
16
+ * requires.
17
+ *
18
+ * Flat and grouped options share one render path: the options arrive already
19
+ * normalised, `groupOptions` only splits them into their visual groups again.
20
+ * The listbox is not focusable - the focus stays in the input field, the active
21
+ * option is announced through `aria-activedescendant`.
11
22
  *
12
23
  * @param props - The props for the ComboBoxOptions component
13
- * @returns A menu containing the combobox options
24
+ * @returns The options panel
14
25
  */
15
- export function ComboBoxOptions({ options, onClick, selectedOption, leadingType, optionDetails, }) {
16
- const isDesktop = useIsDesktopScreenWidth();
17
- const optionsWithoutGroup = Array.isArray(options);
18
- const optionsWithGroup = Object.entries(options);
19
- useEffect(() => {
20
- // Wait for next browser frame to ensure DOM is fully rendered
21
- const frameId = requestAnimationFrame(() => {
22
- scrollOptionToViewport(isDesktop);
23
- });
24
- return () => cancelAnimationFrame(frameId);
25
- }, [isDesktop, selectedOption]);
26
- return (_jsxs(Menu, { className: "combobox__options scrollable", "data-tappable": "true", children: [optionsWithoutGroup ? (_jsx(ComboBoxOptionsItems, { items: options, selectedOption: selectedOption, onClick: onClick, leadingType: leadingType })) : (_jsx(_Fragment, { children: optionsWithGroup.map(([group, items]) => (_jsx(ComboxBoxOptionsWithGrouping, { group: group, items: items, selectedOption: selectedOption, onClick: onClick, leadingType: leadingType }, `combobox__options-group-${group}`))) })), optionDetails && (_jsx("div", { className: "combobox__option-details text--caption", children: optionDetails }))] }));
26
+ export function ComboBoxOptions({ options, listboxAriaProps, selectedValues, activeOptionId, leadingType, optionDetails, onOptionClick, }) {
27
+ return (_jsxs(Menu, { className: styles.panel, "data-tappable": "true", children: [_jsx("div", Object.assign({ className: clsx(styles.options, 'scrollable'), tabIndex: -1 }, listboxAriaProps, { children: groupOptions(options).map(group => {
28
+ var _a;
29
+ return (_jsx(ComboBoxOptionsGroup, { group: group.group, options: group.options, selectedValues: selectedValues, activeOptionId: activeOptionId, leadingType: leadingType, onOptionClick: onOptionClick }, `combobox__options-group-${(_a = group.group) !== null && _a !== void 0 ? _a : 'default'}`));
30
+ }) })), optionDetails && (_jsx(Text, { variant: TEXT_VARIANT.CAPTION, className: styles.optionDetails, children: optionDetails }))] }));
27
31
  }
28
32
  export default ComboBoxOptions;
29
33
  //# sourceMappingURL=ComboBoxOptions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ComboBoxOptions.js","sourceRoot":"","sources":["../../src/partials/ComboBoxOptions.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAEjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,OAAO,EACP,cAAc,EACd,WAAW,EACX,aAAa,GACQ;IACrB,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAA;IAC3C,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,8DAA8D;QAC9D,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE;YACzC,sBAAsB,CAAC,SAAS,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAA;IAE/B,OAAO,CACL,MAAC,IAAI,IAAC,SAAS,EAAC,8BAA8B,mBAAe,MAAM,aAChE,mBAAmB,CAAC,CAAC,CAAC,CACrB,KAAC,oBAAoB,IACnB,KAAK,EAAE,OAAO,EACd,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACxB,CACH,CAAC,CAAC,CAAC,CACF,4BACG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CACxC,KAAC,4BAA4B,IAE3B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,IALnB,2BAA2B,KAAK,EAAE,CAMvC,CACH,CAAC,GACD,CACJ,EACA,aAAa,IAAI,CAChB,cAAK,SAAS,EAAC,wCAAwC,YACpD,aAAa,GACV,CACP,IACI,CACR,CAAA;AACH,CAAC;AAED,eAAe,eAAe,CAAA"}
1
+ {"version":3,"file":"ComboBoxOptions.js","sourceRoot":"","sources":["../../src/partials/ComboBoxOptions.tsx"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,aAAa,CAAA;AAC9B,OAAO,IAAI,EAAE,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAE3C;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,GACa;IAC1B,OAAO,CACL,MAAC,IAAI,IAAC,SAAS,EAAE,MAAM,CAAC,KAAK,mBAAgB,MAAM,aACjD,4BACE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,EAC7C,QAAQ,EAAE,CAAC,CAAC,IACR,gBAAgB,cAEnB,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;;oBAAC,OAAA,CAClC,KAAC,oBAAoB,IAEnB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,IANvB,2BAA2B,MAAA,KAAK,CAAC,KAAK,mCAAI,SAAS,EAAE,CAO1D,CACH,CAAA;iBAAA,CAAC,IACE,EAEL,aAAa,IAAI,CAChB,KAAC,IAAI,IAAC,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,aAAa,YACjE,aAAa,GACT,CACR,IACI,CACR,CAAA;AACH,CAAC;AAED,eAAe,eAAe,CAAA"}
@@ -1,24 +1,39 @@
1
1
  import { LeadingType } from '@pixum/menu-item';
2
- import type { ComboBoxOptionItemProps } from '../types';
3
- /**
4
- * Props for the ComboBoxOptionsItems component
5
- */
6
- interface ComboBoxOptionsItemsProps {
7
- /** Array of option items to display */
8
- items: ComboBoxOptionItemProps[];
9
- /** Currently selected option value */
10
- selectedOption?: string;
11
- /** Callback fired when an option is clicked */
12
- onClick?: (value: string) => void;
13
- /** Type of leading element to display (icon, avatar, etc.) */
2
+ import type { ComboBoxOption } from '../types';
3
+ export interface ComboBoxOptionsItemsProps {
4
+ /** Normalised options to render. */
5
+ options: ComboBoxOption[];
6
+ /** Values that are currently selected. */
7
+ selectedValues: string[];
8
+ /** DOM id of the active option (`aria-activedescendant`). */
9
+ activeOptionId?: string;
10
+ /** Type of the leading element, e.g. a checkbox for multi select. */
14
11
  leadingType?: LeadingType;
12
+ /** Called with the value of the clicked option. */
13
+ onOptionClick: (value: string) => void;
15
14
  }
16
15
  /**
17
- * ComboBoxOptionsItems component that renders individual menu items.
18
- * Handles click events and displays selected state for each option.
16
+ * Renders the individual options.
17
+ *
18
+ * The options are deliberately not focusable: the focus stays in the input
19
+ * field and the highlight is driven by `aria-activedescendant`. Checkbox
20
+ * options are ordinary options with `aria-selected` - inside a listbox that is
21
+ * the state screen readers announce, and it keeps mouse and keyboard selection
22
+ * on exactly the same code path.
23
+ *
24
+ * An option is a `MenuItemProps` object, so everything except the ComboBox
25
+ * specific `key` and `disabled` is spread onto the `MenuItem` unchanged.
26
+ * Consumers that pass further MenuItem props keep working without the ComboBox
27
+ * having to know about them; only `selected`, `tabIndex` and the keyboard
28
+ * handling are owned by the ComboBox and therefore not overridable.
29
+ *
30
+ * Styling hooks: every option carries its state as a data attribute
31
+ * (`data-selected`, `data-active`, `data-disabled`), so consumers can style
32
+ * options without knowing the hashed module class names. The selection state is
33
+ * left to `MenuItem` itself - the component does not add a `selected` class of
34
+ * its own, which would be impossible to override from the outside.
19
35
  *
20
36
  * @param props - The props for the ComboBoxOptionsItems component
21
- * @returns A list of clickable menu items
37
+ * @returns A list of selectable options
22
38
  */
23
- export declare function ComboBoxOptionsItems({ items, selectedOption, onClick, leadingType, }: ComboBoxOptionsItemsProps): import("react/jsx-runtime").JSX.Element;
24
- export {};
39
+ export declare function ComboBoxOptionsItems({ options, selectedValues, activeOptionId, leadingType, onOptionClick, }: ComboBoxOptionsItemsProps): import("react/jsx-runtime").JSX.Element;
@@ -1,24 +1,56 @@
1
1
  import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
2
- import MenuItem from '@pixum/menu-item';
2
+ import MenuItem, { LeadingType } from '@pixum/menu-item';
3
3
  import clsx from 'clsx';
4
+ import { toMenuItemProps } from '../utils';
5
+ import styles from '../ComboBox.module.css';
4
6
  /**
5
- * ComboBoxOptionsItems component that renders individual menu items.
6
- * Handles click events and displays selected state for each option.
7
+ * Renders the individual options.
8
+ *
9
+ * The options are deliberately not focusable: the focus stays in the input
10
+ * field and the highlight is driven by `aria-activedescendant`. Checkbox
11
+ * options are ordinary options with `aria-selected` - inside a listbox that is
12
+ * the state screen readers announce, and it keeps mouse and keyboard selection
13
+ * on exactly the same code path.
14
+ *
15
+ * An option is a `MenuItemProps` object, so everything except the ComboBox
16
+ * specific `key` and `disabled` is spread onto the `MenuItem` unchanged.
17
+ * Consumers that pass further MenuItem props keep working without the ComboBox
18
+ * having to know about them; only `selected`, `tabIndex` and the keyboard
19
+ * handling are owned by the ComboBox and therefore not overridable.
20
+ *
21
+ * Styling hooks: every option carries its state as a data attribute
22
+ * (`data-selected`, `data-active`, `data-disabled`), so consumers can style
23
+ * options without knowing the hashed module class names. The selection state is
24
+ * left to `MenuItem` itself - the component does not add a `selected` class of
25
+ * its own, which would be impossible to override from the outside.
7
26
  *
8
27
  * @param props - The props for the ComboBoxOptionsItems component
9
- * @returns A list of clickable menu items
28
+ * @returns A list of selectable options
10
29
  */
11
- export function ComboBoxOptionsItems({ items, selectedOption, onClick, leadingType, }) {
12
- return (_jsx(_Fragment, { children: items.map((item) => {
30
+ export function ComboBoxOptionsItems({ options, selectedValues, activeOptionId, leadingType, onOptionClick, }) {
31
+ const isCheckbox = leadingType === LeadingType.CheckBox;
32
+ return (_jsx(_Fragment, { children: options.map(({ item, id, value, disabled }) => {
13
33
  var _a;
14
- const itemText = item.text;
15
- const isSelected = selectedOption === itemText;
16
- return (_jsx("div", { className: "combobox__option-wrapper", role: "button", tabIndex: 0, onPointerDown: e => e.stopPropagation(), onTouchStart: e => e.stopPropagation(), onMouseDown: e => e.stopPropagation(), onClickCapture: e => {
17
- e.stopPropagation();
18
- onClick === null || onClick === void 0 ? void 0 : onClick(itemText);
19
- }, children: _jsx(MenuItem, { tabIndex: -1, className: clsx(isSelected && 'selected'), onMouseEnter: item.onMouseEnter, leadingProps: leadingType ? { name: itemText, type: leadingType } : undefined, selected: selectedOption === itemText, text: itemText, subtext: item.subtext, subItemProps: {
20
- text: (_a = item.subItemProps) === null || _a === void 0 ? void 0 : _a.text,
21
- } }) }, `combobox-item-wrapper-${itemText}`));
34
+ const isSelected = selectedValues.includes(value);
35
+ const isActive = id === activeOptionId;
36
+ const menuItemProps = toMenuItemProps(item);
37
+ return (_jsx("div", { id: id, className: clsx(styles.option, isCheckbox && styles.optionCheckbox, isActive && styles.optionActive), role: "option", "aria-selected": isSelected, "aria-disabled": disabled || undefined, "data-selected": isSelected, "data-active": isActive, "data-disabled": disabled || undefined, onMouseDown: event => {
38
+ // Keeps the focus in the input field ...
39
+ event.preventDefault();
40
+ // ... and keeps the bottom sheet's drag handler out of it.
41
+ event.stopPropagation();
42
+ }, onPointerDown: event => event.stopPropagation(),
43
+ // No preventDefault on touchstart, scrolling in the sheet must work.
44
+ onTouchStart: event => event.stopPropagation(), onClickCapture: event => {
45
+ event.stopPropagation();
46
+ if (disabled)
47
+ return;
48
+ onOptionClick(value);
49
+ }, children: _jsx(MenuItem, Object.assign({}, menuItemProps, { tabIndex: -1, disableKeyboardNav: true,
50
+ // A leading type set on the ComboBox wins over the option's own
51
+ // one: it is what makes multi select look like a checkbox list.
52
+ leadingProps: leadingType
53
+ ? Object.assign(Object.assign({}, menuItemProps.leadingProps), { name: value, type: leadingType }) : menuItemProps.leadingProps, selected: isSelected })) }, (_a = item.key) !== null && _a !== void 0 ? _a : `combobox-item-wrapper-${id}`));
22
54
  }) }));
23
55
  }
24
56
  //# sourceMappingURL=ComboBoxOptionsItems.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ComboBoxOptionsItems.js","sourceRoot":"","sources":["../../src/partials/ComboBoxOptionsItems.tsx"],"names":[],"mappings":";AAAA,OAAO,QAAyB,MAAM,kBAAkB,CAAA;AACxD,OAAO,IAAI,MAAM,MAAM,CAAA;AAiBvB;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,EACnC,KAAK,EACL,cAAc,EACd,OAAO,EACP,WAAW,GACe;IAC1B,OAAO,CACL,4BACG,KAAK,CAAC,GAAG,CAAC,CAAC,IAA6B,EAAE,EAAE;;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;YAC1B,MAAM,UAAU,GAAG,cAAc,KAAK,QAAQ,CAAA;YAE9C,OAAO,CACL,cAEE,SAAS,EAAC,0BAA0B,EACpC,IAAI,EAAC,QAAQ,EACb,QAAQ,EAAE,CAAC,EACX,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,EACvC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,EACtC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,EACrC,cAAc,EAAE,CAAC,CAAC,EAAE;oBAClB,CAAC,CAAC,eAAe,EAAE,CAAA;oBACnB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,QAAQ,CAAC,CAAA;gBACrB,CAAC,YAED,KAAC,QAAQ,IACP,QAAQ,EAAE,CAAC,CAAC,EACZ,SAAS,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,EACzC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,YAAY,EACV,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,EAEjE,QAAQ,EAAE,cAAc,KAAK,QAAQ,EACrC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,YAAY,EAAE;wBACZ,IAAI,EAAE,MAAA,IAAI,CAAC,YAAY,0CAAE,IAAI;qBAC9B,GACD,IAzBG,yBAAyB,QAAQ,EAAE,CA0BpC,CACP,CAAA;QACH,CAAC,CAAC,GACD,CACJ,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"ComboBoxOptionsItems.js","sourceRoot":"","sources":["../../src/partials/ComboBoxOptionsItems.tsx"],"names":[],"mappings":";AAAA,OAAO,QAAQ,EAAE,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAgB3C;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,oBAAoB,CAAC,EACnC,OAAO,EACP,cAAc,EACd,cAAc,EACd,WAAW,EACX,aAAa,GACa;IAC1B,MAAM,UAAU,GAAG,WAAW,KAAK,WAAW,CAAC,QAAQ,CAAA;IAEvD,OAAO,CACL,4BACG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;;YAC7C,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACjD,MAAM,QAAQ,GAAG,EAAE,KAAK,cAAc,CAAA;YACtC,MAAM,aAAa,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;YAE3C,OAAO,CACL,cAEE,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,IAAI,CACb,MAAM,CAAC,MAAM,EACb,UAAU,IAAI,MAAM,CAAC,cAAc,EACnC,QAAQ,IAAI,MAAM,CAAC,YAAY,CAChC,EACD,IAAI,EAAC,QAAQ,mBACE,UAAU,mBACV,QAAQ,IAAI,SAAS,mBACrB,UAAU,iBACZ,QAAQ,mBACN,QAAQ,IAAI,SAAS,EACpC,WAAW,EAAE,KAAK,CAAC,EAAE;oBACnB,yCAAyC;oBACzC,KAAK,CAAC,cAAc,EAAE,CAAA;oBACtB,2DAA2D;oBAC3D,KAAK,CAAC,eAAe,EAAE,CAAA;gBACzB,CAAC,EACD,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE;gBAC/C,qEAAqE;gBACrE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,EAC9C,cAAc,EAAE,KAAK,CAAC,EAAE;oBACtB,KAAK,CAAC,eAAe,EAAE,CAAA;oBAEvB,IAAI,QAAQ;wBAAE,OAAM;oBAEpB,aAAa,CAAC,KAAK,CAAC,CAAA;gBACtB,CAAC,YAED,KAAC,QAAQ,oBACH,aAAa,IACjB,QAAQ,EAAE,CAAC,CAAC,EACZ,kBAAkB;oBAClB,gEAAgE;oBAChE,gEAAgE;oBAChE,YAAY,EACV,WAAW;wBACT,CAAC,iCACM,aAAa,CAAC,YAAY,KAC7B,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,WAAW,IAErB,CAAC,CAAC,aAAa,CAAC,YAAY,EAEhC,QAAQ,EAAE,UAAU,IACpB,IA9CG,MAAA,IAAI,CAAC,GAAG,mCAAI,yBAAyB,EAAE,EAAE,CA+C1C,CACP,CAAA;QACH,CAAC,CAAC,GACD,CACJ,CAAA;AACH,CAAC"}
@@ -1,34 +1,35 @@
1
- import type { ReactNode } from 'react';
2
- import '../styles.css';
3
- export interface ComboBoxOptionsSlotProps {
4
- /** The content to render inside the options slot */
1
+ import type { ElementType, HTMLAttributes, ReactNode } from 'react';
2
+ export interface ComboBoxOptionsSlotProps extends HTMLAttributes<HTMLElement> {
3
+ /** The content to render inside the options slot. */
5
4
  children: ReactNode;
6
- className?: string;
7
- role?: string;
8
- tag?: 'div' | 'ul' | 'ol' | 'dl';
5
+ /** Element the slot renders as. */
6
+ tag?: Extract<ElementType, 'div' | 'ul' | 'ol' | 'dl'>;
9
7
  }
10
8
  /**
11
- * Styled container for optionsSlot content.
9
+ * Styled container for `optionsSlot` content.
12
10
  *
13
- * Applies the standard ComboBox dropdown appearance white background,
14
- * border, border-radius, box-shadow and top margin so consumers don't
15
- * have to replicate it in every optionsSlot implementation.
11
+ * Applies the standard ComboBox dropdown appearance - background, border,
12
+ * border radius, box shadow and top margin - so consumers do not have to
13
+ * replicate it in every `optionsSlot` implementation. Every other prop
14
+ * (`role`, `aria-*`, ...) is forwarded, because the slot content owns its own
15
+ * accessibility semantics.
16
16
  *
17
- * Use it as the outermost wrapper of your optionsSlot:
17
+ * A slot replaces the built-in options list and therefore also its keyboard
18
+ * navigation: content rendered here has to bring its own key handling.
18
19
  *
19
20
  * ```tsx
20
21
  * import ComboBox, { ComboBoxOptionsSlot } from '@pixum/combobox'
21
22
  *
22
23
  * <ComboBox
23
24
  * optionsSlot={
24
- * <ComboBoxOptionsSlot>
25
+ * <ComboBoxOptionsSlot role="listbox" aria-label="Pickup points">
25
26
  * <MyCustomOptionsList />
26
27
  * </ComboBoxOptionsSlot>
27
28
  * }
28
29
  * />
29
30
  * ```
30
31
  *
31
- * @param children - The slot content to render inside the container
32
- * @returns A styled wrapper div matching the ComboBox dropdown look
32
+ * @param props - The props for the ComboBoxOptionsSlot component
33
+ * @returns A styled wrapper matching the ComboBox dropdown look
33
34
  */
34
- export declare function ComboBoxOptionsSlot({ children, className, role, tag, }: ComboBoxOptionsSlotProps): import("react/jsx-runtime").JSX.Element;
35
+ export declare function ComboBoxOptionsSlot({ children, className, tag, ...rest }: ComboBoxOptionsSlotProps): import("react/jsx-runtime").JSX.Element;
@@ -1,32 +1,47 @@
1
+ var __rest = (this && this.__rest) || function (s, e) {
2
+ var t = {};
3
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
4
+ t[p] = s[p];
5
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
6
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
7
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
8
+ t[p[i]] = s[p[i]];
9
+ }
10
+ return t;
11
+ };
1
12
  import { jsx as _jsx } from "react/jsx-runtime";
2
- import '../styles.css';
3
13
  import Menu from '@pixum/menu';
4
14
  import clsx from 'clsx';
15
+ import styles from '../ComboBox.module.css';
5
16
  /**
6
- * Styled container for optionsSlot content.
17
+ * Styled container for `optionsSlot` content.
7
18
  *
8
- * Applies the standard ComboBox dropdown appearance white background,
9
- * border, border-radius, box-shadow and top margin so consumers don't
10
- * have to replicate it in every optionsSlot implementation.
19
+ * Applies the standard ComboBox dropdown appearance - background, border,
20
+ * border radius, box shadow and top margin - so consumers do not have to
21
+ * replicate it in every `optionsSlot` implementation. Every other prop
22
+ * (`role`, `aria-*`, ...) is forwarded, because the slot content owns its own
23
+ * accessibility semantics.
11
24
  *
12
- * Use it as the outermost wrapper of your optionsSlot:
25
+ * A slot replaces the built-in options list and therefore also its keyboard
26
+ * navigation: content rendered here has to bring its own key handling.
13
27
  *
14
28
  * ```tsx
15
29
  * import ComboBox, { ComboBoxOptionsSlot } from '@pixum/combobox'
16
30
  *
17
31
  * <ComboBox
18
32
  * optionsSlot={
19
- * <ComboBoxOptionsSlot>
33
+ * <ComboBoxOptionsSlot role="listbox" aria-label="Pickup points">
20
34
  * <MyCustomOptionsList />
21
35
  * </ComboBoxOptionsSlot>
22
36
  * }
23
37
  * />
24
38
  * ```
25
39
  *
26
- * @param children - The slot content to render inside the container
27
- * @returns A styled wrapper div matching the ComboBox dropdown look
40
+ * @param props - The props for the ComboBoxOptionsSlot component
41
+ * @returns A styled wrapper matching the ComboBox dropdown look
28
42
  */
29
- export function ComboBoxOptionsSlot({ children, className = '', role = '', tag = 'ul', }) {
30
- return (_jsx(Menu, { tag: tag, className: clsx(className, 'combobox__options-slot'), role: role, children: children }));
43
+ export function ComboBoxOptionsSlot(_a) {
44
+ var { children, className, tag = 'ul' } = _a, rest = __rest(_a, ["children", "className", "tag"]);
45
+ return (_jsx(Menu, Object.assign({ tag: tag, className: clsx(styles.optionsSlot, className) }, rest, { children: children })));
31
46
  }
32
47
  //# sourceMappingURL=ComboBoxOptionsSlot.js.map
@@ -1 +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"}
1
+ {"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"}
@@ -1,4 +1,5 @@
1
1
  export * from './ComboBoxOptions';
2
- export * from './ComboBoxOptionsWithGrouping';
2
+ export * from './ComboBoxOptionsGroup';
3
3
  export * from './ComboBoxOptionsItems';
4
4
  export * from './ComboBoxOptionsSlot';
5
+ export * from './ComboBoxNoResults';
@@ -1,5 +1,6 @@
1
1
  export * from './ComboBoxOptions';
2
- export * from './ComboBoxOptionsWithGrouping';
2
+ export * from './ComboBoxOptionsGroup';
3
3
  export * from './ComboBoxOptionsItems';
4
4
  export * from './ComboBoxOptionsSlot';
5
+ export * from './ComboBoxNoResults';
5
6
  //# sourceMappingURL=index.js.map
@@ -1 +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"}
1
+ {"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"}