diff --git a/packages/react-core/src/components/Popover/examples/Popover.md b/packages/react-core/src/components/Popover/examples/Popover.md
index 3d34b811135..11867adcf1d 100644
--- a/packages/react-core/src/components/Popover/examples/Popover.md
+++ b/packages/react-core/src/components/Popover/examples/Popover.md
@@ -16,335 +16,52 @@ import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
 
 ### Basic
 
-```js
-import React from 'react';
-import { Popover, PopoverPosition, Button } from '@patternfly/react-core';
-
-<div style={{ margin: '50px' }}>
-  <Popover
-    aria-label="Basic popover"
-    headerContent={<div>Popover header</div>}
-    bodyContent={<div>Popovers are triggered by click rather than hover.</div>}
-    footerContent="Popover footer"
-  >
-    <Button>Toggle popover</Button>
-  </Popover>
-</div>;
+```ts file="./PopoverBasic.tsx"
 ```
 
 ### Close popover from content (controlled)
 
-```js
-import React from 'react';
-import { Popover, PopoverPosition, Button } from '@patternfly/react-core';
-
-PopoverCloseControlled = () => {
-  const [isVisible, setIsVisible] = React.useState(false);
-  return (
-    <div style={{ margin: '50px' }}>
-      <Popover
-        aria-label="Popover with button in the body that can close it"
-        isVisible={isVisible}
-        shouldOpen={() => setIsVisible(true)}
-        shouldClose={() => setIsVisible(false)}
-        headerContent={<div>Popover header</div>}
-        bodyContent={
-          <div>
-            <div>
-              All the content props (headerContent, bodyContent, footerContent) can take a function which the popover
-              component passes the hide function to which can be used to close the popover after some user interaction.
-            </div>
-            <div>
-              <button onClick={() => setIsVisible(false)}>Close popover</button>
-            </div>
-          </div>
-        }
-        footerContent="Popover footer"
-      >
-        <Button>Toggle popover</Button>
-      </Popover>
-    </div>
-  );
-};
+```ts file="./PopoverCloseControlled.tsx"
 ```
 
 ### Close popover from content (uncontrolled)
 
 Note: If you use the isVisible prop, either refer to the example above or if you want to use the hide callback from the content then be sure to keep isVisible in-sync.
 
-```js
-import React from 'react';
-import { Popover, PopoverPosition, Button } from '@patternfly/react-core';
-
-<div style={{ margin: '50px' }}>
-  <Popover
-    aria-label="Popover with button in the body that can close it"
-    headerContent={<div>Popover header</div>}
-    bodyContent={hide => (
-      <div>
-        <div>
-          All the content props (headerContent, bodyContent, footerContent) can take a function which the popover
-          component passes the hide function to which can be used to close the popover after some user interaction.
-        </div>
-        <div>
-          <button onClick={hide}>Close popover</button>
-        </div>
-      </div>
-    )}
-    footerContent="Popover footer"
-  >
-    <Button>Toggle popover</Button>
-  </Popover>
-</div>;
+```ts file="./PopoverCloseUncontrolled.tsx"
 ```
 
 ### Without header/footer/close and no padding
 
-```js
-import React from 'react';
-import { Popover, PopoverPosition, Button } from '@patternfly/react-core';
-
-<div style={{ margin: '50px' }}>
-  <Popover
-    aria-label="Popover with no header, footer, close button, and padding"
-    hasNoPadding
-    showClose={false}
-    bodyContent={hide => (
-      <div>
-        This popover has no padding and is intended for use with content that has its own spacing and should touch the
-        edges of the popover container.
-      </div>
-    )}
-    withFocusTrap={false /* no focusable content in this example */}
-  >
-    <Button>Toggle popover</Button>
-  </Popover>
-</div>;
+```ts file="./PopoverWithoutHeaderFooterCloseNoPadding.tsx"
 ```
 
 ### Width auto
 
