From 192331af5991ad009a6bf66d32e268ab31ae2ff4 Mon Sep 17 00:00:00 2001
From: Kyle Suss <susskyle@gmail.com>
Date: Thu, 6 Jun 2019 17:36:52 -0600
Subject: [PATCH 1/3] Fix LintWrapper props to avoid collisions w React,
 Gatsby, etc links

---
 src/components/Link.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Link.js b/src/components/Link.js
index b1794d4e..e45fd219 100644
--- a/src/components/Link.js
+++ b/src/components/Link.js
@@ -135,7 +135,7 @@ const LinkButton = styled.button`
   ${linkStyles};
 `;
 
-export function Link({ isButton, withArrow, containsIcon, LinkWrapper, children, ...props }) {
+export function Link({ isButton, withArrow, containsIcon, LinkWrapper, children, ...rest }) {
   const content = (
     <Fragment>
       <LinkInner withArrow={withArrow} containsIcon={containsIcon}>
@@ -147,12 +147,19 @@ export function Link({ isButton, withArrow, containsIcon, LinkWrapper, children,
 
   if (LinkWrapper) {
     const StyledLinkWrapper = LinkA.withComponent(LinkWrapper);
-    return <StyledLinkWrapper {...props}>{content}</StyledLinkWrapper>;
+    const linkWrapperProps = { ...rest };
+    delete linkWrapperProps.inverse;
+    delete linkWrapperProps.nochrome;
+    delete linkWrapperProps.secondary;
+    delete linkWrapperProps.tertiary;
+    return <StyledLinkWrapper {...linkWrapperProps}>{content}</StyledLinkWrapper>;
   }
+
   if (isButton) {
-    return <LinkButton {...props}>{content}</LinkButton>;
+    return <LinkButton {...rest}>{content}</LinkButton>;
   }
-  return <LinkA {...props}>{content}</LinkA>;
+
+  return <LinkA {...rest}>{content}</LinkA>;
 }
 
 Link.propTypes = {

From 6191f557f0dc77d853bececfb496b63ac90d629e Mon Sep 17 00:00:00 2001
From: Kyle Suss <susskyle@gmail.com>
Date: Thu, 6 Jun 2019 20:36:03 -0600
Subject: [PATCH 2/3] Clean up linkWrapperProps destructuring in Link component

---
 src/components/Link.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/Link.js b/src/components/Link.js
index e45fd219..53bc294e 100644
--- a/src/components/Link.js
+++ b/src/components/Link.js
@@ -147,11 +147,8 @@ export function Link({ isButton, withArrow, containsIcon, LinkWrapper, children,
 
   if (LinkWrapper) {
     const StyledLinkWrapper = LinkA.withComponent(LinkWrapper);
-    const linkWrapperProps = { ...rest };
-    delete linkWrapperProps.inverse;
-    delete linkWrapperProps.nochrome;
-    delete linkWrapperProps.secondary;
-    delete linkWrapperProps.tertiary;
+    const { inverse, nochrome, secondary, tertiary, ...linkWrapperProps } = rest;
+
     return <StyledLinkWrapper {...linkWrapperProps}>{content}</StyledLinkWrapper>;
   }
 

From 0fb5605bf7a3f13baa0565203c036a8a4483aafd Mon Sep 17 00:00:00 2001
From: Kyle Suss <susskyle@gmail.com>
Date: Fri, 7 Jun 2019 08:29:43 -0600
Subject: [PATCH 3/3] Switch Highlight to a named export

---
 src/components/Highlight.js         | 4 +---
 src/components/Highlight.stories.js | 2 +-
 src/components/index.js             | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/Highlight.js b/src/components/Highlight.js
index 912a1fae..af87e5bb 100644
--- a/src/components/Highlight.js
+++ b/src/components/Highlight.js
@@ -34,7 +34,7 @@ const HighlightBlock = styled.div`
   }
 `;
 
-class Highlight extends React.Component {
+export class Highlight extends React.Component {
   componentDidMount() {
     this.highlightCode();
   }
@@ -62,5 +62,3 @@ class Highlight extends React.Component {
 Highlight.propTypes = {
   children: PropTypes.node.isRequired,
 };
-
-export default Highlight;
diff --git a/src/components/Highlight.stories.js b/src/components/Highlight.stories.js
index e4d27c12..5210c1f1 100644
--- a/src/components/Highlight.stories.js
+++ b/src/components/Highlight.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import Highlight from './Highlight';
+import { Highlight } from './Highlight';
 
 const bash = `
 <pre class="language-bash"><code class="language-bash"><span class="token comment"># Highlight bash:</span>
diff --git a/src/components/index.js b/src/components/index.js
index 7888fba3..3be950e8 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -9,7 +9,7 @@ export * from './Avatar';
 export * from './AvatarList';
 export * from './Badge';
 export * from './Button';
-export { default as Highlight } from './Highlight';
+export * from './Highlight';
 export * from './Icon';
 export * from './Link';
 export * from './Subheading';