idea-react 3.0.0-beta.0 → 3.0.0-beta.2

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 (130) hide show
  1. package/AGENTS.md +19 -2
  2. package/ReadMe.md +95 -54
  3. package/dist/DatePickerPlugin-CpGuQRsi.js +1 -0
  4. package/dist/DatePickerPlugin-DB3nnslN.mjs +1 -0
  5. package/dist/index.d.mts +1232 -474
  6. package/dist/index.d.ts +1232 -474
  7. package/dist/index.js +16 -16
  8. package/dist/index.mjs +15 -15
  9. package/dist/rolldown-runtime-5iZMYShA.js +1 -0
  10. package/dist/style.css +66 -66
  11. package/package.json +1 -1
  12. package/source/Accordion.tsx +161 -0
  13. package/source/Alert.tsx +153 -0
  14. package/source/Avatar.tsx +57 -46
  15. package/source/Badge.tsx +17 -15
  16. package/source/Breadcrumb.tsx +50 -0
  17. package/source/Button.tsx +69 -40
  18. package/source/ButtonGroup.tsx +23 -18
  19. package/source/Card.tsx +86 -17
  20. package/source/Carousel/index.tsx +392 -0
  21. package/source/Carousel/model.ts +113 -0
  22. package/source/Carousel/scroll.ts +79 -0
  23. package/source/CloseButton.tsx +20 -15
  24. package/source/Collapse.tsx +233 -0
  25. package/source/Drawer.tsx +158 -38
  26. package/source/{ClickBoundary.tsx → Extension/ClickBoundary.tsx} +24 -5
  27. package/source/Extension/CodeBlock.tsx +64 -0
  28. package/source/{Countdown.tsx → Extension/Countdown.tsx} +21 -9
  29. package/source/{Dialog.tsx → Extension/Dialog.tsx} +10 -6
  30. package/source/Extension/Editor.tsx +78 -0
  31. package/source/Extension/EditorHTML.tsx +20 -0
  32. package/source/{HorizontalMarquee → Extension/HorizontalMarquee}/index.module.less +1 -3
  33. package/source/Extension/HorizontalMarquee/index.tsx +85 -0
  34. package/source/Extension/Icon.tsx +19 -0
  35. package/source/Extension/Loading.tsx +30 -0
  36. package/source/{MonthCalendar.tsx → Extension/MonthCalendar.tsx} +29 -13
  37. package/source/{Nameplate.tsx → Extension/Nameplate.tsx} +1 -1
  38. package/source/Extension/OverlayBox.tsx +293 -0
  39. package/source/{PageNav.tsx → Extension/PageNav.tsx} +43 -16
  40. package/source/{ScrollNav → Extension/ScrollNav}/Scroller.tsx +21 -5
  41. package/source/Extension/ScrollNav/index.tsx +47 -0
  42. package/source/Extension/Select.tsx +128 -0
  43. package/source/{ShareBox.tsx → Extension/ShareBox.tsx} +1 -1
  44. package/source/Extension/SpinnerButton.tsx +30 -0
  45. package/source/Extension/TableSpinner.tsx +22 -0
  46. package/source/Extension/TextTruncate/index.tsx +29 -0
  47. package/source/Extension/Time.tsx +17 -0
  48. package/source/Extension/TimeDistance.tsx +45 -0
  49. package/source/Extension/Timeline/index.tsx +63 -0
  50. package/source/Extension/TypeEcho/Content.tsx +123 -0
  51. package/source/Extension/TypeEcho/index.tsx +22 -0
  52. package/source/Extension/UserRank/Address.tsx +22 -0
  53. package/source/Extension/UserRank/index.tsx +106 -0
  54. package/source/Extension/VerticalMarquee/index.tsx +23 -0
  55. package/source/Extension/ZodiacBar.tsx +59 -0
  56. package/source/Extension/index.ts +27 -0
  57. package/source/Form/Adorn.tsx +45 -26
  58. package/source/Form/Checkbox.tsx +20 -11
  59. package/source/Form/ChipInput.tsx +129 -0
  60. package/source/Form/Chips.tsx +57 -37
  61. package/source/Form/Combobox.tsx +362 -78
  62. package/source/Form/Control.tsx +72 -42
  63. package/source/Form/DatePicker.tsx +245 -45
  64. package/source/Form/DatePickerPlugin.ts +37 -0
  65. package/source/Form/Feedback.tsx +21 -16
  66. package/source/Form/FloatingLabel.tsx +21 -7
  67. package/source/Form/InputGroup.tsx +162 -11
  68. package/source/Form/OTP.tsx +156 -45
  69. package/source/Form/PasswordStrength.tsx +43 -17
  70. package/source/Form/Plugin.tsx +53 -0
  71. package/source/Form/Primitives.tsx +70 -20
  72. package/source/Form/Radio.tsx +35 -40
  73. package/source/Form/Range.tsx +125 -56
  74. package/source/Form/Switch.tsx +53 -27
  75. package/source/Form/index.ts +1 -0
  76. package/source/Grid.tsx +68 -56
  77. package/source/Image.tsx +10 -6
  78. package/source/ListGroup.tsx +59 -58
  79. package/source/Menu.tsx +317 -46
  80. package/source/NativeDialog/index.tsx +148 -22
  81. package/source/Nav.tsx +49 -33
  82. package/source/NavOverflow/index.tsx +323 -0
  83. package/source/NavOverflow/model.ts +21 -0
  84. package/source/Navbar.tsx +65 -45
  85. package/source/Overlay.ts +163 -1
  86. package/source/Pagination.tsx +86 -0
  87. package/source/Placeholder.tsx +70 -0
  88. package/source/Polymorphic.ts +57 -0
  89. package/source/Popover.tsx +34 -26
  90. package/source/Progress/index.tsx +81 -0
  91. package/source/Progress/style.module.css +15 -0
  92. package/source/ScrollSpy/index.tsx +380 -0
  93. package/source/ScrollSpy/model.ts +17 -0
  94. package/source/Spinner.tsx +31 -17
  95. package/source/Stack.tsx +25 -0
  96. package/source/Stepper.tsx +91 -0
  97. package/source/Tab.tsx +261 -0
  98. package/source/Table.tsx +53 -42
  99. package/source/Toast.tsx +93 -46
  100. package/source/ToggleButton.tsx +47 -30
  101. package/source/Toggler.tsx +117 -0
  102. package/source/Tooltip.tsx +31 -24
  103. package/source/index.ts +17 -27
  104. package/source/CodeBlock.tsx +0 -40
  105. package/source/Editor.tsx +0 -43
  106. package/source/EditorHTML.tsx +0 -16
  107. package/source/HorizontalMarquee/index.tsx +0 -61
  108. package/source/Icon.tsx +0 -24
  109. package/source/Loading.tsx +0 -22
  110. package/source/OverlayBox.tsx +0 -208
  111. package/source/ScrollNav/index.tsx +0 -22
  112. package/source/Select.tsx +0 -95
  113. package/source/SpinnerButton.tsx +0 -35
  114. package/source/TableSpinner.tsx +0 -26
  115. package/source/TextTruncate/index.tsx +0 -25
  116. package/source/Time.tsx +0 -15
  117. package/source/TimeDistance.tsx +0 -41
  118. package/source/Timeline/index.tsx +0 -60
  119. package/source/TypeEcho/Content.tsx +0 -58
  120. package/source/TypeEcho/index.tsx +0 -14
  121. package/source/UserRank/Address.tsx +0 -20
  122. package/source/UserRank/index.tsx +0 -111
  123. package/source/VerticalMarquee/index.tsx +0 -25
  124. package/source/ZodiacBar.tsx +0 -51
  125. /package/source/{LiveTSX.tsx → Extension/LiveTSX.tsx} +0 -0
  126. /package/source/{ScrollNav → Extension/ScrollNav}/index.module.less +0 -0
  127. /package/source/{TextTruncate → Extension/TextTruncate}/Content.tsx +0 -0
  128. /package/source/{Timeline → Extension/Timeline}/index.module.less +0 -0
  129. /package/source/{UserRank → Extension/UserRank}/index.module.less +0 -0
  130. /package/source/{VerticalMarquee → Extension/VerticalMarquee}/index.module.less +0 -0
