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

Jump to bottom

[joy-ui][docs] Add UI improvements to the side navigation demo #41461

Merged
merged 14 commits into from
Mar 13, 2024
Merged

[joy-ui][docs] Add UI improvements to the side navigation demo #41461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e41b24f
[joy-ui][docs] Optimize side navigation's relative contrast
cipherlogs Mar 11, 2024
3673658
[joy-ui][docs] Fix Side navigation IconButton interaction issues.
cipherlogs Mar 12, 2024
75dc7b4
[joy-ui][docs] Unify the rest of the right sidebar IconButtons
cipherlogs Mar 12, 2024
a2aadd7
Remove solid variant ring color from all badges
cipherlogs Mar 12, 2024
a14ea41
Make color success global to all badges withing the right sidebar
cipherlogs Mar 12, 2024
f99e023
Fix the chip color clash inside the left sidebar
cipherlogs Mar 12, 2024
11d8026
Fix Select placeholder styling
cipherlogs Mar 12, 2024
3c1e74d
Change Select to soft and unifty its styling with the rest of the UI
cipherlogs Mar 12, 2024
cc98476
remove redundant props
cipherlogs Mar 12, 2024
6a1dc6a
Apply pnpm prettier
cipherlogs Mar 12, 2024
3c09770
remove unused vars
cipherlogs Mar 12, 2024
b14f711
Applying new tweaks to the side navigation demo
cipherlogs Mar 12, 2024
931e91d
[joy-ui][docs] Give better context to the Plus icon
cipherlogs Mar 12, 2024
2f4468a
fix lint and run docs:typescript:formatted
danilo-leal Mar 13, 2024
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
64 changes: 31 additions & 33 deletions docs/data/joy/main-features/color-inversion/ColorInversionNavigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';

