@fluentui-react-native/menu 0.14.1 → 0.14.4

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 (92) hide show
  1. package/CHANGELOG.json +46 -1
  2. package/CHANGELOG.md +26 -2
  3. package/SPEC.md +344 -0
  4. package/lib/Menu/Menu.types.d.ts +1 -1
  5. package/lib/Menu/Menu.types.d.ts.map +1 -1
  6. package/lib/Menu/useMenu.d.ts.map +1 -1
  7. package/lib/Menu/useMenu.js +36 -7
  8. package/lib/Menu/useMenu.js.map +1 -1
  9. package/lib/MenuItem/useMenuItem.d.ts.map +1 -1
  10. package/lib/MenuItem/useMenuItem.js +4 -1
  11. package/lib/MenuItem/useMenuItem.js.map +1 -1
  12. package/lib/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
  13. package/lib/MenuItemRadio/useMenuItemRadio.js +9 -4
  14. package/lib/MenuItemRadio/useMenuItemRadio.js.map +1 -1
  15. package/lib/MenuList/MenuList.js +1 -1
  16. package/lib/MenuList/MenuList.js.map +1 -1
  17. package/lib/MenuList/MenuList.types.d.ts +10 -5
  18. package/lib/MenuList/MenuList.types.d.ts.map +1 -1
  19. package/lib/MenuList/useMenuList.d.ts.map +1 -1
  20. package/lib/MenuList/useMenuList.js +73 -26
  21. package/lib/MenuList/useMenuList.js.map +1 -1
  22. package/lib/MenuList/useMenuListContextValue.js +1 -1
  23. package/lib/MenuList/useMenuListContextValue.js.map +1 -1
  24. package/lib/MenuTrigger/MenuTrigger.d.ts +2 -2
  25. package/lib/MenuTrigger/MenuTrigger.d.ts.map +1 -1
  26. package/lib/MenuTrigger/MenuTrigger.js +5 -5
  27. package/lib/MenuTrigger/MenuTrigger.js.map +1 -1
  28. package/lib/MenuTrigger/MenuTrigger.types.d.ts +2 -2
  29. package/lib/MenuTrigger/MenuTrigger.types.d.ts.map +1 -1
  30. package/lib/MenuTrigger/useMenuTrigger.d.ts +2 -2
  31. package/lib/MenuTrigger/useMenuTrigger.d.ts.map +1 -1
  32. package/lib/MenuTrigger/useMenuTrigger.js +1 -1
  33. package/lib/MenuTrigger/useMenuTrigger.js.map +1 -1
  34. package/lib/__tests__/Menu.test.js +2 -2
  35. package/lib/__tests__/Menu.test.js.map +1 -1
  36. package/lib/context/menuContext.js +2 -2
  37. package/lib/context/menuListContext.d.ts +6 -4
  38. package/lib/context/menuListContext.d.ts.map +1 -1
  39. package/lib/context/menuListContext.js +2 -1
  40. package/lib/context/menuListContext.js.map +1 -1
  41. package/lib-commonjs/Menu/Menu.types.d.ts +1 -1
  42. package/lib-commonjs/Menu/Menu.types.d.ts.map +1 -1
  43. package/lib-commonjs/Menu/useMenu.d.ts.map +1 -1
  44. package/lib-commonjs/Menu/useMenu.js +36 -7
  45. package/lib-commonjs/Menu/useMenu.js.map +1 -1
  46. package/lib-commonjs/MenuItem/useMenuItem.d.ts.map +1 -1
  47. package/lib-commonjs/MenuItem/useMenuItem.js +4 -1
  48. package/lib-commonjs/MenuItem/useMenuItem.js.map +1 -1
  49. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
  50. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js +9 -4
  51. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js.map +1 -1
  52. package/lib-commonjs/MenuList/MenuList.js +1 -1
  53. package/lib-commonjs/MenuList/MenuList.js.map +1 -1
  54. package/lib-commonjs/MenuList/MenuList.types.d.ts +10 -5
  55. package/lib-commonjs/MenuList/MenuList.types.d.ts.map +1 -1
  56. package/lib-commonjs/MenuList/useMenuList.d.ts.map +1 -1
  57. package/lib-commonjs/MenuList/useMenuList.js +74 -27
  58. package/lib-commonjs/MenuList/useMenuList.js.map +1 -1
  59. package/lib-commonjs/MenuList/useMenuListContextValue.js +1 -1
  60. package/lib-commonjs/MenuList/useMenuListContextValue.js.map +1 -1
  61. package/lib-commonjs/MenuTrigger/MenuTrigger.d.ts +2 -2
  62. package/lib-commonjs/MenuTrigger/MenuTrigger.d.ts.map +1 -1
  63. package/lib-commonjs/MenuTrigger/MenuTrigger.js +5 -5
  64. package/lib-commonjs/MenuTrigger/MenuTrigger.js.map +1 -1
  65. package/lib-commonjs/MenuTrigger/MenuTrigger.types.d.ts +2 -2
  66. package/lib-commonjs/MenuTrigger/MenuTrigger.types.d.ts.map +1 -1
  67. package/lib-commonjs/MenuTrigger/useMenuTrigger.d.ts +2 -2
  68. package/lib-commonjs/MenuTrigger/useMenuTrigger.d.ts.map +1 -1
  69. package/lib-commonjs/MenuTrigger/useMenuTrigger.js +1 -1
  70. package/lib-commonjs/MenuTrigger/useMenuTrigger.js.map +1 -1
  71. package/lib-commonjs/__tests__/Menu.test.js +2 -2
  72. package/lib-commonjs/__tests__/Menu.test.js.map +1 -1
  73. package/lib-commonjs/context/menuContext.js +2 -2
  74. package/lib-commonjs/context/menuListContext.d.ts +6 -4
  75. package/lib-commonjs/context/menuListContext.d.ts.map +1 -1
  76. package/lib-commonjs/context/menuListContext.js +2 -1
  77. package/lib-commonjs/context/menuListContext.js.map +1 -1
  78. package/package.json +1 -1
  79. package/src/Menu/Menu.types.ts +1 -1
  80. package/src/Menu/useMenu.ts +53 -7
  81. package/src/MenuItem/useMenuItem.ts +6 -1
  82. package/src/MenuItemRadio/useMenuItemRadio.ts +11 -3
  83. package/src/MenuList/MenuList.tsx +1 -1
  84. package/src/MenuList/MenuList.types.ts +11 -5
  85. package/src/MenuList/useMenuList.ts +76 -37
  86. package/src/MenuList/useMenuListContextValue.ts +1 -1
  87. package/src/MenuTrigger/MenuTrigger.tsx +7 -7
  88. package/src/MenuTrigger/MenuTrigger.types.ts +2 -2
  89. package/src/MenuTrigger/useMenuTrigger.ts +2 -2
  90. package/src/__tests__/Menu.test.tsx +2 -2
  91. package/src/context/menuContext.ts +2 -2
  92. package/src/context/menuListContext.ts +5 -2