package/source/Menu.tsx CHANGED
@@ -6,72 +6,185 @@ import { observer } from 'mobx-react';
6
6
  import {
7
7
  Component,
8
8
  createRef,
9
- FC,
9
+ ElementType,
10
10
  FocusEvent,
11
11
  HTMLAttributes,
12
12
  KeyboardEvent,
13
13
  MouseEvent,
14
- PropsWithChildren,
15
14
  ReactNode
16
15
  } from 'react';
17
16
 
18
17
  import { Button, ButtonProps } from './Button';
19
-
20
- export const MenuItem: FC<ButtonProps> = ({ className, ...props }) => (
21
- <Button {...props} className={classNames('menu-item', className)} />
18
+ import { Icon, IconProps } from './Extension/Icon';
19
+ import { Breakpoint } from './Grid';
20
+ import { FloatingOptions, FloatingPosition } from './Overlay';
21
+ import { AsProps, polymorphic, PolymorphicClassProps } from './Polymorphic';
22
+
23
+ export type MenuItemProps = ButtonProps & { active?: boolean; selected?: boolean };
24
+
25
+ export const MenuItem = polymorphic<MenuItemProps>(
26
+ ({ as: RootAs, active, selected, className, ...props }) => (
27
+ <Button
28
+ as={RootAs}
29
+ {...props}
30
+ className={classNames('menu-item', { active, selected }, className)}
31
+ aria-current={active || (selected && props.href) ? 'true' : props['aria-current']}
32
+ aria-pressed={props.href ? props['aria-pressed'] : (selected ?? props['aria-pressed'])}
33
+ />
34
+ )
22
35
  );
36
+ MenuItem.displayName = 'MenuItem';
37
+
38
+ export interface MenuPanelProps extends HTMLAttributes<HTMLDivElement> {
39
+ theme?: 'light' | 'dark';
40
+ translucent?: boolean;
41
+ scrollable?: boolean;
42
+ show?: boolean;
43
+ }
23
44
 
24
- export const MenuPanel: FC<HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
25
- <div {...props} className={classNames('menu', className)} />
45
+ export const MenuPanel = polymorphic<MenuPanelProps>(
46
+ ({ as: Root = 'div', theme, translucent, scrollable, show, className, ...props }) => (
47
+ <Root
48
+ {...props}
49
+ data-bs-theme={theme}
50
+ className={classNames(
51
+ 'menu',
52
+ { show },
53
+ translucent && 'menu-translucent',
54
+ scrollable && 'menu-scrollable',
55
+ className
56
+ )}
57
+ />
58
+ )
59
+ );
60
+ MenuPanel.displayName = 'MenuPanel';
61
+
62
+ export const MenuItemIcon = polymorphic<IconProps>(({ as: RootAs, className, ...props }) => (
63
+ <Icon
64
+ as={RootAs}
65
+ aria-hidden="true"
66
+ {...props}
67
+ className={classNames('menu-item-icon', className)}
68
+ />
69
+ ));
70
+ MenuItemIcon.displayName = 'MenuItemIcon';
71
+
72
+ export const MenuItemCheck = polymorphic<Omit<IconProps, 'name'>>(
73
+ ({ as: RootAs, className, ...props }) => (
74
+ <Icon
75
+ as={RootAs}
76
+ aria-hidden="true"
77
+ {...props}
78
+ name="check"
79
+ className={classNames('menu-item-check', className)}
80
+ />
81
+ )
26
82
  );
83
+ MenuItemCheck.displayName = 'MenuItemCheck';
27
84
 
28
- export const MenuText: FC<HTMLAttributes<HTMLSpanElement>> = ({ className, ...props }) => (
29
- <span {...props} className={classNames('menu-text', className)} />
85
+ export const MenuText = polymorphic<HTMLAttributes<HTMLSpanElement>>(
86
+ ({ as: Root = 'span', className, ...props }) => (
87
+ <Root {...props} className={classNames('menu-text', className)} />
88
+ )
30
89
  );
90
+ MenuText.displayName = 'MenuText';
31
91
 
32
- export const MenuHeader: FC<HTMLAttributes<HTMLHeadingElement>> = ({ className, ...props }) => (
33
- <h6 {...props} className={classNames('menu-header', className)} />
92
+ export const MenuHeader = polymorphic<HTMLAttributes<HTMLHeadingElement>>(
93
+ ({ as: Root = 'h6', className, ...props }) => (
94
+ <Root {...props} className={classNames('menu-header', className)} />
95
+ )
34
96
  );
97
+ MenuHeader.displayName = 'MenuHeader';
35
98
 
36
- export const MenuDivider: FC<HTMLAttributes<HTMLHRElement>> = ({ className, ...props }) => (
37
- <hr {...props} className={classNames('menu-divider', className)} />
99
+ export const MenuDivider = polymorphic<HTMLAttributes<HTMLHRElement>>(
100
+ ({ as: Root = 'hr', className, ...props }) => (
101
+ <Root {...props} className={classNames('menu-divider', className)} />
102
+ )
38
103
  );
104
+ MenuDivider.displayName = 'MenuDivider';
39
105
 
40
- export const MenuItemContent: FC<HTMLAttributes<HTMLSpanElement>> = ({ className, ...props }) => (
41
- <span {...props} className={classNames('menu-item-content', className)} />
106
+ export const MenuItemContent = polymorphic<HTMLAttributes<HTMLSpanElement>>(
107
+ ({ as: Root = 'span', className, ...props }) => (
108
+ <Root {...props} className={classNames('menu-item-content', className)} />
109
+ )
42
110
  );
111
+ MenuItemContent.displayName = 'MenuItemContent';
43
112
 
44
- export const MenuItemDescription: FC<HTMLAttributes<HTMLElement>> = ({ className, ...props }) => (
45
- <small {...props} className={classNames('menu-item-description', className)} />
113
+ export const MenuItemDescription = polymorphic<HTMLAttributes<HTMLElement>>(
114
+ ({ as: Root = 'small', className, ...props }) => (
115
+ <Root {...props} className={classNames('menu-item-description', className)} />
116
+ )
46
117
  );
118
+ MenuItemDescription.displayName = 'MenuItemDescription';
47
119
 
48
- export interface MenuSubmenuProps extends PropsWithChildren {
120
+ export interface MenuSubmenuProps extends HTMLAttributes<HTMLDivElement> {
49
121
  label: ReactNode;
50
122
  className?: string;
51
123
  }
52
124
 
53
125
  @observer
54
- export class MenuSubmenu extends Component<MenuSubmenuProps> {
126
+ export class MenuSubmenu<T extends ElementType | undefined = 'div'> extends Component<
127
+ PolymorphicClassProps<T, MenuSubmenuProps>
128
+ > {
129
+ static displayName = 'MenuSubmenu';
130
+
131
+ declare readonly props: PolymorphicClassProps<T, MenuSubmenuProps>;
132
+
133
+ protected get componentProps(): Readonly<MenuSubmenuProps & AsProps> {
134
+ return this.props;
135
+ }
136
+
55
137
  @observable accessor open = false;
56
138
 
57
139
  panel = createRef<HTMLDivElement>();
140
+ trigger = createRef<HTMLButtonElement>();
141
+ position = new FloatingPosition();
142
+
143
+ componentDidUpdate() {
144
+ const { position, panel, trigger } = this;
145
+
146
+ if (!this.open) return position.dispose();
147
+ if (!panel.current || !trigger.current) return;
148
+
149
+ if (position.element !== panel.current)
150
+ position.attach(trigger.current, panel.current, {
151
+ placement: 'right-start',
152
+ offset: 2
153
+ });
154
+ else position.update();
155
+ }
156
+
157
+ componentWillUnmount() {
158
+ this.position.dispose();
159
+ }
58
160
 
59
161
  @action
60
- setOpen = (open: boolean) => {
61
- this.open = open;
62
- };
162
+ setOpen = (open: boolean) => (this.open = open);
63
163
 
64
164
  handleClick = () => this.setOpen(!this.open);
65
165
 
66
- handleMouseEnter = () => this.setOpen(true);
166
+ handleMouseEnter = (event: MouseEvent<HTMLDivElement>) => {
167
+ this.componentProps.onMouseEnter?.(event);
168
+
169
+ if (!event.defaultPrevented) this.setOpen(true);
170
+ };
67
171
 
68
- handleMouseLeave = () => this.setOpen(false);
172
+ handleMouseLeave = (event: MouseEvent<HTMLDivElement>) => {
173
+ this.componentProps.onMouseLeave?.(event);
174
+
175
+ if (!event.defaultPrevented) this.setOpen(false);
176
+ };
69
177
 
70
178
  handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
179
+ this.componentProps.onKeyDown?.(event);
180
+
181
+ if (event.defaultPrevented) return;
182
+
71
183
  const { key } = event;
72
184
 
73
185
  if (key === 'ArrowRight') {
74
186
  event.preventDefault();
187
+ event.stopPropagation();
75
188
  this.setOpen(true);
76
189
 
77
190
  queueMicrotask(() =>
@@ -80,24 +193,31 @@ export class MenuSubmenu extends Component<MenuSubmenuProps> {
80
193
  ?.focus()
81
194
  );
82
195
  }
83
- if (key === 'ArrowLeft' && this.open) {
196
+ if ((key === 'ArrowLeft' || key === 'Escape') && this.open) {
84
197
  event.preventDefault();
198
+ event.stopPropagation();
199
+
85
200
  this.setOpen(false);
201
+ this.trigger.current?.focus();
86
202
  }
87
203
  };
88
204
 
89
205
  render() {
90
- const { label, className, children } = this.props;
206
+ const Root: ElementType = this.componentProps.as ?? 'div';
207
+
208
+ const { as: _as, label, className, children, ...props } = this.componentProps;
91
209
  const { open } = this;
92
210
 
93
211
  return (
94
- <div
212
+ <Root
213
+ {...props}
95
214
  className={classNames('submenu', { show: open }, className)}
96
215
  onMouseEnter={this.handleMouseEnter}
97
216
  onMouseLeave={this.handleMouseLeave}
98
217
  onKeyDown={this.handleKeyDown}
99
218
  >
100
219
  <Button
220
+ ref={this.trigger}
101
221
  className="menu-item"
102
222
  aria-haspopup="true"
103
223
  aria-expanded={open}
@@ -107,12 +227,14 @@ export class MenuSubmenu extends Component<MenuSubmenuProps> {
107
227
  </Button>
108
228
  <div
109
229
  ref={this.panel}
230
+ style={{ ...this.position.style }}
231
+ data-bs-placement={this.position.placement}
110
232
  className={classNames('menu start-100 top-0', { show: open })}
111
233
  hidden={!open}
112
234
  >
113
235
  {children}
114
236
  </div>
115
- </div>
237
+ </Root>
116
238
  );
117
239
  }
118
240
  }
@@ -122,37 +244,139 @@ export interface MenuProps extends Omit<HTMLAttributes<HTMLDivElement>, 'onChang
122
244
  autoClose?: boolean | 'inside' | 'outside';
123
245
  align?: 'start' | 'end';
124
246
  menuClassName?: string;
247
+ placement?: MenuPlacement;
248
+ responsivePlacement?: Partial<Record<Breakpoint, MenuPlacement>>;
249
+ theme?: 'light' | 'dark';
250
+ translucent?: boolean;
251
+ scrollable?: boolean;
252
+ split?: boolean;
253
+ nav?: boolean;
254
+ offset?: FloatingOptions['offset'];
255
+ padding?: number;
256
+ flip?: boolean;
125
257
  toggleProps?: Omit<
126
258
  Extract<ButtonProps, { href?: never }>,
127
259
  'children' | 'onClick' | 'onKeyDown'
128
260
  >;
129
- onOpenChange?: (open: boolean) => void;
261
+ onOpenChange?: (open: boolean) => unknown;
130
262
  }
131
263
 
264
+ export type MenuPlacement =
265
+ | 'top-start'
266
+ | 'top-end'
267
+ | 'bottom-start'
268
+ | 'bottom-end'
269
+ | 'left-start'
270
+ | 'left-end'
271
+ | 'right-start'
272
+ | 'right-end';
273
+
274
+ const MENU_PLACEMENT_CLASSES: Record<MenuPlacement, string[]> = {
275
+ 'top-start': ['bottom-100', 'start-0'],
276
+ 'top-end': ['bottom-100', 'end-0'],
277
+ 'bottom-start': ['top-100', 'start-0'],
278
+ 'bottom-end': ['top-100', 'end-0'],
279
+ 'left-start': ['end-100', 'top-0'],
280
+ 'left-end': ['end-100', 'bottom-0'],
281
+ 'right-start': ['start-100', 'top-0'],
282
+ 'right-end': ['start-100', 'bottom-0']
283
+ };
284
+
285
+ const MENU_BREAKPOINT_WIDTHS: Record<Breakpoint, number> = {
286
+ sm: 576,
287
+ md: 768,
288
+ lg: 1024,
289
+ xl: 1280,
290
+ '2xl': 1536
291
+ };
292
+
132
293
  @observer
133
- export class Menu extends Component<MenuProps> {
294
+ export class Menu<T extends ElementType | undefined = 'div'> extends Component<
295
+ PolymorphicClassProps<T, MenuProps>
296
+ > {
297
+ static displayName = 'Menu';
298
+
299
+ declare readonly props: PolymorphicClassProps<T, MenuProps>;
300
+
301
+ protected get componentProps(): Readonly<MenuProps & AsProps> {
302
+ return this.props;
303
+ }
304
+
134
305
  @observable accessor open = false;
306
+ @observable accessor responsiveDirection: MenuPlacement | undefined;
307
+
135
308
  root = createRef<HTMLDivElement>();
136
309
  trigger = createRef<HTMLButtonElement>();
137
310
  panel = createRef<HTMLDivElement>();
311
+ media: { query: MediaQueryList; placement: MenuPlacement }[] = [];
312
+ position = new FloatingPosition();
138
313
 
139
314
  componentDidMount() {
140
315
  document.addEventListener('pointerdown', this.handleOutside);
316
+ this.observePlacement();
317
+ }
318
+
319
+ componentDidUpdate({ responsivePlacement }: MenuProps) {
320
+ if (responsivePlacement !== this.componentProps.responsivePlacement)
321
+ this.observePlacement();
322
+ const { trigger, panel, position, componentProps: props } = this;
323
+ if (!this.open) return position.dispose();
324
+ if (!trigger.current || !panel.current) return;
325
+
326
+ const { placement, align, offset, padding, flip } = props;
327
+
328
+ const options: FloatingOptions = {
329
+ placement: this.responsiveDirection ?? placement ?? `bottom-${align ?? 'end'}`,
330
+ offset,
331
+ padding,
332
+ flip
333
+ };
334
+ if (position.element !== panel.current)
335
+ position.attach(trigger.current, panel.current, options);
336
+ else {
337
+ position.options = options;
338
+ position.update();
339
+ }
141
340
  }
142
341
 
143
342
  componentWillUnmount() {
144
343
  document.removeEventListener('pointerdown', this.handleOutside);
344
+ this.position.dispose();
345
+
346
+ for (const { query } of this.media)
347
+ query.removeEventListener('change', this.handlePlacement);
145
348
  }
146
349
 
350
+ observePlacement = () => {
351
+ for (const { query } of this.media)
352
+ query.removeEventListener('change', this.handlePlacement);
353
+
354
+ this.media = (Object.keys(MENU_BREAKPOINT_WIDTHS) as Breakpoint[]).flatMap(breakpoint => {
355
+ const placement = this.componentProps.responsivePlacement?.[breakpoint];
356
+ if (!placement) return [];
357
+
358
+ const query = window.matchMedia(`(min-width: ${MENU_BREAKPOINT_WIDTHS[breakpoint]}px)`);
359
+ query.addEventListener('change', this.handlePlacement);
360
+ return [{ query, placement }];
361
+ });
362
+ this.handlePlacement();
363
+ };
364
+
365
+ @action
366
+ handlePlacement = () =>
367
+ (this.responsiveDirection = [...this.media]
368
+ .reverse()
369
+ .find(({ query }) => query.matches)?.placement);
370
+
147
371
  @action
148
372
  setOpen = (open: boolean) => {
149
373
  if (this.open === open) return;
150
374
  this.open = open;
151
- this.props.onOpenChange?.(open);
375
+ this.componentProps.onOpenChange?.(open);
152
376
  };
153
377
 
154
378
  handleOutside = ({ target }: PointerEvent) => {
155
- const { autoClose = true } = this.props;
379
+ const { autoClose = true } = this.componentProps;
156
380
  if (
157
381
  autoClose !== false &&
158
382
  autoClose !== 'inside' &&
@@ -162,16 +386,16 @@ export class Menu extends Component<MenuProps> {
162
386
  this.setOpen(false);
163
387
  };
164
388
 
165
- items() {
389
+ items(panel: HTMLElement | null = this.panel.current) {
166
390
  return [
167
- ...(this.panel.current?.querySelectorAll<HTMLElement>(
391
+ ...(panel?.querySelectorAll<HTMLElement>(
168
392
  'a[href]:not([aria-disabled="true"]), button:not(:disabled):not([aria-disabled="true"])'
169
393
  ) ?? [])
170
- ].filter(item => !item.closest('[hidden]'));
394
+ ].filter(item => !item.closest('[hidden]') && item.closest('.menu') === panel);
171
395
  }
172
396
 
173
397
  handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
174
- this.props.onKeyDown?.(event);
398
+ this.componentProps.onKeyDown?.(event);
175
399
 
176
400
  const { key, defaultPrevented } = event;
177
401
  if (defaultPrevented) return;
@@ -182,13 +406,23 @@ export class Menu extends Component<MenuProps> {
182
406
  return this.trigger.current?.focus();
183
407
  }
184
408
  if (key === 'Tab') return this.setOpen(false);
409
+ if (
410
+ event.target instanceof Element &&
411
+ event.target.matches('input, textarea, select, [contenteditable="true"]')
412
+ )
413
+ return;
414
+
185
415
  if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(key)) return;
186
416
 
187
417
  event.preventDefault();
188
418
  this.setOpen(true);
189
419
 
190
420
  queueMicrotask(() => {
191
- const items = this.items();
421
+ const panel =
422
+ event.target instanceof Element
423
+ ? event.target.closest<HTMLElement>('.menu')
424
+ : undefined;
425
+ const items = this.items(panel ?? this.panel.current);
192
426
  const index = items.findIndex(item => item === document.activeElement);
193
427
 
194
428
  let next = key === 'Home' ? 0 : items.length - 1;
@@ -200,7 +434,7 @@ export class Menu extends Component<MenuProps> {
200
434
  };
201
435
 
202
436
  handleBlur = (event: FocusEvent<HTMLDivElement>) => {
203
- const { onBlur, autoClose = true } = this.props;
437
+ const { onBlur, autoClose = true } = this.componentProps;
204
438
  onBlur?.(event);
205
439
 
206
440
  const { defaultPrevented, currentTarget, relatedTarget } = event;
@@ -215,10 +449,11 @@ export class Menu extends Component<MenuProps> {
215
449
 
216
450
  handleToggle = () => this.setOpen(!this.open);
217
451
 
218
- handleSelect = ({ target }: MouseEvent<HTMLDivElement>) => {
219
- const { autoClose = true } = this.props;
452
+ handleSelect = ({ target, defaultPrevented }: MouseEvent<HTMLDivElement>) => {
453
+ const { autoClose = true } = this.componentProps;
220
454
  if (
221
455
  autoClose &&
456
+ !defaultPrevented &&
222
457
  autoClose !== 'outside' &&
223
458
  target instanceof Element &&
224
459
  !target.closest('.submenu > .menu-item') &&
@@ -228,10 +463,23 @@ export class Menu extends Component<MenuProps> {
228
463
  };
229
464
 
230
465
  render() {
466
+ const Root: ElementType = this.componentProps.as ?? 'div';
467
+
231
468
  const {
469
+ as: _as,
232
470
  label,
233
471
  autoClose: _autoClose,
234
472
  align = 'end',
473
+ placement,
474
+ responsivePlacement: _responsivePlacement,
475
+ theme,
476
+ translucent,
477
+ scrollable,
478
+ split,
479
+ nav,
480
+ offset: _offset,
481
+ padding: _padding,
482
+ flip: _flip,
235
483
  menuClassName,
236
484
  toggleProps,
237
485
  onOpenChange: _onOpenChange,
@@ -241,22 +489,41 @@ export class Menu extends Component<MenuProps> {
241
489
  className,
242
490
  id,
243
491
  ...props
244
- } = this.props;
492
+ } = this.componentProps;
245
493
  const { open } = this;
494
+ const preferred = this.responsiveDirection ?? placement;
495
+ const direction = this.position.element
496
+ ? (this.position.placement as MenuPlacement)
497
+ : preferred;
498
+ const placementClasses = direction
499
+ ? MENU_PLACEMENT_CLASSES[direction]
500
+ : ['top-100', align === 'end' ? 'end-0' : 'start-0'];
246
501
 
247
502
  return (
248
- <div
503
+ <Root
249
504
  {...props}
250
505
  ref={this.root}
251
506
  id={id}
252
- className={classNames('d-inline-block position-relative', className)}
507
+ data-bs-theme={theme}
508
+ className={classNames(
509
+ split ? 'btn-group' : 'd-inline-block',
510
+ 'position-relative',
511
+ className
512
+ )}
253
513
  onKeyDown={this.handleKeyDown}
254
514
  onBlur={this.handleBlur}
255
515
  >
256
516
  <Button
517
+ variant={nav ? false : undefined}
257
518
  {...toggleProps}
258
519
  ref={this.trigger}
259
520
  aria-expanded={open}
521
+ aria-haspopup="true"
522
+ className={classNames(
523
+ toggleProps?.className,
524
+ split && 'menu-toggle-split',
525
+ nav && 'nav-link'
526
+ )}
260
527
  aria-controls={id ? `${id}-menu` : undefined}
261
528
  onClick={this.handleToggle}
262
529
  >
@@ -265,9 +532,13 @@ export class Menu extends Component<MenuProps> {
265
532
  <div
266
533
  ref={this.panel}
267
534
  id={id ? `${id}-menu` : undefined}
535
+ data-bs-placement={direction ?? `bottom-${align}`}
536
+ style={{ ...this.position.style }}
268
537
  className={classNames(
269
- 'menu top-100',
270
- align === 'end' ? 'end-0' : 'start-0',
538
+ 'menu',
539
+ placementClasses,
540
+ translucent && 'menu-translucent',
541
+ scrollable && 'menu-scrollable',
271
542
  { show: open },
272
543
  menuClassName
273
544
  )}
@@ -276,7 +547,7 @@ export class Menu extends Component<MenuProps> {
276
547
  >
277
548
  {children}
278
549
  </div>
279
- </div>
550
+ </Root>
280
551
  );
281
552
  }
282
553
  }