Fixed issue with hover tooltips.

This commit is contained in:
Mike Cao 2023-06-15 20:15:31 -07:00
parent 2b13002f1b
commit ab0838e272
20 changed files with 50 additions and 91 deletions

View File

@ -18,9 +18,9 @@ export function HoverTooltip({ children }) {
}, []);
return (
<div className={styles.tooltip} style={{ left: position.x, top: position.y - 16 }}>
<Tooltip position="top" action="none" label={children} />
</div>
<Tooltip className={styles.tooltip} style={{ left: position.x, top: position.y }}>
{children}
</Tooltip>
);
}

View File

@ -1,43 +1,6 @@
.chart {
position: relative;
}
.tooltip {
position: fixed;
pointer-events: none;
z-index: var(--z-index-popup);
}
.content {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
}
.title {
font-size: var(--font-size-xs);
font-weight: 600;
}
.metric {
display: flex;
justify-content: center;
align-items: center;
font-size: var(--font-size-sm);
font-weight: 600;
}
.dot {
position: relative;
overflow: hidden;
border-radius: 100%;
margin-right: 8px;
background: var(--base50);
}
.color {
width: 10px;
height: 10px;
transform: translate(-50%, calc(-100% - 5px));
}

View File

@ -14,7 +14,7 @@ import styles from './WorldMap.module.css';
export function WorldMap({ data, className }) {
const { basePath } = useRouter();
const [tooltip, setTooltip] = useState();
const [tooltip, setTooltipPopup] = useState();
const { theme, colors } = useTheme();
const { locale } = useLocale();
const countryNames = useCountryNames(locale);
@ -40,7 +40,7 @@ export function WorldMap({ data, className }) {
function handleHover(code) {
if (code === 'AQ') return;
const country = metrics?.find(({ x }) => x === code);
setTooltip(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} visitors`);
setTooltipPopup(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} visitors`);
}
return (
@ -69,7 +69,7 @@ export function WorldMap({ data, className }) {
pressed: { outline: 'none' },
}}
onMouseOver={() => handleHover(code)}
onMouseOut={() => setTooltip(null)}
onMouseOut={() => setTooltipPopup(null)}
/>
);
});

View File

