@toptal/picasso 12.2.1 → 12.4.0

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 (108) hide show
  1. package/FormError/FormError.js +1 -1
  2. package/FormError/FormError.js.map +1 -1
  3. package/FormError/styles.d.ts +1 -2
  4. package/FormError/styles.js +1 -3
  5. package/FormError/styles.js.map +1 -1
  6. package/FormHint/FormHint.js +1 -1
  7. package/FormHint/FormHint.js.map +1 -1
  8. package/FormHint/styles.d.ts +1 -1
  9. package/FormHint/styles.js +0 -3
  10. package/FormHint/styles.js.map +1 -1
  11. package/MenuItem/MenuItem.js +2 -1
  12. package/MenuItem/MenuItem.js.map +1 -1
  13. package/MenuItem/styles.d.ts +1 -1
  14. package/MenuItem/styles.js +7 -1
  15. package/MenuItem/styles.js.map +1 -1
  16. package/NativeSelect/NativeSelect.js +3 -2
  17. package/NativeSelect/NativeSelect.js.map +1 -1
  18. package/NativeSelectOptions/NativeSelectOptions.d.ts +7 -6
  19. package/NativeSelectOptions/NativeSelectOptions.js +14 -5
  20. package/NativeSelectOptions/NativeSelectOptions.js.map +1 -1
  21. package/NonNativeSelect/NonNativeSelect.js +10 -6
  22. package/NonNativeSelect/NonNativeSelect.js.map +1 -1
  23. package/NonNativeSelectLimitFooter/NonNativeSelectLimitFooter.d.ts +7 -0
  24. package/NonNativeSelectLimitFooter/NonNativeSelectLimitFooter.js +16 -0
  25. package/NonNativeSelectLimitFooter/NonNativeSelectLimitFooter.js.map +1 -0
  26. package/NonNativeSelectLimitFooter/index.d.ts +1 -0
  27. package/NonNativeSelectLimitFooter/index.js +2 -0
  28. package/NonNativeSelectLimitFooter/index.js.map +1 -0
  29. package/NonNativeSelectLimitFooter/styles.d.ts +3 -0
  30. package/NonNativeSelectLimitFooter/styles.js +10 -0
  31. package/NonNativeSelectLimitFooter/styles.js.map +1 -0
  32. package/NonNativeSelectLoader/NonNativeSelectLoader.d.ts +4 -1
  33. package/NonNativeSelectLoader/NonNativeSelectLoader.js +2 -2
  34. package/NonNativeSelectLoader/NonNativeSelectLoader.js.map +1 -1
  35. package/NonNativeSelectOption/NonNativeSelectOption.d.ts +3 -6
  36. package/NonNativeSelectOption/NonNativeSelectOption.js +14 -2
  37. package/NonNativeSelectOption/NonNativeSelectOption.js.map +1 -1
  38. package/NonNativeSelectOptions/NonNativeSelectOptions.d.ts +8 -3
  39. package/NonNativeSelectOptions/NonNativeSelectOptions.js +55 -35
  40. package/NonNativeSelectOptions/NonNativeSelectOptions.js.map +1 -1
  41. package/NonNativeSelectOptions/styles.d.ts +1 -2
  42. package/NonNativeSelectOptions/styles.js +1 -7
  43. package/NonNativeSelectOptions/styles.js.map +1 -1
  44. package/Notification/Notification.js +1 -1
  45. package/Notification/Notification.js.map +1 -1
  46. package/ScrollMenu/ScrollMenu.d.ts +1 -0
  47. package/ScrollMenu/ScrollMenu.js +2 -2
  48. package/ScrollMenu/ScrollMenu.js.map +1 -1
  49. package/Select/hooks/use-highlighted-index/use-highlighted-index.d.ts +4 -2
  50. package/Select/hooks/use-highlighted-index/use-highlighted-index.js +12 -8
  51. package/Select/hooks/use-highlighted-index/use-highlighted-index.js.map +1 -1
  52. package/Select/hooks/use-select-props/mocks.js +1 -3
  53. package/Select/hooks/use-select-props/mocks.js.map +1 -1
  54. package/Select/hooks/use-select-props/use-arrows-keydown-handler/use-arrows-keydown-handler.js +13 -2
  55. package/Select/hooks/use-select-props/use-arrows-keydown-handler/use-arrows-keydown-handler.js.map +1 -1
  56. package/Select/hooks/use-select-props/use-select-handler/use-select-handler.d.ts +1 -1
  57. package/Select/hooks/use-select-props/use-select-handler/use-select-handler.js +4 -5
  58. package/Select/hooks/use-select-props/use-select-handler/use-select-handler.js.map +1 -1
  59. package/Select/hooks/use-select-props/use-select-props.js +0 -3
  60. package/Select/hooks/use-select-props/use-select-props.js.map +1 -1
  61. package/Select/hooks/use-select-state/use-select-state.js +28 -20
  62. package/Select/hooks/use-select-state/use-select-state.js.map +1 -1
  63. package/Select/types.d.ts +8 -6
  64. package/Select/utils/count-options/count-options.d.ts +3 -0
  65. package/Select/utils/count-options/count-options.js +9 -0
  66. package/Select/utils/count-options/count-options.js.map +1 -0
  67. package/Select/utils/count-options/index.d.ts +1 -0
  68. package/Select/utils/count-options/index.js +2 -0
  69. package/Select/utils/count-options/index.js.map +1 -0
  70. package/Select/utils/get-multiple-selection/get-multiple-selection.d.ts +2 -2
  71. package/Select/utils/get-multiple-selection/get-multiple-selection.js +4 -9
  72. package/Select/utils/get-multiple-selection/get-multiple-selection.js.map +1 -1
  73. package/Select/utils/get-selected-options/get-selected-options.d.ts +2 -2
  74. package/Select/utils/get-selected-options/get-selected-options.js +4 -4
  75. package/Select/utils/get-selected-options/get-selected-options.js.map +1 -1
  76. package/Select/utils/get-single-selection/get-single-selection.d.ts +2 -2
  77. package/Select/utils/get-single-selection/get-single-selection.js +4 -6
  78. package/Select/utils/get-single-selection/get-single-selection.js.map +1 -1
  79. package/Select/utils/index.d.ts +2 -2
  80. package/Select/utils/index.js +2 -2
  81. package/Select/utils/index.js.map +1 -1
  82. package/Select/utils/limit-options/index.d.ts +1 -0
  83. package/Select/utils/limit-options/index.js +2 -0
  84. package/Select/utils/limit-options/index.js.map +1 -0
  85. package/Select/utils/limit-options/limit-options.d.ts +7 -0
  86. package/Select/utils/limit-options/limit-options.js +16 -0
  87. package/Select/utils/limit-options/limit-options.js.map +1 -0
  88. package/Typography/Typography.d.ts +1 -1
  89. package/Typography/Typography.js.map +1 -1
  90. package/Typography/styles.d.ts +1 -1
  91. package/Typography/styles.js +6 -0
  92. package/Typography/styles.js.map +1 -1
  93. package/Typography/utils/to-mui-variant/to-mui-variant.d.ts +5 -1
  94. package/Typography/utils/to-mui-variant/to-mui-variant.js +2 -0
  95. package/Typography/utils/to-mui-variant/to-mui-variant.js.map +1 -1
  96. package/package.json +2 -2
  97. package/Select/utils/get-selection/get-selection.d.ts +0 -3
  98. package/Select/utils/get-selection/get-selection.js +0 -7
  99. package/Select/utils/get-selection/get-selection.js.map +0 -1
  100. package/Select/utils/get-selection/index.d.ts +0 -1
  101. package/Select/utils/get-selection/index.js +0 -2
  102. package/Select/utils/get-selection/index.js.map +0 -1
  103. package/Select/utils/remove-duplicated-options/index.d.ts +0 -1
  104. package/Select/utils/remove-duplicated-options/index.js +0 -2
  105. package/Select/utils/remove-duplicated-options/index.js.map +0 -1
  106. package/Select/utils/remove-duplicated-options/remove-duplicated-options.d.ts +0 -3
  107. package/Select/utils/remove-duplicated-options/remove-duplicated-options.js +0 -6
  108. package/Select/utils/remove-duplicated-options/remove-duplicated-options.js.map +0 -1
