Skip to content

fix: convert space-* on breakpoints when paste tailwind #5308

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

Merged
merged 1 commit into from
Jun 30, 2025
Merged

fix: convert space-* on breakpoints when paste tailwind #5308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions apps/builder/app/shared/tailwind/tailwind.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,8 @@ test("generate space without display property", async () => {
await generateFragmentFromTailwind(
renderTemplate(
<>
<ws.element ws:tag="div" class="space-x-4"></ws.element>
<ws.element ws:tag="div" class="space-y-4"></ws.element>
<ws.element ws:tag="div" class="space-x-4 md:space-x-6"></ws.element>
<ws.element ws:tag="div" class="space-y-4 md:space-y-6"></ws.element>
</>
)
)
Expand All @@ -596,7 +596,10 @@ test("generate space without display property", async () => {
ws:tag="div"
ws:style={css`
display: flex;
column-gap: 1rem;
@media (max-width: 767px) {
column-gap: 1rem;
}
column-gap: 1.5rem;
`}
></ws.element>
<ws.element
Expand All @@ -605,7 +608,10 @@ test("generate space without display property", async () => {
display: flex;
flex-direction: column;
align-items: start;
row-gap: 1rem;
@media (max-width: 767px) {
row-gap: 1rem;
}
row-gap: 1.5rem;
`}
></ws.element>
</>
Expand Down
10 changes: 4 additions & 6 deletions apps/builder/app/shared/tailwind/tailwind.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,13 @@ const parseTailwindClasses = async (classes: string) => {
.map((item) => {
// styles data cannot express space-x and space-y selectors
// with lobotomized owl so replace with gaps
const spaceX = "space-x-";
if (item.startsWith(spaceX)) {
if (item.includes("space-x-")) {
hasColumnGaps = true;
return `gap-x-${item.slice(spaceX.length)}`;
return item.replace("space-x-", "gap-x-");
}
const spaceY = "space-y-";
if (item.startsWith(spaceY)) {
if (item.includes("space-y-")) {
hasRowGaps = true;
return `gap-y-${item.slice(spaceY.length)}`;
return item.replace("space-y-", "gap-y-");
}
hasFlexOrGrid ||= item.endsWith("flex") || item.endsWith("grid");
hasContainer ||= item === "container";
Expand Down