-```js
-import React from 'react';
-import { Popover, PopoverPosition, Button } from '@patternfly/react-core';
-
-<div style={{ margin: '50px' }}>
-  <Popover
-    aria-label="Popover with auto-width"
-    hasAutoWidth
-    bodyContent={hide => <div>Removes fixed-width and allows width to be defined by contents</div>}
-  >
-    <Button>Toggle popover</Button>
-  </Popover>
-</div>;
+```ts file="./PopoverWidthAuto.tsx"
 ```
 
 ### Popover react ref
 
-```js
-import React from 'react';
-import { Popover } from '@patternfly/react-core';
-
-PopoverReactRef = () => {
-  const popoverRef = React.useRef();
-  return (
-    <div style={{ margin: '50px' }}>
-      <button ref={popoverRef}>Popover attached via react ref</button>
-      <Popover
-        aria-label="Popover with react reference example"
-        headerContent={<div>Popover header</div>}
-        bodyContent={
-          <div>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
-          </div>
-        }
-        footerContent="Popover footer"
-        reference={popoverRef}
-      />
-    </div>
-  );
-};
+```ts file="./PopoverReactRef.tsx"
 ```
 
 ### Popover selector ref
 
-```js
-import React from 'react';
-import { Popover } from '@patternfly/react-core';
-
-<div style={{ margin: '50px' }}>
-  <button id="popover-selector">Popover attached via selector ref</button>
-  <Popover
-    aria-label="Popover with selector reference example"
-    headerContent={<div>Popover header</div>}
-    bodyContent={
-      <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.</div>
-    }
-    footerContent="Popover footer"
-    reference={() => document.getElementById('popover-selector')}
-  />
-</div>;
+```ts file="./PopoverSelectorRef.tsx"
 ```
 
 ### Advanced
 
-```js
-import React from 'react';
-import { Popover, PopoverPosition, Checkbox, Button } from '@patternfly/react-core';
-
-class AdvancedPopover extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      position: 'auto',
-      show: false,
-      keepInViewChecked: true
-    };
-    this.handleKeepInViewChange = checked => {
-      this.setState({ keepInViewChecked: checked });
-    };
-    this.handleProgrammaticChange = checked => {
-      this.setState({
-        show: checked
-      });
-    };
-    this.shouldClose = () => {
-      console.log('shouldClose');
-      this.setState({ show: false });
-    };
-    this.shouldOpen = () => {
-      console.log('shouldOpen');
-      this.setState({ show: true });
-    };
-  }
-
-  render() {
-    return (
-      <div>
-        <div>
-          <span style={{ paddingRight: '10px' }}>Popover position</span>
-          <select
-            aria-label="Popover position"
-            onChange={event => {
-              this.setState({ position: event.target.value });
-            }}
-          >
-            {Object.values(PopoverPosition).map(position => (
-              <option key={position} value={position}>
-                {position}
-              </option>
-            ))}
-          </select>
-          <Checkbox
-            label="Flip popover if the position falls outside the view"
-            isChecked={this.state.keepInViewChecked}
-            onChange={this.handleKeepInViewChange}
-            aria-label="Keep in view"
-            id="check-3"
-          />
-          <Checkbox
-            label="Toggle popover from outside"
-            isChecked={this.state.show}
-            onChange={this.handleProgrammaticChange}
-            aria-label="Toggle popover from outside"
-            id="check-4"
-          />
-        </div>
-
-        <div style={{ margin: '50px' }}>
-          <Popover
-            aria-label="Advanced popover usages example"
-            position={this.state.position}
-            hideOnOutsideClick={false}
-            isVisible={this.state.show}
-            shouldClose={this.shouldClose}
-            shouldOpen={this.shouldOpen}
-            enableFlip={this.state.keepInViewChecked}
-            appendTo={() => document.body}
-            headerContent={<div>Popover header</div>}
-            bodyContent={
-              <div>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
-              </div>
-            }
-            footerContent="Popover footer"
-          >
-            <Button>Toggle popover</Button>
-          </Popover>
-        </div>
-      </div>
-    );
-  }
-}
+```ts file="./PopoverAdvanced.tsx"
 ```
 
 ### Popover with icon in the title
 
