Skip to content

Commit 4496305

Browse files
committed
chore: better scroll behavior on history overflow
1 parent a947e63 commit 4496305

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

site/src/modules/dashboard/DashboardLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ export const DashboardLayout: FC = () => {
2323
{canViewDeployment && <LicenseBanner />}
2424
<AnnouncementBanners />
2525

26-
<div className="flex flex-col min-h-full">
26+
<div className="flex flex-col h-screen">
2727
<Navbar />
2828

29-
<div className="flex flex-col flex-1">
29+
<div className="flex flex-col flex-1 min-h-0">
3030
<Suspense fallback={<Loader />}>
3131
<Outlet />
3232
</Suspense>

site/src/modules/dashboard/Navbar/NavbarView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const NavbarView: FC<NavbarViewProps> = ({
5151
const webPush = useWebpushNotifications();
5252

5353
return (
54-
<div className="border-0 border-b border-solid h-[72px] flex items-center leading-none px-6">
54+
<div className="border-0 border-b border-solid h-[72px] min-h-[72px] flex items-center leading-none px-6">
5555
<NavLink to="/workspaces">
5656
{logo_url ? (
5757
<ExternalImage className="h-7" src={logo_url} alt="Custom Logo" />

site/src/pages/WorkspacePage/Workspace.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
} from "./WorkspaceBuildProgress";
2424
import { WorkspaceDeletedBanner } from "./WorkspaceDeletedBanner";
2525
import { WorkspaceTopbar } from "./WorkspaceTopbar";
26+
import { height } from "@mui/system";
2627

2728
interface WorkspaceProps {
2829
workspace: TypesGen.Workspace;
@@ -99,7 +100,7 @@ export const Workspace: FC<WorkspaceProps> = ({
99100
workspacePending && !haveBuildLogs && !provisionersHealthy && !isRestarting;
100101

101102
return (
102-
<div className="flex flex-col overflow-hidden flex-1">
103+
<div className="flex flex-col flex-1 min-h-0">
103104
<WorkspaceTopbar
104105
workspace={workspace}
105106
template={template}
@@ -118,7 +119,7 @@ export const Workspace: FC<WorkspaceProps> = ({
118119
handleToggleFavorite={handleToggleFavorite}
119120
/>
120121

121-
<div className="flex flex-1">
122+
<div className="flex flex-1 min-h-0">
122123
<div className="flex">
123124
<div className="flex flex-col h-full overflow-y-auto border-solid border-0 border-r border-r-border">
124125
<SidebarIconButton

0 commit comments

Comments
 (0)