@fluentui/react-menu 0.0.0-nightlyd3bf09bf8120211201.1 → 0.0.0-nightlydd0f007b3f20220119.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (149) hide show
  1. package/CHANGELOG.json +124 -26
  2. package/CHANGELOG.md +29 -16
  3. package/Spec.md +21 -16
  4. package/dist/react-menu.d.ts +49 -9
  5. package/lib/MenuSplitGroup.d.ts +1 -0
  6. package/lib/MenuSplitGroup.js +2 -0
  7. package/lib/MenuSplitGroup.js.map +1 -0
  8. package/lib/components/Menu/useMenu.js +29 -21
  9. package/lib/components/Menu/useMenu.js.map +1 -1
  10. package/lib/components/MenuDivider/renderMenuDivider.js +2 -1
  11. package/lib/components/MenuDivider/renderMenuDivider.js.map +1 -1
  12. package/lib/components/MenuDivider/useMenuDivider.js +3 -0
  13. package/lib/components/MenuDivider/useMenuDivider.js.map +1 -1
  14. package/lib/components/MenuDivider/useMenuDividerStyles.d.ts +1 -1
  15. package/lib/components/MenuDivider/useMenuDividerStyles.js +1 -0
  16. package/lib/components/MenuDivider/useMenuDividerStyles.js.map +1 -1
  17. package/lib/components/MenuGroup/renderMenuGroup.js +2 -1
  18. package/lib/components/MenuGroup/renderMenuGroup.js.map +1 -1
  19. package/lib/components/MenuGroup/useMenuGroup.js +3 -0
  20. package/lib/components/MenuGroup/useMenuGroup.js.map +1 -1
  21. package/lib/components/MenuGroupHeader/renderMenuGroupHeader.js +2 -1
  22. package/lib/components/MenuGroupHeader/renderMenuGroupHeader.js.map +1 -1
  23. package/lib/components/MenuGroupHeader/useMenuGroupHeader.js +3 -0
  24. package/lib/components/MenuGroupHeader/useMenuGroupHeader.js.map +1 -1
  25. package/lib/components/MenuGroupHeader/useMenuGroupHeaderStyles.d.ts +1 -1
  26. package/lib/components/MenuGroupHeader/useMenuGroupHeaderStyles.js +1 -0
  27. package/lib/components/MenuGroupHeader/useMenuGroupHeaderStyles.js.map +1 -1
  28. package/lib/components/MenuItem/MenuItem.js +0 -2
  29. package/lib/components/MenuItem/MenuItem.js.map +1 -1
  30. package/lib/components/MenuItem/MenuItem.types.d.ts +1 -1
  31. package/lib/components/MenuItem/renderMenuItem.js +8 -3
  32. package/lib/components/MenuItem/renderMenuItem.js.map +1 -1
  33. package/lib/components/MenuItem/useMenuItem.d.ts +1 -5
  34. package/lib/components/MenuItem/useMenuItem.js +3 -8
  35. package/lib/components/MenuItem/useMenuItem.js.map +1 -1
  36. package/lib/components/MenuItem/useMenuItemStyles.js +19 -20
  37. package/lib/components/MenuItem/useMenuItemStyles.js.map +1 -1
  38. package/lib/components/MenuItemCheckbox/renderMenuItemCheckbox.js +7 -3
  39. package/lib/components/MenuItemCheckbox/renderMenuItemCheckbox.js.map +1 -1
  40. package/lib/components/MenuItemRadio/renderMenuItemRadio.js +7 -3
  41. package/lib/components/MenuItemRadio/renderMenuItemRadio.js.map +1 -1
  42. package/lib/components/MenuList/renderMenuList.js +2 -1
  43. package/lib/components/MenuList/renderMenuList.js.map +1 -1
  44. package/lib/components/MenuList/useMenuList.js +3 -0
  45. package/lib/components/MenuList/useMenuList.js.map +1 -1
  46. package/lib/components/MenuPopover/renderMenuPopover.js +4 -2
  47. package/lib/components/MenuPopover/renderMenuPopover.js.map +1 -1
  48. package/lib/components/MenuPopover/useMenuPopover.js +3 -0
  49. package/lib/components/MenuPopover/useMenuPopover.js.map +1 -1
  50. package/lib/components/MenuPopover/useMenuPopoverStyles.js +1 -0
  51. package/lib/components/MenuPopover/useMenuPopoverStyles.js.map +1 -1
  52. package/lib/components/MenuSplitGroup/MenuSplitGroup.d.ts +6 -0
  53. package/lib/components/MenuSplitGroup/MenuSplitGroup.js +15 -0
  54. package/lib/components/MenuSplitGroup/MenuSplitGroup.js.map +1 -0
  55. package/lib/components/MenuSplitGroup/MenuSplitGroup.types.d.ts +13 -0
  56. package/lib/components/MenuSplitGroup/MenuSplitGroup.types.js +2 -0
  57. package/lib/components/MenuSplitGroup/MenuSplitGroup.types.js.map +1 -0
  58. package/lib/components/MenuSplitGroup/index.d.ts +5 -0
  59. package/lib/components/MenuSplitGroup/index.js +6 -0
  60. package/lib/components/MenuSplitGroup/index.js.map +1 -0
  61. package/lib/components/MenuSplitGroup/renderMenuSplitGroup.d.ts +5 -0
  62. package/lib/components/MenuSplitGroup/renderMenuSplitGroup.js +15 -0
  63. package/lib/components/MenuSplitGroup/renderMenuSplitGroup.js.map +1 -0
  64. package/lib/components/MenuSplitGroup/useMenuSplitGroup.d.ts +12 -0
  65. package/lib/components/MenuSplitGroup/useMenuSplitGroup.js +67 -0
  66. package/lib/components/MenuSplitGroup/useMenuSplitGroup.js.map +1 -0
  67. package/lib/components/MenuSplitGroup/useMenuSplitGroupStyles.d.ts +6 -0
  68. package/lib/components/MenuSplitGroup/useMenuSplitGroupStyles.js +35 -0
  69. package/lib/components/MenuSplitGroup/useMenuSplitGroupStyles.js.map +1 -0
  70. package/lib/components/MenuTrigger/MenuTrigger.types.d.ts +2 -1
  71. package/lib/components/MenuTrigger/useTriggerElement.js +6 -5
  72. package/lib/components/MenuTrigger/useTriggerElement.js.map +1 -1
  73. package/lib/index.d.ts +11 -10
  74. package/lib/index.js +11 -10
  75. package/lib/index.js.map +1 -1
  76. package/lib/utils/useOnMenuEnter.js.map +1 -1
  77. package/lib-commonjs/MenuSplitGroup.d.ts +1 -0
  78. package/lib-commonjs/MenuSplitGroup.js +10 -0
  79. package/lib-commonjs/MenuSplitGroup.js.map +1 -0
  80. package/lib-commonjs/components/Menu/useMenu.js +33 -26
  81. package/lib-commonjs/components/Menu/useMenu.js.map +1 -1
  82. package/lib-commonjs/components/MenuDivider/renderMenuDivider.js +2 -1
  83. package/lib-commonjs/components/MenuDivider/renderMenuDivider.js.map +1 -1
  84. package/lib-commonjs/components/MenuDivider/useMenuDivider.js +3 -0
  85. package/lib-commonjs/components/MenuDivider/useMenuDivider.js.map +1 -1
  86. package/lib-commonjs/components/MenuDivider/useMenuDividerStyles.d.ts +1 -1
  87. package/lib-commonjs/components/MenuDivider/useMenuDividerStyles.js +2 -0
  88. package/lib-commonjs/components/MenuDivider/useMenuDividerStyles.js.map +1 -1
  89. package/lib-commonjs/components/MenuGroup/renderMenuGroup.js +2 -1
  90. package/lib-commonjs/components/MenuGroup/renderMenuGroup.js.map +1 -1
  91. package/lib-commonjs/components/MenuGroup/useMenuGroup.js +3 -0
  92. package/lib-commonjs/components/MenuGroup/useMenuGroup.js.map +1 -1
  93. package/lib-commonjs/components/MenuGroupHeader/renderMenuGroupHeader.js +2 -1
  94. package/lib-commonjs/components/MenuGroupHeader/renderMenuGroupHeader.js.map +1 -1
  95. package/lib-commonjs/components/MenuGroupHeader/useMenuGroupHeader.js +3 -0
  96. package/lib-commonjs/components/MenuGroupHeader/useMenuGroupHeader.js.map +1 -1
  97. package/lib-commonjs/components/MenuGroupHeader/useMenuGroupHeaderStyles.d.ts +1 -1
  98. package/lib-commonjs/components/MenuGroupHeader/useMenuGroupHeaderStyles.js +2 -0
  99. package/lib-commonjs/components/MenuGroupHeader/useMenuGroupHeaderStyles.js.map +1 -1
  100. package/lib-commonjs/components/MenuItem/MenuItem.js +0 -3
  101. package/lib-commonjs/components/MenuItem/MenuItem.js.map +1 -1
  102. package/lib-commonjs/components/MenuItem/MenuItem.types.d.ts +1 -1
  103. package/lib-commonjs/components/MenuItem/renderMenuItem.js +8 -4
  104. package/lib-commonjs/components/MenuItem/renderMenuItem.js.map +1 -1
  105. package/lib-commonjs/components/MenuItem/useMenuItem.d.ts +1 -5
  106. package/lib-commonjs/components/MenuItem/useMenuItem.js +5 -10
  107. package/lib-commonjs/components/MenuItem/useMenuItem.js.map +1 -1
  108. package/lib-commonjs/components/MenuItem/useMenuItemStyles.js +21 -20
  109. package/lib-commonjs/components/MenuItem/useMenuItemStyles.js.map +1 -1
  110. package/lib-commonjs/components/MenuItemCheckbox/renderMenuItemCheckbox.js +7 -4
  111. package/lib-commonjs/components/MenuItemCheckbox/renderMenuItemCheckbox.js.map +1 -1
  112. package/lib-commonjs/components/MenuItemRadio/renderMenuItemRadio.js +7 -4
  113. package/lib-commonjs/components/MenuItemRadio/renderMenuItemRadio.js.map +1 -1
  114. package/lib-commonjs/components/MenuList/renderMenuList.js +2 -1
  115. package/lib-commonjs/components/MenuList/renderMenuList.js.map +1 -1
  116. package/lib-commonjs/components/MenuList/useMenuList.js +3 -0
  117. package/lib-commonjs/components/MenuList/useMenuList.js.map +1 -1
  118. package/lib-commonjs/components/MenuPopover/renderMenuPopover.js +4 -2
  119. package/lib-commonjs/components/MenuPopover/renderMenuPopover.js.map +1 -1
  120. package/lib-commonjs/components/MenuPopover/useMenuPopover.js +3 -0
  121. package/lib-commonjs/components/MenuPopover/useMenuPopover.js.map +1 -1
  122. package/lib-commonjs/components/MenuPopover/useMenuPopoverStyles.js +2 -0
  123. package/lib-commonjs/components/MenuPopover/useMenuPopoverStyles.js.map +1 -1
  124. package/lib-commonjs/components/MenuSplitGroup/MenuSplitGroup.d.ts +6 -0
  125. package/lib-commonjs/components/MenuSplitGroup/MenuSplitGroup.js +26 -0
  126. package/lib-commonjs/components/MenuSplitGroup/MenuSplitGroup.js.map +1 -0
  127. package/lib-commonjs/components/MenuSplitGroup/MenuSplitGroup.types.d.ts +13 -0
  128. package/lib-commonjs/components/MenuSplitGroup/MenuSplitGroup.types.js +6 -0
  129. package/lib-commonjs/components/MenuSplitGroup/MenuSplitGroup.types.js.map +1 -0
  130. package/lib-commonjs/components/MenuSplitGroup/index.d.ts +5 -0
  131. package/lib-commonjs/components/MenuSplitGroup/index.js +18 -0
  132. package/lib-commonjs/components/MenuSplitGroup/index.js.map +1 -0
  133. package/lib-commonjs/components/MenuSplitGroup/renderMenuSplitGroup.d.ts +5 -0
  134. package/lib-commonjs/components/MenuSplitGroup/renderMenuSplitGroup.js +26 -0
  135. package/lib-commonjs/components/MenuSplitGroup/renderMenuSplitGroup.js.map +1 -0
  136. package/lib-commonjs/components/MenuSplitGroup/useMenuSplitGroup.d.ts +12 -0
  137. package/lib-commonjs/components/MenuSplitGroup/useMenuSplitGroup.js +81 -0
  138. package/lib-commonjs/components/MenuSplitGroup/useMenuSplitGroup.js.map +1 -0
  139. package/lib-commonjs/components/MenuSplitGroup/useMenuSplitGroupStyles.d.ts +6 -0
  140. package/lib-commonjs/components/MenuSplitGroup/useMenuSplitGroupStyles.js +47 -0
  141. package/lib-commonjs/components/MenuSplitGroup/useMenuSplitGroupStyles.js.map +1 -0
  142. package/lib-commonjs/components/MenuTrigger/MenuTrigger.types.d.ts +2 -1
  143. package/lib-commonjs/components/MenuTrigger/useTriggerElement.js +6 -5
  144. package/lib-commonjs/components/MenuTrigger/useTriggerElement.js.map +1 -1
  145. package/lib-commonjs/index.d.ts +11 -10
  146. package/lib-commonjs/index.js +16 -14
  147. package/lib-commonjs/index.js.map +1 -1
  148. package/lib-commonjs/utils/useOnMenuEnter.js.map +1 -1
  149. package/package.json +15 -15
