Skip to content

fix: update sizes for navigation rail items #452

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
achou11 merged 1 commit into from
Dec 9, 2025
Merged

fix: update sizes for navigation rail items #452

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
46 changes: 36 additions & 10 deletions src/renderer/src/routes/app/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { BLUE_GREY, COMAPEO_BLUE, DARK_GREY, WHITE } from '../../colors'
import { Icon } from '../../components/icon'
import { ButtonLink, type ButtonLinkProps } from '../../components/link'
import { useGlobalEditingState } from '../../contexts/global-editing-state-store-context'
import { useIconSizeBasedOnTypography } from '../../hooks/icon.ts'
import {
COMAPEO_CORE_REACT_ROOT_QUERY_KEY,
COORDINATOR_ROLE_ID,
Expand Down Expand Up @@ -142,6 +143,14 @@ function RouteComponent() {
const someGlobalMutationIsPending =
useIsMutating({ mutationKey: GLOBAL_MUTATIONS_BASE_KEY }) > 0

const labeledNavIconSize = useIconSizeBasedOnTypography({
typographyVariant: 'body1',
})
const unlabledNavIconSize = useIconSizeBasedOnTypography({
typographyVariant: 'body1',
multiplier: 1.2,
})

return (
<Box bgcolor={WHITE} height="100%">
<Box display="grid" gridTemplateColumns="min-content 1fr" height="100%">
Expand Down Expand Up @@ -191,6 +200,7 @@ function RouteComponent() {
fullWidth
variant="text"
color="inherit"
size="small"
inactiveProps={BASE_INACTIVE_LINK_PROPS}
activeProps={
// NOTE: Subroutes of the project that also live as nav rail tabs
Expand All @@ -215,7 +225,10 @@ function RouteComponent() {
paddingBlock={4}
flex={1}
>
<Icon name="noun-project-notebook" size={32} />
<Icon
name="noun-project-notebook"
size={unlabledNavIconSize}
/>
</Box>
</ButtonLink>
</ListItem>
Expand Down Expand Up @@ -245,6 +258,7 @@ function RouteComponent() {
fullWidth
variant="text"
color="inherit"
size="small"
inactiveProps={BASE_INACTIVE_LINK_PROPS}
activeProps={BASE_ACTIVE_LINK_PROPS}
aria-label={t(m.exchangeTabAccessibleLabel)}
Expand All @@ -256,7 +270,10 @@ function RouteComponent() {
paddingBlock={4}
flex={1}
>
<Icon name="material-offline-bolt-filled" size={36} />
<Icon
name="material-offline-bolt-filled"
size={unlabledNavIconSize}
/>
</Box>
</ButtonLink>
</ListItem>
Expand Down Expand Up @@ -291,6 +308,7 @@ function RouteComponent() {
fullWidth
variant="text"
color="inherit"
size="small"
inactiveProps={BASE_INACTIVE_LINK_PROPS}
activeProps={BASE_ACTIVE_LINK_PROPS}
>
Expand All @@ -299,9 +317,12 @@ function RouteComponent() {
alignItems="center"
flexWrap="wrap"
textAlign="center"
gap={2}
gap={1}
>
<Icon name="material-people-filled" size={36} />
<Icon
name="material-people-filled"
size={labeledNavIconSize}
/>

{t(m.teamTabLabel)}
</Stack>
Expand Down Expand Up @@ -337,6 +358,7 @@ function RouteComponent() {
fullWidth
variant="text"
color="inherit"
size="small"
inactiveProps={BASE_INACTIVE_LINK_PROPS}
activeProps={BASE_ACTIVE_LINK_PROPS}
>
Expand All @@ -345,9 +367,12 @@ function RouteComponent() {
alignItems="center"
flexWrap="wrap"
textAlign="center"
gap={2}
gap={1}
>
<Icon name="material-manage-accounts-filled" size={36} />
<Icon
name="material-manage-accounts-filled"
size={labeledNavIconSize}
/>

{t(m.toolsTabLabel)}
</Stack>
Expand Down Expand Up @@ -380,6 +405,7 @@ function RouteComponent() {
fullWidth
variant="text"
color="inherit"
size="small"
inactiveProps={BASE_INACTIVE_LINK_PROPS}
activeProps={BASE_ACTIVE_LINK_PROPS}
>
Expand All @@ -388,9 +414,9 @@ function RouteComponent() {
alignItems="center"
flexWrap="wrap"
textAlign="center"
gap={2}
gap={1}
>
<Icon name="material-settings" size={32} />
<Icon name="material-settings" size={labeledNavIconSize} />

{t(m.appSettingsTabLabel)}
</Stack>
Expand All @@ -410,15 +436,15 @@ function RouteComponent() {

const BASE_INACTIVE_LINK_PROPS = {
sx: {
padding: 2,
padding: 1,
borderRadius: 2,
color: DARK_GREY,
},
} satisfies ButtonLinkProps['inactiveProps']

const BASE_ACTIVE_LINK_PROPS = {
sx: {
padding: 2,
padding: 1,
borderRadius: 2,
color: COMAPEO_BLUE,
background: (theme) => theme.lighten(theme.palette.primary.light, 0.5),
Expand Down
Loading