From 4d3b92d418f7b3b60757ac04197e7a8643d2c4c4 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Wed, 5 May 2021 11:28:09 -0400
Subject: [PATCH 1/3] fix(tooltip): change default entry and exit delay

---
 .../src/components/CodeEditor/CodeEditor.tsx       |  2 +-
 .../components/CodeEditor/CodeEditorControl.tsx    |  4 ++--
 .../src/components/ClipboardCopy/ClipboardCopy.tsx |  2 +-
 .../ClipboardCopy/ClipboardCopyButton.tsx          |  4 ++--
 .../react-core/src/components/Tooltip/Tooltip.tsx  |  4 ++--
 packages/react-docs/src/pages/icons.js             |  2 +-
 .../react-table/src/components/Table/TableText.tsx |  2 +-
 .../src/components/DefaultRemoveConnector.tsx      |  7 ++++++-
 .../TopologyControlBar/TopologyControlBar.tsx      |  6 +++++-
 .../__snapshots__/TopologyControlBar.test.tsx.snap | 14 ++++++++++++++
 10 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
index 6ac9b4c3c95..881b3087b0c 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
@@ -137,7 +137,7 @@ export class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState
     downloadButtonToolTipText: 'Download',
     copyButtonSuccessTooltipText: 'Content added to clipboard',
     toolTipCopyExitDelay: 1600,
-    toolTipDelay: 100,
+    toolTipDelay: 0,
     toolTipMaxWidth: '100px',
     toolTipPosition: 'top',
     customControls: null,
diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
index 2ee7b90e470..967406023e9 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
@@ -30,8 +30,8 @@ export const CodeEditorControl: React.FunctionComponent<CodeEditorControlProps>
   className,
   'aria-label': ariaLabel,
   toolTipText,
-  exitDelay = 100,
-  entryDelay = 100,
+  exitDelay = 0,
+  entryDelay = 0,
   maxWidth = '100px',
   position = 'top',
   onClick = () => {},
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
index 4f7e91004c3..7548dce834d 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
@@ -95,7 +95,7 @@ export class ClipboardCopy extends React.Component<ClipboardCopyProps, Clipboard
     position: TooltipPosition.top,
     maxWidth: '150px',
     exitDelay: 1600,
