From 740503d88fc5f7fabfc07b88f81c4b3ed1af29db Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 15 Jun 2021 11:09:04 +0200
Subject: [PATCH] Copy the changes to the core-components packages

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/yellow-schools-matter.md                |  1 +
 .../src/components/Button/Button.tsx               | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.changeset/yellow-schools-matter.md b/.changeset/yellow-schools-matter.md
index b159828b88..15a65a7bcb 100644
--- a/.changeset/yellow-schools-matter.md
+++ b/.changeset/yellow-schools-matter.md
@@ -1,5 +1,6 @@
 ---
 '@backstage/core': patch
+'@backstage/core-components': patch
 ---
 
 Use the Backstage `Link` component in the `Button`
diff --git a/packages/core-components/src/components/Button/Button.tsx b/packages/core-components/src/components/Button/Button.tsx
index ca45b3da7f..c678b9a9db 100644
--- a/packages/core-components/src/components/Button/Button.tsx
+++ b/packages/core-components/src/components/Button/Button.tsx
@@ -14,17 +14,19 @@
  * limitations under the License.
  */
 
-import React, { ComponentProps } from 'react';
-import { Button as MaterialButton } from '@material-ui/core';
-import { Link as RouterLink } from 'react-router-dom';
+import {
+  Button as MaterialButton,
+  ButtonProps as MaterialButtonProps,
+} from '@material-ui/core';
+import React from 'react';
+import { Link, LinkProps } from '../Link';
 
-type Props = ComponentProps<typeof MaterialButton> &
-  ComponentProps<typeof RouterLink>;
+type Props = MaterialButtonProps & Omit<LinkProps, 'variant' | 'color'>;
 
 /**
  * Thin wrapper on top of material-ui's Button component
  * Makes the Button to utilise react-router
  */
 export const Button = React.forwardRef<any, Props>((props, ref) => (
-  <MaterialButton ref={ref} component={RouterLink} {...props} />
+  <MaterialButton ref={ref} component={Link} {...props} />
 ));