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.

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

merged 2 commits into from
Dec 13, 2024

Conversation

katspaugh
Copy link
Member

What it solves

The sx prop wasn't passed down to MUI Box and Typography because it was overwritten by individual props.

Copy link

github-actions bot commented Dec 13, 2024

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Code review by ChatGPT

const box = getByTestId('box')
expect(box).toHaveStyle('padding: 24px')
expect(box).toHaveStyle('font-size: 14px')
})
})

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.

@@ -175,6 +176,7 @@ export const Typography = ({
letterSpacing,
whiteSpace,
width,
...props.sx,
}}
{...props}
/>

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.

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} />

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.

Copy link
Member

@usame-algan usame-algan left a comment

Choose a reason for hiding this comment

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

Is it intended that when passing the sx prop it would overwrite whatever inline prop is set?

Copy link

📦 Next.js Bundle Analysis for safe-wallet-web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

⚠️ Global Bundle Size Increased

Page Size (compressed)
global 1020.68 KB (🟡 +2 B)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Copy link

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements
73.71% (-0.07% 🔻)
14378/19506
🔴 Branches
51.1% (-0.2% 🔻)
3420/6693
🔴 Functions
56.44% (-0.14% 🔻)
2029/3595
🟡 Lines
75.28% (-0.04% 🔻)
13048/17332
Show files with reduced coverage 🔻
St.
File Statements Branches Functions Lines
🟢
... / useAllOwnedSafes.ts
93.33% (-6.67% 🔻)
33.33% (-16.67% 🔻)
100%
92.86% (-7.14% 🔻)
🔴
... / useAllSafes.ts
48.33% (-51.67% 🔻)
21.43% (-78.57% 🔻)
30% (-70% 🔻)
54.9% (-45.1% 🔻)
🔴
... / index.tsx
46.67% (-0.14% 🔻)
0% 0%
48.84% (-0.05% 🔻)

Test suite run success

1676 tests passing in 228 suites.

Report generated by 🧪jest coverage report action from aaa61b2

@katspaugh katspaugh merged commit b34d46d into dev Dec 13, 2024
16 checks passed
@katspaugh katspaugh deleted the sx branch December 13, 2024 11:44
@github-actions github-actions bot locked and limited conversation to collaborators Dec 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants