Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions src/components/parser-components/external-link/external-link.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,20 @@ import React from 'react';
import PropTypes from 'prop-types';
import { IconExternalLink } from '@tabler/icons-react';

import Tooltip from '@/components/core/tooltip';

const linkClassName =
'inline-flex items-center gap-1 px-2 py-1 rounded text-primary underline hover:text-blue-900 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary';
'inline-flex items-center text-primary underline rounded-sm hover:text-blue-900 focus-visible:outline focus-visible:outline-2 focus-visible:outline-primary';

const ExternalLink = ({ display = '', target = '', title = '', newTab = false }) => {
const anchor = (
<a
href={target}
{...(newTab && { target: '_blank', rel: 'noopener noreferrer' })}
className={linkClassName}
>
{display}
{newTab && <IconExternalLink size={20} aria-hidden="true" />}
</a>
);
return title ? <Tooltip label={title}>{anchor}</Tooltip> : anchor;
};
const ExternalLink = ({ display = '', target = '', title = '', newTab = false }) => (
<a
href={target}
{...(title && { title })}
{...(newTab && { target: '_blank', rel: 'noopener noreferrer' })}
className={linkClassName}
>
{display}
{newTab && <IconExternalLink size={20} aria-hidden="true" />}
</a>
);

ExternalLink.propTypes = {
display: PropTypes.string,
Expand Down
43 changes: 6 additions & 37 deletions src/components/parser-components/image/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { IconExternalLink } from '@tabler/icons-react';

import Tooltip from '@/components/core/tooltip';

const useImageBroken = (source) => {
const [erroredSource, setErroredSource] = useState(null);
return {
Expand Down Expand Up @@ -44,23 +42,6 @@ LinkedImg.propTypes = {
onError: PropTypes.func,
};

const AltTooltip = ({ alt = '', disabled = false, children }) => {
if (!alt || disabled) return children;
return (
<span className="block overflow-hidden">
<Tooltip label={alt}>
<span className="block -mt-[15px] pt-[15px]">{children}</span>
</Tooltip>
</span>
);
};

AltTooltip.propTypes = {
alt: PropTypes.string,
disabled: PropTypes.bool,
children: PropTypes.node.isRequired,
};

const Caption = ({ display = '', children }) => (
<figure>
{children}
Expand All @@ -74,12 +55,8 @@ Caption.propTypes = {
};

const Image = ({ alt = '', source = '' }) => {
const { broken, onError } = useImageBroken(source);
return (
<AltTooltip alt={alt} disabled={broken}>
<Img source={source} alt={alt} onError={onError} />
</AltTooltip>
);
const { onError } = useImageBroken(source);
return <Img source={source} alt={alt} onError={onError} />;
};

Image.propTypes = {
Expand All @@ -89,11 +66,7 @@ Image.propTypes = {

export const ImageLink = ({ alt = '', source = '', target = '' }) => {
const { broken, onError } = useImageBroken(source);
return (
<AltTooltip alt={alt} disabled={broken}>
<LinkedImg source={source} alt={alt} target={target} broken={broken} onError={onError} />
</AltTooltip>
);
return <LinkedImg source={source} alt={alt} target={target} broken={broken} onError={onError} />;
};

ImageLink.propTypes = {
Expand All @@ -103,12 +76,10 @@ ImageLink.propTypes = {
};

export const ImageDisplay = ({ alt = '', display = '', source = '' }) => {
const { broken, onError } = useImageBroken(source);
const { onError } = useImageBroken(source);
return (
<Caption display={display}>
<AltTooltip alt={alt} disabled={broken}>
<Img source={source} alt={alt} onError={onError} />
</AltTooltip>
<Img source={source} alt={alt} onError={onError} />
</Caption>
);
};
Expand All @@ -123,9 +94,7 @@ export const ImageDisplayLink = ({ alt = '', display = '', source = '', target =
const { broken, onError } = useImageBroken(source);
return (
<Caption display={display}>
<AltTooltip alt={alt} disabled={broken}>
<LinkedImg source={source} alt={alt} target={target} broken={broken} onError={onError} />
</AltTooltip>
<LinkedImg source={source} alt={alt} target={target} broken={broken} onError={onError} />
</Caption>
);
};
Expand Down
9 changes: 8 additions & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ math {
padding-left: 1.5em;
}

.right-side-preview-area table {
display: block;
width: max-content;
max-width: 100%;
overflow-x: auto;
}

.right-side-preview-area table td,
.right-side-preview-area table th {
padding: 8px;
Expand Down Expand Up @@ -99,5 +106,5 @@ math {
}

.right-side-preview-area a:not([class]) {
@apply inline-flex items-center gap-1 px-2 py-1 rounded text-primary underline hover:text-blue-900 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary;
@apply inline-flex items-center text-primary underline rounded-sm hover:text-blue-900 focus-visible:outline focus-visible:outline-2 focus-visible:outline-primary;
}
Loading