package/CHANGELOG.json CHANGED
@@ -2,7 +2,52 @@
2
2
  "name": "@fluentui-react-native/menu",
3
3
  "entries": [
4
4
  {
5
- "date": "Mon, 06 Jun 2022 19:19:10 GMT",
5
+ "date": "Mon, 13 Jun 2022 23:05:31 GMT",
6
+ "tag": "@fluentui-react-native/menu_v0.14.4",
7
+ "version": "0.14.4",
8
+ "comments": {
9
+ "patch": [
10
+ {
11
+ "author": "ruaraki@microsoft.com",
12
+ "package": "@fluentui-react-native/menu",
13
+ "commit": "4b0ff05c94a8c8ea7a1b00347c9b6590461d973a",
14
+ "comment": "Add comments"
15
+ }
16
+ ]
17
+ }
18
+ },
19
+ {
20
+ "date": "Mon, 13 Jun 2022 21:38:26 GMT",
21
+ "tag": "@fluentui-react-native/menu_v0.14.3",
22
+ "version": "0.14.3",
23
+ "comments": {
24
+ "patch": [
25
+ {
26
+ "author": "ruaraki@microsoft.com",
27
+ "package": "@fluentui-react-native/menu",
28
+ "commit": "7c5c2341dfa4faf9f72ced717e488a76d64581af",
29
+ "comment": "Close all menus when submenu item clicked"
30
+ }
31
+ ]
32
+ }
33
+ },
34
+ {
35
+ "date": "Mon, 06 Jun 2022 20:30:26 GMT",
36
+ "tag": "@fluentui-react-native/menu_v0.14.2",
37
+ "version": "0.14.2",
38
+ "comments": {
39
+ "patch": [
40
+ {
41
+ "author": "ruaraki@microsoft.com",
42
+ "package": "@fluentui-react-native/menu",
43
+ "commit": "59f213110a277b6414c0ab505d4fce2e825f4b81",
44
+ "comment": "Spec and minor fixes"
45
+ }
46
+ ]
47
+ }
48
+ },
49
+ {
50
+ "date": "Mon, 06 Jun 2022 19:20:10 GMT",
6
51
  "tag": "@fluentui-react-native/menu_v0.14.1",
7
52
  "version": "0.14.1",
8
53
  "comments": {
package/CHANGELOG.md CHANGED
@@ -1,12 +1,36 @@
1
1
  # Change Log - @fluentui-react-native/menu
2
2
 
3
- This log was last generated on Mon, 06 Jun 2022 19:19:10 GMT and should not be manually modified.
3
+ This log was last generated on Mon, 13 Jun 2022 23:05:31 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
+ ## 0.14.4
8
+
9
+ Mon, 13 Jun 2022 23:05:31 GMT
10
+
11
+ ### Patches
12
+
13
+ - Add comments (ruaraki@microsoft.com)
14
+
15
+ ## 0.14.3
16
+
17
+ Mon, 13 Jun 2022 21:38:26 GMT
18
+
19
+ ### Patches
20
+
21
+ - Close all menus when submenu item clicked (ruaraki@microsoft.com)
22
+
23
+ ## 0.14.2
24
+
25
+ Mon, 06 Jun 2022 20:30:26 GMT
26
+
27
+ ### Patches
28
+
29
+ - Spec and minor fixes (ruaraki@microsoft.com)
30
+
7
31
  ## 0.14.1
8
32
 
9
- Mon, 06 Jun 2022 19:19:10 GMT
33
+ Mon, 06 Jun 2022 19:20:10 GMT
10
34
 
11
35
  ### Patches
12
36
 
package/SPEC.md ADDED
@@ -0,0 +1,344 @@
1
+ # Menu
2
+
3
+ ## Background
4
+
5
+ A `Menu` is an component that displays a list of options on a temporary surface. They are invoked when users interact with a button, action, or other control.
6
+
7
+ ## Requirements
8
+
9
+ If using FURN's theming, the `Menu` and its sub-components require use of the `ThemeProvider` from `@fluentui-react-native/theme` to work properly with themes. Please see [this page](../../../docs/pages/Guides/UpdateThemeProvider.md) for information on updating your `ThemeProvider` if using the version from `@uifabricshared/theming-react-native`.
10
+
11
+ ## Sample code
12
+
13
+ The below samples do not represent the definitive props of the final implemented component, but represent the ideal final implementations. Can be subject to change during the implementation phase.
14
+
15
+ ### Basic Menu
16
+
17
+ ```tsx
18
+ const menu = (
19
+ <Menu>
20
+ <MenuTrigger><Button>Open menu</Button></MenuTrigger>
21
+ <MenuPopover>
22
+ <MenuList>
23
+ <MenuItem>Option 1</MenuItem>
24
+ <MenuItem>Option 2</MenuItem>
25
+ <MenuItem>Option 3</MenuItem>
26
+ </MenuList>
27
+ </MenuPopover>
28
+ <Menu>
29
+ )
30
+ ```
31
+
32
+ ### Submenus
33
+
34
+ ```tsx
35
+ const menu = (
36
+ <Menu>
37
+ <MenuTrigger><Button>Open menu</Button></MenuTrigger>
38
+ <MenuPopover>
39
+ <MenuList>
40
+ <MenuItem>Option 1</MenuItem>
41
+ <Menu>
42
+ <MenuTrigger>
43
+ <MenuItem>Open submenu</MenuItem>
44
+ </MenuTrigger>
45
+ <MenuPopover>
46
+ <MenuList>
47
+ <MenuItem>Option 1</MenuItem>
48
+ <MenuItem>Option 2</MenuItem>
49
+ <MenuItem>Option 3</MenuItem>
50
+ </MenuList>
51
+ </MenuPopover>
52
+ </Menu>
53
+ </MenuList>
54
+ </MenuPopover>
55
+ <Menu>
56
+ )
57
+ ```
58
+
59
+ ### Selection
60
+
61
+ ```tsx
62
+ const [selectedItems, setSelectedItems] = React.useState([]);
63
+ const menuCheckbox = (
64
+ <Menu
65
+ selectedItems={selectedItems}
66
+ onSelectionChange={setSeelctedItems}
67
+ >
68
+ <MenuTrigger><Button>Open menu</Button></MenuTrigger>
69
+ <MenuPopover>
70
+ <MenuList>
71
+ <MenuItemCheckbox name="checkbox1">Option 1</MenuItemCheckbox>
72
+ <MenuItemCheckbox name="checkbox2">Option 2</MenuItemCheckbox>
73
+ <MenuItemCheckbox name="checkbox3">Option 3</MenuItemCheckbox>
74
+ </MenuList>
75
+ </MenuPopover>
76
+ <Menu>
77
+ )
78
+ ```
79
+
80
+ ## Visual Examples
81
+
82
+ Coming soon
83
+
84
+ ## Variants
85
+
86
+ ### Nested menus
87
+
88
+ A `Menu` should be able to trigger a submenu, or an additional instance of `Menu`, as a part of one or more of its options. The nested `Menu` component should have the same functional capabilities as the root `Menu` component, however it will have some default behavioral differences.
89
+
90
+ Nested menus are by default triggered by hovering over a trigger, but can also be opened by invoking the trigger component for the nested `Menu`.
91
+
92
+ ### Selection state
93
+
94
+ A `Menu` should be able to track and represent the selection, or checked, state of its options.
95
+
96
+ When an option has a configurable selection state, it does not dismiss the `Menu` when toggled, as opposed to other options which close the `Menu` on being invoked by default.
97
+
98
+ ### Sections
99
+
100
+ A `Menu` can be divided into sections using dividers. The `Menu` does not support `MenuGroups` yet, but can visually represent sections using `MenuDividers`.
101
+
102
+ ### Disabled option(s)
103
+
104
+ All options in a `Menu` component can be disabled and should provide a visible indication for this purpose. Although disabled actions cannot be invoked, they are keyboard focusable for the purposes of accessibility.
105
+
106
+ ## API
107
+
108
+ ### Menu
109
+
110
+ The root level component serves as a simplified interface for configuring the triggering of a Menu.
111
+
112
+ ```ts
113
+ export interface MenuProps extends MenuListProps {
114
+ /**
115
+ * Whether the popup is open
116
+ */
117
+ open?: boolean;
118
+
119
+ /**
120
+ * Call back when the component requests to change value
121
+ */
122
+ onOpenChange?: (e: InteractionEvent, isOpen: boolean) => void;
123
+
124
+ /**
125
+ * Whether the popup is open by default
126
+ */
127
+ defaultOpen?: boolean;
128
+
129
+ /*
130
+ * Opens the menu on hover
131
+ */
132
+ openOnHover?: boolean;
133
+ }
134
+ ```
135
+
136
+ ### MenuTrigger
137
+
138
+ A non-visual component that wraps its child and configures them to be the trigger that will open a menu. This component should only accept one child. Accepts no other props.
139
+
140
+ ### MenuPopover
141
+
142
+ This component provides the temporary surface that will host the `Menu`'s options.
143
+
144
+ ```ts
145
+ export type MenuPopoverProps = ICalloutProps;
146
+ ```
147
+
148
+ ### MenuList
149
+
150
+ This component is used internally by `Menu` and manages the context and layout of its items.
151
+
152
+ #### MenuList Props
153
+
154
+ ```ts
155
+ export type MenuListProps = {
156
+ /**
157
+ * Callback when checked items change for value with a name
158
+ *
159
+ * @param checked Array of all checked values
160
+ */
161
+ onCheckedChange?: (e: InteractionEvent, checked[]) => void;
162
+
163
+ /**
164
+ * Array of all checked items
165
+ */
166
+ checked?: string[];
167
+
168
+ /**
169
+ * Default items to be checked on mount
170
+ */
171
+ defaultChecked?: string[];
172
+
173
+ /**
174
+ * States that menu items can contain selectable items and reserve slots for item alignment
175
+ */
176
+ hasCheckmarks?: boolean;
177
+ };
178
+ ```
179
+
180
+ #### MenuList Tokens
181
+
182
+ ```ts
183
+ export interface MenuListTokens extends LayoutTokens, IBackgroundColorTokens {
184
+ /**
185
+ * Space between items in pixels
186
+ */
187
+ gap?: number;
188
+ }
189
+ ```
190
+
191
+ #### MenuList Slots
192
+
193
+ - `root` - The container of the `Menu`'s options that wraps all `children`.
194
+
195
+ ### MenuDivider
196
+
197
+ Creates a divider element in the `MenuList`. This divider is purely visual and does not handle any grouping logic of the options in the `MenuList`.
198
+
199
+ ### MenuItem
200
+
201
+ #### MenuItem Props
202
+
203
+ ```ts
204
+ export interface MenuItemProps extends Omit<IWithPressableOptions<ViewProps>, 'onPress'> {
205
+ /**
206
+ * Text to show for the item
207
+ */
208
+ content: string;
209
+
210
+ /**
211
+ * A RefObject to access the IButton interface. Use this to access the public methods and properties of the component.
212
+ */
213
+ componentRef?: React.RefObject<IFocusable>;
214
+
215
+ /**
216
+ * A callback to call on button click event
217
+ */
218
+ onClick?: (e: InteractionEvent) => void;
219
+ }
220
+ ```
221
+
222
+ #### MenuItem Tokens
223
+
224
+ ```ts
225
+ export interface MenuItemTokens extends LayoutTokens, FontTokens, IBorderTokens, IColorTokens {
226
+ checkmarkSize?: number;
227
+ submenuIndicatorPadding?: number;
228
+ submenuIndicatorSize?: number;
229
+ gap?: number;
230
+
231
+ disabled?: MenuItemTokens;
232
+ focused?: MenuItemTokens;
233
+ hovered?: MenuItemTokens;
234
+ pressed?: MenuItemTokens;
235
+ }
236
+ ```
237
+
238
+ #### MenuItem Slots
239
+
240
+ - `root` - The outer container representing the `MenuItem` itself that wraps everything passed via the `children` prop.
241
+ - `content` - If specified, renders the `content` prop as text.
242
+ - `checkmark` - If specified, renders space such that the `content` aligns with other items which have checkmarks. Only used when the `Menu` has `hasCheckmarks`.
243
+ - `submenuIndicator` - If specified, renders an SVG which indicates that the `MenuItem` is a trigger for a nested `Menu`.
244
+
245
+ ### MenuItemCheckbox/Radio
246
+
247
+ Variants of `MenuItem` that allows a single or multiple selection state based on the value that it represents. These `MenuItems` do not support submenus. `MenuItemCheckbox` and `MenuItemRadio` share the same types for props, tokens, and slots.
248
+
249
+ #### MenuItemCheckbox/Radio Props
250
+
251
+ ```ts
252
+ export interface MenuItemCheckboxProps extends Omit<IWithPressableOptions<ViewProps>, 'onPress'> {
253
+ content: string;
254
+
255
+ /**
256
+ * Applies disabled styles to menu item but remains focusable
257
+ */
258
+ disabled?: boolean;
259
+
260
+ /**
261
+ * A RefObject to access the IButton interface. Use this to access the public methods and properties of the component.
262
+ */
263
+ componentRef?: React.RefObject<IFocusable>;
264
+
265
+ /**
266
+ * Identifier for the control
267
+ */
268
+ name: string;
269
+ }
270
+ ```
271
+
272
+ #### MenuItemCheckbox/Radio Tokens
273
+
274
+ ```ts
275
+ export interface MenuItemCheckboxTokens extends LayoutTokens, FontTokens, IBorderTokens, IColorTokens {
276
+ checkmarkColor?: ColorValue;
277
+ checkmarkPadding?: number;
278
+ checkmarkSize?: number;
279
+ checkmarkVisibility?: number;
280
+ gap?: number;
281
+
282
+ checked?: MenuItemCheckboxTokens;
283
+ disabled?: MenuItemCheckboxTokens;
284
+ focused?: MenuItemCheckboxTokens;
285
+ hovered?: MenuItemCheckboxTokens;
286
+ pressed?: MenuItemCheckboxTokens;
287
+ }
288
+ ```
289
+
290
+ #### MenuItemCheckbox/Radio Slots
291
+
292
+ - `root` - The outer container representing the `MenuItem` itself that wraps everything passed via the `children` prop.
293
+ - `content` - If specified, renders the `content` prop as text.
294
+ - `checkmark` - If specified, renders an SVG which indicates that the `MenuItem` is selected.
295
+
296
+ ## Behaviors
297
+
298
+ ### Mouse interactions
299
+
300
+ - Clicking on a menu's trigger will open the menu
301
+ - Clicking outside of a menu's trigger and popover will light dismiss the menu
302
+ - Clicking on a `MenuItem` which is not configured to track selection will invoke the `MenuItem` and close the menu by default
303
+ - Clicking on a `MenuItem` variant which is configured to track selection will toggle its selection state in the configured way and not close the menu.
304
+ - If the menu is configured to open on hover, it will only close once the mouse leaves both the trigger and the popover. There is a delay for this behavior.
305
+ - Submenus are configured to open on hover by default. If the mouse stops hovering over the submenu, only the submenu will close.
306
+
307
+ ### Keyboard interactions
308
+
309
+ - When a menu is invoked via keyboard, open the menu and place focus on the first focusable element by default.
310
+ - Up and down inside of the menu that has focus should navigate vertically between keyboard focusable elements
311
+ - On win32, up and down should circularly navigate through a list of menu items. On MacOS, circular navigation does not occur.
312
+ - Right key on a menu item that has an available submenu or split button should invoke the submenu, and move focus into it onto the first focusable item (Left in RTL)
313
+ - Left key when in a submenu should close the submenu and place focus back on the parent menu's item that opened the submenu. (Right in RTL)
314
+ - ESC on a menu should close the currently focused menu. If focus is in a submenu and ESC is hit, it should only close the current submenu and return focus to the parent's element where focus was previously.
315
+ - Space and Enter key execute the action that is currently focused in the menu.
316
+
317
+ ### MenuItem selection
318
+
319
+ Below are the interactions that should be supported for all menu items that are required to handle a selection state.
320
+
321
+ In the event that the selection method is a radio, the previous selected item must be unselected.
322
+
323
+ | Type | Action | Result | Details |
324
+ | ------------- | ------ | ------ | -------------------------------------------- |
325
+ | Keyboard | Space | Toggle | Toggle the selection status of the menu item |
326
+ | Keyboard | Enter | Toggle | Toggle the selection status of the menu item |
327
+ | Mouse | Click | Toggle | Toggle the selection status of the menu item |
328
+ | Accessibility | Toggle | Toggle | Toggle the selection status of the menu item |
329
+
330
+ ### Positioning
331
+
332
+ #### Menu positioning
333
+
334
+ The default positioning for the root `Menu` is below the trigger and aligned with the left (or right in RTL) edge.
335
+
336
+ #### Submenu positioning
337
+
338
+ The default positioning for a submenu is to the right of the menu item trigger (or left in RTL) and aligned with the top edge.
339
+
340
+ ## Accessibility
341
+
342
+ The `MenuTrigger` will set `expand` or `collapsed` state and will respond to actions which explicitly tell it to expand or collapse (win32 only)
343
+ The `MenuPopover` has its role set to `menu`, and `MenuItmes` and variants have their role set to `menuitem`.
344
+ The `MenuItem` variants which track selection have the `Toggle` pattern available.
@@ -13,7 +13,7 @@ export interface MenuState extends MenuProps {
13
13
  isControlled: boolean;
14
14
  isSubmenu: boolean;
15
15
  parentPopoverHoverOutTimer?: NodeJS.Timeout;
16
- setOpen: (e: InteractionEvent, isOpen: boolean) => void;
16
+ setOpen: (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void;
17
17
  triggerRef: React.RefObject<React.Component>;
18
18
  }
19
19
  //# sourceMappingURL=Menu.types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Menu.types.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxD,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;CAC9C"}
1
+ {"version":3,"file":"Menu.types.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1E,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;CAC9C"}
@@ -1 +1 @@
1
- {"version":3,"file":"useMenu.d.ts","sourceRoot":"","sources":["../../src/Menu/useMenu.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,OAAO,UAAW,SAAS,KAAG,SA4B1C,CAAC"}
1
+ {"version":3,"file":"useMenu.d.ts","sourceRoot":"","sources":["../../src/Menu/useMenu.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AASpD,eAAO,MAAM,OAAO,UAAW,SAAS,KAAG,SAgC1C,CAAC"}
@@ -1,12 +1,19 @@
1
1
  import { __assign } from "tslib";
2
2
  import React from 'react';
3
3
  import { useMenuContext } from '../context/menuContext';
4
+ // Due to how events get fired we get double notifications
5
+ // for the same event causing us to immediately reopen
6
+ // a menu when we close it. Adding in a delay to prevent
7
+ // this behavior.
8
+ var delayOpen = 150;
9
+ var lastCloseTimestamp = -1;
4
10
  export var useMenu = function (props) {
5
11
  var triggerRef = React.useRef();
6
12
  var context = useMenuContext();
7
13
  var isSubmenu = context.triggerRef !== null;
8
- var isControlled = typeof props.open !== 'undefined';
9
- var _a = useMenuOpenState(isControlled, props), open = _a[0], setOpen = _a[1];
14
+ var isOpenControlled = typeof props.open !== 'undefined';
15
+ var _a = useMenuOpenState(isOpenControlled, props, context.setOpen), open = _a[0], setOpen = _a[1];
16
+ var _b = useMenuCheckedState(props), checked = _b[0], onCheckedChange = _b[1];
10
17
  // Default behavior for submenu is to open on hover
11
18
  // the ...props line below will override this behavior for a submenu
12
19
  // or apply openOnHover if passed into a root Menu.
@@ -16,22 +23,44 @@ export var useMenu = function (props) {
16
23
  // is also set to open/close on hover out. Otherwise
17
24
  // the parent menu will close when the timeout passes.
18
25
  var parentPopoverHoverOutTimer = isSubmenu ? context.popoverHoverOutTimer : undefined;
19
- return __assign(__assign({ openOnHover: openOnHover }, props), { open: open, setOpen: setOpen, triggerRef: triggerRef, isSubmenu: isSubmenu, isControlled: isControlled, parentPopoverHoverOutTimer: parentPopoverHoverOutTimer });
26
+ return __assign(__assign({ openOnHover: openOnHover }, props), { open: open, setOpen: setOpen, checked: checked, onCheckedChange: onCheckedChange, triggerRef: triggerRef, isSubmenu: isSubmenu, isControlled: isOpenControlled, parentPopoverHoverOutTimer: parentPopoverHoverOutTimer });
20
27
  };
21
- var useMenuOpenState = function (isControlled, props) {
28
+ var useMenuOpenState = function (isControlled, props, parentSetOpen) {
22
29
  var defaultOpen = props.defaultOpen, onOpenChange = props.onOpenChange, open = props.open;
23
30
  var initialState = typeof defaultOpen !== 'undefined' ? defaultOpen : !!open;
24
31
  var _a = React.useState(initialState), openInternal = _a[0], setOpenInternal = _a[1];
25
32
  var state = isControlled ? open : openInternal;
26
- var setOpen = React.useCallback(function (e, isOpen) {
33
+ var setOpen = React.useCallback(function (e, isOpen, bubble) {
27
34
  var openPrev = state;
28
35
  if (!isControlled) {
29
- setOpenInternal(isOpen);
36
+ if (!isOpen || lastCloseTimestamp + delayOpen <= Date.now()) {
37
+ setOpenInternal(isOpen);
38
+ }
39
+ if (!isOpen) {
40
+ lastCloseTimestamp = Date.now();
41
+ }
30
42
  }
31
43
  if (onOpenChange && openPrev !== isOpen) {
32
44
  onOpenChange(e, isOpen);
33
45
  }
34
- }, [isControlled, state, onOpenChange, setOpenInternal]);
46
+ if (bubble && parentSetOpen) {
47
+ parentSetOpen(e, isOpen, bubble);
48
+ }
49
+ }, [isControlled, state, onOpenChange, setOpenInternal, parentSetOpen]);
35
50
  return [state, setOpen];
36
51
  };
52
+ var useMenuCheckedState = function (props) {
53
+ var _a;
54
+ var checked = props.checked, defaultChecked = props.defaultChecked, onCheckedChangeOriginal = props.onCheckedChange;
55
+ var _b = React.useState((_a = defaultChecked !== null && defaultChecked !== void 0 ? defaultChecked : checked) !== null && _a !== void 0 ? _a : []), checkedInternal = _b[0], setCheckedInternal = _b[1];
56
+ var isControlled = typeof checked !== 'undefined';
57
+ var state = isControlled ? checked : checkedInternal;
58
+ var onCheckedChange = React.useCallback(function (e, checked) {
59
+ if (!isControlled) {
60
+ setCheckedInternal(checked);
61
+ }
62
+ onCheckedChangeOriginal === null || onCheckedChangeOriginal === void 0 ? void 0 : onCheckedChangeOriginal(e, checked);
63
+ }, [isControlled, setCheckedInternal, onCheckedChangeOriginal]);
64
+ return [state, onCheckedChange];
65
+ };
37
66
  //# sourceMappingURL=useMenu.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useMenu.js","sourceRoot":"","sources":["../../src/Menu/useMenu.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,MAAM,CAAC,IAAM,OAAO,GAAG,UAAC,KAAgB;IACtC,IAAM,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;IAClC,IAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,IAAM,SAAS,GAAG,OAAO,CAAC,UAAU,KAAK,IAAI,CAAC;IAC9C,IAAM,YAAY,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;IACjD,IAAA,KAAkB,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC,EAAtD,IAAI,QAAA,EAAE,OAAO,QAAyC,CAAC;IAE9D,mDAAmD;IACnD,oEAAoE;IACpE,mDAAmD;IACnD,IAAM,WAAW,GAAG,SAAS,CAAC;IAE9B,0DAA0D;IAC1D,wDAAwD;IACxD,oDAAoD;IACpD,sDAAsD;IACtD,IAAM,0BAA0B,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC;IAExF,2BACE,WAAW,aAAA,IACR,KAAK,KACR,IAAI,MAAA,EACJ,OAAO,SAAA,EACP,UAAU,YAAA,EACV,SAAS,WAAA,EACT,YAAY,cAAA,EACZ,0BAA0B,4BAAA,IAC1B;AACJ,CAAC,CAAC;AAEF,IAAM,gBAAgB,GAAG,UAAC,YAAqB,EAAE,KAAgB;IACvD,IAAA,WAAW,GAAyB,KAAK,YAA9B,EAAE,YAAY,GAAW,KAAK,aAAhB,EAAE,IAAI,GAAK,KAAK,KAAV,CAAW;IAClD,IAAM,YAAY,GAAG,OAAO,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzE,IAAA,KAAkC,KAAK,CAAC,QAAQ,CAAU,YAAY,CAAC,EAAtE,YAAY,QAAA,EAAE,eAAe,QAAyC,CAAC;IAE9E,IAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;IAEjD,IAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAC/B,UAAC,CAAmB,EAAE,MAAe;QACnC,IAAM,QAAQ,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,YAAY,EAAE;YACjB,eAAe,CAAC,MAAM,CAAC,CAAC;SACzB;QACD,IAAI,YAAY,IAAI,QAAQ,KAAK,MAAM,EAAE;YACvC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;SACzB;IACH,CAAC,EACD,CAAC,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,CAAC,CACrD,CAAC;IAEF,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC1B,CAAC,CAAC"}
1
+ {"version":3,"file":"useMenu.js","sourceRoot":"","sources":["../../src/Menu/useMenu.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUhE,eAAO,MAAM,WAAW,UAAW,aAAa,KAAG,aAgElD,CAAC"}
1
+ {"version":3,"file":"useMenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUhE,eAAO,MAAM,WAAW,UAAW,aAAa,KAAG,aAqElD,CAAC"}
@@ -34,7 +34,10 @@ export var useMenuItem = function (props) {
34
34
  }
35
35
  onClick === null || onClick === void 0 ? void 0 : onClick(e);
36
36
  if (!hasSubmenu) {
37
- setOpen(e, false /*isOpen*/);
37
+ var isArrowClose = isKeyPressEvent(e) &&
38
+ isInSubmenu &&
39
+ ((isRtl && e.nativeEvent.key === 'ArrowRight') || (!isRtl && e.nativeEvent.key === 'ArrowLeft'));
40
+ setOpen(e, false /*isOpen*/, !isArrowClose /*bubble*/);
38
41
  }
39
42
  }, [disabled, hasSubmenu, isInSubmenu, onClick, setOpen]);
40
43
  var pressable = useAsPressable(__assign(__assign({}, rest), { disabled: disabled, onPress: onInvoke }));
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useMenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItemRadio.d.ts","sourceRoot":"","sources":["../../src/MenuItemRadio/useMenuItemRadio.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAG1G,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,KAAG,qBAgB/D,CAAC"}
1
+ {"version":3,"file":"useMenuItemRadio.d.ts","sourceRoot":"","sources":["../../src/MenuItemRadio/useMenuItemRadio.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAG1G,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,KAAG,qBAwB/D,CAAC"}
@@ -2,16 +2,21 @@ import * as React from 'react';
2
2
  import { useMenuListContext } from '../context/menuListContext';
3
3
  import { useMenuCheckboxInteraction } from '../MenuItemCheckbox/useMenuItemCheckbox';
4
4
  export var useMenuItemRadio = function (props) {
5
- var _a;
6
5
  var disabled = props.disabled, name = props.name;
7
6
  var context = useMenuListContext();
8
- var checked = (_a = context.checked) === null || _a === void 0 ? void 0 : _a[name];
9
7
  var selectRadio = context.selectRadio;
10
8
  var toggleChecked = React.useCallback(function (e) {
11
9
  if (!disabled) {
12
- selectRadio(e, name, !checked);
10
+ selectRadio(e, name);
13
11
  }
14
- }, [checked, disabled, name, selectRadio]);
12
+ }, [disabled, name, selectRadio]);
13
+ // Explicitly only run on mount and unmount
14
+ React.useEffect(function () {
15
+ context.addRadioItem(name);
16
+ return function () {
17
+ context.removeRadioItem(name);
18
+ };
19
+ }, []); // eslint-disable-line react-hooks/exhaustive-deps
15
20
  return useMenuCheckboxInteraction(props, toggleChecked);
16
21
  };
17
22
  //# sourceMappingURL=useMenuItemRadio.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItemRadio.js","sourceRoot":"","sources":["../../src/MenuItemRadio/useMenuItemRadio.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAErF,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,KAA4B;;IACnD,IAAA,QAAQ,GAAW,KAAK,SAAhB,EAAE,IAAI,GAAK,KAAK,KAAV,CAAW;IACjC,IAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,IAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,IAAI,CAAC,CAAC;IACxC,IAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,IAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CACrC,UAAC,CAAmB;QAClB,IAAI,CAAC,QAAQ,EAAE;YACb,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;SAChC;IACH,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CACvC,CAAC;IAEF,OAAO,0BAA0B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC"}
1
+ {"version":3,"file":"useMenuItemRadio.js","sourceRoot":"","sources":["../../src/MenuItemRadio/useMenuItemRadio.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAErF,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,KAA4B;IACnD,IAAA,QAAQ,GAAW,KAAK,SAAhB,EAAE,IAAI,GAAK,KAAK,KAAV,CAAW;IACjC,IAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,IAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,IAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CACrC,UAAC,CAAmB;QAClB,IAAI,CAAC,QAAQ,EAAE;YACb,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;SACtB;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAC9B,CAAC;IAEF,2CAA2C;IAC3C,KAAK,CAAC,SAAS,CAAC;QACd,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE3B,OAAO;YACL,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kDAAkD;IAE1D,OAAO,0BAA0B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC"}
@@ -30,7 +30,7 @@ export var MenuList = compose(__assign(__assign({ displayName: menuListName }, s
30
30
  }, useRender: function (userProps, useSlots) {
31
31
  var menuList = useMenuList(userProps);
32
32
  var contextValue = useMenuListContextValue(menuList);
33
- var Slots = useSlots(menuList);
33
+ var Slots = useSlots(menuList.props);
34
34
  return function (_final, children) {
35
35
  return (withSlots(MenuListProvider, { value: contextValue },
36
36
  withSlots(Slots.root, null, children)));
@@ -1 +1 @@
1
- {"version":3,"file":"MenuList.js","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":";AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAY,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7G,OAAO,EAAE,YAAY,EAA+B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,IAAM,SAAS,GAAG,eAAe,CAAC,UAAC,KAAwD;IACjF,IAAA,GAAG,GAAc,KAAK,IAAnB,EAAK,IAAI,UAAK,KAAK,EAAxB,OAAgB,CAAF,CAAW;IAC/B,OAAO,UAAC,KAAwD,EAAE,QAAyB;QACzF,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC,IAAI,QAAQ,EAAE;YAC9B,6DAA6D;YAC7D,yCAAyC;YACzC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,KAAuB,EAAE,KAAa;gBAC7E,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE;oBAC5C,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBAC1F;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,UAAC,IAAI,eAAK,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAQ,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;AAEpC,MAAM,CAAC,IAAM,QAAQ,GAAG,OAAO,qBAC7B,WAAW,EAAE,YAAY,IACtB,eAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;KAChB,EACD,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,YAAY,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEjC,OAAO,UAAC,MAAqB,EAAE,QAAyB;YACtD,OAAO,CACL,UAAC,gBAAgB,IAAC,KAAK,EAAE,YAAY;gBACnC,UAAC,KAAK,CAAC,IAAI,QAAE,QAAQ,CAAc,CAClB,CACpB,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,IACD,CAAC"}
1
+ {"version":3,"file":"MenuList.js","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":";AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAY,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7G,OAAO,EAAE,YAAY,EAA+B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,IAAM,SAAS,GAAG,eAAe,CAAC,UAAC,KAAwD;IACjF,IAAA,GAAG,GAAc,KAAK,IAAnB,EAAK,IAAI,UAAK,KAAK,EAAxB,OAAgB,CAAF,CAAW;IAC/B,OAAO,UAAC,KAAwD,EAAE,QAAyB;QACzF,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC,IAAI,QAAQ,EAAE;YAC9B,6DAA6D;YAC7D,yCAAyC;YACzC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,KAAuB,EAAE,KAAa;gBAC7E,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE;oBAC5C,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBAC1F;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,UAAC,IAAI,eAAK,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAQ,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;AAEpC,MAAM,CAAC,IAAM,QAAQ,GAAG,OAAO,qBAC7B,WAAW,EAAE,YAAY,IACtB,eAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;KAChB,EACD,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,YAAY,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvC,OAAO,UAAC,MAAqB,EAAE,QAAyB;YACtD,OAAO,CACL,UAAC,gBAAgB,IAAC,KAAK,EAAE,YAAY;gBACnC,UAAC,KAAK,CAAC,IAAI,QAAE,QAAQ,CAAc,CAClB,CACpB,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,IACD,CAAC"}