Merge pull request #135 from element-hq/more-react-17

Change types some more for React 17 compatibility
element-hq · Dec 13, 2023 · 09a2bcf · 09a2bcf
2 parents 6ffa277 + 8e5db75
commit 09a2bcf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/components/Menu/DrawerMenu.tsx b/src/components/Menu/DrawerMenu.tsx
@@ -36,7 +36,7 @@ interface Props extends ComponentPropsWithoutRef<"div"> {
 // This an internal component not intended for export! Consumers should use it
 // via the Menu or ContextMenu components.
 export const DrawerMenu = forwardRef<HTMLDivElement, Props>(
-  ({ title, children, className, ...props }, ref): ReactNode => (
+  ({ title, children, className, ...props }, ref) => (
     <div
       ref={ref}
       className={classNames(className, styles.drawer)}

diff --git a/src/components/Menu/FloatingMenu.tsx b/src/components/Menu/FloatingMenu.tsx
@@ -41,7 +41,7 @@ interface Props extends ComponentPropsWithoutRef<"div"> {
 // This an internal component not intended for export! Consumers should use it
 // via the Menu or ContextMenu components.
 export const FloatingMenu = forwardRef<HTMLDivElement, Props>(
-  ({ title, className, children, ...props }, ref): ReactNode => {
+  ({ title, className, children, ...props }, ref) => {
     const titleId = useId();
     return (
       <div

diff --git a/src/components/Menu/MenuItem.tsx b/src/components/Menu/MenuItem.tsx
@@ -19,7 +19,6 @@ import React, {
   ComponentPropsWithoutRef,
   ComponentType,
   ElementType,
-  ReactNode,
   SVGAttributes,
   useCallback,
   useContext,
@@ -80,7 +79,7 @@ export const MenuItem = <C extends MenuItemElement = "button">({
   onClick: onClickProp,
   disabled,
   ...props
-}: Props<C>): Exclude<ReactNode, undefined> => {
+}: Props<C>): JSX.Element => {
   const Component = as ?? ("button" as ElementType);
   const context = useContext(MenuContext);