address comments

This commit is contained in:
Samira Mokaram
2020-12-21 13:36:01 +01:00
parent fba3acffda
commit 7358a60fa1
3 changed files with 4 additions and 45 deletions
@@ -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) => {
@@ -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({
<Link
className={classnames(classes.link, classes.disabled)}
underline="none"
title={props.title}
{...props}
>
{icon}
@@ -74,27 +72,13 @@ export function IconLinkVertical({
if (action) {
return (
<Link
className={classnames(classes.link, classes.linkStyle)}
href={href}
{...props}
>
<Link className={classnames(classes.link, classes.linkStyle)} {...props}>
{icon}
{action}
</Link>
);
}
// Absolute links should not be using RouterLink
if (href?.startsWith('//') || href?.includes('://')) {
return (
<Link className={classes.link} href={href} {...props}>
{icon}
<span className={classes.label}>{props.label}</span>
</Link>
);
}
return (
<Link className={classes.link} to={href} component={RouterLink} {...props}>
{icon}
@@ -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;
};