package/CHANGELOG.json CHANGED
@@ -2,88 +2,186 @@
2
2
  "name": "@fluentui/react-menu",
3
3
  "entries": [
4
4
  {
5
- "date": "Wed, 01 Dec 2021 04:25:38 GMT",
6
- "tag": "@fluentui/react-menu_v0.0.0-nightlyd3bf09bf8120211201.1",
7
- "version": "0.0.0-nightlyd3bf09bf8120211201.1",
5
+ "date": "Wed, 19 Jan 2022 04:16:37 GMT",
6
+ "tag": "@fluentui/react-menu_v0.0.0-nightlydd0f007b3f20220119.1",
7
+ "version": "0.0.0-nightlydd0f007b3f20220119.1",
8
8
  "comments": {
9
9
  "prerelease": [
10
10
  {
11
11
  "author": "email not defined",
12
12
  "package": "@fluentui/react-menu",
13
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7",
13
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55",
14
14
  "comment": "Release nightly v9"
15
15
  },
16
+ {
17
+ "author": "lingfangao@hotmail.com",
18
+ "package": "@fluentui/react-menu",
19
+ "commit": "c2e6c50d56dcb45b4ca9e3a9daf2fae4be10a19e",
20
+ "comment": "fix: set `aria-expanded` and `aria-haspopup` values correctly"
21
+ },
22
+ {
23
+ "author": "lingfangao@hotmail.com",
24
+ "package": "@fluentui/react-menu",
25
+ "commit": "6ca0355f6740f836ff4df009687718a380085247",
26
+ "comment": "fix: Focus on first menu item on click"
27
+ },
28
+ {
29
+ "author": "Humberto.Morimoto@microsoft.com",
30
+ "package": "@fluentui/react-menu",
31
+ "commit": "38c8bed2c707014688ae2ae689033fa36ef23075",
32
+ "comment": "Updating packages based on changes to focusIndicator functions to remove functions from makeStyles in @fluentui/react-tabster."
33
+ },
34
+ {
35
+ "author": "behowell@microsoft.com",
36
+ "package": "@fluentui/react-menu",
37
+ "commit": "7cc28ed8320b00f42d91c63882f10316db2205c5",
38
+ "comment": "Remove component's shorthandProps array"
39
+ },
16
40
  {
17
41
  "author": "olfedias@microsoft.com",
18
42
  "package": "@fluentui/react-menu",
19
43
  "commit": "7e0933ed386742df28c416e6b3a6903a0c041f28",
20
44
  "comment": "update styles to not use CSS shorthands"
21
45
  },
46
+ {
47
+ "author": "lingfangao@hotmail.com",
48
+ "package": "@fluentui/react-menu",
49
+ "commit": "4121754498bba5137f769295e2b7a2899f557278",
50
+ "comment": "fix: Call `useCheckmarkStyles` in `useMenuItemStyles`"
51
+ },
52
+ {
53
+ "author": "Humberto.Morimoto@microsoft.com",
54
+ "package": "@fluentui/react-menu",
55
+ "commit": "6c32d0180e89674a46daf795de69e5dc6ca71ef7",
56
+ "comment": "Updating based on removal of functions from makeStyles."
57
+ },
58
+ {
59
+ "author": "Humberto.Morimoto@microsoft.com",
60
+ "package": "@fluentui/react-menu",
61
+ "commit": "227e09f59026e2bd243422427d9e230d6aa892ca",
62
+ "comment": "Replacing use of functions in makeStyles with direct use of tokens."
63
+ },
64
+ {
65
+ "author": "behowell@microsoft.com",
66
+ "package": "@fluentui/react-menu",
67
+ "commit": "23b8a6df449d6e76b90ae5ca9bd2285febdff222",
68
+ "comment": "Apply fontSize styling to icon slot"
69
+ },
70
+ {
71
+ "author": "ololubek@microsoft.com",
72
+ "package": "@fluentui/react-menu",
73
+ "commit": "63cbefe55e5db10eedbde19392aa8b6376d6a7f7",
74
+ "comment": "Update react-icons usage to resizable icons"
75
+ },
76
+ {
77
+ "author": "lingfangao@hotmail.com",
78
+ "package": "@fluentui/react-menu",
79
+ "commit": "95a6a32cbffa9d86d6017cf8e0204d4b459ef370",
80
+ "comment": "feat: implement `MenuSplitGroup` component for split menu items"
81
+ },
82
+ {
83
+ "author": "Humberto.Morimoto@microsoft.com",
84
+ "package": "@fluentui/react-menu",
85
+ "commit": "00a5d945904c896a0664de6ba72c145a255f0848",
86
+ "comment": "Updating use of tokens.fontWeight now that we don't need to use casting."
87
+ },
88
+ {
89
+ "author": "ololubek@microsoft.com",
90
+ "package": "@fluentui/react-menu",
91
+ "commit": "7cb2a5d8db1b6a1ddb638aa82d5815ab5ae84e69",
92
+ "comment": "(fix): Update react-icons dependency to latest version"
93
+ },
94
+ {
95
+ "author": "lingfangao@hotmail.com",
96
+ "package": "@fluentui/react-menu",
97
+ "commit": "07d9ed6d1b436b7ca9571c94fbb0bcbdb080f235",
98
+ "comment": "breaking: MenuTrigger must be the first child of the `Menu`"
99
+ },
22
100
  {
23
101
  "author": "beachball",
24
102
  "package": "@fluentui/react-menu",
25
- "comment": "Bump @fluentui/keyboard-keys to v0.0.0-nightlyd3bf09bf8120211201.1",
26
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
103
+ "comment": "Bump @fluentui/keyboard-keys to v0.0.0-nightlydd0f007b3f20220119.1",
104
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
27
105
  },
28
106
  {
29
107
  "author": "beachball",
30
108
  "package": "@fluentui/react-menu",
31
- "comment": "Bump @fluentui/react-context-selector to v0.0.0-nightlyd3bf09bf8120211201.1",
32
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
109
+ "comment": "Bump @fluentui/react-context-selector to v0.0.0-nightlydd0f007b3f20220119.1",
110
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
33
111
  },
34
112
  {
35
113
  "author": "beachball",
36
114
  "package": "@fluentui/react-menu",
37
- "comment": "Bump @fluentui/react-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1",
38
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
115
+ "comment": "Bump @fluentui/react-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
116
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
39
117
  },
40
118
  {
41
119
  "author": "beachball",
42
120
  "package": "@fluentui/react-menu",
43
- "comment": "Bump @fluentui/react-portal to v0.0.0-nightlyd3bf09bf8120211201.1",
44
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
121
+ "comment": "Bump @fluentui/react-portal to v0.0.0-nightlydd0f007b3f20220119.1",
122
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
45
123
  },
46
124
  {
47
125
  "author": "beachball",
48
126
  "package": "@fluentui/react-menu",
49
- "comment": "Bump @fluentui/react-positioning to v0.0.0-nightlyd3bf09bf8120211201.1",
50
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
127
+ "comment": "Bump @fluentui/react-positioning to v0.0.0-nightlydd0f007b3f20220119.1",
128
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
51
129
  },
52
130
  {
53
131
  "author": "beachball",
54
132
  "package": "@fluentui/react-menu",
55
- "comment": "Bump @fluentui/react-shared-contexts to v0.0.0-nightlyd3bf09bf8120211201.1",
56
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
133
+ "comment": "Bump @fluentui/react-shared-contexts to v0.0.0-nightlydd0f007b3f20220119.1",
134
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
57
135
  },
58
136
  {
59
137
  "author": "beachball",
60
138
  "package": "@fluentui/react-menu",
61
- "comment": "Bump @fluentui/react-tabster to v0.0.0-nightlyd3bf09bf8120211201.1",
62
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
139
+ "comment": "Bump @fluentui/react-tabster to v0.0.0-nightlydd0f007b3f20220119.1",
140
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
63
141
  },
64
142
  {
65
143
  "author": "beachball",
66
144
  "package": "@fluentui/react-menu",
67
- "comment": "Bump @fluentui/react-utilities to v0.0.0-nightlyd3bf09bf8120211201.1",
68
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
145
+ "comment": "Bump @fluentui/react-utilities to v0.0.0-nightlydd0f007b3f20220119.1",
146
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
69
147
  },
70
148
  {
71
149
  "author": "beachball",
72
150
  "package": "@fluentui/react-menu",
73
- "comment": "Bump @fluentui/babel-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1",
74
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
151
+ "comment": "Bump @fluentui/babel-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
152
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
75
153
  },
76
154
  {
77
155
  "author": "beachball",
78
156
  "package": "@fluentui/react-menu",
79
- "comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1",
80
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
157
+ "comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
158
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
81
159
  },
82
160
  {
83
161
  "author": "beachball",
84
162
  "package": "@fluentui/react-menu",
85
- "comment": "Bump @fluentui/react-conformance-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1",
86
- "commit": "40bec5fdab524f928e775fb2ed002822255eb2a7"
163
+ "comment": "Bump @fluentui/react-conformance-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
164
+ "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
165
+ }
166
+ ],
167
+ "none": [
168
+ {
169
+ "author": "email not defined",
170
+ "package": "@fluentui/react-menu",
171
+ "commit": "97752a0e494875c4dc22b268030d7d5e51b19211",
172
+ "comment": "Add workaround for cypress bug"
173
+ },
174
+ {
175
+ "author": "elcraig@microsoft.com",
176
+ "package": "@fluentui/react-menu",
177
+ "commit": "3360b45ec159250b1346c91afad7dce138e6bc20",
178
+ "comment": "Update API file to version generated by typescript 4.3"
179
+ },
180
+ {
181
+ "author": "martinhochel@microsoft.com",
182
+ "package": "@fluentui/react-menu",
183
+ "commit": "8dfa712156b70414205b87b5b6d099367b0c297d",
184
+ "comment": "chore: use storybook runner for all vNext packages"
87
185
  }
88
186
  ]
89
187
  }
package/CHANGELOG.md CHANGED
@@ -1,29 +1,42 @@
1
1
  # Change Log - @fluentui/react-menu
2
2
 
3
- This log was last generated on Wed, 01 Dec 2021 04:25:38 GMT and should not be manually modified.
3
+ This log was last generated on Wed, 19 Jan 2022 04:16:37 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
- ## [0.0.0-nightlyd3bf09bf8120211201.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-menu_v0.0.0-nightlyd3bf09bf8120211201.1)
7
+ ## [0.0.0-nightlydd0f007b3f20220119.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-menu_v0.0.0-nightlydd0f007b3f20220119.1)
8
8
 
9
- Wed, 01 Dec 2021 04:25:38 GMT
10
- [Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-menu_v9.0.0-beta.5..@fluentui/react-menu_v0.0.0-nightlyd3bf09bf8120211201.1)
9
+ Wed, 19 Jan 2022 04:16:37 GMT
10
+ [Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-menu_v9.0.0-beta.5..@fluentui/react-menu_v0.0.0-nightlydd0f007b3f20220119.1)
11
11
 
12
12
  ### Changes
13
13
 
14
- - Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by email not defined)
14
+ - Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by email not defined)
15
+ - fix: set `aria-expanded` and `aria-haspopup` values correctly ([PR #20957](https://github.com/microsoft/fluentui/pull/20957) by lingfangao@hotmail.com)
16
+ - fix: Focus on first menu item on click ([PR #20955](https://github.com/microsoft/fluentui/pull/20955) by lingfangao@hotmail.com)
17
+ - Updating packages based on changes to focusIndicator functions to remove functions from makeStyles in @fluentui/react-tabster. ([PR #21035](https://github.com/microsoft/fluentui/pull/21035) by Humberto.Morimoto@microsoft.com)
18
+ - Remove component's shorthandProps array ([PR #21134](https://github.com/microsoft/fluentui/pull/21134) by behowell@microsoft.com)
15
19
  - update styles to not use CSS shorthands ([PR #20820](https://github.com/microsoft/fluentui/pull/20820) by olfedias@microsoft.com)
16
- - Bump @fluentui/keyboard-keys to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
17
- - Bump @fluentui/react-context-selector to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
18
- - Bump @fluentui/react-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
19
- - Bump @fluentui/react-portal to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
20
- - Bump @fluentui/react-positioning to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
21
- - Bump @fluentui/react-shared-contexts to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
22
- - Bump @fluentui/react-tabster to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
23
- - Bump @fluentui/react-utilities to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
24
- - Bump @fluentui/babel-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
25
- - Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
26
- - Bump @fluentui/react-conformance-make-styles to v0.0.0-nightlyd3bf09bf8120211201.1 ([commit](https://github.com/microsoft/fluentui/commit/40bec5fdab524f928e775fb2ed002822255eb2a7) by beachball)
20
+ - fix: Call `useCheckmarkStyles` in `useMenuItemStyles` ([PR #20956](https://github.com/microsoft/fluentui/pull/20956) by lingfangao@hotmail.com)
21
+ - Updating based on removal of functions from makeStyles. ([PR #21239](https://github.com/microsoft/fluentui/pull/21239) by Humberto.Morimoto@microsoft.com)
22
+ - Replacing use of functions in makeStyles with direct use of tokens. ([PR #21048](https://github.com/microsoft/fluentui/pull/21048) by Humberto.Morimoto@microsoft.com)
23
+ - Apply fontSize styling to icon slot ([PR #21222](https://github.com/microsoft/fluentui/pull/21222) by behowell@microsoft.com)
24
+ - Update react-icons usage to resizable icons ([PR #21074](https://github.com/microsoft/fluentui/pull/21074) by ololubek@microsoft.com)
25
+ - feat: implement `MenuSplitGroup` component for split menu items ([PR #21095](https://github.com/microsoft/fluentui/pull/21095) by lingfangao@hotmail.com)
26
+ - Updating use of tokens.fontWeight now that we don't need to use casting. ([PR #21217](https://github.com/microsoft/fluentui/pull/21217) by Humberto.Morimoto@microsoft.com)
27
+ - (fix): Update react-icons dependency to latest version ([PR #20943](https://github.com/microsoft/fluentui/pull/20943) by ololubek@microsoft.com)
28
+ - breaking: MenuTrigger must be the first child of the `Menu` ([PR #21096](https://github.com/microsoft/fluentui/pull/21096) by lingfangao@hotmail.com)
29
+ - Bump @fluentui/keyboard-keys to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
30
+ - Bump @fluentui/react-context-selector to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
31
+ - Bump @fluentui/react-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
32
+ - Bump @fluentui/react-portal to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
33
+ - Bump @fluentui/react-positioning to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
34
+ - Bump @fluentui/react-shared-contexts to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
35
+ - Bump @fluentui/react-tabster to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
36
+ - Bump @fluentui/react-utilities to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
37
+ - Bump @fluentui/babel-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
38
+ - Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
39
+ - Bump @fluentui/react-conformance-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
27
40
 
28
41
  ## [9.0.0-beta.5](https://github.com/microsoft/fluentui/tree/@fluentui/react-menu_v9.0.0-beta.5)
29
42
 
package/Spec.md CHANGED
@@ -619,7 +619,7 @@ const menu = (
619
619
 
620
620
  ```html
621
621
  <!-- expected DOM output -->
622
- <button aria-haspopup="true" aria-expanded="true" id="trigger">Open menu</button>
622
+ <button aria-haspopup="menu" aria-expanded="true" id="trigger">Open menu</button>
623
623
  <div role="menu" aria-labelledby="trigger">
624
624
  <div role="menuitem" tabindex="0">Option 1</div>
625
625
  <div role="menuitem" tabindex="-1">Option 2</div>
@@ -644,7 +644,7 @@ const menu = (
644
644
 
645
645
  ```html
646
646
  <!-- expected DOM output -->
647
- <button aria-haspopup="true" aria-expanded="true" id="trigger">Open menu</button>
647
+ <button aria-haspopup="menu" aria-expanded="true" id="trigger">Open menu</button>
648
648
  <div role="menu" aria-labelledby="trigger">
649
649
  <div role="menuitem" tabindex="0">
650
650
  <span role="presentation"><svg>FileIcon</svg></span>
@@ -682,7 +682,7 @@ const menu = (
682
682
 
683
683
  ```html
684
684
  <!-- expected DOM output -->
685
- <button aria-haspopup="true" aria-expanded="true" id="trigger">Open menu</button>
685
+ <button aria-haspopup="menu" aria-expanded="true" id="trigger">Open menu</button>
686
686
  <div role="menu" aria-labelledby="trigger">
687
687
  <div role="menuitem" tabindex="0">Option 1</div>
688
688
  <div role="separator" aria-hidden="true"></div>
@@ -719,7 +719,7 @@ const menu = (
719
719
 
720
720
  ```html
721
721
  <!-- expected DOM output -->
722
- <button aria-haspopup="true" aria-expanded="true" id="trigger">Open menu</button>
722
+ <button aria-haspopup="menu" aria-expanded="true" id="trigger">Open menu</button>
723
723
  <div role="menu" aria-labelledby="trigger">
724
724
  <div role="menuitem" tabindex="0">Option 1</div>
725
725
  <div role="separator" aria-hidden="true"></div>
@@ -758,10 +758,10 @@ const menu = (
758
758
 
759
759
  ```html
760
760
  <!-- expected DOM output -->
761
- <button aria-haspopup="true" aria-expanded="true" id="trigger">Open menu</button>
761
+ <button aria-haspopup="menu" aria-expanded="true" id="trigger">Open menu</button>
762
762
  <div role="menu" aria-labelledby="trigger">
763
763
  <div role="menuitem" tabindex="0">Option 1</div>
764
- <div role="menuitem" tabindex="-1" aria-haspopup="true" aria-expanded="false" id="submenu-trigger">Open submenu</div>
764
+ <div role="menuitem" tabindex="-1" aria-haspopup="menu" aria-expanded="false" id="submenu-trigger">Open submenu</div>
765
765
  </div>
766
766
 
767
767
  <!-- expected DOM output for submenu -->
@@ -843,7 +843,7 @@ const menuSelectableSections = (
843
843
  ```
844
844
 
845
845
  ```html
846
- <button aria-haspopup="true" aria-expanded="true" id="trigger">Open menu</button>
846
+ <button aria-haspopup="menu" aria-expanded="true" id="trigger">Open menu</button>
847
847
 
848
848
  <!-- expected DOM output for basic checkbox -->
849
849
  <div role="menu" aria-labelledby="trigger">
@@ -882,9 +882,12 @@ const menuSplitbutton= (
882
882
  <MenuList>
883
883
  <MenuItem>Option 1</MenuItem>
884
884
  <Menu>
885
- <MenuTrigger>
886
- <MenuItemSplit></MenuItemSplit>
887
- </MenuTrigger>
885
+ <MenuSplitGroup>
886
+ <MenuItem>Main action</MenuItem>
887
+ <MenuTrigger>
888
+ <MenuItem />
889
+ </MenuTrigger>
890
+ </MenuSplitGroup>
888
891
  <MenuItem>Option 1</MenuItem>
889
892
  <MenuItem>Option 2</MenuItem>
890
893
  <MenuItem>Option 3</MenuItem>
@@ -897,7 +900,7 @@ const menuSplitbutton= (
897
900
  ```html
898
901
  <div role="menu" aria-labelledby="trigger">
899
902
  <div role="menuitem" tabindex="0">Option 1</div>
900
- <div role="menuitem" tabindex="-1" aria-haspopup="true" aria-expanded="false" id="submenu-trigger">Open submenu</div>
903
+ <div role="menuitem" tabindex="-1" aria-haspopup="menu" aria-expanded="false" id="submenu-trigger">Open submenu</div>
901
904
  </div>
902
905
 
903
906
  <!-- expected DOM output -->
@@ -905,7 +908,7 @@ const menuSplitbutton= (
905
908
  <div role="menuitem" tabindex="0">Option 1</div>
906
909
  <div role="group">
907
910
  <div role="menuitem" tabindex="-1">content slot</div>
908
- <div role="menuitem" tabindex="-1" aria-haspopup="true" aria-expanded="false" id="submenu-trgger">
911
+ <div role="menuitem" tabindex="-1" aria-haspopup="menu" aria-expanded="false" id="submenu-trgger">
909
912
  <svg>indicator icon</svg>
910
913
  </div>
911
914
  </div>
@@ -958,11 +961,13 @@ Below is a set of diagrams that tries to illustrates all the interactions menus
958
961
 
959
962
  All of the above Mouse events seen previously should apply to the part of the split button that is intended to open a submenu.
960
963
 
961
- Once the submenu is open, the same behavior as in the [previous section](#submenu-trigger/navigation) applies with the exception of returning focus to the splitbutton, which is shown in the images below.
962
-
963
- ![Using up/down arrow key](./etc/images/splitbutton-up-down.jpg)
964
+ > TODO convert these diagrams to excalidraw or smth that is text format
965
+ > TODO add extra descriptions to diagrams
964
966
 
965
- ![Using left/right arrow key](./etc/images/splitbutton-left-right.jpg)
967
+ <img src="./etc/images/menu-interactions/Slide19.PNG" width="700" />
968
+ <img src="./etc/images/menu-interactions/Slide20.PNG" width="700" />
969
+ <img src="./etc/images/menu-interactions/Slide21.PNG" width="700" />
970
+ <img src="./etc/images/menu-interactions/Slide22.PNG" width="700" />
966
971
 
967
972
  ### MenuItem selection
968
973
 
@@ -238,18 +238,13 @@ export declare type MenuItemSlots = {
238
238
  * Component children are placed in this slot
239
239
  * Avoid using the `children` property in this slot in favour of Component children whenever possible
240
240
  */
241
- content: IntrinsicShorthandProps<'span'>;
241
+ content?: IntrinsicShorthandProps<'span'>;
242
242
  /**
243
243
  * Secondary content rendered opposite the primary content (e.g Shortcut text)
244
244
  */
245
245
  secondaryContent?: IntrinsicShorthandProps<'span'>;
246
246
  };
247
247
 
248
- /**
249
- * Consts listing which props are shorthand props.
250
- */
251
- export declare const menuItemSlots: Array<keyof MenuItemSlots>;
252
-
253
248
  export declare type MenuItemState = ComponentState<MenuItemSlots> & MenuItemCommons;
254
249
 
255
250
  /**
@@ -386,6 +381,29 @@ export declare const MenuProvider: React_2.Provider<MenuContextValue> & React_2.
386
381
 
387
382
  export declare type MenuSlots = {};
388
383
 
384
+ /**
385
+ * Layout wrapper that provides extra keyboard navigation behavior for two `MenuItem` components.
386
+ */
387
+ export declare const MenuSplitGroup: ForwardRefComponent<MenuSplitGroupProps>;
388
+
389
+ export declare const menuSplitGroupClassName = "fui-MenuSplitGroup";
390
+
391
+ export declare type MenuSplitGroupCommons = {};
392
+
393
+ /**
394
+ * MenuSplitGroup Props
395
+ */
396
+ export declare type MenuSplitGroupProps = ComponentProps<MenuSplitGroupSlots> & MenuSplitGroupCommons;
397
+
398
+ export declare type MenuSplitGroupSlots = {
399
+ root: IntrinsicShorthandProps<'div'>;
400
+ };
401
+
402
+ /**
403
+ * State used in rendering MenuSplitGroup
404
+ */
405
+ export declare type MenuSplitGroupState = ComponentState<MenuSplitGroupSlots> & MenuSplitGroupCommons;
406
+
389
407
  export declare type MenuState = MenuCommons & ComponentState<MenuSlots> & {
390
408
  /**
391
409
  * Callback to open/close the popup
@@ -434,8 +452,9 @@ export declare const MenuTrigger: React_2.FC<MenuTriggerProps>;
434
452
  /**
435
453
  * Props that are passed to the child of the MenuTrigger when cloned to ensure correct behaviour for the Menu
436
454
  */
437
- export declare type MenuTriggerChildProps = Required<Pick<React_2.HTMLAttributes<HTMLElement>, 'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onContextMenu' | 'onKeyDown' | 'aria-haspopup' | 'aria-expanded' | 'id'>> & {
455
+ export declare type MenuTriggerChildProps = Required<Pick<React_2.HTMLAttributes<HTMLElement>, 'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onContextMenu' | 'onKeyDown' | 'aria-haspopup' | 'id'>> & {
438
456
  ref?: React_2.Ref<never>;
457
+ 'aria-expanded': boolean | undefined;
439
458
  };
440
459
 
441
460
  export declare const MenuTriggerContextProvider: React_2.Provider<boolean>;
@@ -498,6 +517,11 @@ export declare const renderMenuList: (state: MenuListState, contextValues: MenuL
498
517
  */
499
518
  export declare const renderMenuPopover: (state: MenuPopoverState) => JSX.Element;
500
519
 
520
+ /**
521
+ * Render the final JSX of MenuSplitGroup
522
+ */
523
+ export declare const renderMenuSplitGroup: (state: MenuSplitGroupState) => JSX.Element;
524
+
501
525
  /**
502
526
  * Render the final JSX of MenuTrigger
503
527
  *
@@ -535,7 +559,7 @@ export declare function useMenuContextValues(state: MenuState): MenuContextValue
535
559
  */
536
560
  export declare const useMenuDivider: (props: MenuDividerProps, ref: React_2.Ref<HTMLElement>) => MenuDividerState;
537
561
 
538
- export declare const useMenuDividerStyles: (state: MenuDividerState) => ComponentState<MenuDividerSlots>;
562
+ export declare const useMenuDividerStyles: (state: MenuDividerState) => MenuDividerState;
539
563
 
540
564
  /**
541
565
  * Given user props, returns state and render function for a MenuGroup.
@@ -551,7 +575,7 @@ export declare function useMenuGroupContextValues(state: MenuGroupState): MenuGr
551
575
  */
552
576
  export declare function useMenuGroupHeader(props: MenuGroupHeaderProps, ref: React_2.Ref<HTMLElement>): MenuGroupHeaderState;
553
577
 
554
- export declare const useMenuGroupHeaderStyles: (state: MenuGroupHeaderState) => ComponentState<MenuGroupHeaderSlots>;
578
+ export declare const useMenuGroupHeaderStyles: (state: MenuGroupHeaderState) => MenuGroupHeaderState;
555
579
 
556
580
  export declare const useMenuGroupStyles: (state: MenuGroupState) => MenuGroupState;
557
581
 
@@ -605,6 +629,22 @@ export declare const useMenuPopover: (props: MenuPopoverProps, ref: React_2.Ref<
605
629
  */
606
630
  export declare const useMenuPopoverStyles: (state: MenuPopoverState) => MenuPopoverState;
607
631
 
632
+ /**
633
+ * Create the state required to render MenuSplitGroup.
634
+ *
635
+ * The returned state can be modified with hooks such as useMenuSplitGroupStyles,
636
+ * before being passed to renderMenuSplitGroup.
637
+ *
638
+ * @param props - props from this instance of MenuSplitGroup
639
+ * @param ref - reference to root HTMLElement of MenuSplitGroup
640
+ */
641
+ export declare const useMenuSplitGroup: (props: MenuSplitGroupProps, ref: React_2.Ref<HTMLElement>) => MenuSplitGroupState;
642
+
643
+ /**
644
+ * Apply styling to the MenuSplitGroup slots based on the state
645
+ */
646
+ export declare const useMenuSplitGroupStyles: (state: MenuSplitGroupState) => MenuSplitGroupState;
647
+
608
648
  /**
609
649
  * Create the state required to render MenuTrigger.
610
650
  * Clones the only child component and adds necessary event handling behaviours to open a popup menu
@@ -0,0 +1 @@
1
+ export * from './components/MenuSplitGroup/index';
@@ -0,0 +1,2 @@
1
+ export * from './components/MenuSplitGroup/index';
2
+ //# sourceMappingURL=MenuSplitGroup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MenuSplitGroup.js","sourceRoot":"","sources":["../src/MenuSplitGroup.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}
@@ -4,7 +4,6 @@ import { useControllableState, useId, useOnClickOutside, useEventCallback } from
4
4
  import { useFluent } from '@fluentui/react-shared-contexts';
5
5
  import { elementContains } from '@fluentui/react-portal';
6
6
  import { useFocusFinders } from '@fluentui/react-tabster';
7
- import { MenuTrigger } from '../MenuTrigger/index';
8
7
  import { useMenuContext } from '../../contexts/menuContext';
9
8
  import { MENU_ENTER_EVENT, useOnMenuMouseEnter } from '../../utils/index';
10
9
  import { useIsSubmenu } from '../../utils/useIsSubmenu';
@@ -29,23 +28,28 @@ export const useMenu = props => {
29
28
  };
30
29
  const children = React.Children.toArray(props.children);
31
30
 
32
- if (children.length !== 2 && process.env.NODE_ENV !== 'production') {
33
- // eslint-disable-next-line no-console
34
- console.warn('Menu can only take one MenuTrigger and one MenuList as children');
35
- }
31
+ if (process.env.NODE_ENV !== 'production') {
32
+ if (children.length === 0) {
33
+ // eslint-disable-next-line no-console
34
+ console.warn('Menu must contain at least one child');
35
+ }
36
36
 
37
- const {
38
- menuTrigger,
39
- menuPopover
40
- } = children.reduce((acc, child) => {
41
- if (child.type === MenuTrigger) {
42
- acc.menuTrigger = child;
43
- } else {
44
- acc.menuPopover = child;
37
+ if (children.length > 2) {
38
+ // eslint-disable-next-line no-console
39
+ console.warn('Menu must contain at most two children');
45
40
  }
41
+ }
42
+
43
+ let menuTrigger = undefined;
44
+ let menuPopover = undefined;
45
+
46
+ if (children.length === 2) {
47
+ menuTrigger = children[0];
48
+ menuPopover = children[1];
49
+ } else if (children.length === 1) {
50
+ menuPopover = children[0];
51
+ }
46
52
 
47
- return acc;
48
- }, {});
49
53
  const {
50
54
  targetRef: triggerRef,
51
55
  containerRef: menuPopoverRef
@@ -61,7 +65,8 @@ export const useMenu = props => {
61
65
  menuTrigger,
62
66
  menuPopover,
63
67
  triggerRef,
64
- menuPopoverRef
68
+ menuPopoverRef,
69
+ components: {}
65
70
  }; // TODO Better way to narrow types ?
66
71
 
67
72
  const [open, setOpen] = useMenuOpenState(initialState);
@@ -227,15 +232,18 @@ const useMenuOpenState = state => {
227
232
  prevFocusable === null || prevFocusable === void 0 ? void 0 : prevFocusable.focus();
228
233
  }, [findPrevFocusable, state.triggerRef]);
229
234
  React.useEffect(() => {
230
- var _a;
231
-
232
- if (!shouldHandleKeyboardRef.current) {
233
- return;
235
+ if (open) {
236
+ focusFirst();
234
237
  }
238
+ }, [open, focusFirst]);
239
+ React.useEffect(() => {
240
+ var _a;
235
241
 
236
242
  if (open) {
237
243
  focusFirst();
238
- } else {
244
+ }
245
+
246
+ if (shouldHandleKeyboardRef.current && !open) {
239
247
  if (shouldHandleTabRef.current && !state.isSubmenu) {
240
248
  pressedShiftRef.current ? focusBeforeMenuTrigger() : focusAfterMenuTrigger();
241
249
  } else {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/components/Menu/useMenu.tsx"],"names":[],"mappings":"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","sourceRoot":""}
1
+ {"version":3,"sources":["../../../src/components/Menu/useMenu.tsx"],"names":[],"mappings":"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","sourceRoot":""}