Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TM-1467] show tooltip over the land use type chart #756

Merged
merged 1 commit into from
Dec 17, 2024
Merged

[TM-1467] show tooltip over the land use type chart #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ const MonitoredCharts = ({
const [hasNoData, setHasNoData] = useState(false);

useEffect(() => {
if (isLoadingIndicator) {
setHasNoData(false);
}
const noData = selected.some(chartId => {
switch (chartId) {
case "1":
Expand All @@ -102,7 +105,7 @@ const MonitoredCharts = ({
}
});
setHasNoData(noData);
}, [selected, parsedData, ecoRegionData, strategiesData, landUseData]);
}, [selected, parsedData, ecoRegionData, strategiesData, landUseData, isLoadingIndicator]);

const renderChart = (chartId: React.Key) => {
switch (chartId) {
Expand Down
33 changes: 21 additions & 12 deletions src/pages/dashboard/components/GraphicIconDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ import { DashboardTableDataProps } from "../index.page";

const GraphicIconDashboard = ({ data, maxValue }: { data: DashboardTableDataProps[]; maxValue: number }) => {
const t = useT();
const [tooltip, setTooltip] = useState<{ text: string | null; label: string | null; x: number; y: number }>({
const [tooltip, setTooltip] = useState<{
text: string | null;
label: string | null;
position: { top: number; left: number } | null;
}>({
text: null,
label: null,
x: 0,
y: 0
position: null
});

const colorIconLabel = (label: string): { color: string; icon: keyof typeof IconNames } => {
Expand Down Expand Up @@ -43,17 +46,23 @@ const GraphicIconDashboard = ({ data, maxValue }: { data: DashboardTableDataProp
}
};

const handleMouseEnter = (event: MouseEvent<HTMLDivElement>, label: string, valueText: string) => {
const handleMouseMove = (event: MouseEvent<HTMLDivElement>, label: string, valueText: string) => {
setTooltip({
text: valueText,
label,
x: event.pageX,
y: event.pageY
position: {
top: event.clientY - 70,
left: event.clientX
}
});
};

const handleMouseLeave = () => {
setTooltip({ text: null, label: null, x: 0, y: 0 });
setTooltip({
text: null,
label: null,
position: null
});
};

return (
Expand All @@ -72,18 +81,18 @@ const GraphicIconDashboard = ({ data, maxValue }: { data: DashboardTableDataProp
)}
style={{ width: `${percentage}%` }}
key={index}
onMouseEnter={e => handleMouseEnter(e, item.label, item.valueText)}
onMouseMove={e => handleMouseMove(e, item.label, item.valueText)}
onMouseLeave={handleMouseLeave}
/>
);
})}
</div>
{tooltip.text && (
{tooltip.text && tooltip.position && (
<div
className="shadow-md fixed z-10 w-auto rounded border border-darkCustom bg-white p-2"
style={{
left: `${tooltip.x}px`,
top: `${tooltip.y - 65}px`,
left: `${tooltip.position.left}px`,
top: `${tooltip.position.top}px`,
transform: "translateX(-50%)"
}}
>
Expand All @@ -109,7 +118,7 @@ const GraphicIconDashboard = ({ data, maxValue }: { data: DashboardTableDataProp
</div>
<div
className="relative h-4 rounded bg-blueCustom-30 lg:h-5"
onMouseEnter={e => handleMouseEnter(e, item.label, item.valueText)}
onMouseMove={e => handleMouseMove(e, item.label, item.valueText)}
onMouseLeave={handleMouseLeave}
>
<div
Expand Down
Loading