@@ -14,7 +14,7 @@ import { makeStyles } from '@material-ui/core/styles';
14
14
  import MenuItem from '../MenuItem';
15
15
  import NonNativeSelectOption from '../NonNativeSelectOption';
16
16
  import ScrollMenu from '../ScrollMenu';
17
- import { flattenOptions, getSelection, isOptionsType, DEFAULT_LIMIT } from '../Select';
17
+ import { flattenOptions, isOptionsType } from '../Select';
18
18
  import Typography from '../Typography';
19
19
  import styles from './styles';
20
20
  const useStyles = makeStyles(styles);
@@ -26,46 +26,66 @@ const MenuGroup = (props) => {
26
26
  React.createElement(Typography, { size: 'small', weight: 'semibold', color: 'dark-grey' }, group)),
27
27
  children));
28
28
  };
29
- const NonNativeSelectOptions = ({ options, renderOption = () => null, highlightedIndex, getItemProps, onBlur, value, size, filterOptionsValue, noOptionsText, fixedHeader, limit = DEFAULT_LIMIT }) => {
30
- const classes = useStyles();
29
+ const renderOptions = ({ options, getItemProps, selection, size, highlightedIndex, offset = 0, renderOption }) => {
30
+ return options.map((option, index) => {
31
+ return (React.createElement(NonNativeSelectOption, Object.assign({ key: option.key || option.value, option: option, size: size, selected: selection.isOptionSelected(option), highlighted: highlightedIndex === index + offset, description: option.description }, getItemProps(option, index + offset)), renderOption === null || renderOption === void 0 ? void 0 : renderOption(option)));
32
+ });
33
+ };
34
+ const renderGroups = ({ groups, getItemProps, selection, size, highlightedIndex, renderOption }) => {
35
+ let optionsCount = 0;
36
+ return Object.keys(groups).map(group => {
37
+ const menuGroups = (React.createElement(MenuGroup, { key: group, group: group }, renderOptions({
38
+ options: groups[group],
39
+ getItemProps,
40
+ selection,
41
+ size,
42
+ highlightedIndex,
43
+ offset: optionsCount,
44
+ renderOption
45
+ })));
46
+ optionsCount += groups[group].length;
47
+ return menuGroups;
48
+ });
49
+ };
50
+ const addOffsetToHighlightedIndex = (groups, highlightedIndex) => {
51
+ if (!highlightedIndex) {
52
+ return highlightedIndex;
53
+ }
54
+ let optionsCount = 0;
55
+ const offset = Object.values(groups).findIndex(group => {
56
+ optionsCount += group.length;
57
+ const isHighlightedOptionInGroup = highlightedIndex < optionsCount;
58
+ return isHighlightedOptionInGroup;
59
+ }) + 1;
60
+ return highlightedIndex + offset;
61
+ };
62
+ const NonNativeSelectOptions = ({ options, renderOption = () => null, highlightedIndex, getItemProps, onBlur, selection, size, filterOptionsValue, noOptionsText, fixedHeader, fixedFooter, testIds }) => {
31
63
  const flatOptions = useMemo(() => flattenOptions(options), [
32
64
  options
33
65
  ]);
34
66
  if (!flatOptions.length && filterOptionsValue) {
35
- return (React.createElement(ScrollMenu, { "data-testid": 'no-options', fixedHeader: fixedHeader },
67
+ return (React.createElement(ScrollMenu, { "data-testid": testIds === null || testIds === void 0 ? void 0 : testIds.noOptions, role: 'listbox', fixedHeader: fixedHeader },
36
68
  React.createElement(MenuItem, { titleCase: false, disabled: true }, noOptionsText)));
37
69
  }
38
- const flatOptionComponents = (optionsList, limit, offset = 0) => {
39
- const limitedOptions = limit ? optionsList.slice(0, limit) : optionsList;
40
- return limitedOptions.map((option, currentIndex) => {
41
- const { onMouseDown, onMouseEnter, onClick } = getItemProps(option, currentIndex + offset);
42
- const selection = getSelection(flatOptions, value);
43
- return (React.createElement(NonNativeSelectOption, { key: option.key || option.value, option: option, size: size, onMouseDown: onMouseDown, onMouseEnter: onMouseEnter, selected: selection.isOptionSelected(option), highlighted: highlightedIndex === currentIndex + offset, onClick: onClick, description: option.description }, renderOption(option)));
44
- });
45
- };
46
- const groupedOptionComponents = (optionGroups, limit) => {
47
- let cursor = 0;
48
- return Object.keys(optionGroups).reduce((rendered, group) => {
49
- const remainingLimit = limit - cursor;
50
- cursor += 1; // for the group item itself
51
- const offset = cursor;
52
- if (remainingLimit > 0) {
53
- rendered.push(React.createElement(MenuGroup, { key: group, group: group }, flatOptionComponents(optionGroups[group], remainingLimit, offset)));
54
- cursor += optionGroups[group].length;
55
- }
56
- return rendered;
57
- }, []);
58
- };
59
- const optionComponents = isOptionsType(options)
60
- ? flatOptionComponents(options, limit)
61
- : groupedOptionComponents(options, limit);
62
- const fixedFooter = limit && flatOptions.length > limit ? (React.createElement(MenuItem, { titleCase: false, className: classes.fixedFooter, disabled: true },
63
- "Showing only first ",
64
- limit,
65
- " of ",
66
- flatOptions.length,
67
- " items")) : null;
68
- return (React.createElement(ScrollMenu, { fixedHeader: fixedHeader, onBlur: onBlur, selectedIndex: highlightedIndex, fixedFooter: fixedFooter }, optionComponents));
70
+ return (React.createElement(ScrollMenu, { fixedHeader: fixedHeader, onBlur: onBlur, selectedIndex: isOptionsType(options)
71
+ ? highlightedIndex
72
+ : addOffsetToHighlightedIndex(options, highlightedIndex), fixedFooter: fixedFooter, role: 'listbox' }, isOptionsType(options)
73
+ ? renderOptions({
74
+ options,
75
+ getItemProps,
76
+ selection,
77
+ size,
78
+ highlightedIndex,
79
+ renderOption
80
+ })
81
+ : renderGroups({
82
+ groups: options,
83
+ getItemProps,
84
+ selection,
85
+ size,
86
+ highlightedIndex,
87
+ renderOption
88
+ })));
69
89
  };
70
90
  NonNativeSelectOptions.displayName = 'NonNativeSelectOptions';
71
91
  export default NonNativeSelectOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"NonNativeSelectOptions.js","sourceRoot":"","sources":["../../src/NonNativeSelectOptions/NonNativeSelectOptions.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NonNativeSelectOptions.js","sourceRoot":"","sources":["../../src/NonNativeSelectOptions/NonNativeSelectOptions.tsx"],"names":[],"mappings":"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"}
@@ -1,3 +1,2 @@
1
- import { Theme } from '@material-ui/core/styles';
2
- declare const _default: ({ palette, sizes }: Theme) => import("@material-ui/styles").StyleRules<{}, "fixedFooter" | "menuGroup">;
1
+ declare const _default: () => import("@material-ui/styles").StyleRules<{}, "menuGroup">;
3
2
  export default _default;
@@ -1,13 +1,7 @@
1
1
  import { createStyles } from '@material-ui/core/styles';
2
- export default ({ palette, sizes }) => createStyles({
2
+ export default () => createStyles({
3
3
  menuGroup: {
4
4
  padding: '16px 16px 10px'
5
- },
6
- fixedFooter: {
7
- color: palette.grey.dark,
8
- padding: '0.75rem 1rem',
9
- borderTop: `${sizes.borderWidth} solid ${palette.grey.light}`,
10
- fontSize: '0.6875rem'
11
5
  }
12
6
  });
13
7
  //# sourceMappingURL=styles.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/NonNativeSelectOptions/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,0BAA0B,CAAA;AAE9D,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,EAAS,EAAE,EAAE,CAC3C,YAAY,CAAC;IACX,SAAS,EAAE;QACT,OAAO,EAAE,gBAAgB;KAC1B;IACD,WAAW,EAAE;QACX,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;QACxB,OAAO,EAAE,cAAc;QACvB,SAAS,EAAE,GAAG,KAAK,CAAC,WAAW,UAAU,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;QAC7D,QAAQ,EAAE,WAAW;KACtB;CACF,CAAC,CAAA"}
1
+ {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/NonNativeSelectOptions/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,eAAe,GAAG,EAAE,CAClB,YAAY,CAAC;IACX,SAAS,EAAE;QACT,OAAO,EAAE,gBAAgB;KAC1B;CACF,CAAC,CAAA"}
@@ -20,7 +20,7 @@ import Button from '../Button';
20
20
  import styles from './styles';
21
21
  import Typography from '../Typography';
22
22
  import NotificationActions from '../NotificationActions';
23
- const renderNotificationCloseButton = ({ onClose, classes }) => (React.createElement(Button.Circular, { onClick: onClose, className: classes === null || classes === void 0 ? void 0 : classes.close, title: 'Close Notification', icon: React.createElement(CloseMinor16, { className: classes === null || classes === void 0 ? void 0 : classes.closeIcon }) }));
23
+ const renderNotificationCloseButton = ({ onClose, classes }) => (React.createElement(Button.Circular, { onClick: onClose, className: classes === null || classes === void 0 ? void 0 : classes.close, icon: React.createElement(CloseMinor16, { className: classes === null || classes === void 0 ? void 0 : classes.closeIcon }) }));
24
24
  const renderNotificationIcon = ({ icon, variant, classes }) => {
25
25
  const iconProps = {
26
26
  className: classes === null || classes === void 0 ? void 0 : classes.icon
@@ -1 +1 @@
1
- {"version":3,"file":"Notification.js","sourceRoot":"","sources":["../../src/Notification/Notification.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Notification.js","sourceRoot":"","sources":["../../src/Notification/Notification.tsx"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ export interface Props extends BaseProps {
5
5
  onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
6
6
  fixedHeader?: ReactNode;
7
7
  fixedFooter?: ReactNode;
8
+ role?: 'listbox' | 'menu';
8
9
  }
9
10
  export declare const scrollToSelection: (menuRef: RefObject<HTMLDivElement>, selectedIndex?: number | null | undefined) => void;
10
11
  declare const ScrollMenu: FunctionComponent<Props>;
@@ -38,13 +38,13 @@ export const scrollToSelection = (menuRef, selectedIndex) => {
38
38
  }
39
39
  };
40
40
  const ScrollMenu = props => {
41
- const { selectedIndex, onBlur, children, style, fixedHeader, fixedFooter } = props, rest = __rest(props, ["selectedIndex", "onBlur", "children", "style", "fixedHeader", "fixedFooter"]);
41
+ const { selectedIndex, onBlur, children, style, fixedHeader, fixedFooter, role = 'menu' } = props, rest = __rest(props, ["selectedIndex", "onBlur", "children", "style", "fixedHeader", "fixedFooter", "role"]);
42
42
  const classes = useStyles();
43
43
  const menuRef = useRef(null);
44
44
  useLayoutEffect(() => scrollToSelection(menuRef, selectedIndex), [
45
45
  selectedIndex
46
46
  ]);
47
- return (React.createElement(Menu, Object.assign({ className: classes.menu, style: style }, rest),
47
+ return (React.createElement(Menu, Object.assign({ className: classes.menu, style: style, role: role }, rest),
48
48
  fixedHeader,
49
49
  React.createElement("div", { ref: menuRef, className: classes.scrollView, onBlur: onBlur }, children),
50
50
  fixedFooter));
@@ -1 +1 @@
1
- {"version":3,"file":"ScrollMenu.js","sourceRoot":"","sources":["../../src/ScrollMenu/ScrollMenu.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAIZ,eAAe,EACf,MAAM,EACP,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,UAAU,EAAS,MAAM,0BAA0B,CAAA;AAG5D,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,MAAM,MAAM,UAAU,CAAA;AAS7B,MAAM,SAAS,GAAG,UAAU,CAAQ,MAAM,EAAE;IAC1C,IAAI,EAAE,mBAAmB;CAC1B,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAC1B,OAAkC,EAClC,aAA6B,EAC7B,EAAE;;IACF,OAAA,OAAO,aAAa,KAAK,QAAQ;QAC/B,CAAC,CAAC,MAAA,OAAO,CAAC,OAAO,0CAAE,QAAQ,CAAC,aAAa,CAAC;QAC1C,CAAC,CAAC,SAAS,CAAA;CAAA,CAAA;AAEf,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAkC,EAClC,aAA6B,EAC7B,EAAE;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAA;IAChC,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE;QAC9B,OAAM;KACP;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAA;IACjD,MAAM,YAAY,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAA;IAEzD,IAAI,YAAY,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE;QACnC,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAA;KACtD;SAAM,IAAI,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE;QAChD,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;KAC5D;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAA6B,KAAK,CAAC,EAAE;IACnD,MAAM,EACJ,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,EACL,WAAW,EACX,WAAW,KAET,KAAK,EADJ,IAAI,UACL,KAAK,EARH,8EAQL,CAAQ,CAAA;IACT,MAAM,OAAO,GAAG,SAAS,EAAE,CAAA;IAC3B,MAAM,OAAO,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAE5C,eAAe,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE;QAC/D,aAAa;KACd,CAAC,CAAA;IAEF,OAAO,CACL,oBAAC,IAAI,kBACH,SAAS,EAAE,OAAO,CAAC,IAAI,EACvB,KAAK,EAAE,KAAK,IAER,IAAI;QAEP,WAAW;QACZ,6BAAK,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,IAC7D,QAAQ,CACL;QACL,WAAW,CACP,CACR,CAAA;AACH,CAAC,CAAA;AAED,eAAe,UAAU,CAAA"}
1
+ {"version":3,"file":"ScrollMenu.js","sourceRoot":"","sources":["../../src/ScrollMenu/ScrollMenu.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAIZ,eAAe,EACf,MAAM,EACP,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,UAAU,EAAS,MAAM,0BAA0B,CAAA;AAG5D,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,MAAM,MAAM,UAAU,CAAA;AAU7B,MAAM,SAAS,GAAG,UAAU,CAAQ,MAAM,EAAE;IAC1C,IAAI,EAAE,mBAAmB;CAC1B,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAC1B,OAAkC,EAClC,aAA6B,EAC7B,EAAE;;IACF,OAAA,OAAO,aAAa,KAAK,QAAQ;QAC/B,CAAC,CAAC,MAAA,OAAO,CAAC,OAAO,0CAAE,QAAQ,CAAC,aAAa,CAAC;QAC1C,CAAC,CAAC,SAAS,CAAA;CAAA,CAAA;AAEf,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAkC,EAClC,aAA6B,EAC7B,EAAE;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAA;IAChC,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEhE,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE;QAC9B,OAAM;KACP;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAA;IACjD,MAAM,YAAY,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAA;IAEzD,IAAI,YAAY,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE;QACnC,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAA;KACtD;SAAM,IAAI,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE;QAChD,QAAQ,CAAC,SAAS,IAAI,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;KAC5D;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAA6B,KAAK,CAAC,EAAE;IACnD,MAAM,EACJ,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,EACL,WAAW,EACX,WAAW,EACX,IAAI,GAAG,MAAM,KAEX,KAAK,EADJ,IAAI,UACL,KAAK,EATH,sFASL,CAAQ,CAAA;IACT,MAAM,OAAO,GAAG,SAAS,EAAE,CAAA;IAC3B,MAAM,OAAO,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAE5C,eAAe,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE;QAC/D,aAAa;KACd,CAAC,CAAA;IAEF,OAAO,CACL,oBAAC,IAAI,kBACH,SAAS,EAAE,OAAO,CAAC,IAAI,EACvB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,IAEN,IAAI;QAEP,WAAW;QACZ,6BAAK,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,IAC7D,QAAQ,CACL;QACL,WAAW,CACP,CACR,CAAA;AACH,CAAC,CAAA;AAED,eAAe,UAAU,CAAA"}
@@ -1,6 +1,8 @@
1
+ import { Option, Selection } from '../../types';
1
2
  interface Props {
2
- selectedIndexes: number[];
3
+ flatOptions: Option[];
4
+ selection: Selection;
3
5
  isOpen: boolean;
4
6
  }
5
- declare const useHighlightedIndex: ({ selectedIndexes, isOpen }: Props) => [number, (value: number) => void];
7
+ declare const useHighlightedIndex: ({ flatOptions, isOpen, selection }: Props) => readonly [number, (nextIndex: number) => false | void];
6
8
  export default useHighlightedIndex;
@@ -1,14 +1,18 @@
1
- import { useState, useEffect } from 'react';
2
- const useHighlightedIndex = ({ selectedIndexes, isOpen }) => {
1
+ import { useState, useEffect, useCallback, useMemo } from 'react';
2
+ const useHighlightedIndex = ({ flatOptions, isOpen, selection }) => {
3
3
  const [highlightedIndex, setHighlightedIndex] = useState(0);
4
+ const selectedIndicies = useMemo(() => flatOptions.reduce((acc, option, index) => selection.isOptionSelected(option) ? [...acc, index] : acc, []), [selection, flatOptions]);
5
+ const nonDisabledIndicies = useMemo(() => flatOptions.reduce((acc, option, index) => (!option.disabled ? [...acc, index] : acc), []), [flatOptions]);
6
+ const handleChange = useCallback((nextIndex) => !flatOptions[nextIndex].disabled && setHighlightedIndex(nextIndex), [flatOptions]);
7
+ // Reset index on close/options change
4
8
  useEffect(() => {
5
- if (!isOpen) {
6
- const nextHighlightedIndex = selectedIndexes.length === 1 ? selectedIndexes[0] : 0;
7
- setHighlightedIndex(nextHighlightedIndex);
8
- }
9
+ const nextHighlightedIndex = selectedIndicies.length === 1
10
+ ? selectedIndicies[0]
11
+ : nonDisabledIndicies[0];
12
+ setHighlightedIndex(nextHighlightedIndex);
9
13
  // eslint-disable-next-line react-hooks/exhaustive-deps
10
- }, [isOpen, selectedIndexes.length, selectedIndexes[0]]);
11
- return [highlightedIndex, setHighlightedIndex];
14
+ }, [isOpen, flatOptions]);
15
+ return [highlightedIndex, handleChange];
12
16
  };
13
17
  export default useHighlightedIndex;
14
18
  //# sourceMappingURL=use-highlighted-index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-highlighted-index.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-highlighted-index/use-highlighted-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAO3C,MAAM,mBAAmB,GAAG,CAAC,EAAE,eAAe,EAAE,MAAM,EAAS,EAAE,EAAE;IACjE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAA;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,oBAAoB,GACxB,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAEvD,mBAAmB,CAAC,oBAAoB,CAAC,CAAA;SAC1C;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAExD,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAG5C,CAAA;AACH,CAAC,CAAA;AAED,eAAe,mBAAmB,CAAA"}
1
+ {"version":3,"file":"use-highlighted-index.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-highlighted-index/use-highlighted-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAUjE,MAAM,mBAAmB,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAS,EAAE,EAAE;IACxE,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAE3D,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CACH,WAAW,CAAC,MAAM,CAChB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CACrB,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAC5D,EAAc,CACf,EACH,CAAC,SAAS,EAAE,WAAW,CAAC,CACzB,CAAA;IAED,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE,CACH,WAAW,CAAC,MAAM,CAChB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAClE,EAAc,CACf,EACH,CAAC,WAAW,CAAC,CACd,CAAA;IAED,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,SAAiB,EAAE,EAAE,CACpB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,mBAAmB,CAAC,SAAS,CAAC,EACpE,CAAC,WAAW,CAAC,CACd,CAAA;IAED,sCAAsC;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,oBAAoB,GACxB,gBAAgB,CAAC,MAAM,KAAK,CAAC;YAC3B,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAA;QAE5B,mBAAmB,CAAC,oBAAoB,CAAC,CAAA;QAEzC,uDAAuD;IACzD,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAA;IAEzB,OAAO,CAAC,gBAAgB,EAAE,YAAY,CAAU,CAAA;AAClD,CAAC,CAAA;AAED,eAAe,mBAAmB,CAAA"}
@@ -30,7 +30,6 @@ export const getUseSelectPropsMock = () => {
30
30
  enableReset: false
31
31
  },
32
32
  selectState: {
33
- selectedIndexes: [],
34
33
  isOpen: false,
35
34
  canOpen: true,
36
35
  open: jest.fn(),
@@ -42,7 +41,6 @@ export const getUseSelectPropsMock = () => {
42
41
  showSearch: false,
43
42
  filterOptionsValue: '',
44
43
  displayValue: '',
45
- setDisplayValue: jest.fn(),
46
44
  selection: {
47
45
  isSelected: jest.fn(),
48
46
  isOptionSelected: jest.fn(),
@@ -51,7 +49,7 @@ export const getUseSelectPropsMock = () => {
51
49
  filteredOptions: [],
52
50
  emptySelectValue: '',
53
51
  selectedOptions: [],
54
- setSelectedOptions: jest.fn()
52
+ setValue: jest.fn()
55
53
  }
56
54
  };
57
55
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-select-props/mocks.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAmB,EAAE;IACxD,OAAO;QACL,cAAc,EAAE;YACd,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACV;SACT;QACD,SAAS,EAAE;YACT,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACV;SACT;QACD,SAAS,EAAE;YACT,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACV;SACT;QACD,WAAW,EAAE;YACX,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;YACnB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;YACzB,OAAO,EAAE,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;YACvB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;YAC1B,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;SACnB;QACD,WAAW,EAAE;YACX,eAAe,EAAE,EAAE;YACnB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YACf,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;YAChB,gBAAgB,EAAE,CAAC;YACnB,YAAY,EAAE,IAAI;YAClB,mBAAmB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC9B,qBAAqB,EAAE,IAAI,CAAC,EAAE,EAAE;YAChC,UAAU,EAAE,KAAK;YACjB,kBAAkB,EAAE,EAAE;YACtB,YAAY,EAAE,EAAE;YAChB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;YAC1B,SAAS,EAAE;gBACT,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;gBACrB,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC3B,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;aACnB;YACD,eAAe,EAAE,EAAE;YACnB,gBAAgB,EAAE,EAAE;YACpB,eAAe,EAAE,EAAE;YACnB,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE;SAC9B;KACF,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-select-props/mocks.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAmB,EAAE;IACxD,OAAO;QACL,cAAc,EAAE;YACd,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACV;SACT;QACD,SAAS,EAAE;YACT,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACV;SACT;QACD,SAAS,EAAE;YACT,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;aACV;SACT;QACD,WAAW,EAAE;YACX,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;YACnB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;YACzB,OAAO,EAAE,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE;YACvB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;YAC1B,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;SACnB;QACD,WAAW,EAAE;YACX,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YACf,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;YAChB,gBAAgB,EAAE,CAAC;YACnB,YAAY,EAAE,IAAI;YAClB,mBAAmB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC9B,qBAAqB,EAAE,IAAI,CAAC,EAAE,EAAE;YAChC,UAAU,EAAE,KAAK;YACjB,kBAAkB,EAAE,EAAE;YACtB,YAAY,EAAE,EAAE;YAChB,SAAS,EAAE;gBACT,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE;gBACrB,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC3B,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;aACnB;YACD,eAAe,EAAE,EAAE;YACnB,gBAAgB,EAAE,EAAE;YACpB,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;SACpB;KACF,CAAA;AACH,CAAC,CAAA"}
@@ -1,9 +1,20 @@
1
- import { flattenOptions, getNextWrappingIndex } from '@toptal/picasso/Select/utils';
2
1
  import { useCallback } from 'react';
2
+ import { flattenOptions, getNextWrappingIndex } from '../../../utils';
3
3
  const useArrowsKeyDownHandler = ({ selectState: { isOpen, highlightedIndex, filteredOptions, setHighlightedIndex, open } }) => useCallback((key, event) => {
4
4
  event.preventDefault();
5
5
  if (isOpen) {
6
- setHighlightedIndex(getNextWrappingIndex(key === 'ArrowDown' ? 1 : -1, highlightedIndex, flattenOptions(filteredOptions).length));
6
+ // Use only non-disabled options
7
+ const nonDisabledOptions = flattenOptions(filteredOptions)
8
+ .map((option, actualIndex) => (Object.assign(Object.assign({}, option), { actualIndex })))
9
+ .filter(option => !option.disabled);
10
+ // Find the non-disabled index for highlightedIndex
11
+ const initialIndex = nonDisabledOptions.findIndex(option => option.actualIndex === highlightedIndex);
12
+ const moveAmount = key === 'ArrowDown' ? 1 : -1;
13
+ // Find the next wrapping non-disabled index
14
+ const nextNonDisabledIndex = getNextWrappingIndex(moveAmount, initialIndex, nonDisabledOptions.length);
15
+ // Convert non-disabled index to the actual one
16
+ const actualIndex = nonDisabledOptions[nextNonDisabledIndex].actualIndex;
17
+ setHighlightedIndex(actualIndex);
7
18
  }
8
19
  else {
9
20
  open();
@@ -1 +1 @@
1
- {"version":3,"file":"use-arrows-keydown-handler.js","sourceRoot":"","sources":["../../../../../src/Select/hooks/use-select-props/use-arrows-keydown-handler/use-arrows-keydown-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnF,OAAO,EAAiB,WAAW,EAAE,MAAM,OAAO,CAAA;AAIlD,MAAM,uBAAuB,GAAG,CAG9B,EACA,WAAW,EAAE,EACX,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,IAAI,EACL,EACoB,EAAE,EAAE,CACzB,WAAW,CACT,CAAC,GAAW,EAAE,KAAsC,EAAE,EAAE;IACtD,KAAK,CAAC,cAAc,EAAE,CAAA;IAEtB,IAAI,MAAM,EAAE;QACV,mBAAmB,CACjB,oBAAoB,CAClB,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC5B,gBAAgB,EAChB,cAAc,CAAC,eAAe,CAAC,CAAC,MAAM,CACvC,CACF,CAAA;KACF;SAAM;QACL,IAAI,EAAE,CAAA;KACP;AACH,CAAC,EACD,CAAC,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,EAAE,IAAI,CAAC,CACvE,CAAA;AAEH,eAAe,uBAAuB,CAAA"}
1
+ {"version":3,"file":"use-arrows-keydown-handler.js","sourceRoot":"","sources":["../../../../../src/Select/hooks/use-select-props/use-arrows-keydown-handler/use-arrows-keydown-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,WAAW,EAAE,MAAM,OAAO,CAAA;AAElD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAGrE,MAAM,uBAAuB,GAAG,CAG9B,EACA,WAAW,EAAE,EACX,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,IAAI,EACL,EACoB,EAAE,EAAE,CACzB,WAAW,CACT,CAAC,GAAW,EAAE,KAAsC,EAAE,EAAE;IACtD,KAAK,CAAC,cAAc,EAAE,CAAA;IAEtB,IAAI,MAAM,EAAE;QACV,gCAAgC;QAChC,MAAM,kBAAkB,GAAG,cAAc,CAAC,eAAe,CAAC;aACvD,GAAG,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,iCAAM,MAAM,KAAE,WAAW,IAAG,CAAC;aAC1D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAErC,mDAAmD;QACnD,MAAM,YAAY,GAAG,kBAAkB,CAAC,SAAS,CAC/C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,gBAAgB,CAClD,CAAA;QACD,MAAM,UAAU,GAAG,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,MAAM,oBAAoB,GAAG,oBAAoB,CAC/C,UAAU,EACV,YAAY,EACZ,kBAAkB,CAAC,MAAM,CAC1B,CAAA;QACD,+CAA+C;QAC/C,MAAM,WAAW,GAAG,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,WAAW,CAAA;QAExE,mBAAmB,CAAC,WAAW,CAAC,CAAA;KACjC;SAAM;QACL,IAAI,EAAE,CAAA;KACP;AACH,CAAC,EACD,CAAC,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,EAAE,IAAI,CAAC,CACvE,CAAA;AAEH,eAAe,uBAAuB,CAAA"}
@@ -1,3 +1,3 @@
1
1
  import { Option, ValueType, UseSelectProps } from '../../../types';
2
- declare const useSelectHandler: <T extends ValueType, M extends boolean = false>({ selectState: { emptySelectValue, setSelectedOptions, setFilterOptionsValue }, selectProps: { multiple, value, options, name, onChange }, selectRef }: UseSelectProps<T, M, M extends true ? T[] : T>) => (event: React.SyntheticEvent, option: Option | null) => void;
2
+ declare const useSelectHandler: <T extends ValueType, M extends boolean = false>({ selectState: { emptySelectValue, setValue, setFilterOptionsValue }, selectProps: { multiple, value, name, onChange }, selectRef }: UseSelectProps<T, M, M extends true ? T[] : T>) => (event: React.SyntheticEvent, option: Option | null) => void;
3
3
  export default useSelectHandler;
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable max-lines */
2
2
  import { useCallback } from 'react';
3
- import { EMPTY_INPUT_VALUE, toggleMultipleSelectValue, focusRef, fireOnChangeEvent, getSelectedOptions } from '../../../utils';
4
- const useSelectHandler = ({ selectState: { emptySelectValue, setSelectedOptions, setFilterOptionsValue }, selectProps: { multiple, value, options, name, onChange }, selectRef }) => useCallback((event, option) => {
3
+ import { EMPTY_INPUT_VALUE, toggleMultipleSelectValue, focusRef, fireOnChangeEvent } from '../../../utils';
4
+ const useSelectHandler = ({ selectState: { emptySelectValue, setValue, setFilterOptionsValue }, selectProps: { multiple, value, name, onChange }, selectRef }) => useCallback((event, option) => {
5
5
  let newValue;
6
6
  if (option === null) {
7
7
  newValue = emptySelectValue;
@@ -12,20 +12,19 @@ const useSelectHandler = ({ selectState: { emptySelectValue, setSelectedOptions,
12
12
  else {
13
13
  newValue = option.value;
14
14
  }
15
- setSelectedOptions(getSelectedOptions(options, newValue));
15
+ setValue(newValue);
16
16
  fireOnChangeEvent({ event, value: newValue, name, onChange });
17
17
  setFilterOptionsValue(EMPTY_INPUT_VALUE);
18
18
  focusRef(selectRef);
19
19
  }, [
20
20
  name,
21
21
  onChange,
22
- options,
23
22
  emptySelectValue,
24
23
  setFilterOptionsValue,
25
24
  multiple,
26
25
  value,
27
26
  selectRef,
28
- setSelectedOptions
27
+ setValue
29
28
  ]);
30
29
  export default useSelectHandler;
31
30
  //# sourceMappingURL=use-select-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-select-handler.js","sourceRoot":"","sources":["../../../../../src/Select/hooks/use-select-props/use-select-handler/use-select-handler.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,QAAQ,EACR,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,gBAAgB,GAAG,CAAiD,EACxE,WAAW,EAAE,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,EAC5E,WAAW,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,EACzD,SAAS,EACY,EAAE,EAAE,CACzB,WAAW,CACT,CAAC,KAA2B,EAAE,MAAqB,EAAE,EAAE;IACrD,IAAI,QAAiC,CAAA;IAErC,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,QAAQ,GAAG,gBAAgB,CAAA;KAC5B;SAAM,IAAI,QAAQ,EAAE;QACnB,QAAQ,GAAG,yBAAyB,CAClC,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAgB,EAC5B,MAAM,CACP,CAAA;KACF;SAAM;QACL,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAA;KACxB;IAED,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;IAEzD,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC7D,qBAAqB,CAAC,iBAAiB,CAAC,CAAA;IAExC,QAAQ,CAAC,SAAS,CAAC,CAAA;AACrB,CAAC,EACD;IACE,IAAI;IACJ,QAAQ;IACR,OAAO;IACP,gBAAgB;IAChB,qBAAqB;IACrB,QAAQ;IACR,KAAK;IACL,SAAS;IACT,kBAAkB;CACnB,CACF,CAAA;AAEH,eAAe,gBAAgB,CAAA"}
1
+ {"version":3,"file":"use-select-handler.js","sourceRoot":"","sources":["../../../../../src/Select/hooks/use-select-props/use-select-handler/use-select-handler.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnC,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,QAAQ,EACR,iBAAiB,EAClB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,gBAAgB,GAAG,CAAiD,EACxE,WAAW,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,qBAAqB,EAAE,EAClE,WAAW,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAChD,SAAS,EACY,EAAE,EAAE,CACzB,WAAW,CACT,CAAC,KAA2B,EAAE,MAAqB,EAAE,EAAE;IACrD,IAAI,QAAiC,CAAA;IAErC,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,QAAQ,GAAG,gBAAgB,CAAA;KAC5B;SAAM,IAAI,QAAQ,EAAE;QACnB,QAAQ,GAAG,yBAAyB,CAClC,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAgB,EAC5B,MAAM,CACP,CAAA;KACF;SAAM;QACL,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAA;KACxB;IAED,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAElB,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC7D,qBAAqB,CAAC,iBAAiB,CAAC,CAAA;IAExC,QAAQ,CAAC,SAAS,CAAC,CAAA;AACrB,CAAC,EACD;IACE,IAAI;IACJ,QAAQ;IACR,gBAAgB;IAChB,qBAAqB;IACrB,QAAQ;IACR,KAAK;IACL,SAAS;IACT,QAAQ;CACT,CACF,CAAA;AAEH,eAAe,gBAAgB,CAAA"}
@@ -34,8 +34,6 @@ const useSelectProps = (props) => {
34
34
  handleEnterOrSpaceKeyDown,
35
35
  handleEscapeKeyDown }));
36
36
  const getItemProps = (item, index) => ({
37
- role: 'option',
38
- 'aria-selected': props.selectState.highlightedIndex === index,
39
37
  onMouseEnter: () => handleItemOnMouseEnter(index),
40
38
  onMouseDown: handleItemOnMouseDown,
41
39
  onClick: (event) => handleItemOnClick(event, item)
@@ -50,7 +48,6 @@ const useSelectProps = (props) => {
50
48
  onResetClick: handleResetClick
51
49
  });
52
50
  const getSearchInputProps = () => ({
53
- 'aria-autocomplete': 'list',
54
51
  onChange: handleSearchChange,
55
52
  onKeyDown: handleSearchKeyDown,
56
53
  onBlur: handleSearchBlur
@@ -1 +1 @@
1
- {"version":3,"file":"use-select-props.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-select-props/use-select-props.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"use-select-props.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-select-props/use-select-props.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,30 @@
1
+ /* eslint-disable max-statements */
1
2
  import { useState, useCallback, useEffect, useMemo } from 'react';
2
- import { getSelection, removeDuplicatedOptions, getSelectedOptions, DEFAULT_SEARCH_THRESHOLD, DEFAULT_LIMIT, filterOptions, flattenOptions } from '../../utils';
3
+ import { getMultipleSelection, getSingleSelection, getSelectedOptions, DEFAULT_SEARCH_THRESHOLD, DEFAULT_LIMIT, filterOptions, flattenOptions, limitOptions } from '../../utils';
3
4
  import useHighlightedIndex from '../use-highlighted-index';
4
5
  export const EMPTY_INPUT_VALUE = '';
5
6
  const useSelectState = (props) => {
6
- const { getDisplayValue, options = [], disabled = false, multiple, value, searchThreshold = DEFAULT_SEARCH_THRESHOLD, limit = DEFAULT_LIMIT } = props;
7
+ const { getDisplayValue, options = [], disabled = false, multiple, value: valueProp, searchThreshold = DEFAULT_SEARCH_THRESHOLD, limit = DEFAULT_LIMIT } = props;
7
8
  const flatOptions = useMemo(() => flattenOptions(options), [
8
9
  options
9
10
  ]);
10
- const [selectedOptions, setSelectedOptions] = useState(getSelectedOptions(options, value));
11
- const selection = useMemo(() => getSelection(removeDuplicatedOptions([...flatOptions, ...selectedOptions]), value), [flatOptions, selectedOptions, value]);
12
- const [displayValue, setDisplayValue] = useState(selection.display(getDisplayValue));
11
+ const [value, setValue] = useState(valueProp);
12
+ const selectedOptions = useMemo(() => getSelectedOptions(flatOptions, value), [flatOptions, value]);
13
+ const selection = useMemo(() => multiple
14
+ ? getMultipleSelection(selectedOptions)
15
+ : getSingleSelection(selectedOptions[0]), [selectedOptions, multiple]);
16
+ const displayValue = useMemo(() => selection.display(getDisplayValue), [
17
+ selection,
18
+ getDisplayValue
19
+ ]);
13
20
  const [filterOptionsValue, setFilterOptionsValue] = useState(EMPTY_INPUT_VALUE);
14
- const filteredOptions = useMemo(() => filterOptions({ options, filterOptionsValue, getDisplayValue }), [options, filterOptionsValue, getDisplayValue]);
15
- const selectedIndexes = useMemo(() => flatOptions.reduce((selected, option, index) => selection.isOptionSelected(option) ? [...selected, index] : selected, []), [flatOptions, selection]);
21
+ const filteredOptions = useMemo(() => filterOptions({
22
+ options,
23
+ filterOptionsValue,
24
+ getDisplayValue
25
+ }), [options, filterOptionsValue, getDisplayValue]);
26
+ const filteredLimitedOptions = useMemo(() => limitOptions({ options: filteredOptions, limit }), [filteredOptions, limit]);
27
+ const filteredLimitedFlatOptions = useMemo(() => flattenOptions(filteredLimitedOptions), [filteredLimitedOptions]);
16
28
  const emptySelectValue = useMemo(() => (multiple ? [] : ''), [multiple]);
17
29
  // Search should be shown when limit < searchThreshold
18
30
  // otherwise user might not be able to search through long list
@@ -20,15 +32,13 @@ const useSelectState = (props) => {
20
32
  const [isOpen, setOpen] = useState(false);
21
33
  const canOpen = !isOpen && !disabled;
22
34
  const [highlightedIndex, setHighlightedIndex] = useHighlightedIndex({
23
- selectedIndexes,
35
+ flatOptions: filteredLimitedFlatOptions,
36
+ selection,
24
37
  isOpen
25
38
  });
26
39
  useEffect(() => {
27
- const newSelect = getSelection(removeDuplicatedOptions([...flatOptions, ...selectedOptions]), value);
28
- setDisplayValue(newSelect.display(getDisplayValue));
29
- setSelectedOptions(getSelectedOptions(options, value));
30
- // eslint-disable-next-line react-hooks/exhaustive-deps
31
- }, [value, options, flatOptions]);
40
+ setValue(valueProp);
41
+ }, [valueProp]);
32
42
  const close = useCallback(() => {
33
43
  setOpen(false);
34
44
  }, []);
@@ -41,11 +51,10 @@ const useSelectState = (props) => {
41
51
  close();
42
52
  }
43
53
  }, [disabled, isOpen, close]);
44
- return Object.assign(Object.assign({}, props), { setSelectedOptions,
45
- selectedOptions,
46
- filteredOptions,
47
- selectedIndexes,
48
- isOpen,
54
+ return Object.assign(Object.assign({}, props), { setValue,
55
+ selectedOptions,
56
+ // TODO: keep consistent naming
57
+ filteredOptions: filteredLimitedOptions, isOpen,
49
58
  canOpen,
50
59
  open,
51
60
  close,
@@ -55,8 +64,7 @@ const useSelectState = (props) => {
55
64
  displayValue,
56
65
  selection,
57
66
  emptySelectValue,
58
- setFilterOptionsValue,
59
- setDisplayValue });
67
+ setFilterOptionsValue });
60
68
  };
61
69
  export default useSelectState;
62
70
  //# sourceMappingURL=use-select-state.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-select-state.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-select-state/use-select-state.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"use-select-state.js","sourceRoot":"","sources":["../../../../src/Select/hooks/use-select-state/use-select-state.ts"],"names":[],"mappings":"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"}
package/Select/types.d.ts CHANGED
@@ -72,6 +72,11 @@ export interface SelectProps<T extends ValueType = ValueType, M extends boolean
72
72
  /** Specifies whether the autofill enabled or not, disabled by default */
73
73
  enableAutofill?: boolean;
74
74
  ref?: React.Ref<HTMLInputElement>;
75
+ testIds?: {
76
+ noOptions?: string;
77
+ loader?: string;
78
+ limitFooter?: string;
79
+ };
75
80
  }
76
81
  export declare type ValueType = string | number;
77
82
  export declare type Option<T extends string | number = string | number> = {
@@ -79,14 +84,13 @@ export declare type Option<T extends string | number = string | number> = {
79
84
  text: string;
80
85
  description?: string;
81
86
  value: T;
82
- [prop: string]: string | number | undefined;
87
+ disabled?: boolean;
88
+ [prop: string]: string | number | undefined | boolean;
83
89
  };
84
90
  export declare type OptionGroups<T extends string | number = string | number> = {
85
91
  [group: string]: Option<T>[];
86
92
  };
87
93
  export declare type ItemProps = {
88
- role: string;
89
- 'aria-selected': boolean;
90
94
  onMouseEnter: () => void;
91
95
  onMouseDown: (event: React.MouseEvent) => void;
92
96
  onClick: (event: React.MouseEvent) => void;
@@ -107,7 +111,6 @@ export interface UseSelectStateProps {
107
111
  limit?: number;
108
112
  }
109
113
  export declare type UseSelectStateOutput = {
110
- selectedIndexes: number[];
111
114
  isOpen: boolean;
112
115
  canOpen: boolean;
113
116
  open: () => void;
@@ -119,12 +122,11 @@ export declare type UseSelectStateOutput = {
119
122
  showSearch: boolean;
120
123
  filterOptionsValue: string;
121
124
  displayValue: string;
122
- setDisplayValue: (value: string) => void;
123
125
  selection: Selection;
124
126
  filteredOptions: Option[] | OptionGroups;
125
127
  emptySelectValue: string | string[];
126
128
  selectedOptions: Option[];
127
- setSelectedOptions: (options: Option[]) => void;
129
+ setValue: (value: ValueType | ValueType[]) => void;
128
130
  };
129
131
  export interface UseSelectProps<T extends ValueType = ValueType, M extends boolean = boolean, V = M extends true ? T[] : T> {
130
132
  searchInputRef?: React.Ref<HTMLInputElement>;
@@ -0,0 +1,3 @@
1
+ import { Option, OptionGroups } from '../../types';
2
+ declare const countOptions: (options: Option[] | OptionGroups) => number;
3
+ export default countOptions;
@@ -0,0 +1,9 @@
1
+ import { isOptionsType } from '..';
2
+ const countOptions = (options) => {
3
+ if (isOptionsType(options)) {
4
+ return options.length;
5
+ }
6
+ return Object.values(options).reduce((result, optionList) => result + optionList.length, 0);
7
+ };
8
+ export default countOptions;
9
+ //# sourceMappingURL=count-options.js.map