diff --git a/packages/react-core/src/components/Chip/examples/Chip.md b/packages/react-core/src/components/Chip/examples/Chip.md
index aae5468e6d4..c740435a418 100644
--- a/packages/react-core/src/components/Chip/examples/Chip.md
+++ b/packages/react-core/src/components/Chip/examples/Chip.md
@@ -10,77 +10,5 @@ ouia: true
 
 ### Default
 
-```js
-import React from 'react';
-import { Badge, Chip } from '@patternfly/react-core';
-
-class SingleChip extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      chip: {
-        name: 'Chip 1'
-      },
-      longchip: {
-        name: 'Really long chip that goes on and on'
-      },
-      badgechip: {
-        name: 'Chip',
-        isRead: true,
-        count: 7
-      },
-      readonlychip: {
-        name: 'Read-only chip'
-      },
-      overflowchip: {
-        name: 'Overflow chip'
-      }
-    };
-    this.deleteItem = id => {
-      this.setState({ [id]: null });
-    };
-  }
-
-  render() {
-    const { chip, longchip, badgechip, readonlychip, overflowchip } = this.state;
-    return (
-      <React.Fragment>
-        {chip && (
-          <React.Fragment>
-            <Chip key="chip1" onClick={() => this.deleteItem('chip')}>
-              {chip.name}
-            </Chip>
-            <br /> <br />
-          </React.Fragment>
-        )}
-        {longchip && (
-          <React.Fragment>
-            <Chip key="chip2" onClick={() => this.deleteItem('longchip')}>
-              {longchip.name}
-            </Chip>
-            <br /> <br />
-          </React.Fragment>
-        )}
-        {badgechip && (
-          <React.Fragment>
-            <Chip key="chip3" onClick={() => this.deleteItem('badgechip')}>
-              {badgechip.name}
-              <Badge isRead={badgechip.isRead}>{badgechip.count}</Badge>
-            </Chip>
-            <br /> <br />
-          </React.Fragment>
-        )}
-        <Chip key="chip4" onClick={() => this.deleteItem('readonlychip')} isReadOnly>
-          {readonlychip.name}
-        </Chip>
-        <br /> <br />
-        {overflowchip && (
-          <Chip key="chip5" component="button" onClick={() => this.deleteItem('overflowchip')} isOverflowChip>
-            {overflowchip.name}
-          </Chip>
-        )}
-      </React.Fragment>
-    );
-  }
-}
+```ts file='./ChipDefault.tsx'
 ```
diff --git a/packages/react-core/src/components/Chip/examples/ChipDefault.tsx b/packages/react-core/src/components/Chip/examples/ChipDefault.tsx
new file mode 100644
index 00000000000..5411b30e91f
--- /dev/null
+++ b/packages/react-core/src/components/Chip/examples/ChipDefault.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import { Badge, Chip } from '@patternfly/react-core';
+
+export const ChipDefault: React.FunctionComponent = () => {
+  const [chips, setChips] = React.useState({
+    chip: {
+      name: 'Chip 1'
+    },
+    longchip: {
+      name: 'Really long chip that goes on and on'
+    },
+    badgechip: {
+      name: 'Chip',
+      isRead: true,
+      count: 7
+    },
+    readonlychip: {
+      name: 'Read-only chip'
+    },
+    overflowchip: {
+      name: 'Overflow chip'
+    }
+  });
+
+  const deleteItem = (id: string) => {
+    setChips({ ...chips, [id]: null });
+  };
+
+  const { chip, longchip, badgechip, readonlychip, overflowchip } = chips;
+  return (
+    <React.Fragment>
+      {chip && (
+        <React.Fragment>
+          <Chip key="chip1" onClick={() => deleteItem('chip')}>
+            {chip.name}
+          </Chip>
+          <br /> <br />
+        </React.Fragment>
+      )}
+      {longchip && (
+        <React.Fragment>
+          <Chip key="chip2" onClick={() => deleteItem('longchip')}>
+            {longchip.name}
+          </Chip>
+          <br /> <br />
+        </React.Fragment>
+      )}
+      {badgechip && (
+        <React.Fragment>
+          <Chip key="chip3" onClick={() => deleteItem('badgechip')}>
+            {badgechip.name}
+            <Badge isRead={badgechip.isRead}>{badgechip.count}</Badge>
+          </Chip>
+          <br /> <br />
+        </React.Fragment>
+      )}
+      <Chip key="chip4" onClick={() => deleteItem('readonlychip')} isReadOnly>
+        {readonlychip.name}
+      </Chip>
+      <br /> <br />
+      {overflowchip && (
+        <Chip key="chip5" component="button" onClick={() => deleteItem('overflowchip')} isOverflowChip>
+          {overflowchip.name}
+        </Chip>
+      )}
+    </React.Fragment>
+  );
+};