-```ts isBeta
-import React from 'react';
-import { Popover, Button } from '@patternfly/react-core';
-import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
-
-<div style={{ margin: '50px' }}>
-  <Popover
-    aria-label="Alert popover"
-    headerContent="Popover with icon"
-    headerIcon={<BullhornIcon />}
-    bodyContent={<div>Popovers are triggered by click rather than hover.</div>}
-    footerContent="Popover footer"
-  >
-    <Button>Toggle popover</Button>
-  </Popover>
-</div>;
+```ts file="./PopoverWithIconInTheTitle.tsx" isBeta 
 ```
 
 ### Alert popover
 
-```ts isBeta
-import React from 'react';
-import { Popover, Button } from '@patternfly/react-core';
-import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
-import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
-import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
-import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
-import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
-
-const AlertPopover = () => {
-  const [alertSeverityVariant, setAlertSeverityVariant] = React.useState('default');
-  const alertIcons = {
-    default: <BellIcon />,
-    info: <InfoCircleIcon />,
-    success: <CheckCircleIcon />,
-    warning: <ExclamationTriangleIcon />,
-    danger: <ExclamationCircleIcon />
-  };
-
-  return (
-    <div>
-      <div>
-        <span style={{ paddingRight: '10px' }}>Alert variant:</span>
-        <select aria-label="Popover alert type" onChange={event => setAlertSeverityVariant(event.target.value)}>
-          <option value="default">default</option>
-          <option value="info">info</option>
-          <option value="success">success</option>
-          <option value="warning">warning</option>
-          <option value="danger">danger</option>
-        </select>
-      </div>
-      <div style={{ margin: '50px' }}>
-        <Popover
-          aria-label="Alert popover"
-          alertSeverityVariant={alertSeverityVariant as 'default' | 'info' | 'warning' | 'success' | 'danger'}
-          headerContent="Default popover title"
-          headerIcon={alertIcons[alertSeverityVariant]}
-          headerComponent="h1"
-          bodyContent={<div>Popovers are triggered by click rather than hover.</div>}
-          footerContent="Popover footer"
-        >
-          <Button>Toggle popover</Button>
-        </Popover>
-      </div>
-    </div>
-  );
-};
+```ts file="./PopoverAlert.tsx" isBeta 
 ```
