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(fuselage): OptionIcon not receiving proper icon props #1522

Merged
merged 2 commits into from
Jan 9, 2025
Merged

fix(fuselage): OptionIcon not receiving proper icon props #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1247883
fix: allow option icon to receive icon props
dougfabris Jan 8, 2025
f6e8686
chore: changeset
dougfabris Jan 8, 2025
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/tall-rabbits-do.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/fuselage': patch
---

fix: `OptionIcon` not receiving proper icon props
2 changes: 1 addition & 1 deletion packages/fuselage/src/components/Menu/V2/Menu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const Complex: StoryFn<typeof Menu> = (args) => (
<MenuItemContent>Chats</MenuItemContent>
</MenuItem>
<MenuItem key='settings'>
<MenuItemIcon name='cog' />
<MenuItemIcon name='cog' color='font-info' />
<MenuItemContent>Settings</MenuItemContent>
</MenuItem>
</Menu>
Expand Down
8 changes: 3 additions & 5 deletions packages/fuselage/src/components/Option/OptionIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ import { Icon } from '../Icon';

import OptionColumn from './OptionColumn';

type OptionIconProps = {
name: ComponentProps<typeof Icon>['name'];
};
type OptionIconProps = ComponentProps<typeof Icon>;

const OptionIcon = ({ name }: OptionIconProps) => (
const OptionIcon = (props: OptionIconProps) => (
<OptionColumn>
<Icon size='x20' rcx-option__icon name={name} />
<Icon size='x20' rcx-option__icon {...props} />
</OptionColumn>
);

Expand Down
Loading