Get rid of unused renderContent prop on PopperController

packages/grafana-ui/src/components/Tooltip/Popper.tsx

@@ -3,6 +3,7 @@ import * as PopperJS from 'popper.js';
 import { Manager, Popper as ReactPopper } from 'react-popper';
 import { Portal } from '@grafana/ui';
 import Transition from 'react-transition-group/Transition';
+import { PopperContent } from './PopperController';
 
 const defaultTransitionStyles = {
   transition: 'opacity 200ms linear',
@@ -17,17 +18,16 @@ const transitionStyles: { [key: string]: object } = {
 };
 
 interface Props extends React.HTMLAttributes<HTMLDivElement> {
-  renderContent: (content: any) => any;
   show: boolean;
   placement?: PopperJS.Placement;
-  content: string | ((props: any) => JSX.Element);
+  content: PopperContent;
   referenceElement: PopperJS.ReferenceObject;
   arrowClassName?: string;
 }
 
 class Popper extends PureComponent<Props> {
   render() {
-    const { renderContent, show, placement, onMouseEnter, onMouseLeave, className, arrowClassName } = this.props;
+    const { show, placement, onMouseEnter, onMouseLeave, className, arrowClassName } = this.props;
     const { content } = this.props;
 
     return (
@@ -56,7 +56,7 @@ class Popper extends PureComponent<Props> {
                       className={`popper`}
                     >
                       <div className={className}>
-                        {renderContent(content)}
+                        {content}
                         <div
                           ref={arrowProps.ref}
                           style={{ ...arrowProps.style }}

packages/grafana-ui/src/components/Tooltip/PopperController.tsx

@@ -1,14 +1,13 @@
 import React from 'react';
 import * as PopperJS from 'popper.js';
 
-type PopperContent = string | (() => JSX.Element);
+export type PopperContent = string | JSX.Element;
 
 export interface UsingPopperProps {
   show?: boolean;
   placement?: PopperJS.Placement;
   content: PopperContent;
   children: JSX.Element;
-  renderContent?: (content: PopperContent) => JSX.Element;
 }
 
 type PopperControllerRenderProp = (
@@ -17,8 +16,7 @@ type PopperControllerRenderProp = (
   popperProps: {
     show: boolean;
     placement: PopperJS.Placement;
-    content: string | ((props: any) => JSX.Element);
-    renderContent: (content: any) => any;
+    content: PopperContent;
   }
 ) => JSX.Element;
 
@@ -69,16 +67,6 @@ class PopperController extends React.Component<Props, State> {
     }));
   };
 
-  renderContent(content: PopperContent) {
-
-    if (typeof content === 'function') {
-      // If it's a function we assume it's a React component
-      const ReactComponent = content;
-      return <ReactComponent />;
-    }
-    return content;
-  }
-
   render() {
     const { children, content } = this.props;
     const { show, placement } = this.state;
@@ -87,7 +75,6 @@ class PopperController extends React.Component<Props, State> {
       show,
       placement,
       content,
-      renderContent: this.renderContent,
     });
   }
 }

packages/grafana-ui/src/components/Tooltip/Tooltip.tsx

@@ -12,7 +12,7 @@ export enum Themes {
 interface TooltipProps extends UsingPopperProps {
   theme?: Themes;
 }
-export const Tooltip = ({ children, renderContent, theme, ...controllerProps }: TooltipProps) => {
+export const Tooltip = ({ children, theme, ...controllerProps }: TooltipProps) => {
   const tooltipTriggerRef = createRef<PopperJS.ReferenceObject>();
   const popperBackgroundClassName = 'popper__background' + (theme ? ' ' + theme : '');