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: pass sx prop to Box and Typography #4654

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Fix: pass sx prop to Box and Typography #4654

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
d985d7d
Fix: pass sx prop to Box and Typography
katspaugh Dec 13, 2024
aaa61b2
Add tests
katspaugh Dec 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
7 changes: 7 additions & 0 deletions src/components/common/Mui/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,11 @@ describe('Box Component', () => {
const box = getByTestId('box')
expect(box).toHaveStyle('text-align: center')
})

it('should pass the sx prop to the MuiBox component', () => {
const { getByTestId } = render(<Box p={1} sx={{ p: 3, fontSize: '14px' }} data-testid="box" />)
const box = getByTestId('box')
expect(box).toHaveStyle('padding: 24px')
expect(box).toHaveStyle('font-size: 14px')
})
})
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider whether testing specific inline styles is necessary, as changes in the component might break these tests unintentionally. Instead, assert the presence of the sx prop and its key properties. This could simplify maintainability and test resilience over time.

2 changes: 2 additions & 0 deletions src/components/common/Mui/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export const Box = ({
bgcolor,
gridArea,
lineHeight,
...props.sx,
}}
{...props}
/>
Expand Down Expand Up @@ -175,6 +176,7 @@ export const Typography = ({
letterSpacing,
whiteSpace,
width,
...props.sx,
}}
{...props}
/>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure the spread operator for props.sx does not overwrite other style props unintentionally. Consider merging sx with existing styles explicitly to prevent unintended style clashes.

Expand Down
8 changes: 1 addition & 7 deletions src/components/new-safe/create/steps/StatusStep/StatusStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@ const StatusStep = ({
className={css.label}
icon={<SvgIcon component={Icon} className={css.icon} color={color} fontSize="small" />}
>
<Box
display="flex"
alignItems="center"
gap={2}
color={color}
sx={{ color: ({ palette }) => (isLoading ? palette.border.main : palette.text.primary) }}
>
<Box display="flex" alignItems="center" gap={2} color={color}>
<Box flexShrink={0}>
{safeAddress && !isLoading ? (
<Identicon address={safeAddress} size={32} />
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code change removed the sx prop for dynamic color styling based on isLoading. Consider re-implementing this logic within a separate style function or component to maintain the original dynamic behavior if it's necessary for the component's functionality.

Expand Down
Loading