import Avatar from '@mui/joy/Avatar';
import Badge, { badgeClasses } from '@mui/joy/Badge';
import Badge from '@mui/joy/Badge';
import Box from '@mui/joy/Box';
import Card from '@mui/joy/Card';
import CardContent from '@mui/joy/CardContent';
Expand All @@ -15,6 +15,7 @@ import ListItemButton from '@mui/joy/ListItemButton';
import ListItemDecorator from '@mui/joy/ListItemDecorator';
import Typography from '@mui/joy/Typography';
import Select from '@mui/joy/Select';
import Tooltip from '@mui/joy/Tooltip';
import Option from '@mui/joy/Option';
import Sheet from '@mui/joy/Sheet';
import PieChart from '@mui/icons-material/PieChart';
Expand All @@ -30,25 +31,19 @@ export default function ColorInversionNavigation() {
<Box sx={{ display: 'flex', borderRadius: 'sm', overflow: 'auto' }}>
<Sheet
variant="solid"
color="neutral"
invertedColors
sx={{
p: 2,
...(color !== 'neutral' && {
bgcolor: `${color}.800`,
bgcolor: `${color}.700`,
}),
}}
>
<Select
variant="outlined"
variant="soft"
defaultValue="1"
size="sm"
placeholder={
<div>
<Typography level="inherit">Saleshouse</Typography>
<Typography level="body-md">general team</Typography>
</div>
}
color={color}
startDecorator={
<Sheet
variant="solid"
Expand All @@ -59,10 +54,15 @@ export default function ColorInversionNavigation() {
alignSelf: 'center',
}}
>
<BubbleChartIcon sx={{ m: 0 }} />
<BubbleChartIcon fontSize="small" sx={{ m: 0 }} />
</Sheet>
}
sx={{ py: 1 }}
sx={{
py: 1,
bgcolor: 'transparent',
border: '1px solid',
borderColor: 'divider',
}}
>
<Option value="1">General team</Option>
<Option value="2">Engineering team</Option>
Expand All @@ -89,8 +89,8 @@ export default function ColorInversionNavigation() {
<Chip
data-skip-inverted-colors
size="sm"
color="warning"
variant="soft"
color={color}
sx={{ ml: 'auto' }}
>
5
Expand Down Expand Up @@ -131,27 +131,25 @@ export default function ColorInversionNavigation() {
</Card>
</Sheet>
<Sheet
variant="soft"
color="neutral"
variant="solid"
invertedColors
sx={(theme) => ({
sx={{
p: 2,
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: 2,
...(color !== 'neutral' && {
bgcolor: `${color}.900`,
}),
bgcolor: `${color}.800`,
'& .MuiBadge-root': { '--Badge-ringColor': '#FFF' },
'& .MuiBadge-colorSuccess': { bgcolor: 'success.400' },
'& button': {
borderRadius: '50%',
padding: 0,
'&:hover': {
boxShadow: theme.shadow.md,
},
'--IconButton-size': '3rem',
danilo-leal marked this conversation as resolved.
Show resolved Hide resolved
},
})}
}}
>
<Badge badgeContent="7" size="sm">
<Badge badgeContent="7" badgeInset="10%" size="sm">
<IconButton>
<Avatar src="/static/images/avatar/3.jpg" />
</IconButton>
Expand All @@ -161,28 +159,28 @@ export default function ColorInversionNavigation() {
vertical: 'bottom',
horizontal: 'right',
}}
badgeInset="14%"
sx={{ [`& .${badgeClasses.badge}`]: { bgcolor: 'success.300' } }}
badgeInset="15%"
color="success"
>
<IconButton>
<Avatar src="/static/images/avatar/4.jpg" />
</IconButton>
</Badge>
<IconButton variant="soft" aria-label="Add another chat">
<AddIcon />
</IconButton>
<Tooltip title="Add another chat" variant="soft">
<IconButton sx={{ color: 'text.tertiary' }}>
<AddIcon />
</IconButton>
</Tooltip>
<IconButton
variant="plain"
size="sm"
onClick={() => {
const colors = ['primary', 'neutral', 'danger', 'success', 'warning'];

const nextColorIndex = colors.indexOf(color) + 1;
setColor(colors[nextColorIndex] ?? colors[0]);
}}
sx={{ mt: 'auto', height: '40px' }}
sx={{ mt: 'auto', color: 'text.tertiary' }}
>
<ColorLensRoundedIcon fontSize="small" />
<ColorLensRoundedIcon />
</IconButton>
</Sheet>
</Box>
Expand Down
64 changes: 31 additions & 33 deletions docs/data/joy/main-features/color-inversion/ColorInversionNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { ColorPaletteProp } from '@mui/joy/styles';
import Avatar from '@mui/joy/Avatar';
import Badge, { badgeClasses } from '@mui/joy/Badge';
import Badge from '@mui/joy/Badge';
import Box from '@mui/joy/Box';
import Card from '@mui/joy/Card';
import CardContent from '@mui/joy/CardContent';
Expand All @@ -15,6 +15,7 @@ import ListItemButton from '@mui/joy/ListItemButton';
import ListItemDecorator from '@mui/joy/ListItemDecorator';
import Typography from '@mui/joy/Typography';
import Select from '@mui/joy/Select';
import Tooltip from '@mui/joy/Tooltip';
import Option from '@mui/joy/Option';
import Sheet from '@mui/joy/Sheet';
import PieChart from '@mui/icons-material/PieChart';
Expand All @@ -30,25 +31,19 @@ export default function ColorInversionNavigation() {
<Box sx={{ display: 'flex', borderRadius: 'sm', overflow: 'auto' }}>
<Sheet
variant="solid"
color="neutral"
invertedColors
sx={{
p: 2,
...(color !== 'neutral' && {
bgcolor: `${color}.800`,
bgcolor: `${color}.700`,
}),
}}
>
<Select
variant="outlined"
variant="soft"
defaultValue="1"
size="sm"
placeholder={
<div>
<Typography level="inherit">Saleshouse</Typography>
<Typography level="body-md">general team</Typography>
</div>
}
color={color}
startDecorator={
<Sheet
variant="solid"
Expand All @@ -59,10 +54,15 @@ export default function ColorInversionNavigation() {
alignSelf: 'center',
}}
>
<BubbleChartIcon sx={{ m: 0 }} />
<BubbleChartIcon fontSize="small" sx={{ m: 0 }} />
</Sheet>
}
sx={{ py: 1 }}
sx={{
py: 1,
bgcolor: 'transparent',
border: '1px solid',
borderColor: 'divider',
}}
>
<Option value="1">General team</Option>
<Option value="2">Engineering team</Option>
Expand All @@ -89,8 +89,8 @@ export default function ColorInversionNavigation() {
<Chip
data-skip-inverted-colors
size="sm"
color="warning"
variant="soft"
color={color}
sx={{ ml: 'auto' }}
>
5
Expand Down Expand Up @@ -131,27 +131,25 @@ export default function ColorInversionNavigation() {
</Card>
</Sheet>
<Sheet
variant="soft"
color="neutral"
variant="solid"
invertedColors
sx={(theme) => ({
sx={{
p: 2,
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: 2,
...(color !== 'neutral' && {
bgcolor: `${color}.900`,
}),
bgcolor: `${color}.800`,
'& .MuiBadge-root': { '--Badge-ringColor': '#FFF' },
'& .MuiBadge-colorSuccess': { bgcolor: 'success.400' },
'& button': {
borderRadius: '50%',
padding: 0,
'&:hover': {
boxShadow: theme.shadow.md,
},
'--IconButton-size': '3rem',
},
})}
}}
>
<Badge badgeContent="7" size="sm">
<Badge badgeContent="7" badgeInset="10%" size="sm">
<IconButton>
<Avatar src="/static/images/avatar/3.jpg" />
</IconButton>
Expand All @@ -161,19 +159,19 @@ export default function ColorInversionNavigation() {
vertical: 'bottom',
horizontal: 'right',
}}
badgeInset="14%"
sx={{ [`& .${badgeClasses.badge}`]: { bgcolor: 'success.300' } }}
badgeInset="15%"
color="success"
>
<IconButton>
<Avatar src="/static/images/avatar/4.jpg" />
</IconButton>
</Badge>
<IconButton variant="soft" aria-label="Add another chat">
<AddIcon />
</IconButton>
<Tooltip title="Add another chat" variant="soft">
<IconButton sx={{ color: 'text.tertiary' }}>
<AddIcon />
</IconButton>
</Tooltip>
<IconButton
variant="plain"
size="sm"
onClick={() => {
const colors: ColorPaletteProp[] = [
'primary',
Expand All @@ -185,9 +183,9 @@ export default function ColorInversionNavigation() {
const nextColorIndex = colors.indexOf(color) + 1;
setColor(colors[nextColorIndex] ?? colors[0]);
}}
sx={{ mt: 'auto', height: '40px' }}
sx={{ mt: 'auto', color: 'text.tertiary' }}
>
<ColorLensRoundedIcon fontSize="small" />
<ColorLensRoundedIcon />
</IconButton>
</Sheet>
</Box>
Expand Down
Loading