Skip to content

Commit 9006c4e

Browse files
authored
🤖 Merge PR DefinitelyTyped#72963 fix(tonic-ui__react) newly added props are optional by @derekhawker
1 parent 3b147d7 commit 9006c4e

File tree

2 files changed

+45
-12
lines changed

2 files changed

+45
-12
lines changed

‎types/tonic-ui__react/index.d.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export interface AccordionProps extends Omit<TonicProps, "children"> {
260260

261261
export interface AccordionContentProps extends TonicProps {
262262
TransitionComponent?: ComponentType;
263-
TransitionProps?: { appear: boolean };
263+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
264264
}
265265

266266
export interface AccordionHeaderProps extends TonicProps {
@@ -466,12 +466,12 @@ export interface DrawerProps extends Omit<TonicProps, "children"> {
466466

467467
export interface DrawerContentProps extends TonicProps {
468468
TransitionComponent?: ComponentType;
469-
TransitionProps?: { appear: boolean };
469+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
470470
}
471471

472472
export interface DrawerOverlayProps extends TonicProps {
473473
TransitionComponent?: ComponentType;
474-
TransitionProps?: { appear: boolean };
474+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
475475
}
476476

477477
export interface FlexProps extends
@@ -575,7 +575,7 @@ export interface MenuContentProps extends TonicProps {
575575
PopperComponent: ComponentType;
576576
PopperProps: Record<string, unknown>;
577577
TransitionComponent?: ComponentType;
578-
TransitionProps?: { appear: boolean };
578+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
579579
}
580580

581581
export interface MenuGroupProps extends TonicProps {
@@ -588,10 +588,10 @@ export interface MenuItemProps extends TonicProps {
588588
}
589589

590590
export interface MenuListProps extends TonicProps {
591-
PopperComponent: ComponentType;
592-
PopperProps: Record<string, unknown>;
591+
PopperComponent?: ComponentType;
592+
PopperProps?: Record<string, unknown>;
593593
TransitionComponent?: ComponentType;
594-
TransitionProps?: { appear: boolean };
594+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
595595
}
596596

597597
export interface MenuToggleProps extends Omit<TonicProps, "children"> {
@@ -601,6 +601,7 @@ export interface MenuToggleProps extends Omit<TonicProps, "children"> {
601601
state: { getMenuToggleProps: () => _ExtendedCSSProperties },
602602
props: _ExtendedCSSProperties,
603603
) => ReactNode);
604+
disabled?: boolean;
604605
}
605606

606607
export interface MenuToggleIconProps extends Omit<TonicProps, "children"> {
@@ -631,12 +632,12 @@ export interface ModalProps extends Omit<TonicProps, "children"> {
631632

632633
export interface ModalContentProps extends TonicProps {
633634
TransitionComponent?: ComponentType;
634-
TransitionProps?: { appear: boolean };
635+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
635636
}
636637

637638
export interface ModalOverlayProps extends TonicProps {
638639
TransitionComponent?: ComponentType;
639-
TransitionProps?: { appear: boolean };
640+
TransitionProps?: Record<string, unknown> | Omit<TransitionProps, "children">;
640641
}
641642

642643
export interface OverflowTooltipProps extends Omit<TonicProps, "children"> {
@@ -750,6 +751,7 @@ export interface PopoverContentProps extends TonicProps {
750751
}
751752

752753
export interface PopoverTriggerProps extends Omit<TonicProps, "children"> {
754+
shouldWrapChildren?: boolean;
753755
children:
754756
| ReactNode
755757
| ((args: { getPopoverTriggerProps: () => TonicProps }) => ReactNode);

‎types/tonic-ui__react/tonic-ui__react-tests.tsx‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {
22
Accordion,
33
AccordionContent,
44
AccordionItem,
5-
AccordionItemProps,
65
AccordionToggle,
76
AccordionToggleIcon,
87
Box,
@@ -16,6 +15,11 @@ import {
1615
Input,
1716
LightMode,
1817
Link,
18+
Menu,
19+
MenuItem,
20+
MenuList,
21+
MenuToggle,
22+
MenuToggleIcon,
1923
Modal,
2024
ModalBody,
2125
ModalContent,
@@ -404,8 +408,11 @@ const TreeApp = () => {
404408

405409
const PopoverTest = () => {
406410
return (
407-
<Popover>
408-
<PopoverTrigger>
411+
<Popover
412+
disabled={false} // Use the `disabled` prop to control whether the popover will be displayed
413+
trigger="hover"
414+
>
415+
<PopoverTrigger shouldWrapChildren>
409416
<Button>Open Popover</Button>
410417
</PopoverTrigger>
411418
<PopoverContent
@@ -450,3 +457,27 @@ const AccordionApp = () => {
450457
</Accordion>
451458
);
452459
};
460+
461+
const MenuApp = () => {
462+
return (
463+
<Menu>
464+
<MenuToggle disabled={true}>
465+
{({ getMenuToggleProps }) => (
466+
<Button {...getMenuToggleProps()}>
467+
<MenuToggleIcon />
468+
</Button>
469+
)}
470+
</MenuToggle>
471+
<MenuList
472+
width="max-content"
473+
PopperComponent={PopoverArrow}
474+
PopperProps={{ arrowWidth: 20, arrowHeight: 20, randomProp: 123 }}
475+
TransitionComponent={Box}
476+
TransitionProps={{ appear: false, in: false, randomProp: 123 }}
477+
>
478+
<MenuItem>List item 1</MenuItem>
479+
<MenuItem>List item 2</MenuItem>
480+
</MenuList>
481+
</Menu>
482+
);
483+
};

0 commit comments

Comments
 (0)