From 7358a60fa1d5ddee3850a42c6293308cd20caa62 Mon Sep 17 00:00:00 2001 From: Samira Mokaram Date: Mon, 21 Dec 2020 13:36:01 +0100 Subject: [PATCH] address comments --- .../HeaderIconLinkRow/HeaderIconLinkRow.tsx | 5 ++-- .../HeaderIconLinkRow/IconLinkVertical.tsx | 20 ++-------------- .../src/components/HeaderIconLinkRow/types.ts | 24 ------------------- 3 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 packages/core/src/components/HeaderIconLinkRow/types.ts diff --git a/packages/core/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx b/packages/core/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx index 4de3f2b174..a2f86d133b 100644 --- a/packages/core/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx +++ b/packages/core/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx @@ -14,8 +14,7 @@ * limitations under the License. */ import React from 'react'; -import { IconLinkVertical } from './IconLinkVertical'; -import { HeaderIconLink } from './types'; +import { IconLinkVertical, IconLinkVerticalProps } from './IconLinkVertical'; import { makeStyles } from '@material-ui/core'; const useStyles = makeStyles(theme => ({ @@ -29,7 +28,7 @@ const useStyles = makeStyles(theme => ({ })); type Props = { - links: HeaderIconLink[]; + links: IconLinkVerticalProps[]; }; export const HeaderIconLinkRow = ({ links }: Props) => { diff --git a/packages/core/src/components/HeaderIconLinkRow/IconLinkVertical.tsx b/packages/core/src/components/HeaderIconLinkRow/IconLinkVertical.tsx index 79b3b7efab..7a9078c3e4 100644 --- a/packages/core/src/components/HeaderIconLinkRow/IconLinkVertical.tsx +++ b/packages/core/src/components/HeaderIconLinkRow/IconLinkVertical.tsx @@ -19,11 +19,10 @@ import { makeStyles, Link } from '@material-ui/core'; import LinkIcon from '@material-ui/icons/Link'; import { Link as RouterLink } from '../Link'; -type IconLinkVerticalProps = { +export type IconLinkVerticalProps = { icon?: React.ReactNode; href?: string; disabled?: boolean; - title?: string; label: string; action?: React.ReactNode; }; @@ -63,7 +62,6 @@ export function IconLinkVertical({ {icon} @@ -74,27 +72,13 @@ export function IconLinkVertical({ if (action) { return ( - + {icon} {action} ); } - // Absolute links should not be using RouterLink - if (href?.startsWith('//') || href?.includes('://')) { - return ( - - {icon} - {props.label} - - ); - } - return ( {icon} diff --git a/packages/core/src/components/HeaderIconLinkRow/types.ts b/packages/core/src/components/HeaderIconLinkRow/types.ts deleted file mode 100644 index b67ad1810a..0000000000 --- a/packages/core/src/components/HeaderIconLinkRow/types.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2020 Spotify AB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -export type HeaderIconLink = { - icon?: React.ReactNode; - href?: string; - disabled?: boolean; - title?: string; - label: string; - action?: React.ReactNode; - edithref?: string; -};