-    entryDelay: 100,
+    entryDelay: 1000,
     switchDelay: 2000,
     onCopy: clipboardCopyFunc,
     onChange: (): any => undefined,
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
index 295c6a71908..f4b4a8caa1c 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
@@ -31,8 +31,8 @@ export interface ClipboardCopyButtonProps
 
 export const ClipboardCopyButton: React.FunctionComponent<ClipboardCopyButtonProps> = ({
   onClick,
-  exitDelay = 100,
-  entryDelay = 100,
+  exitDelay = 0,
+  entryDelay = 0,
   maxWidth = '100px',
   position = 'top',
   'aria-label': ariaLabel = 'Copyable input',
diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx
index 0048628e2da..809092f95c2 100644
--- a/packages/react-core/src/components/Tooltip/Tooltip.tsx
+++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx
@@ -105,8 +105,8 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   isContentLeftAligned = false,
   enableFlip = true,
   className = '',
-  entryDelay = 0,
-  exitDelay = 0,
+  entryDelay = 1000,
+  exitDelay = 500,
   appendTo = () => document.body,
   zIndex = 9999,
   maxWidth = tooltipMaxWidth.value,
diff --git a/packages/react-docs/src/pages/icons.js b/packages/react-docs/src/pages/icons.js
index d74e467bb4e..2e58ce140a6 100644
--- a/packages/react-docs/src/pages/icons.js
+++ b/packages/react-docs/src/pages/icons.js
@@ -51,7 +51,7 @@ const iconsPage = () => {
           .filter(([id]) => id !== 'AnsibeTowerIcon')
           .map(([id, Icon]) => (
             <GridItem key={id} style={cellStyle} sm={6} md={4} lg={2}>
-              <Tooltip content={<div>{id}</div>}>
+              <Tooltip entryDelay={0} exitDelay={0} content={<div>{id}</div>}>
                 <Icon size="xl" title={id} />
               </Tooltip>
               <div style={labelStyle}>{getLabel(id)}</div>
diff --git a/packages/react-table/src/components/Table/TableText.tsx b/packages/react-table/src/components/Table/TableText.tsx
index cbdd8a69cc0..240f6d5f400 100644
--- a/packages/react-table/src/components/Table/TableText.tsx
+++ b/packages/react-table/src/components/Table/TableText.tsx
@@ -39,7 +39,7 @@ export const TableText: React.FunctionComponent<TableTextProps> = ({
   variant = 'span',
   wrapModifier = null,
   tooltip: tooltipProp = '',
-  tooltipProps = { entryDelay: 1000 },
+  tooltipProps = {},
   onMouseEnter: onMouseEnterProp = () => {},
   ...props
 }: TableTextProps) => {
diff --git a/packages/react-topology/src/components/DefaultRemoveConnector.tsx b/packages/react-topology/src/components/DefaultRemoveConnector.tsx
index 8d0f514f4a6..4c7f53b27ec 100644
--- a/packages/react-topology/src/components/DefaultRemoveConnector.tsx
+++ b/packages/react-topology/src/components/DefaultRemoveConnector.tsx
@@ -31,7 +31,12 @@ const DefaultRemoveConnector: React.FC<DefaultRemoveConnectorProps> = ({
   onRemove,
   size = 14
 }) => (
-  <Tooltip content="Delete Connector" position={computeTooltipPosition(startPoint, endPoint)}>
+  <Tooltip
+    exitDelay={0}
+    entryDelay={0}
+    content="Delete Connector"
+    position={computeTooltipPosition(startPoint, endPoint)}
+  >
     <g
       transform={`translate(${startPoint.x + (endPoint.x - startPoint.x) * 0.5}, ${startPoint.y +
         (endPoint.y - startPoint.y) * 0.5})`}
diff --git a/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx b/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx
index 349924d6360..d75965ba3cb 100644
--- a/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx
+++ b/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx
@@ -276,7 +276,11 @@ export const TopologyControlBar: React.FunctionComponent<TopologyControlBarProps
     );
 
     if (button.tooltip) {
-      return <Tooltip content={button.tooltip}>{renderedButton}</Tooltip>;
+      return (
+        <Tooltip exitDelay={0} entryDelay={0} content={button.tooltip}>
+          {renderedButton}
+        </Tooltip>
+      );
     }
 
     return renderedButton;
diff --git a/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap b/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
index 1fe3ecf496c..d0692b8f2d8 100644
--- a/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
+++ b/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
@@ -118,6 +118,8 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                       >
                         <Tooltip
                           content="test zoom in tooltip"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -241,6 +243,8 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                       >
                         <Tooltip
                           content="Zoom Out"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -387,6 +391,8 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                       >
                         <Tooltip
                           content="Reset View"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -742,6 +748,8 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Zoom In"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -888,6 +896,8 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Zoom Out"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -1034,6 +1044,8 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Fit to Screen"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -1180,6 +1192,8 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Reset View"
+                          entryDelay={0}
+                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}

From dfeedb32e7f8e277633cfaa36236806cb0c51a16 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Wed, 5 May 2021 13:12:35 -0400
Subject: [PATCH 2/3] check if children is a button or icon

---
 .../ClipboardCopy/ClipboardCopy.tsx           |  2 +-
 .../src/components/Tooltip/Tooltip.tsx        | 20 ++++++++++++++++---
 .../components/Tooltip/examples/Tooltip.md    |  8 +++++---
 packages/react-docs/src/pages/icons.js        |  2 +-
 .../TopologyControlBar/TopologyControlBar.tsx |  6 +-----
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
index 7548dce834d..7dbc945ac25 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
@@ -95,7 +95,7 @@ export class ClipboardCopy extends React.Component<ClipboardCopyProps, Clipboard
     position: TooltipPosition.top,
     maxWidth: '150px',
     exitDelay: 1600,
-    entryDelay: 1000,
+    entryDelay: 0,
     switchDelay: 2000,
     onCopy: clipboardCopyFunc,
     onChange: (): any => undefined,
diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx
index 809092f95c2..c63e4dcd890 100644
--- a/packages/react-core/src/components/Tooltip/Tooltip.tsx
+++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx
@@ -9,6 +9,7 @@ import tooltipMaxWidth from '@patternfly/react-tokens/dist/js/c_tooltip_MaxWidth
 import { ReactElement } from 'react';
 import { Popper, getOpacityTransition } from '../../helpers/Popper/Popper';
 import { Props as TippyProps } from '../../helpers/Popper/DeprecatedTippyTypes';
+import { Button } from '../Button';
 
 export enum TooltipPosition {
   auto = 'auto',
@@ -97,6 +98,19 @@ export interface TooltipProps extends Omit<React.HTMLProps<HTMLDivElement>, 'con
 // id for associating trigger with the content aria-describedby or aria-labelledby
 let pfTooltipIdCounter = 1;
 
+function isButtonOrIcon(children: React.ReactNode) {
+  if (React.isValidElement(children)) {
+    if (['button', Button as any, 'svg', 'g'].includes(children.type)) {
+      return true;
+    }
+    const displayName = (children.type as React.FunctionComponent).displayName;
+    if (typeof displayName === 'string' && displayName.includes('Icon')) {
+      return true;
+    }
+  }
+  return false;
+}
+
 export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   content: bodyContent,
   position = 'top',
@@ -105,8 +119,9 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   isContentLeftAligned = false,
   enableFlip = true,
   className = '',
-  entryDelay = 1000,
-  exitDelay = 500,
+  children,
+  entryDelay = isButtonOrIcon(children) ? 0 : 1000,
+  exitDelay = isButtonOrIcon(children) ? 0 : 500,
   appendTo = () => document.body,
   zIndex = 9999,
   maxWidth = tooltipMaxWidth.value,
@@ -115,7 +130,6 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   // For every initial starting position, there are 3 escape positions
   flipBehavior = ['top', 'right', 'bottom', 'left', 'top', 'right', 'bottom'],
   id = `pf-tooltip-${pfTooltipIdCounter++}`,
-  children,
   animationDuration = 300,
   reference,
   boundary,
diff --git a/packages/react-core/src/components/Tooltip/examples/Tooltip.md b/packages/react-core/src/components/Tooltip/examples/Tooltip.md
index 79d149d58db..e31ade9102d 100644
--- a/packages/react-core/src/components/Tooltip/examples/Tooltip.md
+++ b/packages/react-core/src/components/Tooltip/examples/Tooltip.md
@@ -37,6 +37,8 @@ TooltipReactRef = () => {
     <div style={{ margin: '100px' }}>
       <button ref={tooltipRef}>Tooltip attached via react ref</button>
       <Tooltip
+        entryDelay={0}
+        exitDelay={0}
         content={
           <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.</div>
         }
@@ -55,6 +57,8 @@ import { Tooltip } from '@patternfly/react-core';
 <div style={{ margin: '100px' }}>
   <button id="tooltip-selector">Tooltip attached via selector ref</button>
   <Tooltip
+    entryDelay={0}
+    exitDelay={0}
     content={
       <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.</div>
     }
@@ -76,9 +80,7 @@ import OutlinedQuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/ou
       <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.</div>
     }
   >
-    <span aria-label="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis." tabIndex="0">
-      <OutlinedQuestionCircleIcon />
-    </span>
+    <OutlinedQuestionCircleIcon title="An icon with a tooltip" />
   </Tooltip>
 </div>
 ```
diff --git a/packages/react-docs/src/pages/icons.js b/packages/react-docs/src/pages/icons.js
index 2e58ce140a6..d74e467bb4e 100644
--- a/packages/react-docs/src/pages/icons.js
+++ b/packages/react-docs/src/pages/icons.js
@@ -51,7 +51,7 @@ const iconsPage = () => {
           .filter(([id]) => id !== 'AnsibeTowerIcon')
           .map(([id, Icon]) => (
             <GridItem key={id} style={cellStyle} sm={6} md={4} lg={2}>
-              <Tooltip entryDelay={0} exitDelay={0} content={<div>{id}</div>}>
+              <Tooltip content={<div>{id}</div>}>
                 <Icon size="xl" title={id} />
               </Tooltip>
               <div style={labelStyle}>{getLabel(id)}</div>
diff --git a/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx b/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx
index d75965ba3cb..349924d6360 100644
--- a/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx
+++ b/packages/react-topology/src/components/TopologyControlBar/TopologyControlBar.tsx
@@ -276,11 +276,7 @@ export const TopologyControlBar: React.FunctionComponent<TopologyControlBarProps
     );
 
     if (button.tooltip) {
-      return (
-        <Tooltip exitDelay={0} entryDelay={0} content={button.tooltip}>
-          {renderedButton}
-        </Tooltip>
-      );
+      return <Tooltip content={button.tooltip}>{renderedButton}</Tooltip>;
     }
 
     return renderedButton;

From 792d3b820fcdaddb28640e1227f9ba2d86e27b1d Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 25 May 2021 14:30:39 -0400
Subject: [PATCH 3/3] use 500ms per-design

---
 .../src/components/CodeEditor/CodeEditor.tsx  |  2 +-
 .../CodeEditor/CodeEditorControl.tsx          |  2 +-
 .../ClipboardCopy/ClipboardCopy.tsx           |  2 +-
 .../ClipboardCopy/ClipboardCopyButton.tsx     |  2 +-
 .../src/components/Tooltip/Tooltip.tsx        | 20 +++----------------
 .../components/Tooltip/examples/Tooltip.md    |  4 ----
 .../src/components/DefaultRemoveConnector.tsx |  7 +------
 .../TopologyControlBar.test.tsx.snap          | 14 -------------
 8 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
index 881b3087b0c..1e92430aa6f 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
@@ -137,7 +137,7 @@ export class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState
     downloadButtonToolTipText: 'Download',
     copyButtonSuccessTooltipText: 'Content added to clipboard',
     toolTipCopyExitDelay: 1600,
-    toolTipDelay: 0,
+    toolTipDelay: 300,
     toolTipMaxWidth: '100px',
     toolTipPosition: 'top',
     customControls: null,
diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
index 967406023e9..67b229732e2 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
@@ -31,7 +31,7 @@ export const CodeEditorControl: React.FunctionComponent<CodeEditorControlProps>
   'aria-label': ariaLabel,
   toolTipText,
   exitDelay = 0,
-  entryDelay = 0,
+  entryDelay = 300,
   maxWidth = '100px',
   position = 'top',
   onClick = () => {},
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
index 7dbc945ac25..3af63c9c106 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
@@ -95,7 +95,7 @@ export class ClipboardCopy extends React.Component<ClipboardCopyProps, Clipboard
     position: TooltipPosition.top,
     maxWidth: '150px',
     exitDelay: 1600,
-    entryDelay: 0,
+    entryDelay: 300,
     switchDelay: 2000,
     onCopy: clipboardCopyFunc,
     onChange: (): any => undefined,
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
index f4b4a8caa1c..512e870b43a 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
@@ -32,7 +32,7 @@ export interface ClipboardCopyButtonProps
 export const ClipboardCopyButton: React.FunctionComponent<ClipboardCopyButtonProps> = ({
   onClick,
   exitDelay = 0,
-  entryDelay = 0,
+  entryDelay = 300,
   maxWidth = '100px',
   position = 'top',
   'aria-label': ariaLabel = 'Copyable input',
diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx
index c63e4dcd890..ce70eb44340 100644
--- a/packages/react-core/src/components/Tooltip/Tooltip.tsx
+++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx
@@ -9,7 +9,6 @@ import tooltipMaxWidth from '@patternfly/react-tokens/dist/js/c_tooltip_MaxWidth
 import { ReactElement } from 'react';
 import { Popper, getOpacityTransition } from '../../helpers/Popper/Popper';
 import { Props as TippyProps } from '../../helpers/Popper/DeprecatedTippyTypes';
-import { Button } from '../Button';
 
 export enum TooltipPosition {
   auto = 'auto',
@@ -98,19 +97,6 @@ export interface TooltipProps extends Omit<React.HTMLProps<HTMLDivElement>, 'con
 // id for associating trigger with the content aria-describedby or aria-labelledby
 let pfTooltipIdCounter = 1;
 
-function isButtonOrIcon(children: React.ReactNode) {
-  if (React.isValidElement(children)) {
-    if (['button', Button as any, 'svg', 'g'].includes(children.type)) {
-      return true;
-    }
-    const displayName = (children.type as React.FunctionComponent).displayName;
-    if (typeof displayName === 'string' && displayName.includes('Icon')) {
-      return true;
-    }
-  }
-  return false;
-}
-
 export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   content: bodyContent,
   position = 'top',
@@ -119,9 +105,8 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   isContentLeftAligned = false,
   enableFlip = true,
   className = '',
-  children,
-  entryDelay = isButtonOrIcon(children) ? 0 : 1000,
-  exitDelay = isButtonOrIcon(children) ? 0 : 500,
+  entryDelay = 300,
+  exitDelay = 0,
   appendTo = () => document.body,
   zIndex = 9999,
   maxWidth = tooltipMaxWidth.value,
@@ -130,6 +115,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   // For every initial starting position, there are 3 escape positions
   flipBehavior = ['top', 'right', 'bottom', 'left', 'top', 'right', 'bottom'],
   id = `pf-tooltip-${pfTooltipIdCounter++}`,
+  children,
   animationDuration = 300,
   reference,
   boundary,
diff --git a/packages/react-core/src/components/Tooltip/examples/Tooltip.md b/packages/react-core/src/components/Tooltip/examples/Tooltip.md
index e31ade9102d..0069b82d9af 100644
--- a/packages/react-core/src/components/Tooltip/examples/Tooltip.md
+++ b/packages/react-core/src/components/Tooltip/examples/Tooltip.md
@@ -37,8 +37,6 @@ TooltipReactRef = () => {
     <div style={{ margin: '100px' }}>
       <button ref={tooltipRef}>Tooltip attached via react ref</button>
       <Tooltip
-        entryDelay={0}
-        exitDelay={0}
         content={
           <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.</div>
         }
@@ -57,8 +55,6 @@ import { Tooltip } from '@patternfly/react-core';
 <div style={{ margin: '100px' }}>
   <button id="tooltip-selector">Tooltip attached via selector ref</button>
   <Tooltip
-    entryDelay={0}
-    exitDelay={0}
     content={
       <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.</div>
     }
diff --git a/packages/react-topology/src/components/DefaultRemoveConnector.tsx b/packages/react-topology/src/components/DefaultRemoveConnector.tsx
index 4c7f53b27ec..8d0f514f4a6 100644
--- a/packages/react-topology/src/components/DefaultRemoveConnector.tsx
+++ b/packages/react-topology/src/components/DefaultRemoveConnector.tsx
@@ -31,12 +31,7 @@ const DefaultRemoveConnector: React.FC<DefaultRemoveConnectorProps> = ({
   onRemove,
   size = 14
 }) => (
-  <Tooltip
-    exitDelay={0}
-    entryDelay={0}
-    content="Delete Connector"
-    position={computeTooltipPosition(startPoint, endPoint)}
-  >
+  <Tooltip content="Delete Connector" position={computeTooltipPosition(startPoint, endPoint)}>
     <g
       transform={`translate(${startPoint.x + (endPoint.x - startPoint.x) * 0.5}, ${startPoint.y +
         (endPoint.y - startPoint.y) * 0.5})`}
diff --git a/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap b/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
index d0692b8f2d8..1fe3ecf496c 100644
--- a/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
+++ b/packages/react-topology/src/components/TopologyControlBar/__snapshots__/TopologyControlBar.test.tsx.snap
@@ -118,8 +118,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                       >
                         <Tooltip
                           content="test zoom in tooltip"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -243,8 +241,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                       >
                         <Tooltip
                           content="Zoom Out"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -391,8 +387,6 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `
                       >
                         <Tooltip
                           content="Reset View"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -748,8 +742,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Zoom In"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -896,8 +888,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Zoom Out"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -1044,8 +1034,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Fit to Screen"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}
@@ -1192,8 +1180,6 @@ exports[`TopologyControlBar should display the default controls correctly 1`] =
                       >
                         <Tooltip
                           content="Reset View"
-                          entryDelay={0}
-                          exitDelay={0}
                         >
                           <Popper
                             appendTo={[Function]}