Skip to content

refactor(theme): replace the use of RTL-specific styles with logical properties #3868

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
wingkwong merged 3 commits into from
Oct 11, 2024
Merged

refactor(theme): replace the use of RTL-specific styles with logical properties #3868

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
823b6c7
chore(rtl): remove the usages of rtl
macci001 Oct 11, 2024
455fe28
chore(changeset): adding the changeset
macci001 Oct 11, 2024
5c09a36
chore(changeset): update changeset message
wingkwong Oct 11, 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/giant-worms-hammer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

replace the use of RTL-specific styles with logical properties.
6 changes: 3 additions & 3 deletions packages/core/theme/src/components/checkbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const checkbox = tv({
size: {
sm: {
wrapper: [
"w-4 h-4 mr-2 rtl:ml-2 rtl:mr-[unset]",
"w-4 h-4 me-2",
"rounded-[calc(theme(borderRadius.medium)*0.5)]",
"before:rounded-[calc(theme(borderRadius.medium)*0.5)]",
"after:rounded-[calc(theme(borderRadius.medium)*0.5)]",
Expand All @@ -88,7 +88,7 @@ const checkbox = tv({
},
md: {
wrapper: [
"w-5 h-5 mr-2 rtl:ml-2 rtl:mr-[unset]",
"w-5 h-5 me-2",
"rounded-[calc(theme(borderRadius.medium)*0.6)]",
"before:rounded-[calc(theme(borderRadius.medium)*0.6)]",
"after:rounded-[calc(theme(borderRadius.medium)*0.6)]",
Expand All @@ -98,7 +98,7 @@ const checkbox = tv({
},
lg: {
wrapper: [
"w-6 h-6 mr-2 rtl:ml-2 rtl:mr-[unset]",
"w-6 h-6 me-2",
"rounded-[calc(theme(borderRadius.medium)*0.7)]",
"before:rounded-[calc(theme(borderRadius.medium)*0.7)]",
"after:rounded-[calc(theme(borderRadius.medium)*0.7)]",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/theme/src/components/date-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@ const dateInput = tv({
outside: {
base: "flex flex-col data-[has-helper=true]:pb-[calc(theme(fontSize.tiny)_+8px)] gap-y-1.5",
label: "w-full text-foreground",
helperWrapper: "absolute top-[calc(100%_+_2px)] left-0 rtl:right-0",
helperWrapper: "absolute top-[calc(100%_+_2px)] start-0",
},
"outside-left": {
base: "flex-row items-center data-[has-helper=true]:pb-[calc(theme(fontSize.tiny)_+_8px)] gap-x-2 flex-nowrap",
label: "relative text-foreground",
inputWrapper: "relative flex-1",
helperWrapper: "absolute top-[calc(100%_+_2px)] left-0 rtl:right-0",
helperWrapper: "absolute top-[calc(100%_+_2px)] start-0",
},
inside: {
label: "w-full text-tiny cursor-text",
Expand Down
8 changes: 3 additions & 5 deletions packages/core/theme/src/components/input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ const input = tv({
"absolute",
"z-10",
"pointer-events-none",
"origin-top-left",
"rtl:origin-top-right",
"origin-top-start",
"subpixel-antialiased",
"block",
"text-small",
Expand Down Expand Up @@ -189,7 +188,7 @@ const input = tv({
},
isClearable: {
true: {
input: "peer pr-6 rtl:pr-0 rtl:pl-6",
input: "peer pe-6",
clearButton: "peer-data-[filled=true]:opacity-70 peer-data-[filled=true]:block",
},
},
Expand All @@ -208,8 +207,7 @@ const input = tv({
},
isRequired: {
true: {
label:
"after:content-['*'] after:text-danger after:ml-0.5 rtl:after:ml-[unset] rtl:after:mr-0.5",
label: "after:content-['*'] after:text-danger after:ms-0.5",
},
},
isMultiline: {
Expand Down
4 changes: 1 addition & 3 deletions packages/core/theme/src/components/modal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ const modal = tv({
"outline-none",
"select-none",
"top-1",
"right-1",
"rtl:left-1",
"rtl:right-[unset]",
"end-1",
"p-2",
"text-foreground-500",
"rounded-full",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/theme/src/components/radio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ const radio = tv({
md: {
wrapper: "w-5 h-5",
control: "w-2 h-2",
labelWrapper: "ml-2 rtl:mr-2 rtl:ml-[unset]",
labelWrapper: "ms-2",
label: "text-medium",
description: "text-small",
},
lg: {
wrapper: "w-6 h-6",
control: "w-2.5 h-2.5",
labelWrapper: "ml-2 rtl:mr-2 rtl:ml-[unset]",
labelWrapper: "ms-2",
label: "text-large",
description: "text-medium",
},
Expand Down
8 changes: 3 additions & 5 deletions packages/core/theme/src/components/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ const select = tv({
"block",
"absolute",
"z-10",
"origin-top-left",
"rtl:origin-top-right",
"origin-top-start",
"subpixel-antialiased",
"text-small",
"text-foreground-500",
Expand All @@ -24,7 +23,7 @@ const select = tv({
"inline-flex h-full w-[calc(100%_-_theme(spacing.6))] min-h-4 items-center gap-1.5 box-border",
selectorIcon: "absolute end-3 w-4 h-4",
spinner: "absolute end-3",
value: ["text-foreground-500", "font-normal", "w-full", "text-left", "rtl:text-right"],
value: ["text-foreground-500", "font-normal", "w-full", "text-start"],
listboxWrapper: "scroll-py-6 max-h-64 w-full",
listbox: "",
popoverContent: "w-full p-1 overflow-hidden",
Expand Down Expand Up @@ -188,8 +187,7 @@ const select = tv({
base: "transition-background motion-reduce:transition-none !duration-150",
label: [
"will-change-auto",
"origin-top-left",
"rtl:origin-top-right",
"origin-top-start",
"!duration-200",
"!ease-out",
"transition-[transform,color,left,opacity]",
Expand Down
16 changes: 8 additions & 8 deletions packages/core/theme/src/components/toggle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const toggle = tv({
"rounded-full",
"origin-right",
],
startContent: "z-0 absolute left-1.5 rtl:right-1.5 rtl:left-[unset] text-current",
endContent: "z-0 absolute right-1.5 rtl:left-1.5 rtl:right-[unset] text-default-600",
startContent: "z-0 absolute start-1.5 text-current",
endContent: "z-0 absolute end-1.5 text-default-600",
thumbIcon: "text-black",
label: "relative text-foreground select-none",
},
Expand Down Expand Up @@ -100,33 +100,33 @@ const toggle = tv({
},
size: {
sm: {
wrapper: "w-10 h-6 mr-2 rtl:ml-2 rtl:mr-[unset]",
wrapper: "w-10 h-6 me-2",
thumb: [
"w-4 h-4 text-tiny",
//selected
"group-data-[selected=true]:ml-4 rtl:group-data-[selected=true]:ml-0 rtl:group-data-[selected=true]:mr-4",
"group-data-[selected=true]:ms-4",
],
endContent: "text-tiny",
startContent: "text-tiny",
label: "text-small",
},
md: {
wrapper: "w-12 h-7 mr-2 rtl:ml-2 rtl:mr-[unset]",
wrapper: "w-12 h-7 me-2",
thumb: [
"w-5 h-5 text-small",
//selected
"group-data-[selected=true]:ml-5 rtl:group-data-[selected=true]:ml-0 rtl:group-data-[selected=true]:mr-5",
"group-data-[selected=true]:ms-5",
],
endContent: "text-small",
startContent: "text-small",
label: "text-medium",
},
lg: {
wrapper: "w-14 h-8 mr-2 rtl:ml-2 rtl:mr-[unset]",
wrapper: "w-14 h-8 me-2",
thumb: [
"w-6 h-6 text-medium",
//selected
"group-data-[selected=true]:ml-6 rtl:group-data-[selected=true]:ml-0 rtl:group-data-[selected=true]:mr-6",
"group-data-[selected=true]:ms-6",
],
endContent: "text-medium",
startContent: "text-medium",
Expand Down