Skip to content

Fix for the behavior issue of the measurement graph. #815

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

Merged
scheidtdav merged 3 commits into from
Mar 11, 2026
+8 −8
Merged

Fix for the behavior issue of the measurement graph. #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45680a9
This commit fixes the overflow issue of the measurement graph.
JerryVincent Mar 11, 2026
1f24651
This commit fixes the jumping issue of the measurement graph upon cli…
JerryVincent Mar 11, 2026
353f3fa
improve wrapping
scheidtdav Mar 11, 2026
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
2 changes: 1 addition & 1 deletion app/components/aggregation-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function AggregationFilter() {
>
<SelectPrimitive.Trigger
className={
'flex h-10 w-full items-center justify-between bg-transparent px-3 py-2 text-sm placeholder:text-slate-500 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:placeholder:text-slate-400'
'flex h-10 items-center justify-between bg-transparent px-3 py-2 text-sm placeholder:text-slate-500 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:placeholder:text-slate-400'
}
>
<div className="inline-flex h-8 items-center justify-center whitespace-nowrap rounded-md border border-slate-200 bg-white text-sm font-medium ring-offset-white transition-colors hover:bg-slate-100 hover:text-slate-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:hover:bg-slate-800 dark:hover:text-slate-50 dark:focus-visible:ring-slate-300">
Expand Down
10 changes: 5 additions & 5 deletions app/components/device-detail/graph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,22 +534,22 @@ export default function Graph({
>
<div
ref={nodeRef}
className="shadow-zinc-800/5 ring-zinc-900/5 absolute bottom-6 right-4 top-14 z-40 flex flex-col gap-4 rounded-xl bg-white px-4 pt-2 text-sm font-medium text-zinc-800 shadow-lg ring-1 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95 dark:ring-white dark:backdrop-blur-sm md:bottom-[30px] md:left-auto md:right-4 md:top-auto md:h-[35%] md:max-h-[35%] md:w-[60vw]"
className="shadow-zinc-800/5 ring-zinc-900/5 absolute bottom-6 left-4 right-4 top-14 z-40 flex flex-col gap-2 rounded-xl bg-white px-4 pt-2 text-sm font-medium text-zinc-800 shadow-lg ring-1 dark:bg-zinc-800 dark:text-zinc-200 dark:opacity-95 dark:ring-white dark:backdrop-blur-sm md:bottom-[30px] md:left-auto md:right-4 md:top-auto md:h-[35%] md:max-h-[35%] md:w-[60vw]"
>
{navigation.state === 'loading' && (
<div className="bg-gray-100/30 absolute inset-0 z-50 flex items-center justify-center backdrop-blur-[1.5px]">
<Spinner />
</div>
)}
<div
className="flex cursor-move items-center justify-between px-2 pt-2"
className="flex cursor-move flex-wrap items-center justify-between gap-2 px-2 pt-2"
id="graphTop"
>
<div className="flex items-center justify-center gap-4">
<div className="flex flex-grow flex-wrap items-center gap-2">
<DateRangeFilter />
<AggregationFilter />
</div>
<div className="flex items-center justify-end gap-4">
<div className="ml-auto flex items-center justify-end gap-4">
{currentZoom !== null &&
currentZoom.xMax !== 0 &&
currentZoom.xMin !== 0 && (
Expand Down Expand Up @@ -597,7 +597,7 @@ export default function Graph({
/>
</div>
</div>
<div className="flex h-full w-full items-center justify-center">
<div className="flex min-h-0 w-full flex-1 items-center justify-center">
{(sensors[0].data.length === 0 && sensors[1] === undefined) ||
(sensors[0].data.length === 0 && sensors[1].data.length === 0) ? (
<div>There is no data for the selected time period.</div>
Expand Down
4 changes: 2 additions & 2 deletions app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ export function App() {
useChangeLanguage(data.locale)

return (
<html lang={data.locale} dir={i18n.dir()} className={clsx('light')}>
<html lang={data.locale} dir={i18n.dir()} className={clsx('light h-full')}>
<head>
<Meta />
{/* <PreventFlashOnWrongTheme ssrTheme={Boolean(data.theme)} /> */}
<Links />
</head>
<body className="dark:bg-dark-background dark:text-dark-text">
<body className="h-full dark:bg-dark-background dark:text-dark-text">
<Outlet />
<Toaster />
<ScrollRestoration />
Expand Down
Loading