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: input in card becomes invisible on hover and making date-input and time-input consistent #4394

Merged
merged 1 commit into from
Dec 18, 2024
Merged

fix: input in card becomes invisible on hover and making date-input and time-input consistent #4394

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
5 changes: 5 additions & 0 deletions .changeset/late-doors-rhyme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Fixing the input in card to not become invisible on hover and making time-input and date-input consistent to other inputs.
86 changes: 76 additions & 10 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 @@ -227,7 +227,7 @@ const dateInput = tv({
color: "primary",
class: {
innerWrapper: "text-primary",
inputWrapper: ["bg-primary-50", "hover:bg-primary-100", "focus-within:bg-primary-50"],
inputWrapper: ["bg-primary-100", "hover:bg-primary-50", "focus-within:bg-primary-50"],
segment:
"text-primary-300 data-[editable=true]:data-[placeholder=true]:text-primary-300 data-[editable=true]:text-primary",
label: "text-primary",
Expand All @@ -238,7 +238,7 @@ const dateInput = tv({
color: "secondary",
class: {
innerWrapper: "text-secondary",
inputWrapper: ["bg-secondary-50", "hover:bg-secondary-100", "focus-within:bg-secondary-50"],
inputWrapper: ["bg-secondary-100", "hover:bg-secondary-50", "focus-within:bg-secondary-50"],
segment:
"text-secondary-300 data-[editable=true]:data-[placeholder=true]:text-secondary-300 data-[editable=true]:text-secondary",
label: "text-secondary",
Expand All @@ -249,7 +249,7 @@ const dateInput = tv({
color: "success",
class: {
innerWrapper: "text-success-600 dark:text-success",
inputWrapper: ["bg-success-50", "hover:bg-success-100", "focus-within:bg-success-50"],
inputWrapper: ["bg-success-100", "hover:bg-success-50", "focus-within:bg-success-50"],
segment:
"text-success-400 data-[editable=true]:data-[placeholder=true]:text-success-400 data-[editable=true]:text-success-600 data-[editable=true]:focus:text-success-600",
label: "text-success-600 dark:text-success",
Expand All @@ -260,7 +260,7 @@ const dateInput = tv({
color: "warning",
class: {
innerWrapper: "text-warning-600 dark:text-warning",
inputWrapper: ["bg-warning-50", "hover:bg-warning-100", "focus-within:bg-warning-50"],
inputWrapper: ["bg-warning-100", "hover:bg-warning-50", "focus-within:bg-warning-50"],
segment:
"text-warning-400 data-[editable=true]:data-[placeholder=true]:text-warning-400 data-[editable=true]:text-warning-600 data-[editable=true]:focus:text-warning-600",
label: "text-warning-600 dark:text-warning",
Expand All @@ -271,15 +271,81 @@ const dateInput = tv({
color: "danger",
class: {
innerWrapper: "text-danger",
inputWrapper: ["bg-danger-50", "hover:bg-danger-100", "focus-within:bg-danger-50"],
inputWrapper: ["bg-danger-100", "hover:bg-danger-50", "focus-within:bg-danger-50"],
segment:
"text-danger-300 data-[editable=true]:data-[placeholder=true]:text-danger-300 data-[editable=true]:text-danger",
label: "text-danger",
},
},
// faded & color
{
variant: "faded",
color: "primary",
class: {
innerWrapper: "text-primary",
inputWrapper: [
"hover:border-primary",
"focus-within:border-primary",
"focus-within:hover:border-primary",
],
label: "text-primary",
},
},
{
variant: "faded",
color: "secondary",
class: {
innerWrapper: "text-secondary",
inputWrapper: [
"hover:border-secondary",
"focus-within:border-secondary",
"focus-within:hover:border-secondary",
],
label: "text-secondary",
},
},
{
variant: "faded",
color: "success",
class: {
innerWrapper: "text-success",
inputWrapper: [
"hover:border-success",
"focus-within:border-success",
"focus-within:hover:border-success",
],
label: "text-success",
},
},
{
variant: "faded",
color: "warning",
class: {
innerWrapper: "text-warning",
inputWrapper: [
"hover:border-warning",
"focus-within:border-warning",
"focus-within:hover:border-warning",
],
label: "text-warning",
},
},
{
variant: "faded",
color: "danger",
class: {
innerWrapper: "text-danger",
inputWrapper: [
"hover:border-danger",
"focus-within:border-danger",
"focus-within:hover:border-danger",
],
label: "text-danger",
},
},
// bordered & color
{
variant: ["bordered", "faded"],
variant: "bordered",
color: "primary",
class: {
innerWrapper: "text-primary",
Expand All @@ -288,7 +354,7 @@ const dateInput = tv({
},
},
{
variant: ["bordered", "faded"],
variant: "bordered",
color: "secondary",
class: {
innerWrapper: "text-secondary",
Expand All @@ -297,7 +363,7 @@ const dateInput = tv({
},
},
{
variant: ["bordered", "faded"],
variant: "bordered",
color: "success",
class: {
innerWrapper: "text-success",
Expand All @@ -306,7 +372,7 @@ const dateInput = tv({
},
},
{
variant: ["bordered", "faded"],
variant: "bordered",
color: "warning",
class: {
innerWrapper: "text-warning",
Expand All @@ -315,7 +381,7 @@ const dateInput = tv({
},
},
{
variant: ["bordered", "faded"],
variant: "bordered",
color: "danger",
class: {
innerWrapper: "text-danger",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/theme/src/components/input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const input = tv({
flat: {
inputWrapper: [
"bg-default-100",
"data-[hover=true]:bg-default-50",
"data-[hover=true]:bg-default-200",
"group-data-[focus=true]:bg-default-100",
],
},
Expand Down
26 changes: 18 additions & 8 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 @@ -38,8 +38,8 @@ const select = tv({
flat: {
trigger: [
"bg-default-100",
"data-[hover=true]:bg-default-50",
"group-data-[focus=true]:bg-default-50",
"data-[hover=true]:bg-default-200",
"group-data-[focus=true]:bg-default-200",
],
},
faded: {
Expand Down Expand Up @@ -90,11 +90,21 @@ const select = tv({
},
color: {
default: {},
primary: {},
secondary: {},
success: {},
warning: {},
danger: {},
primary: {
selectorIcon: "text-primary",
},
secondary: {
selectorIcon: "text-secondary",
},
success: {
selectorIcon: "text-success",
},
warning: {
selectorIcon: "text-warning",
},
danger: {
selectorIcon: "text-danger",
},
},
size: {
sm: {
Expand Down Expand Up @@ -222,7 +232,7 @@ const select = tv({
color: "default",
class: {
value: "group-data-[has-value=true]:text-default-foreground",
trigger: ["bg-default-100", "data-[hover=true]:bg-default-50"],
trigger: ["bg-default-100", "data-[hover=true]:bg-default-200"],
},
},
{
Expand Down
Loading