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

fix: Missing html attributes in sidebar item templates #33904

Merged
merged 4 commits into from
Nov 7, 2024
Merged

fix: Missing html attributes in sidebar item templates #33904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a892bfe
fix: sidebarv2 template props
juliajforesti Nov 6, 2024
76a41e1
chore: changeset
juliajforesti Nov 6, 2024
c21bb8a
chore: review changeset
juliajforesti Nov 7, 2024
40a371a
Merge branch 'develop' into fix/sidebar-item-template-props
kodiakhq[bot] Nov 7, 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
5 changes: 5 additions & 0 deletions .changeset/honest-pumpkins-joke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

adds missing html attributes in sidebar item templates
8 changes: 4 additions & 4 deletions apps/meteor/client/sidebarv2/Item/Condensed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
import type { Keys as IconName } from '@rocket.chat/icons';
import type { ReactElement } from 'react';
import type { HTMLAttributes, ReactElement } from 'react';
import React, { memo, useState } from 'react';

type CondensedProps = {
Expand All @@ -17,9 +17,9 @@ type CondensedProps = {
selected?: boolean;
badges?: ReactElement;
clickable?: boolean;
};
} & Omit<HTMLAttributes<HTMLAnchorElement>, 'is'>;

const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected }: CondensedProps) => {
const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected, ...props }: CondensedProps) => {
const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);

const isReduceMotionEnabled = usePrefersReducedMotion();
Expand All @@ -32,7 +32,7 @@ const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, s
};

return (
<SidebarV2Item href={href} selected={selected}>
<SidebarV2Item href={href} selected={selected} {...props}>
{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
{icon && icon}
<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
Expand Down
6 changes: 4 additions & 2 deletions apps/meteor/client/sidebarv2/Item/Extended.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
} from '@rocket.chat/fuselage';
import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
import type { Keys as IconName } from '@rocket.chat/icons';
import type { HTMLAttributes } from 'react';
import React, { memo, useState } from 'react';

import { useShortTimeAgo } from '../../hooks/useTimeAgo';
Expand All @@ -30,7 +31,7 @@ type ExtendedProps = {
menuOptions?: any;
titleIcon?: React.ReactNode;
threadUnread?: boolean;
};
} & Omit<HTMLAttributes<HTMLElement>, 'is'>;

const Extended = ({
icon,
Expand All @@ -47,6 +48,7 @@ const Extended = ({
threadUnread: _threadUnread,
unread,
selected,
...props
}: ExtendedProps) => {
const formatDate = useShortTimeAgo();
const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
Expand All @@ -61,7 +63,7 @@ const Extended = ({
};

return (
<SidebarV2Item href={href} selected={selected}>
<SidebarV2Item href={href} selected={selected} {...props}>
{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}

<SidebarV2ItemCol>
Expand Down
7 changes: 4 additions & 3 deletions apps/meteor/client/sidebarv2/Item/Medium.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
import type { Keys as IconName } from '@rocket.chat/icons';
import type { HTMLAttributes } from 'react';
import React, { memo, useState } from 'react';

type MediumProps = {
Expand All @@ -15,9 +16,9 @@ type MediumProps = {
badges?: React.ReactNode;
selected?: boolean;
menuOptions?: any;
};
} & Omit<HTMLAttributes<HTMLElement>, 'is'>;

const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected }: MediumProps) => {
const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected, ...props }: MediumProps) => {
const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);

const isReduceMotionEnabled = usePrefersReducedMotion();
Expand All @@ -30,7 +31,7 @@ const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, sele
};

return (
<SidebarV2Item href={href} selected={selected}>
<SidebarV2Item href={href} selected={selected} {...props}>
<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
{icon && icon}
<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
Expand Down
Loading