Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/four-baboons-float.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/fuselage': patch
---

fix(fuselage): SidebarV2Item padding
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ $sidebar-color-font-active: theme(
text-decoration: none;
gap: lengths.padding(4);

&--level-2 {
padding-block: calc(lengths.padding(8) - lengths.border-width('default'));
}

&:active {
color: $sidebar-color-font-active;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@ import type { AllHTMLAttributes } from 'react';

export const SidebarItem = ({
selected,
level = 1,
className,
children,
is: Tag = 'a',
...props
}: {
selected?: boolean;
level?: number;
is?: React.ElementType;
} & AllHTMLAttributes<HTMLAnchorElement>) => (
<Tag
className={[
'rcx-box rcx-box--full rcx-sidebar-v2-item',
selected && 'rcx-sidebar-v2-item--selected',
level && `rcx-sidebar-v2-item--level-${level}`,
className,
]
.filter(Boolean)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const Template: StoryFn<typeof Sidepanel> = (args) => (
{new Array(20).fill(null).map((_, index) => {
return (
<SidepanelListItem key={index}>
<SidebarV2Item href='#'>
<SidebarV2Item level={2} href='#'>
<SidebarV2ItemCol>
<SidebarV2ItemRow>
<SidebarItemAvatarWrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,5 @@ $sidepanel-color-default: colors.font(default);

&-list {
padding-block: lengths.padding(8);

&__item {
padding-block: lengths.padding(4);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -179,7 +179,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -285,7 +285,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -391,7 +391,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -497,7 +497,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -603,7 +603,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -709,7 +709,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -815,7 +815,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -921,7 +921,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1027,7 +1027,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1133,7 +1133,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1239,7 +1239,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1345,7 +1345,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1451,7 +1451,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1557,7 +1557,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1663,7 +1663,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1769,7 +1769,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1875,7 +1875,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -1981,7 +1981,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down Expand Up @@ -2087,7 +2087,7 @@ exports[`renders Default without crashing 1`] = `
role="listitem"
>
<a
class="rcx-box rcx-box--full rcx-sidebar-v2-item"
class="rcx-box rcx-box--full rcx-sidebar-v2-item rcx-sidebar-v2-item--level-2"
href="#"
>
<div
Expand Down
Loading