@ -9,7 +9,8 @@ export function LanguageButton() {
const { locale, saveLocale, dir } = useLocale();
const items = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
function handleSelect(value, close) {
function handleSelect(value, close, e) {
e.stopPropagation();
saveLocale(value);
close();
}

View File

@ -1,7 +1,7 @@
.menu {
display: flex;
flex-flow: row wrap;
max-width: 640px;
min-width: 640px;
padding: 10px;
background: var(--base50);
z-index: var(--z-index-popup);

View File

@ -1,4 +1,4 @@
import { Button, Icon, Icons, Tooltip } from 'react-basics';
import { Button, Icon, Icons, TooltipPopup } from 'react-basics';
import Link from 'next/link';
import useMessages from 'hooks/useMessages';
@ -6,13 +6,13 @@ export function LogoutButton({ tooltipPosition = 'top' }) {
const { formatMessage, labels } = useMessages();
return (
<Link href="/logout">
<Tooltip label={formatMessage(labels.logout)} position={tooltipPosition}>
<TooltipPopup label={formatMessage(labels.logout)} position={tooltipPosition}>
<Button variant="quiet">
<Icon>
<Icons.Logout />
</Icon>
</Button>
</Tooltip>
</TooltipPopup>
</Link>
);
}

View File

@ -1,4 +1,4 @@
import { LoadingButton, Icon, Tooltip } from 'react-basics';
import { LoadingButton, Icon, TooltipPopup } from 'react-basics';
import { setWebsiteDateRange } from 'store/websites';
import useDateRange from 'hooks/useDateRange';
import Icons from 'components/icons';
@ -19,13 +19,13 @@ export function RefreshButton({ websiteId, isLoading }) {
}
return (
<Tooltip label={formatMessage(labels.refresh)}>
<TooltipPopup label={formatMessage(labels.refresh)}>
<LoadingButton loading={isLoading} onClick={handleClick}>
<Icon>
<Icons.Refresh />
</Icon>
</LoadingButton>
</Tooltip>
</TooltipPopup>
);
}

View File

@ -2,6 +2,7 @@
display: grid;
grid-template-rows: max-content 1fr;
grid-template-columns: 1fr;
overflow: hidden;
}
.nav {

View File

@ -1,5 +1,5 @@
import { useState } from 'react';
import { Icon, Text, Tooltip } from 'react-basics';
import { Icon, Text, TooltipPopup } from 'react-basics';
import classNames from 'classnames';
import { useRouter } from 'next/router';
import Link from 'next/link';
@ -36,7 +36,7 @@ export function NavGroup({
<div className={styles.body}>
{items.map(({ label, url, icon, divider }) => {
return (
<Tooltip key={label} label={label} position="right" disabled={!minimized}>
<TooltipPopup key={label} label={label} position="right" disabled={!minimized}>
<Link
href={url}
className={classNames(styles.item, {
@ -47,7 +47,7 @@ export function NavGroup({
<Icon>{icon}</Icon>
<Text className={styles.text}>{label}</Text>
</Link>
</Tooltip>
</TooltipPopup>
);
})}
</div>

View File

@ -20,14 +20,14 @@ export function BarChart({
renderYLabel,
XAxisType = 'time',
YAxisType = 'linear',
renderTooltip,
renderTooltipPopup,
onCreate,
onUpdate,
className,
}) {
const canvas = useRef();
const chart = useRef(null);
const [tooltip, setTooltip] = useState(null);
const [tooltip, setTooltipPopup] = useState(null);
const { locale } = useLocale();
const { theme, colors } = useTheme();
@ -50,7 +50,7 @@ export function BarChart({
},
tooltip: {
enabled: false,
external: renderTooltip ? renderTooltip.bind(null, setTooltip) : undefined,
external: renderTooltipPopup ? renderTooltipPopup.bind(null, setTooltipPopup) : undefined,
},
},
scales: {
@ -93,7 +93,7 @@ export function BarChart({
};
}, [
animationDuration,
renderTooltip,
renderTooltipPopup,
renderXLabel,
XAxisType,
YAxisType,
@ -120,7 +120,7 @@ export function BarChart({
};
const updateChart = () => {
setTooltip(null);
setTooltipPopup(null);
datasets.forEach((dataset, index) => {
chart.current.data.datasets[index].data = dataset.data;

View File

@ -13,9 +13,3 @@
.tooltip .value {
text-transform: lowercase;
}
@media only screen and (max-width: 992px) {
.chart {
/*height: 200px;*/
}
}

View File

@ -5,7 +5,7 @@ import BarChart from './BarChart';
import { getDateArray } from 'lib/date';
import { useApi, useLocale, useDateRange, useTimezone, usePageQuery } from 'hooks';
import { EVENT_COLORS } from 'lib/constants';
import { renderDateLabels, renderStatusTooltip } from 'lib/charts';
import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
export function EventsChart({ websiteId, className, token }) {
const { get, useQuery } = useApi();
@ -72,7 +72,7 @@ export function EventsChart({ websiteId, className, token }) {
loading={isLoading}
stacked
renderXLabel={renderDateLabels(unit, locale)}
renderTooltip={renderStatusTooltip(unit, locale)}
renderTooltipPopup={renderStatusTooltipPopup(unit, locale)}
/>
);
}

View File

@ -1,7 +1,7 @@
import { useMemo } from 'react';
import BarChart from './BarChart';
import { useLocale, useTheme, useMessages } from 'hooks';
import { renderDateLabels, renderStatusTooltip } from 'lib/charts';
import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
export function PageviewsChart({ websiteId, data, unit, className, loading, ...props }) {
const { formatMessage, labels } = useMessages();
@ -36,7 +36,7 @@ export function PageviewsChart({ websiteId, data, unit, className, loading, ...p
unit={unit}
loading={loading}
renderXLabel={renderDateLabels(unit, locale)}
renderTooltip={renderStatusTooltip(unit, locale)}
renderTooltipPopup={renderStatusTooltipPopup(unit, locale)}
/>
);
}

View File

@ -39,7 +39,7 @@ export function ReportHeader({ icon }) {
};
const handleNameChange = name => {
updateReport({ name });
updateReport({ name: name || 'Untitled' });
};
const handleDescriptionChange = description => {

View File

@ -21,15 +21,15 @@ export function FunnelChart({ className, loading }) {
[parameters],
);
const renderTooltip = useCallback((setTooltip, model) => {
const renderTooltipPopup = useCallback((setTooltipPopup, model) => {
const { opacity, dataPoints } = model.tooltip;
if (!dataPoints?.length || !opacity) {
setTooltip(null);
setTooltipPopup(null);
return;
}
setTooltip(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
setTooltipPopup(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
}, []);
const datasets = useMemo(() => {
@ -54,7 +54,7 @@ export function FunnelChart({ className, loading }) {
unit="day"
loading={loading}
renderXLabel={renderXLabel}
renderTooltip={renderTooltip}
renderTooltipPopup={renderTooltipPopup}
XAxisType="category"
/>
);

View File

@ -11,7 +11,7 @@ import {
SubmitButton,
Text,
TextField,
Tooltip,
TooltipPopup,
} from 'react-basics';
import Icons from 'components/icons';
import UrlAddForm from './UrlAddForm';
@ -62,7 +62,7 @@ export function FunnelParameters() {
return (
<div key={index} className={styles.url}>
<Text>{url}</Text>
<Tooltip
<TooltipPopup
className={styles.icon}
label={formatMessage(labels.remove)}
position="right"
@ -70,7 +70,7 @@ export function FunnelParameters() {
<Icon onClick={handleRemoveUrl.bind(null, index)}>
<Icons.Close />
</Icon>
</Tooltip>
</TooltipPopup>
</div>
);
})}
@ -90,11 +90,11 @@ function AddUrlButton({ onAdd }) {
return (
<PopupTrigger>
<Tooltip label={formatMessage(labels.addUrl)}>
<TooltipPopup label={formatMessage(labels.addUrl)}>
<Icon>
<Icons.Plus />
</Icon>
</Tooltip>
</TooltipPopup>
<Popup position="bottom" alignment="start">
{close => {
return <UrlAddForm onSave={onAdd} onClose={close} />;

View File

@ -1,6 +1,6 @@
import { useState, useEffect } from 'react';
import { useRouter } from 'next/router';
import { get } from 'next-basics';
import { httpGet } from 'next-basics';
import enUS from 'public/intl/country/en-US.json';
const countryNames = {
@ -12,7 +12,7 @@ export function useCountryNames(locale) {
const { basePath } = useRouter();
async function loadData(locale) {
const { data } = await get(`${basePath}/intl/country/${locale}.json`);
const { data } = await httpGet(`${basePath}/intl/country/${locale}.json`);
if (data) {
countryNames[locale] = data;

View File

@ -27,12 +27,12 @@ export function renderDateLabels(unit, locale) {
};
}
export function renderStatusTooltip(unit, locale) {
return (setTooltip, model) => {
export function renderStatusTooltipPopup(unit, locale) {
return (setTooltipPopup, model) => {
const { opacity, labelColors, dataPoints } = model.tooltip;
if (!dataPoints?.length || !opacity) {
setTooltip(null);
setTooltipPopup(null);
return;
}
@ -48,7 +48,7 @@ export function renderStatusTooltip(unit, locale) {
year: 'yyyy',
};
setTooltip(
setTooltipPopup(
<>
<div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
<div>

View File

@ -95,7 +95,7 @@
"node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5",
"react": "^18.2.0",
"react-basics": "^0.84.0",
"react-basics": "^0.85.0",
"react-beautiful-dnd": "^13.1.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.4",

View File

@ -8191,10 +8191,10 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
react-basics@^0.84.0:
version "0.84.0"
resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.84.0.tgz#cfea2ae6b64d9318406a0c6cf0d5d9e8a0790a28"
integrity sha512-QWnUkw7kVbBK0Z1xvvsNgrUBlUI0FzL39jQAZR5EutE83BlkAtYeisXooPZk3PJuGHZzJvY6+JzMYmvALLjqnQ==
react-basics@^0.85.0:
version "0.85.0"
resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.85.0.tgz#407c413e56b004120b5e11074a7d9f17a697c6b7"
integrity sha512-RPxYiMdOmlWZXh2tKbUay97lsOFWtNYTzx5Jpcd9IUxBrNzYWgTCgtSHJLHAuycUCDNVepX+do+HdRG3uMkE0Q==
dependencies:
classnames "^2.3.1"
date-fns "^2.29.3"