@fluentui/react-combobox 9.17.7 → 9.17.9

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 (165) hide show
  1. package/CHANGELOG.md +27 -2
  2. package/dist/index.d.cts +30 -0
  3. package/dist/index.d.ts +30 -0
  4. package/lib/components/Combobox/Combobox.js.map +1 -1
  5. package/lib/components/Combobox/Combobox.types.js.map +1 -1
  6. package/lib/components/Combobox/index.js.map +1 -1
  7. package/lib/components/Combobox/renderCombobox.js +2 -2
  8. package/lib/components/Combobox/renderCombobox.js.map +1 -1
  9. package/lib/components/Combobox/useCombobox.js +62 -42
  10. package/lib/components/Combobox/useCombobox.js.map +1 -1
  11. package/lib/components/Combobox/useComboboxExpandIconSlot.js +40 -0
  12. package/lib/components/Combobox/useComboboxExpandIconSlot.js.map +1 -0
  13. package/lib/components/Combobox/useComboboxStyles.styles.js +2 -2
  14. package/lib/components/Combobox/useComboboxStyles.styles.js.map +1 -1
  15. package/lib/components/Combobox/useComboboxStyles.styles.raw.js +2 -3
  16. package/lib/components/Combobox/useComboboxStyles.styles.raw.js.map +1 -1
  17. package/lib/components/Combobox/useInputTriggerSlot.js +3 -2
  18. package/lib/components/Combobox/useInputTriggerSlot.js.map +1 -1
  19. package/lib/components/Dropdown/Dropdown.js.map +1 -1
  20. package/lib/components/Dropdown/Dropdown.types.js.map +1 -1
  21. package/lib/components/Dropdown/index.js.map +1 -1
  22. package/lib/components/Dropdown/renderDropdown.js +2 -2
  23. package/lib/components/Dropdown/renderDropdown.js.map +1 -1
  24. package/lib/components/Dropdown/useButtonTriggerSlot.js.map +1 -1
  25. package/lib/components/Dropdown/useDropdown.js +5 -7
  26. package/lib/components/Dropdown/useDropdown.js.map +1 -1
  27. package/lib/components/Dropdown/useDropdownStyles.styles.js +2 -2
  28. package/lib/components/Dropdown/useDropdownStyles.styles.js.map +1 -1
  29. package/lib/components/Dropdown/useDropdownStyles.styles.raw.js +2 -3
  30. package/lib/components/Dropdown/useDropdownStyles.styles.raw.js.map +1 -1
  31. package/lib/components/Listbox/Listbox.js.map +1 -1
  32. package/lib/components/Listbox/Listbox.types.js.map +1 -1
  33. package/lib/components/Listbox/index.js.map +1 -1
  34. package/lib/components/Listbox/renderListbox.js +2 -2
  35. package/lib/components/Listbox/renderListbox.js.map +1 -1
  36. package/lib/components/Listbox/useListbox.js.map +1 -1
  37. package/lib/components/Listbox/useListboxStyles.styles.raw.js.map +1 -1
  38. package/lib/components/Option/Option.js.map +1 -1
  39. package/lib/components/Option/Option.types.js.map +1 -1
  40. package/lib/components/Option/index.js.map +1 -1
  41. package/lib/components/Option/renderOption.js +2 -2
  42. package/lib/components/Option/renderOption.js.map +1 -1
  43. package/lib/components/Option/useOption.js +1 -2
  44. package/lib/components/Option/useOption.js.map +1 -1
  45. package/lib/components/Option/useOptionStyles.styles.js +2 -2
  46. package/lib/components/Option/useOptionStyles.styles.js.map +1 -1
  47. package/lib/components/Option/useOptionStyles.styles.raw.js +1 -1
  48. package/lib/components/Option/useOptionStyles.styles.raw.js.map +1 -1
  49. package/lib/components/OptionGroup/OptionGroup.js.map +1 -1
  50. package/lib/components/OptionGroup/OptionGroup.types.js.map +1 -1
  51. package/lib/components/OptionGroup/index.js.map +1 -1
  52. package/lib/components/OptionGroup/renderOptionGroup.js +2 -2
  53. package/lib/components/OptionGroup/renderOptionGroup.js.map +1 -1
  54. package/lib/components/OptionGroup/useOptionGroup.js.map +1 -1
  55. package/lib/components/OptionGroup/useOptionGroupStyles.styles.raw.js.map +1 -1
  56. package/lib/contexts/ComboboxContext.js.map +1 -1
  57. package/lib/contexts/ListboxContext.js.map +1 -1
  58. package/lib/contexts/useComboboxContextValues.js.map +1 -1
  59. package/lib/contexts/useListboxContextValues.js.map +1 -1
  60. package/lib/hooks/useComboboxFilter.js.map +1 -1
  61. package/lib/hooks/useTabsterEscapeIgnore.js.map +1 -1
  62. package/lib/index.js +1 -0
  63. package/lib/index.js.map +1 -1
  64. package/lib/utils/ComboboxBase.types.js.map +1 -1
  65. package/lib/utils/OptionCollection.types.js.map +1 -1
  66. package/lib/utils/Selection.types.js.map +1 -1
  67. package/lib/utils/dropdownKeyActions.js.map +1 -1
  68. package/lib/utils/internalTokens.js.map +1 -1
  69. package/lib/utils/isComboboxOptionElement.js.map +1 -1
  70. package/lib/utils/useComboboxBaseState.js +5 -4
  71. package/lib/utils/useComboboxBaseState.js.map +1 -1
  72. package/lib/utils/useComboboxPositioning.js.map +1 -1
  73. package/lib/utils/useListboxSlot.js.map +1 -1
  74. package/lib/utils/useOptionCollection.js.map +1 -1
  75. package/lib/utils/useSelection.js.map +1 -1
  76. package/lib/utils/useTriggerSlot.js +6 -3
  77. package/lib/utils/useTriggerSlot.js.map +1 -1
  78. package/lib-commonjs/Combobox.cjs +7 -7
  79. package/lib-commonjs/Dropdown.cjs +7 -7
  80. package/lib-commonjs/Listbox.cjs +6 -6
  81. package/lib-commonjs/Option.cjs +7 -7
  82. package/lib-commonjs/OptionGroup.cjs +6 -6
  83. package/lib-commonjs/components/Combobox/Combobox.cjs.map +1 -1
  84. package/lib-commonjs/components/Combobox/Combobox.types.cjs.map +1 -1
  85. package/lib-commonjs/components/Combobox/index.cjs +7 -7
  86. package/lib-commonjs/components/Combobox/index.cjs.map +1 -1
  87. package/lib-commonjs/components/Combobox/renderCombobox.cjs.map +1 -1
  88. package/lib-commonjs/components/Combobox/useCombobox.cjs +62 -44
  89. package/lib-commonjs/components/Combobox/useCombobox.cjs.map +1 -1
  90. package/lib-commonjs/components/Combobox/useComboboxExpandIconSlot.cjs +46 -0
  91. package/lib-commonjs/components/Combobox/useComboboxExpandIconSlot.cjs.map +1 -0
  92. package/lib-commonjs/components/Combobox/useComboboxStyles.styles.cjs +5 -5
  93. package/lib-commonjs/components/Combobox/useComboboxStyles.styles.cjs.map +1 -1
  94. package/lib-commonjs/components/Combobox/useComboboxStyles.styles.raw.cjs +5 -6
  95. package/lib-commonjs/components/Combobox/useComboboxStyles.styles.raw.cjs.map +1 -1
  96. package/lib-commonjs/components/Combobox/useInputTriggerSlot.cjs +3 -2
  97. package/lib-commonjs/components/Combobox/useInputTriggerSlot.cjs.map +1 -1
  98. package/lib-commonjs/components/Dropdown/Dropdown.cjs.map +1 -1
  99. package/lib-commonjs/components/Dropdown/Dropdown.types.cjs.map +1 -1
  100. package/lib-commonjs/components/Dropdown/index.cjs +7 -7
  101. package/lib-commonjs/components/Dropdown/index.cjs.map +1 -1
  102. package/lib-commonjs/components/Dropdown/renderDropdown.cjs.map +1 -1
  103. package/lib-commonjs/components/Dropdown/useButtonTriggerSlot.cjs.map +1 -1
  104. package/lib-commonjs/components/Dropdown/useDropdown.cjs +8 -10
  105. package/lib-commonjs/components/Dropdown/useDropdown.cjs.map +1 -1
  106. package/lib-commonjs/components/Dropdown/useDropdownStyles.styles.cjs +5 -5
  107. package/lib-commonjs/components/Dropdown/useDropdownStyles.styles.cjs.map +1 -1
  108. package/lib-commonjs/components/Dropdown/useDropdownStyles.styles.raw.cjs +5 -6
  109. package/lib-commonjs/components/Dropdown/useDropdownStyles.styles.raw.cjs.map +1 -1
  110. package/lib-commonjs/components/Listbox/Listbox.cjs.map +1 -1
  111. package/lib-commonjs/components/Listbox/Listbox.types.cjs.map +1 -1
  112. package/lib-commonjs/components/Listbox/index.cjs +6 -6
  113. package/lib-commonjs/components/Listbox/index.cjs.map +1 -1
  114. package/lib-commonjs/components/Listbox/renderListbox.cjs.map +1 -1
  115. package/lib-commonjs/components/Listbox/useListbox.cjs.map +1 -1
  116. package/lib-commonjs/components/Listbox/useListboxStyles.styles.cjs +3 -3
  117. package/lib-commonjs/components/Listbox/useListboxStyles.styles.cjs.map +1 -1
  118. package/lib-commonjs/components/Listbox/useListboxStyles.styles.raw.cjs +3 -3
  119. package/lib-commonjs/components/Listbox/useListboxStyles.styles.raw.cjs.map +1 -1
  120. package/lib-commonjs/components/Option/Option.cjs.map +1 -1
  121. package/lib-commonjs/components/Option/Option.types.cjs.map +1 -1
  122. package/lib-commonjs/components/Option/index.cjs +7 -7
  123. package/lib-commonjs/components/Option/index.cjs.map +1 -1
  124. package/lib-commonjs/components/Option/renderOption.cjs.map +1 -1
  125. package/lib-commonjs/components/Option/useOption.cjs +4 -5
  126. package/lib-commonjs/components/Option/useOption.cjs.map +1 -1
  127. package/lib-commonjs/components/Option/useOptionStyles.styles.cjs +5 -5
  128. package/lib-commonjs/components/Option/useOptionStyles.styles.cjs.map +1 -1
  129. package/lib-commonjs/components/Option/useOptionStyles.styles.raw.cjs +4 -4
  130. package/lib-commonjs/components/Option/useOptionStyles.styles.raw.cjs.map +1 -1
  131. package/lib-commonjs/components/OptionGroup/OptionGroup.cjs.map +1 -1
  132. package/lib-commonjs/components/OptionGroup/OptionGroup.types.cjs.map +1 -1
  133. package/lib-commonjs/components/OptionGroup/index.cjs +6 -6
  134. package/lib-commonjs/components/OptionGroup/index.cjs.map +1 -1
  135. package/lib-commonjs/components/OptionGroup/renderOptionGroup.cjs.map +1 -1
  136. package/lib-commonjs/components/OptionGroup/useOptionGroup.cjs.map +1 -1
  137. package/lib-commonjs/components/OptionGroup/useOptionGroupStyles.styles.cjs +3 -3
  138. package/lib-commonjs/components/OptionGroup/useOptionGroupStyles.styles.cjs.map +1 -1
  139. package/lib-commonjs/components/OptionGroup/useOptionGroupStyles.styles.raw.cjs +3 -3
  140. package/lib-commonjs/components/OptionGroup/useOptionGroupStyles.styles.raw.cjs.map +1 -1
  141. package/lib-commonjs/contexts/ComboboxContext.cjs +3 -3
  142. package/lib-commonjs/contexts/ComboboxContext.cjs.map +1 -1
  143. package/lib-commonjs/contexts/ListboxContext.cjs +4 -4
  144. package/lib-commonjs/contexts/ListboxContext.cjs.map +1 -1
  145. package/lib-commonjs/contexts/useComboboxContextValues.cjs.map +1 -1
  146. package/lib-commonjs/contexts/useListboxContextValues.cjs.map +1 -1
  147. package/lib-commonjs/hooks/useComboboxFilter.cjs.map +1 -1
  148. package/lib-commonjs/hooks/useTabsterEscapeIgnore.cjs.map +1 -1
  149. package/lib-commonjs/index.cjs +44 -40
  150. package/lib-commonjs/index.cjs.map +1 -1
  151. package/lib-commonjs/utils/ComboboxBase.types.cjs.map +1 -1
  152. package/lib-commonjs/utils/OptionCollection.types.cjs.map +1 -1
  153. package/lib-commonjs/utils/Selection.types.cjs.map +1 -1
  154. package/lib-commonjs/utils/dropdownKeyActions.cjs.map +1 -1
  155. package/lib-commonjs/utils/internalTokens.cjs.map +1 -1
  156. package/lib-commonjs/utils/isComboboxOptionElement.cjs.map +1 -1
  157. package/lib-commonjs/utils/useComboboxBaseState.cjs +5 -4
  158. package/lib-commonjs/utils/useComboboxBaseState.cjs.map +1 -1
  159. package/lib-commonjs/utils/useComboboxPositioning.cjs.map +1 -1
  160. package/lib-commonjs/utils/useListboxSlot.cjs.map +1 -1
  161. package/lib-commonjs/utils/useOptionCollection.cjs.map +1 -1
  162. package/lib-commonjs/utils/useSelection.cjs.map +1 -1
  163. package/lib-commonjs/utils/useTriggerSlot.cjs +6 -3
  164. package/lib-commonjs/utils/useTriggerSlot.cjs.map +1 -1
  165. package/package.json +9 -9
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/utils/useTriggerSlot.ts"],"sourcesContent":["'use client';\n\nimport * as React from 'react';\nimport { useSetKeyboardNavigation } from '@fluentui/react-tabster';\nimport type { ActiveDescendantImperativeRef } from '@fluentui/react-aria';\nimport { mergeCallbacks, slot, useEventCallback, useMergedRefs } from '@fluentui/react-utilities';\nimport type { ExtractSlotProps, Slot, SlotComponentType } from '@fluentui/react-utilities';\nimport { getDropdownActionFromKey } from '../utils/dropdownKeyActions';\nimport type { ComboboxBaseState } from './ComboboxBase.types';\nimport type { OptionValue } from './OptionCollection.types';\n\nexport type UseTriggerSlotState = Pick<\n ComboboxBaseState,\n 'open' | 'getOptionById' | 'selectOption' | 'setOpen' | 'multiselect' | 'setHasFocus'\n>;\n\ntype UseTriggerSlotOptions = {\n state: UseTriggerSlotState;\n defaultProps: unknown;\n activeDescendantController: ActiveDescendantImperativeRef;\n};\n\nexport function useTriggerSlot(\n triggerSlotFromProp: NonNullable<Slot<'button'>>,\n ref: React.Ref<HTMLButtonElement>,\n options: UseTriggerSlotOptions & { elementType: 'button' },\n): SlotComponentType<ExtractSlotProps<Slot<'button'>>>;\n\nexport function useTriggerSlot(\n triggerSlotFromProp: NonNullable<Slot<'input'>>,\n ref: React.Ref<HTMLInputElement>,\n options: UseTriggerSlotOptions & { elementType: 'input' },\n): SlotComponentType<ExtractSlotProps<Slot<'input'>>>;\n\n/**\n * Shared trigger behaviour for combobox and dropdown\n * @returns trigger slot with desired behaviour and props\n */\nexport function useTriggerSlot(\n triggerSlotFromProp: NonNullable<Slot<'input'>> | NonNullable<Slot<'button'>>,\n ref: React.Ref<HTMLButtonElement> | React.Ref<HTMLInputElement>,\n options: UseTriggerSlotOptions & { elementType: 'input' | 'button' },\n): SlotComponentType<ExtractSlotProps<Slot<'button'>>> | SlotComponentType<ExtractSlotProps<Slot<'input'>>> {\n const {\n state: { open, setOpen, setHasFocus },\n defaultProps,\n elementType,\n activeDescendantController,\n } = options;\n\n const trigger = slot.always(triggerSlotFromProp, {\n defaultProps: {\n type: 'text',\n 'aria-expanded': open,\n role: 'combobox',\n ...(typeof defaultProps === 'object' && defaultProps),\n },\n elementType,\n });\n\n // handle trigger focus/blur\n const triggerRef = React.useRef<HTMLButtonElement | HTMLInputElement>(null);\n trigger.ref = useMergedRefs(triggerRef, trigger.ref, ref) as React.Ref<HTMLButtonElement & HTMLInputElement>;\n\n // the trigger should open/close the popup on click or blur\n trigger.onBlur = mergeCallbacks((event: React.FocusEvent<HTMLButtonElement> & React.FocusEvent<HTMLInputElement>) => {\n setOpen(event, false);\n setHasFocus(false);\n }, trigger.onBlur);\n\n trigger.onFocus = mergeCallbacks(\n (event: React.FocusEvent<HTMLButtonElement> & React.FocusEvent<HTMLInputElement>) => {\n if (event.target === event.currentTarget) {\n setHasFocus(true);\n }\n },\n trigger.onFocus,\n );\n trigger.onClick = mergeCallbacks(\n (event: React.MouseEvent<HTMLButtonElement> & React.MouseEvent<HTMLInputElement>) => {\n setOpen(event, !open);\n },\n trigger.onClick,\n );\n\n // handle combobox keyboard interaction\n trigger.onKeyDown = mergeCallbacks(\n useTriggerKeydown({ activeDescendantController, ...options.state }),\n trigger.onKeyDown,\n );\n\n return trigger as SlotComponentType<ExtractSlotProps<Slot<'input'>>>;\n}\n\nfunction useTriggerKeydown(\n options: {\n activeDescendantController: ActiveDescendantImperativeRef;\n } & Pick<UseTriggerSlotState, 'setOpen' | 'selectOption' | 'getOptionById' | 'multiselect' | 'open'>,\n) {\n const { activeDescendantController, getOptionById, setOpen, selectOption, multiselect, open } = options;\n\n const getActiveOption = React.useCallback(() => {\n const activeOptionId = activeDescendantController.active();\n return activeOptionId ? getOptionById(activeOptionId) : undefined;\n }, [activeDescendantController, getOptionById]);\n\n const first = () => {\n activeDescendantController.first();\n };\n\n const last = () => {\n activeDescendantController.last();\n };\n\n const next = (activeOption: OptionValue | undefined) => {\n if (activeOption) {\n activeDescendantController.next();\n } else {\n activeDescendantController.first();\n }\n };\n\n const previous = (activeOption: OptionValue | undefined) => {\n if (activeOption) {\n activeDescendantController.prev();\n } else {\n activeDescendantController.first();\n }\n };\n\n const pageUp = () => {\n for (let i = 0; i < 10; i++) {\n activeDescendantController.prev();\n }\n };\n\n const pageDown = () => {\n for (let i = 0; i < 10; i++) {\n activeDescendantController.next();\n }\n };\n\n const setKeyboardNavigation = useSetKeyboardNavigation();\n return useEventCallback((e: React.KeyboardEvent<HTMLInputElement> & React.KeyboardEvent<HTMLButtonElement>) => {\n const action = getDropdownActionFromKey(e, { open, multiselect });\n const activeOption = getActiveOption();\n\n switch (action) {\n case 'First':\n case 'Last':\n case 'Next':\n case 'Previous':\n case 'PageDown':\n case 'PageUp':\n case 'Open':\n case 'Close':\n case 'CloseSelect':\n case 'Select':\n e.preventDefault();\n break;\n }\n\n setKeyboardNavigation(true);\n\n switch (action) {\n case 'First':\n first();\n break;\n case 'Last':\n last();\n break;\n case 'Next':\n next(activeOption);\n break;\n case 'Previous':\n previous(activeOption);\n break;\n case 'PageDown':\n pageDown();\n break;\n case 'PageUp':\n pageUp();\n break;\n case 'Open':\n setOpen(e, true);\n break;\n case 'Close':\n // stop propagation for escape key to avoid dismissing any parent popups\n e.stopPropagation();\n setOpen(e, false);\n break;\n case 'CloseSelect':\n !multiselect && !activeOption?.disabled && setOpen(e, false);\n // fallthrough\n case 'Select':\n activeOption && selectOption(e, activeOption);\n break;\n case 'Tab':\n !multiselect && activeOption && selectOption(e, activeOption);\n break;\n }\n });\n}\n"],"names":["React","useSetKeyboardNavigation","mergeCallbacks","slot","useEventCallback","useMergedRefs","getDropdownActionFromKey","useTriggerSlot","triggerSlotFromProp","ref","options","state","open","setOpen","setHasFocus","defaultProps","elementType","activeDescendantController","trigger","always","type","role","triggerRef","useRef","onBlur","event","onFocus","target","currentTarget","onClick","onKeyDown","useTriggerKeydown","getOptionById","selectOption","multiselect","getActiveOption","useCallback","activeOptionId","active","undefined","first","last","next","activeOption","previous","prev","pageUp","i","pageDown","setKeyboardNavigation","e","action","preventDefault","stopPropagation","disabled"],"mappings":"AAAA;;;;;+BAsCgBO;;;;;;;iEApCO,QAAQ;8BACU,0BAA0B;gCAEG,4BAA4B;oCAEzD,0BAA8B;AA+BhE,wBACLC,mBAA6E,EAC7EC,GAA+D,EAC/DC,OAAoE;IAEpE,MAAM,EACJC,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAAEC,WAAW,EAAE,EACrCC,YAAY,EACZC,WAAW,EACXC,0BAA0B,EAC3B,GAAGP;IAEJ,MAAMQ,UAAUf,oBAAAA,CAAKgB,MAAM,CAACX,qBAAqB;QAC/CO,cAAc;YACZK,MAAM;YACN,iBAAiBR;YACjBS,MAAM;YACN,GAAI,OAAON,iBAAiB,YAAYA,YAAY;QACtD;QACAC;IACF;IAEA,4BAA4B;IAC5B,MAAMM,aAAatB,OAAMuB,MAAM,CAAuC;IACtEL,QAAQT,GAAG,OAAGJ,6BAAAA,EAAciB,YAAYJ,QAAQT,GAAG,EAAEA;IAErD,2DAA2D;IAC3DS,QAAQM,MAAM,OAAGtB,8BAAAA,EAAe,CAACuB;QAC/BZ,QAAQY,OAAO;QACfX,YAAY;IACd,GAAGI,QAAQM,MAAM;IAEjBN,QAAQQ,OAAO,GAAGxB,kCAAAA,EAChB,CAACuB;QACC,IAAIA,MAAME,MAAM,KAAKF,MAAMG,aAAa,EAAE;YACxCd,YAAY;QACd;IACF,GACAI,QAAQQ,OAAO;IAEjBR,QAAQW,OAAO,OAAG3B,8BAAAA,EAChB,CAACuB;QACCZ,QAAQY,OAAO,CAACb;IAClB,GACAM,QAAQW,OAAO;IAGjB,uCAAuC;IACvCX,QAAQY,SAAS,OAAG5B,8BAAAA,EAClB6B,kBAAkB;QAAEd;QAA4B,GAAGP,QAAQC,KAAK;IAAC,IACjEO,QAAQY,SAAS;IAGnB,OAAOZ;AACT;AAEA,SAASa,kBACPrB,OAEoG;IAEpG,MAAM,EAAEO,0BAA0B,EAAEe,aAAa,EAAEnB,OAAO,EAAEoB,YAAY,EAAEC,WAAW,EAAEtB,IAAI,EAAE,GAAGF;IAEhG,MAAMyB,kBAAkBnC,OAAMoC,WAAW,CAAC;QACxC,MAAMC,iBAAiBpB,2BAA2BqB,MAAM;QACxD,OAAOD,iBAAiBL,cAAcK,kBAAkBE;IAC1D,GAAG;QAACtB;QAA4Be;KAAc;IAE9C,MAAMQ,QAAQ;QACZvB,2BAA2BuB,KAAK;IAClC;IAEA,MAAMC,OAAO;QACXxB,2BAA2BwB,IAAI;IACjC;IAEA,MAAMC,OAAO,CAACC;QACZ,IAAIA,cAAc;YAChB1B,2BAA2ByB,IAAI;QACjC,OAAO;YACLzB,2BAA2BuB,KAAK;QAClC;IACF;IAEA,MAAMI,WAAW,CAACD;QAChB,IAAIA,cAAc;YAChB1B,2BAA2B4B,IAAI;QACjC,OAAO;YACL5B,2BAA2BuB,KAAK;QAClC;IACF;IAEA,MAAMM,SAAS;QACb,IAAK,IAAIC,IAAI,GAAGA,IAAI,IAAIA,IAAK;YAC3B9B,2BAA2B4B,IAAI;QACjC;IACF;IAEA,MAAMG,WAAW;QACf,IAAK,IAAID,IAAI,GAAGA,IAAI,IAAIA,IAAK;YAC3B9B,2BAA2ByB,IAAI;QACjC;IACF;IAEA,MAAMO,4BAAwBhD,sCAAAA;IAC9B,OAAOG,oCAAAA,EAAiB,CAAC8C;QACvB,MAAMC,aAAS7C,4CAAAA,EAAyB4C,GAAG;YAAEtC;YAAMsB;QAAY;QAC/D,MAAMS,eAAeR;QAErB,OAAQgB;YACN,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;gBACHD,EAAEE,cAAc;gBAChB;QACJ;QAEAH,sBAAsB;QAEtB,OAAQE;YACN,KAAK;gBACHX;gBACA;YACF,KAAK;gBACHC;gBACA;YACF,KAAK;gBACHC,KAAKC;gBACL;YACF,KAAK;gBACHC,SAASD;gBACT;YACF,KAAK;gBACHK;gBACA;YACF,KAAK;gBACHF;gBACA;YACF,KAAK;gBACHjC,QAAQqC,GAAG;gBACX;YACF,KAAK;gBACH,wEAAwE;gBACxEA,EAAEG,eAAe;gBACjBxC,QAAQqC,GAAG;gBACX;YACF,KAAK;gBACH,CAAChB,eAAe,EAACS,iBAAAA,QAAAA,iBAAAA,KAAAA,IAAAA,KAAAA,IAAAA,aAAcW,QAAAA,AAAQ,KAAIzC,QAAQqC,GAAG;YACxD,cAAc;YACd,KAAK;gBACHP,gBAAgBV,aAAaiB,GAAGP;gBAChC;YACF,KAAK;gBACH,CAACT,eAAeS,gBAAgBV,aAAaiB,GAAGP;gBAChD;QACJ;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/utils/useTriggerSlot.ts"],"sourcesContent":["'use client';\n\nimport * as React from 'react';\nimport { useSetKeyboardNavigation } from '@fluentui/react-tabster';\nimport type { ActiveDescendantImperativeRef } from '@fluentui/react-aria';\nimport { mergeCallbacks, slot, useEventCallback, useMergedRefs } from '@fluentui/react-utilities';\nimport type { ExtractSlotProps, Slot, SlotComponentType } from '@fluentui/react-utilities';\nimport { getDropdownActionFromKey } from '../utils/dropdownKeyActions';\nimport type { ComboboxBaseState } from './ComboboxBase.types';\nimport type { OptionValue } from './OptionCollection.types';\n\nexport type UseTriggerSlotState = Pick<\n ComboboxBaseState,\n 'open' | 'getOptionById' | 'selectOption' | 'setOpen' | 'multiselect' | 'setHasFocus'\n>;\n\nexport type UseTriggerSlotOptions = {\n state: UseTriggerSlotState;\n defaultProps: unknown;\n activeDescendantController: ActiveDescendantImperativeRef;\n shouldCloseOnBlur?: (event: React.FocusEvent<HTMLButtonElement> & React.FocusEvent<HTMLInputElement>) => boolean;\n};\n\nexport function useTriggerSlot(\n triggerSlotFromProp: NonNullable<Slot<'button'>>,\n ref: React.Ref<HTMLButtonElement>,\n options: UseTriggerSlotOptions & { elementType: 'button' },\n): SlotComponentType<ExtractSlotProps<Slot<'button'>>>;\n\nexport function useTriggerSlot(\n triggerSlotFromProp: NonNullable<Slot<'input'>>,\n ref: React.Ref<HTMLInputElement>,\n options: UseTriggerSlotOptions & { elementType: 'input' },\n): SlotComponentType<ExtractSlotProps<Slot<'input'>>>;\n\n/**\n * Shared trigger behaviour for combobox and dropdown\n * @returns trigger slot with desired behaviour and props\n */\nexport function useTriggerSlot(\n triggerSlotFromProp: NonNullable<Slot<'input'>> | NonNullable<Slot<'button'>>,\n ref: React.Ref<HTMLButtonElement> | React.Ref<HTMLInputElement>,\n options: UseTriggerSlotOptions & { elementType: 'input' | 'button' },\n): SlotComponentType<ExtractSlotProps<Slot<'button'>>> | SlotComponentType<ExtractSlotProps<Slot<'input'>>> {\n const {\n state: { open, setOpen, setHasFocus },\n defaultProps,\n elementType,\n activeDescendantController,\n shouldCloseOnBlur,\n } = options;\n\n const trigger = slot.always(triggerSlotFromProp, {\n defaultProps: {\n type: 'text',\n 'aria-expanded': open,\n role: 'combobox',\n ...(typeof defaultProps === 'object' && defaultProps),\n },\n elementType,\n });\n\n // handle trigger focus/blur\n const triggerRef = React.useRef<HTMLButtonElement | HTMLInputElement>(null);\n trigger.ref = useMergedRefs(triggerRef, trigger.ref, ref) as React.Ref<HTMLButtonElement & HTMLInputElement>;\n\n // the trigger should open/close the popup on click or blur\n trigger.onBlur = mergeCallbacks((event: React.FocusEvent<HTMLButtonElement> & React.FocusEvent<HTMLInputElement>) => {\n if (shouldCloseOnBlur?.(event) ?? true) {\n setOpen(event, false);\n setHasFocus(false);\n }\n }, trigger.onBlur);\n\n trigger.onFocus = mergeCallbacks(\n (event: React.FocusEvent<HTMLButtonElement> & React.FocusEvent<HTMLInputElement>) => {\n if (event.target === event.currentTarget) {\n setHasFocus(true);\n }\n },\n trigger.onFocus,\n );\n trigger.onClick = mergeCallbacks(\n (event: React.MouseEvent<HTMLButtonElement> & React.MouseEvent<HTMLInputElement>) => {\n setOpen(event, !open);\n },\n trigger.onClick,\n );\n\n // handle combobox keyboard interaction\n trigger.onKeyDown = mergeCallbacks(\n useTriggerKeydown({ activeDescendantController, ...options.state }),\n trigger.onKeyDown,\n );\n\n return trigger as SlotComponentType<ExtractSlotProps<Slot<'input'>>>;\n}\n\nfunction useTriggerKeydown(\n options: {\n activeDescendantController: ActiveDescendantImperativeRef;\n } & Pick<UseTriggerSlotState, 'setOpen' | 'selectOption' | 'getOptionById' | 'multiselect' | 'open'>,\n) {\n const { activeDescendantController, getOptionById, setOpen, selectOption, multiselect, open } = options;\n\n const getActiveOption = React.useCallback(() => {\n const activeOptionId = activeDescendantController.active();\n return activeOptionId ? getOptionById(activeOptionId) : undefined;\n }, [activeDescendantController, getOptionById]);\n\n const first = () => {\n activeDescendantController.first();\n };\n\n const last = () => {\n activeDescendantController.last();\n };\n\n const next = (activeOption: OptionValue | undefined) => {\n if (activeOption) {\n activeDescendantController.next();\n } else {\n activeDescendantController.first();\n }\n };\n\n const previous = (activeOption: OptionValue | undefined) => {\n if (activeOption) {\n activeDescendantController.prev();\n } else {\n activeDescendantController.first();\n }\n };\n\n const pageUp = () => {\n for (let i = 0; i < 10; i++) {\n activeDescendantController.prev();\n }\n };\n\n const pageDown = () => {\n for (let i = 0; i < 10; i++) {\n activeDescendantController.next();\n }\n };\n\n const setKeyboardNavigation = useSetKeyboardNavigation();\n return useEventCallback((e: React.KeyboardEvent<HTMLInputElement> & React.KeyboardEvent<HTMLButtonElement>) => {\n const action = getDropdownActionFromKey(e, { open, multiselect });\n const activeOption = getActiveOption();\n\n switch (action) {\n case 'First':\n case 'Last':\n case 'Next':\n case 'Previous':\n case 'PageDown':\n case 'PageUp':\n case 'Open':\n case 'Close':\n case 'CloseSelect':\n case 'Select':\n e.preventDefault();\n break;\n }\n\n setKeyboardNavigation(true);\n\n switch (action) {\n case 'First':\n first();\n break;\n case 'Last':\n last();\n break;\n case 'Next':\n next(activeOption);\n break;\n case 'Previous':\n previous(activeOption);\n break;\n case 'PageDown':\n pageDown();\n break;\n case 'PageUp':\n pageUp();\n break;\n case 'Open':\n setOpen(e, true);\n break;\n case 'Close':\n // stop propagation for escape key to avoid dismissing any parent popups\n e.stopPropagation();\n setOpen(e, false);\n break;\n case 'CloseSelect':\n !multiselect && !activeOption?.disabled && setOpen(e, false);\n // fallthrough\n case 'Select':\n activeOption && selectOption(e, activeOption);\n break;\n case 'Tab':\n !multiselect && activeOption && selectOption(e, activeOption);\n break;\n }\n });\n}\n"],"names":["React","useSetKeyboardNavigation","mergeCallbacks","slot","useEventCallback","useMergedRefs","getDropdownActionFromKey","useTriggerSlot","triggerSlotFromProp","ref","options","state","open","setOpen","setHasFocus","defaultProps","elementType","activeDescendantController","shouldCloseOnBlur","trigger","always","type","role","triggerRef","useRef","onBlur","event","onFocus","target","currentTarget","onClick","onKeyDown","useTriggerKeydown","getOptionById","selectOption","multiselect","getActiveOption","useCallback","activeOptionId","active","undefined","first","last","next","activeOption","previous","prev","pageUp","i","pageDown","setKeyboardNavigation","e","action","preventDefault","stopPropagation","disabled"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui/react-combobox",
3
- "version": "9.17.7",
3
+ "version": "9.17.9",
4
4
  "description": "Fluent UI React Combobox component",
5
5
  "main": "lib-commonjs/index.cjs",
6
6
  "module": "lib/index.js",
@@ -13,17 +13,17 @@
13
13
  "license": "MIT",
14
14
  "dependencies": {
15
15
  "@fluentui/keyboard-keys": "^9.0.9",
16
- "@fluentui/react-aria": "^9.17.15",
17
- "@fluentui/react-context-selector": "^9.2.20",
18
- "@fluentui/react-field": "^9.5.5",
16
+ "@fluentui/react-aria": "^9.17.16",
17
+ "@fluentui/react-context-selector": "^9.2.21",
18
+ "@fluentui/react-field": "^9.5.6",
19
19
  "@fluentui/react-icons": "^2.0.245",
20
- "@fluentui/react-jsx-runtime": "^9.4.6",
21
- "@fluentui/react-portal": "^9.8.16",
22
- "@fluentui/react-positioning": "^9.23.3",
20
+ "@fluentui/react-jsx-runtime": "^9.4.7",
21
+ "@fluentui/react-portal": "^9.8.17",
22
+ "@fluentui/react-positioning": "^9.23.4",
23
23
  "@fluentui/react-shared-contexts": "^9.26.4",
24
- "@fluentui/react-tabster": "^9.26.18",
24
+ "@fluentui/react-tabster": "^9.26.19",
25
25
  "@fluentui/react-theme": "^9.2.2",
26
- "@fluentui/react-utilities": "^9.26.7",
26
+ "@fluentui/react-utilities": "^9.27.0",
27
27
  "@griffel/react": "^1.5.32",
28
28
  "@swc/helpers": "^0.5.1"
29
29
  },