type(Menu): fix export type error.

uiwjs · Aug 25, 2022 · 03b2d38 · 03b2d38
1 parent 1ffe8bc
commit 03b2d38
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/react-menu/src/Menu.tsx b/packages/react-menu/src/Menu.tsx
@@ -71,24 +71,30 @@ export const Menu = React.forwardRef<HTMLUListElement, MenuProps>((props, ref) =
   );
 });
 
-export const ContextMenu = React.forwardRef<HTMLUListElement, MenuProps>((props, ref) => {
+const InternalContextMenu = (props: MenuProps, ref?: React.ForwardedRef<HTMLUListElement>) => {
   const [contextHeight, setContextHeight] = React.useState<MenuContextType>({ height: 0, ele: null });
   return (
     <ThemeContext.Provider value={{ ...contextHeight, setContextHeight }}>
       <Menu {...props} ref={ref} />
     </ThemeContext.Provider>
   );
-});
+};
+
+const ContextMenu: ContextMenuComponent = React.forwardRef<HTMLUListElement>(
+  InternalContextMenu,
+) as unknown as ContextMenuComponent;
+
 Menu.displayName = 'uiw.Menu';
 ContextMenu.displayName = 'uiw.Menu';
 
-type Menu = typeof Menu & {
+type ContextMenuComponent = React.FC<React.PropsWithRef<MenuProps>> & {
   Item: typeof MenuItem;
   SubMenu: typeof SubMenu;
   Divider: typeof MenuDivider;
 };
 
-(ContextMenu as Menu).Item = MenuItem;
-(ContextMenu as Menu).SubMenu = SubMenu;
-(ContextMenu as Menu).Divider = MenuDivider;
-export default ContextMenu as Menu;
+ContextMenu.Item = MenuItem;
+ContextMenu.SubMenu = SubMenu;
+ContextMenu.Divider = MenuDivider;
+
+export default ContextMenu;
diff --git a/packages/react-select/src/index.tsx b/packages/react-select/src/index.tsx
@@ -8,7 +8,7 @@ export interface SelectProps extends IProps, Omit<React.SelectHTMLAttributes<HTM
   size?: 'large' | 'default' | 'small';
 }
 
-const InternalSelect = (props: SelectProps, ref?: React.LegacyRef<HTMLSelectElement>) => {
+const InternalSelect = (props: SelectProps, ref?: React.ForwardedRef<HTMLSelectElement>) => {
   const { prefixCls = 'w-select', className, size = 'default', ...other } = props;
   return (
     <select