Skip to content

Commit 03b2d38

Browse files
committedAug 25, 2022
type(Menu): fix export type error.
1 parent 1ffe8bc commit 03b2d38

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed
 

‎packages/react-menu/src/Menu.tsx

+13-7
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,30 @@ export const Menu = React.forwardRef<HTMLUListElement, MenuProps>((props, ref) =
7171
);
7272
});
7373

74-
export const ContextMenu = React.forwardRef<HTMLUListElement, MenuProps>((props, ref) => {
74+
const InternalContextMenu = (props: MenuProps, ref?: React.ForwardedRef<HTMLUListElement>) => {
7575
const [contextHeight, setContextHeight] = React.useState<MenuContextType>({ height: 0, ele: null });
7676
return (
7777
<ThemeContext.Provider value={{ ...contextHeight, setContextHeight }}>
7878
<Menu {...props} ref={ref} />
7979
</ThemeContext.Provider>
8080
);
81-
});
81+
};
82+
83+
const ContextMenu: ContextMenuComponent = React.forwardRef<HTMLUListElement>(
84+
InternalContextMenu,
85+
) as unknown as ContextMenuComponent;
86+
8287
Menu.displayName = 'uiw.Menu';
8388
ContextMenu.displayName = 'uiw.Menu';
8489

85-
type Menu = typeof Menu & {
90+
type ContextMenuComponent = React.FC<React.PropsWithRef<MenuProps>> & {
8691
Item: typeof MenuItem;
8792
SubMenu: typeof SubMenu;
8893
Divider: typeof MenuDivider;
8994
};
9095

91-
(ContextMenu as Menu).Item = MenuItem;
92-
(ContextMenu as Menu).SubMenu = SubMenu;
93-
(ContextMenu as Menu).Divider = MenuDivider;
94-
export default ContextMenu as Menu;
96+
ContextMenu.Item = MenuItem;
97+
ContextMenu.SubMenu = SubMenu;
98+
ContextMenu.Divider = MenuDivider;
99+
100+
export default ContextMenu;

‎packages/react-select/src/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export interface SelectProps extends IProps, Omit<React.SelectHTMLAttributes<HTM
88
size?: 'large' | 'default' | 'small';
99
}
1010

11-
const InternalSelect = (props: SelectProps, ref?: React.LegacyRef<HTMLSelectElement>) => {
11+
const InternalSelect = (props: SelectProps, ref?: React.ForwardedRef<HTMLSelectElement>) => {
1212
const { prefixCls = 'w-select', className, size = 'default', ...other } = props;
1313
return (
1414
<select

0 commit comments

Comments
 (0)
Please sign in to comment.