- Widen the comments/aside panel from 350 to 420 (~20% wider)
- Remove double padding around the panel: AppShell.Aside p="md"->"sm"
and inner Box p="md"->p={0}; reduce header-to-tabs gap mb="md"->"sm"
- Reduce empty space below the add-comment input (paddingBottom 25->10),
align the avatar with the input box (marginTop 10->2) and re-anchor the
send button (bottom 30->15)
- Pull the timestamp closer to the nickname via tighter line-height
(lh 1.2 on the name, 1.1 on the "… ago" text)
163 lines
5.0 KiB
TypeScript
163 lines
5.0 KiB
TypeScript
import { AppShell, Container } from "@mantine/core";
|
|
import React, { useEffect, useRef, useState } from "react";
|
|
import { useLocation } from "react-router-dom";
|
|
import { useTranslation } from "react-i18next";
|
|
import SettingsSidebar from "@/components/settings/settings-sidebar.tsx";
|
|
import { useAtom } from "jotai";
|
|
import {
|
|
asideStateAtom,
|
|
desktopSidebarAtom,
|
|
mobileSidebarAtom,
|
|
sidebarWidthAtom,
|
|
} from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
|
|
import { SpaceSidebar } from "@/features/space/components/sidebar/space-sidebar.tsx";
|
|
import { AppHeader } from "@/components/layouts/global/app-header.tsx";
|
|
import Aside from "@/components/layouts/global/aside.tsx";
|
|
import AiChatWindow from "@/features/ai-chat/components/ai-chat-window.tsx";
|
|
import classes from "./app-shell.module.css";
|
|
import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
|
|
import GlobalSidebar from "@/components/layouts/global/global-sidebar.tsx";
|
|
import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
|
|
import { MAIN_CONTENT_ID, SkipToMain } from "@/components/ui/skip-to-main.tsx";
|
|
|
|
export default function GlobalAppShell({
|
|
children,
|
|
}: {
|
|
children: React.ReactNode;
|
|
}) {
|
|
const { t } = useTranslation();
|
|
const [mobileOpened] = useAtom(mobileSidebarAtom);
|
|
const toggleMobile = useToggleSidebar(mobileSidebarAtom);
|
|
const [desktopOpened] = useAtom(desktopSidebarAtom);
|
|
const [{ isAsideOpen, tab: asideTab }] = useAtom(asideStateAtom);
|
|
const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
|
|
const [isResizing, setIsResizing] = useState(false);
|
|
const sidebarRef = useRef(null);
|
|
|
|
const startResizing = React.useCallback((mouseDownEvent) => {
|
|
mouseDownEvent.preventDefault();
|
|
setIsResizing(true);
|
|
}, []);
|
|
|
|
const stopResizing = React.useCallback(() => {
|
|
setIsResizing(false);
|
|
}, []);
|
|
|
|
const resize = React.useCallback(
|
|
(mouseMoveEvent) => {
|
|
if (isResizing) {
|
|
const newWidth =
|
|
mouseMoveEvent.clientX -
|
|
sidebarRef.current.getBoundingClientRect().left;
|
|
if (newWidth < 220) {
|
|
setSidebarWidth(220);
|
|
return;
|
|
}
|
|
if (newWidth > 600) {
|
|
setSidebarWidth(600);
|
|
return;
|
|
}
|
|
setSidebarWidth(newWidth);
|
|
}
|
|
},
|
|
[isResizing],
|
|
);
|
|
|
|
useEffect(() => {
|
|
//https://codesandbox.io/p/sandbox/kz9de
|
|
window.addEventListener("mousemove", resize);
|
|
window.addEventListener("mouseup", stopResizing);
|
|
return () => {
|
|
window.removeEventListener("mousemove", resize);
|
|
window.removeEventListener("mouseup", stopResizing);
|
|
};
|
|
}, [resize, stopResizing]);
|
|
|
|
const location = useLocation();
|
|
const isSettingsRoute = location.pathname.startsWith("/settings");
|
|
const isSpaceRoute = location.pathname.startsWith("/s/");
|
|
const isPageRoute = location.pathname.includes("/p/");
|
|
const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute;
|
|
|
|
return (
|
|
<>
|
|
<SkipToMain />
|
|
<AppShell
|
|
header={{ height: 45 }}
|
|
navbar={{
|
|
width: isSpaceRoute ? sidebarWidth : 300,
|
|
breakpoint: "sm",
|
|
collapsed: {
|
|
mobile: !mobileOpened,
|
|
desktop: !desktopOpened,
|
|
},
|
|
}}
|
|
aside={
|
|
isPageRoute && {
|
|
width: 420,
|
|
breakpoint: "sm",
|
|
collapsed: { mobile: !isAsideOpen, desktop: !isAsideOpen },
|
|
}
|
|
}
|
|
padding="md"
|
|
>
|
|
<AppShell.Header px="md" className={classes.header}>
|
|
<AppHeader />
|
|
</AppShell.Header>
|
|
<AppShell.Navbar
|
|
className={classes.navbar}
|
|
withBorder={false}
|
|
ref={sidebarRef}
|
|
aria-label={
|
|
isSpaceRoute
|
|
? t("Space navigation")
|
|
: isSettingsRoute
|
|
? t("Settings navigation")
|
|
: t("Main navigation")
|
|
}
|
|
>
|
|
{isSpaceRoute && (
|
|
<div className={classes.resizeHandle} onMouseDown={startResizing} />
|
|
)}
|
|
{isSpaceRoute && <SpaceSidebar />}
|
|
{isSettingsRoute && <SettingsSidebar />}
|
|
{showGlobalSidebar && <GlobalSidebar />}
|
|
</AppShell.Navbar>
|
|
<AppShell.Main id={MAIN_CONTENT_ID} tabIndex={-1}>
|
|
{isSettingsRoute ? (
|
|
<Container size={900} pb={80}>
|
|
{children}
|
|
</Container>
|
|
) : (
|
|
children
|
|
)}
|
|
</AppShell.Main>
|
|
|
|
{isPageRoute && (
|
|
<AppShell.Aside
|
|
id={ASIDE_PANEL_ID}
|
|
tabIndex={-1}
|
|
className={classes.aside}
|
|
p="sm"
|
|
withBorder={false}
|
|
aria-label={
|
|
asideTab === "comments"
|
|
? t("Comments")
|
|
: asideTab === "toc"
|
|
? t("Table of contents")
|
|
: asideTab === "details"
|
|
? t("Details")
|
|
: undefined
|
|
}
|
|
>
|
|
<Aside />
|
|
</AppShell.Aside>
|
|
)}
|
|
</AppShell>
|
|
{/* Floating AI chat window. Mounted once globally; it is position: fixed
|
|
and self-hides when closed, so its place in the tree is not critical. */}
|
|
<AiChatWindow />
|
|
</>
|
|
);
|
|
}
|