diff --git a/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx b/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx
new file mode 100644
index 00000000000..52b936f727c
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { Popover, PopoverPosition, Checkbox, Button } from '@patternfly/react-core';
+
+export const PopoverAdvanced: React.FunctionComponent = () => {
+  const [position, setPosition] = React.useState(PopoverPosition.auto);
+  const [show, setShow] = React.useState(false);
+  const [keepInViewChecked, setKeepInViewChecked] = React.useState(true);
+
+  const handleKeepInViewChange = (checked: boolean) => {
+    setKeepInViewChecked(checked);
+  };
+
+  const handleProgrammaticChange = (checked: boolean) => {
+    setShow(checked);
+  };
+
+  const shouldClose = () => {
+    setShow(false);
+  };
+
+  const shouldOpen = () => {
+    setShow(true);
+  };
+
+  return (
+    <>
+      <div>
+        <span style={{ paddingRight: '10px' }}>Popover position</span>
+        <select
+          aria-label="Popover position"
+          onChange={event => {
+            setPosition(event.target.value as PopoverPosition);
+          }}
+        >
+          {Object.values(PopoverPosition).map(position => (
+            <option key={position} value={position}>
+              {position}
+            </option>
+          ))}
+        </select>
+        <Checkbox
+          label="Flip popover if the position falls outside the view"
+          isChecked={keepInViewChecked}
+          onChange={handleKeepInViewChange}
+          aria-label="Keep in view"
+          id="popover-advanced-check-1"
+        />
+        <Checkbox
+          label="Toggle popover from outside"
+          isChecked={show}
+          onChange={handleProgrammaticChange}
+          aria-label="Toggle popover from outside"
+          id="popover-advanced-check-2"
+        />
+      </div>
+
+      <div style={{ margin: '50px' }}>
+        <Popover
+          aria-label="Advanced popover usages example"
+          position={position}
+          hideOnOutsideClick={false}
+          isVisible={show}
+          shouldClose={shouldClose}
+          shouldOpen={shouldOpen}
+          enableFlip={keepInViewChecked}
+          headerContent={<div>Popover header</div>}
+          bodyContent={
+            <div>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
+            </div>
+          }
+          footerContent="Popover footer"
+        >
+          <Button>Toggle popover</Button>
+        </Popover>
+      </div>
+    </>
+  );
+};
diff --git a/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx b/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx
new file mode 100644
index 00000000000..023569db7ce
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
+import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
+import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
+import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
+import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+
+export const AlertPopover: React.FunctionComponent = () => {
+  const [alertSeverityVariant, setAlertSeverityVariant] = React.useState('default');
+
+  const alertIcons = {
+    default: <BellIcon />,
+    info: <InfoCircleIcon />,
+    success: <CheckCircleIcon />,
+    warning: <ExclamationTriangleIcon />,
+    danger: <ExclamationCircleIcon />
+  };
+
+  return (
+    <>
+      <div>
+        <span style={{ paddingRight: '10px' }}>Alert variant:</span>
+        <select aria-label="Popover alert type" onChange={event => setAlertSeverityVariant(event.target.value)}>
+          <option value="default">default</option>
+          <option value="info">info</option>
+          <option value="success">success</option>
+          <option value="warning">warning</option>
+          <option value="danger">danger</option>
+        </select>
+      </div>
+      <div style={{ margin: '50px' }}>
+        <Popover
+          aria-label="Alert popover"
+          alertSeverityVariant={alertSeverityVariant as 'default' | 'info' | 'warning' | 'success' | 'danger'}
+          headerContent="Default popover title"
+          headerIcon={alertIcons[alertSeverityVariant]}
+          headerComponent="h1"
+          bodyContent={<div>Popovers are triggered by click rather than hover.</div>}
+          footerContent="Popover footer"
+        >
+          <Button>Toggle popover</Button>
+        </Popover>
+      </div>
+    </>
+  );
+};
diff --git a/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx b/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx
new file mode 100644
index 00000000000..4324eac6ee0
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+
+export const PopoverBasic: React.FunctionComponent = () => (
+  <div style={{ margin: '50px' }}>
+    <Popover
+      aria-label="Basic popover"
+      headerContent={<div>Popover header</div>}
+      bodyContent={<div>Popovers are triggered by click rather than hover.</div>}
+      footerContent="Popover footer"
+    >
+      <Button>Toggle popover</Button>
+    </Popover>
+  </div>
+);
diff --git a/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx b/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx
new file mode 100644
index 00000000000..45ea581fcee
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+
+export const PopoverCloseControlled: React.FunctionComponent = () => {
+  const [isVisible, setIsVisible] = React.useState(false);
+
+  return (
+    <div style={{ margin: '50px' }}>
+      <Popover
+        aria-label="Popover with button in the body that can close it"
+        isVisible={isVisible}
+        shouldOpen={() => setIsVisible(true)}
+        shouldClose={() => setIsVisible(false)}
+        headerContent={<div>Popover header</div>}
+        bodyContent={
+          <div>
+            <div>A controlled popover can be closed by updating its isVisible state after some user interaction.</div>
+            <div>
+              <button onClick={() => setIsVisible(false)}>Close popover</button>
+            </div>
+          </div>
+        }
+        footerContent="Popover footer"
+      >
+        <Button>Toggle popover</Button>
+      </Popover>
+    </div>
+  );
+};
diff --git a/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx b/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx
new file mode 100644
index 00000000000..bfab39673be
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+
+export const PopoverCloseUncontrolled: React.FunctionComponent = () => (
+  <div style={{ margin: '50px' }}>
+    <Popover
+      aria-label="Uncontrolled popover with button in the body that can close it"
+      headerContent={<div>Popover header</div>}
+      bodyContent={hide => (
+        <div>
+          <div>
+            All the content props (headerContent, bodyContent, footerContent) can take a function which the popover
+            component passes the hide function to which can be used to close the popover after some user interaction.
+          </div>
+          <div>
+            <button onClick={hide}>Close popover</button>
+          </div>
+        </div>
+      )}
+      footerContent="Popover footer"
+    >
+      <Button>Toggle popover</Button>
+    </Popover>
+  </div>
+);
diff --git a/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx b/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx
new file mode 100644
index 00000000000..5e1d058209c
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Popover } from '@patternfly/react-core';
+
+export const PopoverReactRef: React.FunctionComponent = () => {
+  const popoverRef = React.useRef<HTMLButtonElement>(null);
+
+  return (
+    <div style={{ margin: '50px' }}>
+      <button ref={popoverRef}>Popover attached via react ref</button>
+      <Popover
+        aria-label="Popover with react reference example"
+        headerContent={<div>Popover header</div>}
+        bodyContent={
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
+          </div>
+        }
+        footerContent="Popover footer"
+        reference={popoverRef}
+      />
+    </div>
+  );
+};
diff --git a/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx b/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx
new file mode 100644
index 00000000000..0ce9b06e930
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Popover } from '@patternfly/react-core';
+
+export const PopoverSelectorRef: React.FunctionComponent = () => (
+  <div style={{ margin: '50px' }}>
+    <button id="popover-selector">Popover attached via selector ref</button>
+    <Popover
+      aria-label="Popover with selector reference example"
+      headerContent={<div>Popover header</div>}
+      bodyContent={
+        <div>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam id feugiat augue, nec fringilla turpis.
+        </div>
+      }
+      footerContent="Popover footer"
+      reference={() => document.getElementById('popover-selector') as HTMLButtonElement}
+    />
+  </div>
+);
diff --git a/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx b/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx
new file mode 100644
index 00000000000..f4254147f68
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+
+export const PopoverWidthAuto: React.FunctionComponent = () => (
+  <div style={{ margin: '50px' }}>
+    <Popover
+      aria-label="Popover with auto-width"
+      hasAutoWidth
+      bodyContent={() => <div>Removes fixed-width and allows width to be defined by contents</div>}
+    >
+      <Button>Toggle popover</Button>
+    </Popover>
+  </div>
+);
diff --git a/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx b/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx
new file mode 100644
index 00000000000..7b8e4cb731e
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
+
+export const PopoverWithIconInTheTitle: React.FunctionComponent = () => (
+  <div style={{ margin: '50px' }}>
+    <Popover
+      aria-label="Popover with icon in the title example"
+      headerContent="Popover with icon"
+      headerIcon={<BullhornIcon />}
+      bodyContent={<div>Popovers are triggered by click rather than hover.</div>}
+      footerContent="Popover footer"
+    >
+      <Button>Toggle popover</Button>
+    </Popover>
+  </div>
+);
diff --git a/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx b/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx
new file mode 100644
index 00000000000..1110afd1858
--- /dev/null
+++ b/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Popover, Button } from '@patternfly/react-core';
+
+export const PopoverWithoutHeaderFooterCloseNoPadding: React.FunctionComponent = () => (
+  <div style={{ margin: '50px' }}>
+    <Popover
+      aria-label="Popover with no header, footer, close button, and padding"
+      hasNoPadding
+      showClose={false}
+      bodyContent={() => (
+        <div>
+          This popover has no padding and is intended for use with content that has its own spacing and should touch the
+          edges of the popover container.
+        </div>
+      )}
+      withFocusTrap={false /* no focusable content in this example */}
+    >
+      <Button>Toggle popover</Button>
+    </Popover>
+  </div>
+);