fixes tooltip TS issues

mongodb · Jul 10, 2023 · 686d908 · 686d908
1 parent c26e85d
commit 686d908
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/icon/src/isComponentGlyph.ts b/packages/icon/src/isComponentGlyph.ts
@@ -2,19 +2,23 @@ import { ComponentType, isValidElement, ReactNode } from 'react';
 
 import { LGGlyph } from './types';
 
-type ExtendedComponentType = ComponentType<React.PropsWithChildren<any>> & {
-  [key: string]: any;
-};
+type ExtendedComponentType =
+  | ComponentType<React.PropsWithChildren<any>> & {
+      [key: string]: any;
+    };
 /**
  * Helper type to check if element is a LeafyGreen UI Glyph
  * @internal
  */
+function isComponentGlyph<P>(
+  node: {} | null | undefined,
+): node is React.ReactElement<P>;
 function isComponentGlyph(node: ReactNode): node is LGGlyph.Element;
 function isComponentGlyph(
   component: ExtendedComponentType,
 ): component is LGGlyph.Component;
 function isComponentGlyph(
-  child: ReactNode | ExtendedComponentType,
+  child: ReactNode | ExtendedComponentType | unknown,
 ): child is LGGlyph.Element | LGGlyph.Component {
   // If we're received a rendered component (i.e. ReactNode)
   if (isValidElement(child)) {
@@ -26,12 +30,12 @@ function isComponentGlyph(
     );
   }
 
-  // If we've recieved a component function
+  // If we've received a component function
   return (
     child != null &&
     typeof child === 'function' &&
     'isGlyph' in child &&
-    child.isGlyph === true
+    (child as LGGlyph.Component).isGlyph === true
   );
 }
 

diff --git a/packages/tooltip/src/Tooltip/Tooltip.types.ts b/packages/tooltip/src/Tooltip/Tooltip.types.ts
@@ -1,3 +1,5 @@
+import React from 'react';
+
 import { HTMLElementProps } from '@leafygreen-ui/lib';
 import {
   Align as PopoverAlign,
@@ -26,7 +28,7 @@ export type Align = typeof Align[keyof typeof Align];
 export { Justify };
 
 export interface PopoverFunctionParameters {
-  align: Align;
+  align: PopoverAlign;
   justify: Justify;
   referenceElPos: ElementPosition;
 }
@@ -94,4 +96,6 @@ export type TooltipProps = Omit<
      *
      */
     baseFontSize?: BaseFontSize;
+
+    children?: React.ReactNode;
   };