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

Jump to bottom

fix(Text): Only apply elementType when RAC Text component is used. #4270

Merged
merged 3 commits into from
Oct 30, 2024
Merged

fix(Text): Only apply elementType when RAC Text component is used. #4270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdffe11
fix(Text): Only apply `elementType` when RAC Text component is used.
sebald Oct 29, 2024
740e50a
update snapshots
sebald Oct 29, 2024
daf9568
Create dirty-flies-tan.md
sebald Oct 29, 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/dirty-flies-tan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marigold/components": patch
---

fix(Text): Only apply `elementType` when RAC Text component is used.
1 change: 0 additions & 1 deletion packages/components/src/Text/Text.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ test('get theme color', () => {
<div
class="text-[--color] outline-[--outline] font-["Oswald_Regular"]"
data-testid="text"
elementtype="div"
style="--color: rgb(5 150 105);"
/>
`);
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/Text/Text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const _Text = ({
return (
<Component
{...props}
elementType={as}
elementType={props.slot ? as : undefined}
className={cn(
'text-[--color] outline-[--outline]',
classNames,
Expand Down
Loading