@fluentui/react-combobox 9.11.7 → 9.12.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 (65) hide show
  1. package/CHANGELOG.md +174 -135
  2. package/dist/index.d.ts +16 -2
  3. package/lib/components/Combobox/useCombobox.js +18 -4
  4. package/lib/components/Combobox/useCombobox.js.map +1 -1
  5. package/lib/components/Combobox/useComboboxStyles.styles.js +2 -0
  6. package/lib/components/Combobox/useComboboxStyles.styles.js.map +1 -1
  7. package/lib/components/Combobox/useInputTriggerSlot.js +1 -0
  8. package/lib/components/Combobox/useInputTriggerSlot.js.map +1 -1
  9. package/lib/components/Dropdown/useButtonTriggerSlot.js +4 -1
  10. package/lib/components/Dropdown/useButtonTriggerSlot.js.map +1 -1
  11. package/lib/components/Dropdown/useDropdown.js +15 -2
  12. package/lib/components/Dropdown/useDropdown.js.map +1 -1
  13. package/lib/components/Dropdown/useDropdownStyles.styles.js +2 -0
  14. package/lib/components/Dropdown/useDropdownStyles.styles.js.map +1 -1
  15. package/lib/components/Listbox/Listbox.types.js.map +1 -1
  16. package/lib/components/Listbox/useListbox.js +67 -28
  17. package/lib/components/Listbox/useListbox.js.map +1 -1
  18. package/lib/components/Listbox/useListboxStyles.styles.js +2 -0
  19. package/lib/components/Listbox/useListboxStyles.styles.js.map +1 -1
  20. package/lib/components/Option/useOptionStyles.styles.js +2 -0
  21. package/lib/components/Option/useOptionStyles.styles.js.map +1 -1
  22. package/lib/components/OptionGroup/useOptionGroupStyles.styles.js +2 -0
  23. package/lib/components/OptionGroup/useOptionGroupStyles.styles.js.map +1 -1
  24. package/lib/contexts/ListboxContext.js +6 -0
  25. package/lib/contexts/ListboxContext.js.map +1 -1
  26. package/lib/contexts/useComboboxContextValues.js +3 -1
  27. package/lib/contexts/useComboboxContextValues.js.map +1 -1
  28. package/lib/contexts/useListboxContextValues.js +3 -1
  29. package/lib/contexts/useListboxContextValues.js.map +1 -1
  30. package/lib/utils/ComboboxBase.types.js.map +1 -1
  31. package/lib/utils/useComboboxBaseState.js +5 -24
  32. package/lib/utils/useComboboxBaseState.js.map +1 -1
  33. package/lib/utils/useComboboxPositioning.js +1 -0
  34. package/lib/utils/useComboboxPositioning.js.map +1 -1
  35. package/lib-commonjs/components/Combobox/useCombobox.js +17 -3
  36. package/lib-commonjs/components/Combobox/useCombobox.js.map +1 -1
  37. package/lib-commonjs/components/Combobox/useComboboxStyles.styles.js +1 -0
  38. package/lib-commonjs/components/Combobox/useComboboxStyles.styles.js.map +1 -1
  39. package/lib-commonjs/components/Combobox/useInputTriggerSlot.js +1 -0
  40. package/lib-commonjs/components/Combobox/useInputTriggerSlot.js.map +1 -1
  41. package/lib-commonjs/components/Dropdown/useButtonTriggerSlot.js +4 -1
  42. package/lib-commonjs/components/Dropdown/useButtonTriggerSlot.js.map +1 -1
  43. package/lib-commonjs/components/Dropdown/useDropdown.js +14 -1
  44. package/lib-commonjs/components/Dropdown/useDropdown.js.map +1 -1
  45. package/lib-commonjs/components/Dropdown/useDropdownStyles.styles.js +1 -0
  46. package/lib-commonjs/components/Dropdown/useDropdownStyles.styles.js.map +1 -1
  47. package/lib-commonjs/components/Listbox/useListbox.js +67 -28
  48. package/lib-commonjs/components/Listbox/useListbox.js.map +1 -1
  49. package/lib-commonjs/components/Listbox/useListboxStyles.styles.js +1 -0
  50. package/lib-commonjs/components/Listbox/useListboxStyles.styles.js.map +1 -1
  51. package/lib-commonjs/components/Option/useOptionStyles.styles.js +1 -0
  52. package/lib-commonjs/components/Option/useOptionStyles.styles.js.map +1 -1
  53. package/lib-commonjs/components/OptionGroup/useOptionGroupStyles.styles.js +1 -0
  54. package/lib-commonjs/components/OptionGroup/useOptionGroupStyles.styles.js.map +1 -1
  55. package/lib-commonjs/contexts/ListboxContext.js +6 -0
  56. package/lib-commonjs/contexts/ListboxContext.js.map +1 -1
  57. package/lib-commonjs/contexts/useComboboxContextValues.js +3 -1
  58. package/lib-commonjs/contexts/useComboboxContextValues.js.map +1 -1
  59. package/lib-commonjs/contexts/useListboxContextValues.js +3 -1
  60. package/lib-commonjs/contexts/useListboxContextValues.js.map +1 -1
  61. package/lib-commonjs/utils/useComboboxBaseState.js +5 -24
  62. package/lib-commonjs/utils/useComboboxBaseState.js.map +1 -1
  63. package/lib-commonjs/utils/useComboboxPositioning.js +1 -0
  64. package/lib-commonjs/utils/useComboboxPositioning.js.map +1 -1
  65. package/package.json +16 -14
@@ -1 +1 @@
1
- {"version":3,"sources":["ListboxContext.js"],"sourcesContent":["import * as React from 'react';\nimport { createContext, useContextSelector } from '@fluentui/react-context-selector';\nconst listboxContextDefaultValue = {\n activeOption: undefined,\n focusVisible: false,\n multiselect: false,\n registerOption () {\n return ()=>undefined;\n },\n selectedOptions: [],\n onOptionClick () {\n // noop\n },\n onActiveDescendantChange () {\n // noop\n },\n selectOption () {\n // noop\n },\n setActiveOption () {\n // noop\n }\n};\nexport const ListboxContext = createContext(undefined);\nexport const useListboxContext_unstable = (selector)=>useContextSelector(ListboxContext, (ctx = listboxContextDefaultValue)=>selector(ctx));\nexport const ListboxProvider = ListboxContext.Provider;\n"],"names":["ListboxContext","useListboxContext_unstable","ListboxProvider","listboxContextDefaultValue","activeOption","undefined","focusVisible","multiselect","registerOption","selectedOptions","onOptionClick","onActiveDescendantChange","selectOption","setActiveOption","createContext","selector","useContextSelector","ctx","Provider"],"mappings":";;;;;;;;;;;IAuBaA,cAAc;eAAdA;;IACAC,0BAA0B;eAA1BA;;IACAC,eAAe;eAAfA;;;;iEAzBU;sCAC2B;AAClD,MAAMC,6BAA6B;IAC/BC,cAAcC;IACdC,cAAc;IACdC,aAAa;IACbC;QACI,OAAO,IAAIH;IACf;IACAI,iBAAiB,EAAE;IACnBC;IACA,OAAO;IACP;IACAC;IACA,OAAO;IACP;IACAC;IACA,OAAO;IACP;IACAC;IACA,OAAO;IACP;AACJ;AACO,MAAMb,iBAAiBc,IAAAA,mCAAa,EAACT;AACrC,MAAMJ,6BAA6B,CAACc,WAAWC,IAAAA,wCAAkB,EAAChB,gBAAgB,CAACiB,MAAMd,0BAA0B,GAAGY,SAASE;AAC/H,MAAMf,kBAAkBF,eAAekB,QAAQ"}
1
+ {"version":3,"sources":["ListboxContext.js"],"sourcesContent":["import * as React from 'react';\nimport { createContext, useContextSelector } from '@fluentui/react-context-selector';\nconst listboxContextDefaultValue = {\n activeOption: undefined,\n focusVisible: false,\n multiselect: false,\n getOptionById () {\n return undefined;\n },\n getOptionsMatchingValue () {\n return [];\n },\n registerOption () {\n return ()=>undefined;\n },\n selectedOptions: [],\n onOptionClick () {\n // noop\n },\n onActiveDescendantChange () {\n // noop\n },\n selectOption () {\n // noop\n },\n setActiveOption () {\n // noop\n }\n};\nexport const ListboxContext = createContext(undefined);\nexport const useListboxContext_unstable = (selector)=>useContextSelector(ListboxContext, (ctx = listboxContextDefaultValue)=>selector(ctx));\nexport const ListboxProvider = ListboxContext.Provider;\n"],"names":["ListboxContext","useListboxContext_unstable","ListboxProvider","listboxContextDefaultValue","activeOption","undefined","focusVisible","multiselect","getOptionById","getOptionsMatchingValue","registerOption","selectedOptions","onOptionClick","onActiveDescendantChange","selectOption","setActiveOption","createContext","selector","useContextSelector","ctx","Provider"],"mappings":";;;;;;;;;;;IA6BaA,cAAc;eAAdA;;IACAC,0BAA0B;eAA1BA;;IACAC,eAAe;eAAfA;;;;iEA/BU;sCAC2B;AAClD,MAAMC,6BAA6B;IAC/BC,cAAcC;IACdC,cAAc;IACdC,aAAa;IACbC;QACI,OAAOH;IACX;IACAI;QACI,OAAO,EAAE;IACb;IACAC;QACI,OAAO,IAAIL;IACf;IACAM,iBAAiB,EAAE;IACnBC;IACA,OAAO;IACP;IACAC;IACA,OAAO;IACP;IACAC;IACA,OAAO;IACP;IACAC;IACA,OAAO;IACP;AACJ;AACO,MAAMf,iBAAiBgB,IAAAA,mCAAa,EAACX;AACrC,MAAMJ,6BAA6B,CAACgB,WAAWC,IAAAA,wCAAkB,EAAClB,gBAAgB,CAACmB,MAAMhB,0BAA0B,GAAGc,SAASE;AAC/H,MAAMjB,kBAAkBF,eAAeoB,QAAQ"}
@@ -11,7 +11,7 @@ Object.defineProperty(exports, "useComboboxContextValues", {
11
11
  const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
12
12
  const _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
13
13
  function useComboboxContextValues(state) {
14
- const { appearance, open, registerOption, selectedOptions, selectOption, setOpen, size, activeDescendantController, onOptionClick, onActiveDescendantChange } = state;
14
+ const { appearance, open, getOptionById, getOptionsMatchingValue, registerOption, selectedOptions, selectOption, setOpen, size, activeDescendantController, onOptionClick, onActiveDescendantChange } = state;
15
15
  const combobox = {
16
16
  activeOption: undefined,
17
17
  appearance,
@@ -27,6 +27,8 @@ function useComboboxContextValues(state) {
27
27
  const listbox = {
28
28
  activeOption: undefined,
29
29
  focusVisible: false,
30
+ getOptionById,
31
+ getOptionsMatchingValue,
30
32
  registerOption,
31
33
  selectedOptions,
32
34
  selectOption,
@@ -1 +1 @@
1
- {"version":3,"sources":["useComboboxContextValues.js"],"sourcesContent":["import * as React from 'react';\nexport function useComboboxContextValues(state) {\n const { appearance, open, registerOption, selectedOptions, selectOption, setOpen, size, activeDescendantController, onOptionClick, onActiveDescendantChange } = state;\n const combobox = {\n activeOption: undefined,\n appearance,\n focusVisible: false,\n open,\n registerOption,\n selectedOptions,\n selectOption,\n setActiveOption: ()=>null,\n setOpen,\n size\n };\n const listbox = {\n activeOption: undefined,\n focusVisible: false,\n registerOption,\n selectedOptions,\n selectOption,\n setActiveOption: ()=>null,\n onOptionClick,\n onActiveDescendantChange\n };\n const activeDescendant = React.useMemo(()=>({\n controller: activeDescendantController\n }), [\n activeDescendantController\n ]);\n return {\n combobox,\n activeDescendant,\n listbox\n };\n}\n"],"names":["useComboboxContextValues","state","appearance","open","registerOption","selectedOptions","selectOption","setOpen","size","activeDescendantController","onOptionClick","onActiveDescendantChange","combobox","activeOption","undefined","focusVisible","setActiveOption","listbox","activeDescendant","React","useMemo","controller"],"mappings":";;;;+BACgBA;;;eAAAA;;;;iEADO;AAChB,SAASA,yBAAyBC,KAAK;IAC1C,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,cAAc,EAAEC,eAAe,EAAEC,YAAY,EAAEC,OAAO,EAAEC,IAAI,EAAEC,0BAA0B,EAAEC,aAAa,EAAEC,wBAAwB,EAAE,GAAGV;IAChK,MAAMW,WAAW;QACbC,cAAcC;QACdZ;QACAa,cAAc;QACdZ;QACAC;QACAC;QACAC;QACAU,iBAAiB,IAAI;QACrBT;QACAC;IACJ;IACA,MAAMS,UAAU;QACZJ,cAAcC;QACdC,cAAc;QACdX;QACAC;QACAC;QACAU,iBAAiB,IAAI;QACrBN;QACAC;IACJ;IACA,MAAMO,mBAAmBC,OAAMC,OAAO,CAAC,IAAK,CAAA;YACpCC,YAAYZ;QAChB,CAAA,GAAI;QACJA;KACH;IACD,OAAO;QACHG;QACAM;QACAD;IACJ;AACJ"}
1
+ {"version":3,"sources":["useComboboxContextValues.js"],"sourcesContent":["import * as React from 'react';\nexport function useComboboxContextValues(state) {\n const { appearance, open, getOptionById, getOptionsMatchingValue, registerOption, selectedOptions, selectOption, setOpen, size, activeDescendantController, onOptionClick, onActiveDescendantChange } = state;\n const combobox = {\n activeOption: undefined,\n appearance,\n focusVisible: false,\n open,\n registerOption,\n selectedOptions,\n selectOption,\n setActiveOption: ()=>null,\n setOpen,\n size\n };\n const listbox = {\n activeOption: undefined,\n focusVisible: false,\n getOptionById,\n getOptionsMatchingValue,\n registerOption,\n selectedOptions,\n selectOption,\n setActiveOption: ()=>null,\n onOptionClick,\n onActiveDescendantChange\n };\n const activeDescendant = React.useMemo(()=>({\n controller: activeDescendantController\n }), [\n activeDescendantController\n ]);\n return {\n combobox,\n activeDescendant,\n listbox\n };\n}\n"],"names":["useComboboxContextValues","state","appearance","open","getOptionById","getOptionsMatchingValue","registerOption","selectedOptions","selectOption","setOpen","size","activeDescendantController","onOptionClick","onActiveDescendantChange","combobox","activeOption","undefined","focusVisible","setActiveOption","listbox","activeDescendant","React","useMemo","controller"],"mappings":";;;;+BACgBA;;;eAAAA;;;;iEADO;AAChB,SAASA,yBAAyBC,KAAK;IAC1C,MAAM,EAAEC,UAAU,EAAEC,IAAI,EAAEC,aAAa,EAAEC,uBAAuB,EAAEC,cAAc,EAAEC,eAAe,EAAEC,YAAY,EAAEC,OAAO,EAAEC,IAAI,EAAEC,0BAA0B,EAAEC,aAAa,EAAEC,wBAAwB,EAAE,GAAGZ;IACxM,MAAMa,WAAW;QACbC,cAAcC;QACdd;QACAe,cAAc;QACdd;QACAG;QACAC;QACAC;QACAU,iBAAiB,IAAI;QACrBT;QACAC;IACJ;IACA,MAAMS,UAAU;QACZJ,cAAcC;QACdC,cAAc;QACdb;QACAC;QACAC;QACAC;QACAC;QACAU,iBAAiB,IAAI;QACrBN;QACAC;IACJ;IACA,MAAMO,mBAAmBC,OAAMC,OAAO,CAAC,IAAK,CAAA;YACpCC,YAAYZ;QAChB,CAAA,GAAI;QACJA;KACH;IACD,OAAO;QACHG;QACAM;QACAD;IACJ;AACJ"}
@@ -14,7 +14,7 @@ const _reactcontextselector = require("@fluentui/react-context-selector");
14
14
  const _ListboxContext = require("./ListboxContext");
15
15
  function useListboxContextValues(state) {
16
16
  const hasListboxContext = (0, _reactcontextselector.useHasParentContext)(_ListboxContext.ListboxContext);
17
- const { multiselect, registerOption, selectedOptions, selectOption, activeDescendantController } = state;
17
+ const { getOptionById, getOptionsMatchingValue, multiselect, registerOption, selectedOptions, selectOption, activeDescendantController } = state;
18
18
  // get register/unregister functions from parent combobox context
19
19
  const parentRegisterOption = (0, _ListboxContext.useListboxContext_unstable)((ctx)=>ctx.registerOption);
20
20
  const onOptionClick = (0, _ListboxContext.useListboxContext_unstable)((ctx)=>ctx.onOptionClick);
@@ -23,6 +23,8 @@ function useListboxContextValues(state) {
23
23
  const listbox = {
24
24
  activeOption: undefined,
25
25
  focusVisible: false,
26
+ getOptionById,
27
+ getOptionsMatchingValue,
26
28
  multiselect,
27
29
  registerOption: registerOptionValue,
28
30
  selectedOptions,
@@ -1 +1 @@
1
- {"version":3,"sources":["useListboxContextValues.js"],"sourcesContent":["import * as React from 'react';\nimport { useHasParentContext } from '@fluentui/react-context-selector';\nimport { ListboxContext, useListboxContext_unstable } from './ListboxContext';\nexport function useListboxContextValues(state) {\n const hasListboxContext = useHasParentContext(ListboxContext);\n const { multiselect, registerOption, selectedOptions, selectOption, activeDescendantController } = state;\n // get register/unregister functions from parent combobox context\n const parentRegisterOption = useListboxContext_unstable((ctx)=>ctx.registerOption);\n const onOptionClick = useListboxContext_unstable((ctx)=>ctx.onOptionClick);\n const onActiveDescendantChange = useListboxContext_unstable((ctx)=>ctx.onActiveDescendantChange);\n const registerOptionValue = hasListboxContext ? parentRegisterOption : registerOption;\n const listbox = {\n activeOption: undefined,\n focusVisible: false,\n multiselect,\n registerOption: registerOptionValue,\n selectedOptions,\n selectOption,\n setActiveOption: ()=>undefined,\n onOptionClick,\n onActiveDescendantChange\n };\n const activeDescendant = React.useMemo(()=>({\n controller: activeDescendantController\n }), [\n activeDescendantController\n ]);\n return {\n listbox,\n activeDescendant\n };\n}\n"],"names":["useListboxContextValues","state","hasListboxContext","useHasParentContext","ListboxContext","multiselect","registerOption","selectedOptions","selectOption","activeDescendantController","parentRegisterOption","useListboxContext_unstable","ctx","onOptionClick","onActiveDescendantChange","registerOptionValue","listbox","activeOption","undefined","focusVisible","setActiveOption","activeDescendant","React","useMemo","controller"],"mappings":";;;;+BAGgBA;;;eAAAA;;;;iEAHO;sCACa;gCACuB;AACpD,SAASA,wBAAwBC,KAAK;IACzC,MAAMC,oBAAoBC,IAAAA,yCAAmB,EAACC,8BAAc;IAC5D,MAAM,EAAEC,WAAW,EAAEC,cAAc,EAAEC,eAAe,EAAEC,YAAY,EAAEC,0BAA0B,EAAE,GAAGR;IACnG,iEAAiE;IACjE,MAAMS,uBAAuBC,IAAAA,0CAA0B,EAAC,CAACC,MAAMA,IAAIN,cAAc;IACjF,MAAMO,gBAAgBF,IAAAA,0CAA0B,EAAC,CAACC,MAAMA,IAAIC,aAAa;IACzE,MAAMC,2BAA2BH,IAAAA,0CAA0B,EAAC,CAACC,MAAMA,IAAIE,wBAAwB;IAC/F,MAAMC,sBAAsBb,oBAAoBQ,uBAAuBJ;IACvE,MAAMU,UAAU;QACZC,cAAcC;QACdC,cAAc;QACdd;QACAC,gBAAgBS;QAChBR;QACAC;QACAY,iBAAiB,IAAIF;QACrBL;QACAC;IACJ;IACA,MAAMO,mBAAmBC,OAAMC,OAAO,CAAC,IAAK,CAAA;YACpCC,YAAYf;QAChB,CAAA,GAAI;QACJA;KACH;IACD,OAAO;QACHO;QACAK;IACJ;AACJ"}
1
+ {"version":3,"sources":["useListboxContextValues.js"],"sourcesContent":["import * as React from 'react';\nimport { useHasParentContext } from '@fluentui/react-context-selector';\nimport { ListboxContext, useListboxContext_unstable } from './ListboxContext';\nexport function useListboxContextValues(state) {\n const hasListboxContext = useHasParentContext(ListboxContext);\n const { getOptionById, getOptionsMatchingValue, multiselect, registerOption, selectedOptions, selectOption, activeDescendantController } = state;\n // get register/unregister functions from parent combobox context\n const parentRegisterOption = useListboxContext_unstable((ctx)=>ctx.registerOption);\n const onOptionClick = useListboxContext_unstable((ctx)=>ctx.onOptionClick);\n const onActiveDescendantChange = useListboxContext_unstable((ctx)=>ctx.onActiveDescendantChange);\n const registerOptionValue = hasListboxContext ? parentRegisterOption : registerOption;\n const listbox = {\n activeOption: undefined,\n focusVisible: false,\n getOptionById,\n getOptionsMatchingValue,\n multiselect,\n registerOption: registerOptionValue,\n selectedOptions,\n selectOption,\n setActiveOption: ()=>undefined,\n onOptionClick,\n onActiveDescendantChange\n };\n const activeDescendant = React.useMemo(()=>({\n controller: activeDescendantController\n }), [\n activeDescendantController\n ]);\n return {\n listbox,\n activeDescendant\n };\n}\n"],"names":["useListboxContextValues","state","hasListboxContext","useHasParentContext","ListboxContext","getOptionById","getOptionsMatchingValue","multiselect","registerOption","selectedOptions","selectOption","activeDescendantController","parentRegisterOption","useListboxContext_unstable","ctx","onOptionClick","onActiveDescendantChange","registerOptionValue","listbox","activeOption","undefined","focusVisible","setActiveOption","activeDescendant","React","useMemo","controller"],"mappings":";;;;+BAGgBA;;;eAAAA;;;;iEAHO;sCACa;gCACuB;AACpD,SAASA,wBAAwBC,KAAK;IACzC,MAAMC,oBAAoBC,IAAAA,yCAAmB,EAACC,8BAAc;IAC5D,MAAM,EAAEC,aAAa,EAAEC,uBAAuB,EAAEC,WAAW,EAAEC,cAAc,EAAEC,eAAe,EAAEC,YAAY,EAAEC,0BAA0B,EAAE,GAAGV;IAC3I,iEAAiE;IACjE,MAAMW,uBAAuBC,IAAAA,0CAA0B,EAAC,CAACC,MAAMA,IAAIN,cAAc;IACjF,MAAMO,gBAAgBF,IAAAA,0CAA0B,EAAC,CAACC,MAAMA,IAAIC,aAAa;IACzE,MAAMC,2BAA2BH,IAAAA,0CAA0B,EAAC,CAACC,MAAMA,IAAIE,wBAAwB;IAC/F,MAAMC,sBAAsBf,oBAAoBU,uBAAuBJ;IACvE,MAAMU,UAAU;QACZC,cAAcC;QACdC,cAAc;QACdhB;QACAC;QACAC;QACAC,gBAAgBS;QAChBR;QACAC;QACAY,iBAAiB,IAAIF;QACrBL;QACAC;IACJ;IACA,MAAMO,mBAAmBC,OAAMC,OAAO,CAAC,IAAK,CAAA;YACpCC,YAAYf;QAChB,CAAA,GAAI;QACJA;KACH;IACD,OAAO;QACHO;QACAK;IACJ;AACJ"}
@@ -15,7 +15,8 @@ const _reactutilities = require("@fluentui/react-utilities");
15
15
  const _useOptionCollection = require("../utils/useOptionCollection");
16
16
  const _useSelection = require("../utils/useSelection");
17
17
  const useComboboxBaseState = (props)=>{
18
- const { appearance = 'outline', children, clearable = false, editable = false, inlinePopup = false, mountNode = undefined, multiselect, onOpenChange, size = 'medium', activeDescendantController, freeform = false, disabled = false, onActiveOptionChange = null } = props;
18
+ 'use no memo';
19
+ const { appearance = 'outline', disableAutoFocus, children, clearable = false, editable = false, inlinePopup = false, mountNode = undefined, multiselect, onOpenChange, size = 'medium', activeDescendantController, freeform = false, disabled = false, onActiveOptionChange = null } = props;
19
20
  const optionCollection = (0, _useOptionCollection.useOptionCollection)();
20
21
  const { getOptionsMatchingValue } = optionCollection;
21
22
  const { getOptionById } = optionCollection;
@@ -124,36 +125,16 @@ const useComboboxBaseState = (props)=>{
124
125
  freeform,
125
126
  disabled
126
127
  ]);
127
- // update active option based on change in open state
128
- _react.useEffect(()=>{
129
- if (open) {
130
- // if it is single-select and there is a selected option, start at the selected option
131
- if (!multiselect && selectedOptions.length > 0) {
132
- const selectedOption = getOptionsMatchingValue((v)=>v === selectedOptions[0]).pop();
133
- if (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.id) {
134
- activeDescendantController.focus(selectedOption.id);
135
- }
136
- }
137
- } else {
138
- activeDescendantController.blur();
139
- }
140
- // this should only be run in response to changes in the open state or children
141
- // eslint-disable-next-line react-hooks/exhaustive-deps
142
- }, [
143
- open,
144
- activeDescendantController
145
- ]);
146
128
  // Fallback focus when children are updated in an open popover results in no item being focused
147
129
  _react.useEffect(()=>{
148
- if (open) {
149
- if (!activeDescendantController.active()) {
150
- activeDescendantController.first();
151
- }
130
+ if (open && !disableAutoFocus && !activeDescendantController.active()) {
131
+ activeDescendantController.first();
152
132
  }
153
133
  // this should only be run in response to changes in the open state or children
154
134
  }, [
155
135
  open,
156
136
  children,
137
+ disableAutoFocus,
157
138
  activeDescendantController,
158
139
  getOptionById
159
140
  ]);
@@ -1 +1 @@
1
- {"version":3,"sources":["useComboboxBaseState.js"],"sourcesContent":["import * as React from 'react';\nimport * as ReactDOM from 'react-dom';\nimport { useControllableState, useEventCallback, useFirstMount } from '@fluentui/react-utilities';\nimport { useOptionCollection } from '../utils/useOptionCollection';\nimport { useSelection } from '../utils/useSelection';\n/**\n * @internal\n * State shared between Combobox and Dropdown components\n */ export const useComboboxBaseState = (props)=>{\n const { appearance = 'outline', children, clearable = false, editable = false, inlinePopup = false, mountNode = undefined, multiselect, onOpenChange, size = 'medium', activeDescendantController, freeform = false, disabled = false, onActiveOptionChange = null } = props;\n const optionCollection = useOptionCollection();\n const { getOptionsMatchingValue } = optionCollection;\n const { getOptionById } = optionCollection;\n const getActiveOption = React.useCallback(()=>{\n const activeOptionId = activeDescendantController.active();\n return activeOptionId ? getOptionById(activeOptionId) : undefined;\n }, [\n activeDescendantController,\n getOptionById\n ]);\n // Keeping some kind of backwards compatible functionality here\n // eslint-disable-next-line @typescript-eslint/naming-convention\n const UNSAFE_activeOption = getActiveOption();\n // eslint-disable-next-line @typescript-eslint/naming-convention\n const UNSAFE_setActiveOption = React.useCallback((option)=>{\n let nextOption = undefined;\n if (typeof option === 'function') {\n const activeOption = getActiveOption();\n nextOption = option(activeOption);\n }\n if (nextOption) {\n activeDescendantController.focus(nextOption.id);\n } else {\n activeDescendantController.blur();\n }\n }, [\n activeDescendantController,\n getActiveOption\n ]);\n // track whether keyboard focus outline should be shown\n // tabster/keyborg doesn't work here, since the actual keyboard focus target doesn't move\n const [focusVisible, setFocusVisible] = React.useState(false);\n // track focused state to conditionally render collapsed listbox\n // when the trigger is focused - the listbox should but hidden until the open state is changed\n const [hasFocus, setHasFocus] = React.useState(false);\n const ignoreNextBlur = React.useRef(false);\n // calculate value based on props, internal value changes, and selected options\n const isFirstMount = useFirstMount();\n const [controllableValue, setValue] = useControllableState({\n state: props.value,\n initialState: undefined\n });\n const { selectedOptions, selectOption: baseSelectOption, clearSelection } = useSelection(props);\n // reset any typed value when an option is selected\n const selectOption = React.useCallback((ev, option)=>{\n ReactDOM.unstable_batchedUpdates(()=>{\n setValue(undefined);\n baseSelectOption(ev, option);\n });\n }, [\n setValue,\n baseSelectOption\n ]);\n const value = React.useMemo(()=>{\n // don't compute the value if it is defined through props or setValue,\n if (controllableValue !== undefined) {\n return controllableValue;\n }\n // handle defaultValue here, so it is overridden by selection\n if (isFirstMount && props.defaultValue !== undefined) {\n return props.defaultValue;\n }\n const selectedOptionsText = getOptionsMatchingValue((optionValue)=>{\n return selectedOptions.includes(optionValue);\n }).map((option)=>option.text);\n if (multiselect) {\n // editable inputs should not display multiple selected options in the input as text\n return editable ? '' : selectedOptionsText.join(', ');\n }\n return selectedOptionsText[0];\n // do not change value after isFirstMount changes,\n // we do not want to accidentally override defaultValue on a second render\n // unless another value is intentionally set\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [\n controllableValue,\n editable,\n getOptionsMatchingValue,\n multiselect,\n props.defaultValue,\n selectedOptions\n ]);\n // Handle open state, which is shared with options in context\n const [open, setOpenState] = useControllableState({\n state: props.open,\n defaultState: props.defaultOpen,\n initialState: false\n });\n const setOpen = React.useCallback((event, newState)=>{\n if (disabled) {\n return;\n }\n onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(event, {\n open: newState\n });\n ReactDOM.unstable_batchedUpdates(()=>{\n if (!newState && !freeform) {\n setValue(undefined);\n }\n setOpenState(newState);\n });\n }, [\n onOpenChange,\n setOpenState,\n setValue,\n freeform,\n disabled\n ]);\n // update active option based on change in open state\n React.useEffect(()=>{\n if (open) {\n // if it is single-select and there is a selected option, start at the selected option\n if (!multiselect && selectedOptions.length > 0) {\n const selectedOption = getOptionsMatchingValue((v)=>v === selectedOptions[0]).pop();\n if (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.id) {\n activeDescendantController.focus(selectedOption.id);\n }\n }\n } else {\n activeDescendantController.blur();\n }\n // this should only be run in response to changes in the open state or children\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [\n open,\n activeDescendantController\n ]);\n // Fallback focus when children are updated in an open popover results in no item being focused\n React.useEffect(()=>{\n if (open) {\n if (!activeDescendantController.active()) {\n activeDescendantController.first();\n }\n }\n // this should only be run in response to changes in the open state or children\n }, [\n open,\n children,\n activeDescendantController,\n getOptionById\n ]);\n const onActiveDescendantChange = useEventCallback((event)=>{\n const previousOption = event.detail.previousId ? optionCollection.getOptionById(event.detail.previousId) : null;\n const nextOption = optionCollection.getOptionById(event.detail.id);\n onActiveOptionChange === null || onActiveOptionChange === void 0 ? void 0 : onActiveOptionChange(event, {\n event,\n type: 'change',\n previousOption,\n nextOption\n });\n });\n return {\n ...optionCollection,\n freeform,\n disabled,\n selectOption,\n clearSelection,\n selectedOptions,\n activeOption: UNSAFE_activeOption,\n appearance,\n clearable,\n focusVisible,\n ignoreNextBlur,\n inlinePopup,\n mountNode,\n open,\n hasFocus,\n setActiveOption: UNSAFE_setActiveOption,\n setFocusVisible,\n setHasFocus,\n setOpen,\n setValue,\n size,\n value,\n multiselect,\n onOptionClick: useEventCallback((e)=>{\n if (!multiselect) {\n setOpen(e, false);\n }\n }),\n onActiveDescendantChange\n };\n};\n"],"names":["useComboboxBaseState","props","appearance","children","clearable","editable","inlinePopup","mountNode","undefined","multiselect","onOpenChange","size","activeDescendantController","freeform","disabled","onActiveOptionChange","optionCollection","useOptionCollection","getOptionsMatchingValue","getOptionById","getActiveOption","React","useCallback","activeOptionId","active","UNSAFE_activeOption","UNSAFE_setActiveOption","option","nextOption","activeOption","focus","id","blur","focusVisible","setFocusVisible","useState","hasFocus","setHasFocus","ignoreNextBlur","useRef","isFirstMount","useFirstMount","controllableValue","setValue","useControllableState","state","value","initialState","selectedOptions","selectOption","baseSelectOption","clearSelection","useSelection","ev","ReactDOM","unstable_batchedUpdates","useMemo","defaultValue","selectedOptionsText","optionValue","includes","map","text","join","open","setOpenState","defaultState","defaultOpen","setOpen","event","newState","useEffect","length","selectedOption","v","pop","first","onActiveDescendantChange","useEventCallback","previousOption","detail","previousId","type","setActiveOption","onOptionClick","e"],"mappings":"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"}
1
+ {"version":3,"sources":["useComboboxBaseState.js"],"sourcesContent":["import * as React from 'react';\nimport * as ReactDOM from 'react-dom';\nimport { useControllableState, useEventCallback, useFirstMount } from '@fluentui/react-utilities';\nimport { useOptionCollection } from '../utils/useOptionCollection';\nimport { useSelection } from '../utils/useSelection';\n/**\n * @internal\n * State shared between Combobox and Dropdown components\n */ export const useComboboxBaseState = (props)=>{\n 'use no memo';\n const { appearance = 'outline', disableAutoFocus, children, clearable = false, editable = false, inlinePopup = false, mountNode = undefined, multiselect, onOpenChange, size = 'medium', activeDescendantController, freeform = false, disabled = false, onActiveOptionChange = null } = props;\n const optionCollection = useOptionCollection();\n const { getOptionsMatchingValue } = optionCollection;\n const { getOptionById } = optionCollection;\n const getActiveOption = React.useCallback(()=>{\n const activeOptionId = activeDescendantController.active();\n return activeOptionId ? getOptionById(activeOptionId) : undefined;\n }, [\n activeDescendantController,\n getOptionById\n ]);\n // Keeping some kind of backwards compatible functionality here\n // eslint-disable-next-line @typescript-eslint/naming-convention\n const UNSAFE_activeOption = getActiveOption();\n // eslint-disable-next-line @typescript-eslint/naming-convention\n const UNSAFE_setActiveOption = React.useCallback((option)=>{\n let nextOption = undefined;\n if (typeof option === 'function') {\n const activeOption = getActiveOption();\n nextOption = option(activeOption);\n }\n if (nextOption) {\n activeDescendantController.focus(nextOption.id);\n } else {\n activeDescendantController.blur();\n }\n }, [\n activeDescendantController,\n getActiveOption\n ]);\n // track whether keyboard focus outline should be shown\n // tabster/keyborg doesn't work here, since the actual keyboard focus target doesn't move\n const [focusVisible, setFocusVisible] = React.useState(false);\n // track focused state to conditionally render collapsed listbox\n // when the trigger is focused - the listbox should but hidden until the open state is changed\n const [hasFocus, setHasFocus] = React.useState(false);\n const ignoreNextBlur = React.useRef(false);\n // calculate value based on props, internal value changes, and selected options\n const isFirstMount = useFirstMount();\n const [controllableValue, setValue] = useControllableState({\n state: props.value,\n initialState: undefined\n });\n const { selectedOptions, selectOption: baseSelectOption, clearSelection } = useSelection(props);\n // reset any typed value when an option is selected\n const selectOption = React.useCallback((ev, option)=>{\n ReactDOM.unstable_batchedUpdates(()=>{\n setValue(undefined);\n baseSelectOption(ev, option);\n });\n }, [\n setValue,\n baseSelectOption\n ]);\n const value = React.useMemo(()=>{\n // don't compute the value if it is defined through props or setValue,\n if (controllableValue !== undefined) {\n return controllableValue;\n }\n // handle defaultValue here, so it is overridden by selection\n if (isFirstMount && props.defaultValue !== undefined) {\n return props.defaultValue;\n }\n const selectedOptionsText = getOptionsMatchingValue((optionValue)=>{\n return selectedOptions.includes(optionValue);\n }).map((option)=>option.text);\n if (multiselect) {\n // editable inputs should not display multiple selected options in the input as text\n return editable ? '' : selectedOptionsText.join(', ');\n }\n return selectedOptionsText[0];\n // do not change value after isFirstMount changes,\n // we do not want to accidentally override defaultValue on a second render\n // unless another value is intentionally set\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [\n controllableValue,\n editable,\n getOptionsMatchingValue,\n multiselect,\n props.defaultValue,\n selectedOptions\n ]);\n // Handle open state, which is shared with options in context\n const [open, setOpenState] = useControllableState({\n state: props.open,\n defaultState: props.defaultOpen,\n initialState: false\n });\n const setOpen = React.useCallback((event, newState)=>{\n if (disabled) {\n return;\n }\n onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(event, {\n open: newState\n });\n ReactDOM.unstable_batchedUpdates(()=>{\n if (!newState && !freeform) {\n setValue(undefined);\n }\n setOpenState(newState);\n });\n }, [\n onOpenChange,\n setOpenState,\n setValue,\n freeform,\n disabled\n ]);\n // Fallback focus when children are updated in an open popover results in no item being focused\n React.useEffect(()=>{\n if (open && !disableAutoFocus && !activeDescendantController.active()) {\n activeDescendantController.first();\n }\n // this should only be run in response to changes in the open state or children\n }, [\n open,\n children,\n disableAutoFocus,\n activeDescendantController,\n getOptionById\n ]);\n const onActiveDescendantChange = useEventCallback((event)=>{\n const previousOption = event.detail.previousId ? optionCollection.getOptionById(event.detail.previousId) : null;\n const nextOption = optionCollection.getOptionById(event.detail.id);\n onActiveOptionChange === null || onActiveOptionChange === void 0 ? void 0 : onActiveOptionChange(event, {\n event,\n type: 'change',\n previousOption,\n nextOption\n });\n });\n return {\n ...optionCollection,\n freeform,\n disabled,\n selectOption,\n clearSelection,\n selectedOptions,\n activeOption: UNSAFE_activeOption,\n appearance,\n clearable,\n focusVisible,\n ignoreNextBlur,\n inlinePopup,\n mountNode,\n open,\n hasFocus,\n setActiveOption: UNSAFE_setActiveOption,\n setFocusVisible,\n setHasFocus,\n setOpen,\n setValue,\n size,\n value,\n multiselect,\n onOptionClick: useEventCallback((e)=>{\n if (!multiselect) {\n setOpen(e, false);\n }\n }),\n onActiveDescendantChange\n };\n};\n"],"names":["useComboboxBaseState","props","appearance","disableAutoFocus","children","clearable","editable","inlinePopup","mountNode","undefined","multiselect","onOpenChange","size","activeDescendantController","freeform","disabled","onActiveOptionChange","optionCollection","useOptionCollection","getOptionsMatchingValue","getOptionById","getActiveOption","React","useCallback","activeOptionId","active","UNSAFE_activeOption","UNSAFE_setActiveOption","option","nextOption","activeOption","focus","id","blur","focusVisible","setFocusVisible","useState","hasFocus","setHasFocus","ignoreNextBlur","useRef","isFirstMount","useFirstMount","controllableValue","setValue","useControllableState","state","value","initialState","selectedOptions","selectOption","baseSelectOption","clearSelection","useSelection","ev","ReactDOM","unstable_batchedUpdates","useMemo","defaultValue","selectedOptionsText","optionValue","includes","map","text","join","open","setOpenState","defaultState","defaultOpen","setOpen","event","newState","useEffect","first","onActiveDescendantChange","useEventCallback","previousOption","detail","previousId","type","setActiveOption","onOptionClick","e"],"mappings":";;;;+BAQiBA;;;eAAAA;;;;iEARM;oEACG;gCAC4C;qCAClC;8BACP;AAIlB,MAAMA,uBAAuB,CAACC;IACrC;IACA,MAAM,EAAEC,aAAa,SAAS,EAAEC,gBAAgB,EAAEC,QAAQ,EAAEC,YAAY,KAAK,EAAEC,WAAW,KAAK,EAAEC,cAAc,KAAK,EAAEC,YAAYC,SAAS,EAAEC,WAAW,EAAEC,YAAY,EAAEC,OAAO,QAAQ,EAAEC,0BAA0B,EAAEC,WAAW,KAAK,EAAEC,WAAW,KAAK,EAAEC,uBAAuB,IAAI,EAAE,GAAGf;IACzR,MAAMgB,mBAAmBC,IAAAA,wCAAmB;IAC5C,MAAM,EAAEC,uBAAuB,EAAE,GAAGF;IACpC,MAAM,EAAEG,aAAa,EAAE,GAAGH;IAC1B,MAAMI,kBAAkBC,OAAMC,WAAW,CAAC;QACtC,MAAMC,iBAAiBX,2BAA2BY,MAAM;QACxD,OAAOD,iBAAiBJ,cAAcI,kBAAkBf;IAC5D,GAAG;QACCI;QACAO;KACH;IACD,+DAA+D;IAC/D,gEAAgE;IAChE,MAAMM,sBAAsBL;IAC5B,gEAAgE;IAChE,MAAMM,yBAAyBL,OAAMC,WAAW,CAAC,CAACK;QAC9C,IAAIC,aAAapB;QACjB,IAAI,OAAOmB,WAAW,YAAY;YAC9B,MAAME,eAAeT;YACrBQ,aAAaD,OAAOE;QACxB;QACA,IAAID,YAAY;YACZhB,2BAA2BkB,KAAK,CAACF,WAAWG,EAAE;QAClD,OAAO;YACHnB,2BAA2BoB,IAAI;QACnC;IACJ,GAAG;QACCpB;QACAQ;KACH;IACD,uDAAuD;IACvD,yFAAyF;IACzF,MAAM,CAACa,cAAcC,gBAAgB,GAAGb,OAAMc,QAAQ,CAAC;IACvD,gEAAgE;IAChE,8FAA8F;IAC9F,MAAM,CAACC,UAAUC,YAAY,GAAGhB,OAAMc,QAAQ,CAAC;IAC/C,MAAMG,iBAAiBjB,OAAMkB,MAAM,CAAC;IACpC,+EAA+E;IAC/E,MAAMC,eAAeC,IAAAA,6BAAa;IAClC,MAAM,CAACC,mBAAmBC,SAAS,GAAGC,IAAAA,oCAAoB,EAAC;QACvDC,OAAO7C,MAAM8C,KAAK;QAClBC,cAAcvC;IAClB;IACA,MAAM,EAAEwC,eAAe,EAAEC,cAAcC,gBAAgB,EAAEC,cAAc,EAAE,GAAGC,IAAAA,0BAAY,EAACpD;IACzF,mDAAmD;IACnD,MAAMiD,eAAe5B,OAAMC,WAAW,CAAC,CAAC+B,IAAI1B;QACxC2B,UAASC,uBAAuB,CAAC;YAC7BZ,SAASnC;YACT0C,iBAAiBG,IAAI1B;QACzB;IACJ,GAAG;QACCgB;QACAO;KACH;IACD,MAAMJ,QAAQzB,OAAMmC,OAAO,CAAC;QACxB,sEAAsE;QACtE,IAAId,sBAAsBlC,WAAW;YACjC,OAAOkC;QACX;QACA,6DAA6D;QAC7D,IAAIF,gBAAgBxC,MAAMyD,YAAY,KAAKjD,WAAW;YAClD,OAAOR,MAAMyD,YAAY;QAC7B;QACA,MAAMC,sBAAsBxC,wBAAwB,CAACyC;YACjD,OAAOX,gBAAgBY,QAAQ,CAACD;QACpC,GAAGE,GAAG,CAAC,CAAClC,SAASA,OAAOmC,IAAI;QAC5B,IAAIrD,aAAa;YACb,oFAAoF;YACpF,OAAOJ,WAAW,KAAKqD,oBAAoBK,IAAI,CAAC;QACpD;QACA,OAAOL,mBAAmB,CAAC,EAAE;IACjC,kDAAkD;IAClD,0EAA0E;IAC1E,4CAA4C;IAC5C,uDAAuD;IACvD,GAAG;QACChB;QACArC;QACAa;QACAT;QACAT,MAAMyD,YAAY;QAClBT;KACH;IACD,6DAA6D;IAC7D,MAAM,CAACgB,MAAMC,aAAa,GAAGrB,IAAAA,oCAAoB,EAAC;QAC9CC,OAAO7C,MAAMgE,IAAI;QACjBE,cAAclE,MAAMmE,WAAW;QAC/BpB,cAAc;IAClB;IACA,MAAMqB,UAAU/C,OAAMC,WAAW,CAAC,CAAC+C,OAAOC;QACtC,IAAIxD,UAAU;YACV;QACJ;QACAJ,iBAAiB,QAAQA,iBAAiB,KAAK,IAAI,KAAK,IAAIA,aAAa2D,OAAO;YAC5EL,MAAMM;QACV;QACAhB,UAASC,uBAAuB,CAAC;YAC7B,IAAI,CAACe,YAAY,CAACzD,UAAU;gBACxB8B,SAASnC;YACb;YACAyD,aAAaK;QACjB;IACJ,GAAG;QACC5D;QACAuD;QACAtB;QACA9B;QACAC;KACH;IACD,+FAA+F;IAC/FO,OAAMkD,SAAS,CAAC;QACZ,IAAIP,QAAQ,CAAC9D,oBAAoB,CAACU,2BAA2BY,MAAM,IAAI;YACnEZ,2BAA2B4D,KAAK;QACpC;IACJ,+EAA+E;IAC/E,GAAG;QACCR;QACA7D;QACAD;QACAU;QACAO;KACH;IACD,MAAMsD,2BAA2BC,IAAAA,gCAAgB,EAAC,CAACL;QAC/C,MAAMM,iBAAiBN,MAAMO,MAAM,CAACC,UAAU,GAAG7D,iBAAiBG,aAAa,CAACkD,MAAMO,MAAM,CAACC,UAAU,IAAI;QAC3G,MAAMjD,aAAaZ,iBAAiBG,aAAa,CAACkD,MAAMO,MAAM,CAAC7C,EAAE;QACjEhB,yBAAyB,QAAQA,yBAAyB,KAAK,IAAI,KAAK,IAAIA,qBAAqBsD,OAAO;YACpGA;YACAS,MAAM;YACNH;YACA/C;QACJ;IACJ;IACA,OAAO;QACH,GAAGZ,gBAAgB;QACnBH;QACAC;QACAmC;QACAE;QACAH;QACAnB,cAAcJ;QACdxB;QACAG;QACA6B;QACAK;QACAhC;QACAC;QACAyD;QACA5B;QACA2C,iBAAiBrD;QACjBQ;QACAG;QACA+B;QACAzB;QACAhC;QACAmC;QACArC;QACAuE,eAAeN,IAAAA,gCAAgB,EAAC,CAACO;YAC7B,IAAI,CAACxE,aAAa;gBACd2D,QAAQa,GAAG;YACf;QACJ;QACAR;IACJ;AACJ"}
@@ -31,6 +31,7 @@ function useComboboxPositioning(props) {
31
31
  },
32
32
  fallbackPositions,
33
33
  matchTargetSize: 'width',
34
+ autoSize: true,
34
35
  ...(0, _reactpositioning.resolvePositioningShorthand)(positioning)
35
36
  };
36
37
  const { targetRef, containerRef } = (0, _reactpositioning.usePositioning)(popperOptions);
@@ -1 +1 @@
1
- {"version":3,"sources":["useComboboxPositioning.js"],"sourcesContent":["import { resolvePositioningShorthand, usePositioning } from '@fluentui/react-positioning';\nimport * as React from 'react';\nexport function useComboboxPositioning(props) {\n const { positioning } = props;\n // Set a default set of fallback positions to try if the dropdown does not fit on screen\n const fallbackPositions = [\n 'above',\n 'after',\n 'after-top',\n 'before',\n 'before-top'\n ];\n // popper options\n const popperOptions = {\n position: 'below',\n align: 'start',\n offset: {\n crossAxis: 0,\n mainAxis: 2\n },\n fallbackPositions,\n matchTargetSize: 'width',\n ...resolvePositioningShorthand(positioning)\n };\n const { targetRef, containerRef } = usePositioning(popperOptions);\n return [\n containerRef,\n targetRef\n ];\n}\n"],"names":["useComboboxPositioning","props","positioning","fallbackPositions","popperOptions","position","align","offset","crossAxis","mainAxis","matchTargetSize","resolvePositioningShorthand","targetRef","containerRef","usePositioning"],"mappings":";;;;+BAEgBA;;;eAAAA;;;;kCAF4C;iEACrC;AAChB,SAASA,uBAAuBC,KAAK;IACxC,MAAM,EAAEC,WAAW,EAAE,GAAGD;IACxB,wFAAwF;IACxF,MAAME,oBAAoB;QACtB;QACA;QACA;QACA;QACA;KACH;IACD,iBAAiB;IACjB,MAAMC,gBAAgB;QAClBC,UAAU;QACVC,OAAO;QACPC,QAAQ;YACJC,WAAW;YACXC,UAAU;QACd;QACAN;QACAO,iBAAiB;QACjB,GAAGC,IAAAA,6CAA2B,EAACT,YAAY;IAC/C;IACA,MAAM,EAAEU,SAAS,EAAEC,YAAY,EAAE,GAAGC,IAAAA,gCAAc,EAACV;IACnD,OAAO;QACHS;QACAD;KACH;AACL"}
1
+ {"version":3,"sources":["useComboboxPositioning.js"],"sourcesContent":["import { resolvePositioningShorthand, usePositioning } from '@fluentui/react-positioning';\nimport * as React from 'react';\nexport function useComboboxPositioning(props) {\n const { positioning } = props;\n // Set a default set of fallback positions to try if the dropdown does not fit on screen\n const fallbackPositions = [\n 'above',\n 'after',\n 'after-top',\n 'before',\n 'before-top'\n ];\n // popper options\n const popperOptions = {\n position: 'below',\n align: 'start',\n offset: {\n crossAxis: 0,\n mainAxis: 2\n },\n fallbackPositions,\n matchTargetSize: 'width',\n autoSize: true,\n ...resolvePositioningShorthand(positioning)\n };\n const { targetRef, containerRef } = usePositioning(popperOptions);\n return [\n containerRef,\n targetRef\n ];\n}\n"],"names":["useComboboxPositioning","props","positioning","fallbackPositions","popperOptions","position","align","offset","crossAxis","mainAxis","matchTargetSize","autoSize","resolvePositioningShorthand","targetRef","containerRef","usePositioning"],"mappings":";;;;+BAEgBA;;;eAAAA;;;;kCAF4C;iEACrC;AAChB,SAASA,uBAAuBC,KAAK;IACxC,MAAM,EAAEC,WAAW,EAAE,GAAGD;IACxB,wFAAwF;IACxF,MAAME,oBAAoB;QACtB;QACA;QACA;QACA;QACA;KACH;IACD,iBAAiB;IACjB,MAAMC,gBAAgB;QAClBC,UAAU;QACVC,OAAO;QACPC,QAAQ;YACJC,WAAW;YACXC,UAAU;QACd;QACAN;QACAO,iBAAiB;QACjBC,UAAU;QACV,GAAGC,IAAAA,6CAA2B,EAACV,YAAY;IAC/C;IACA,MAAM,EAAEW,SAAS,EAAEC,YAAY,EAAE,GAAGC,IAAAA,gCAAc,EAACX;IACnD,OAAO;QACHU;QACAD;KACH;AACL"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui/react-combobox",
3
- "version": "9.11.7",
3
+ "version": "9.12.0",
4
4
  "description": "Fluent UI React Combobox component",
5
5
  "main": "lib-commonjs/index.js",
6
6
  "module": "lib/index.js",
@@ -20,31 +20,33 @@
20
20
  "lint": "just-scripts lint",
21
21
  "start": "yarn storybook",
22
22
  "test": "jest --passWithNoTests",
23
- "storybook": "start-storybook",
24
- "type-check": "tsc -b tsconfig.json",
23
+ "storybook": "yarn --cwd ../stories storybook",
24
+ "type-check": "just-scripts type-check",
25
25
  "generate-api": "just-scripts generate-api",
26
- "test-ssr": "test-ssr \"./stories/**/*.stories.tsx\""
26
+ "e2e": "cypress run --component",
27
+ "e2e:local": "cypress open --component"
27
28
  },
28
29
  "devDependencies": {
29
30
  "@fluentui/eslint-plugin": "*",
30
31
  "@fluentui/react-conformance": "*",
31
32
  "@fluentui/react-conformance-griffel": "*",
32
33
  "@fluentui/scripts-api-extractor": "*",
33
- "@fluentui/scripts-tasks": "*"
34
+ "@fluentui/scripts-tasks": "*",
35
+ "@fluentui/scripts-cypress": "*"
34
36
  },
35
37
  "dependencies": {
36
- "@fluentui/react-aria": "^9.12.0",
38
+ "@fluentui/react-aria": "^9.13.0",
37
39
  "@fluentui/keyboard-keys": "^9.0.7",
38
- "@fluentui/react-context-selector": "^9.1.61",
39
- "@fluentui/react-field": "^9.1.67",
40
- "@fluentui/react-icons": "^2.0.239",
41
- "@fluentui/react-jsx-runtime": "^9.0.39",
42
- "@fluentui/react-portal": "^9.4.27",
43
- "@fluentui/react-positioning": "^9.15.3",
40
+ "@fluentui/react-context-selector": "^9.1.63",
41
+ "@fluentui/react-field": "^9.1.69",
42
+ "@fluentui/react-icons": "^2.0.245",
43
+ "@fluentui/react-jsx-runtime": "^9.0.40",
44
+ "@fluentui/react-portal": "^9.4.29",
45
+ "@fluentui/react-positioning": "^9.15.4",
44
46
  "@fluentui/react-shared-contexts": "^9.19.0",
45
- "@fluentui/react-tabster": "^9.21.5",
47
+ "@fluentui/react-tabster": "^9.22.1",
46
48
  "@fluentui/react-theme": "^9.1.19",
47
- "@fluentui/react-utilities": "^9.18.10",
49
+ "@fluentui/react-utilities": "^9.18.11",
48
50
  "@griffel/react": "^1.5.22",
49
51
  "@swc/helpers": "^0.5.1"
50
52
  },