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: remove spacer between table header and body, readjust color #47

Merged
merged 1 commit into from
Mar 22, 2024
Merged

fix: remove spacer between table header and body, readjust color #47

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
2 changes: 0 additions & 2 deletions packages/components/table/src/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {useCallback} from "react";
import {Spacer} from "@jala-banyu/spacer";
import {forwardRef} from "@jala-banyu/system";

import {UseTableProps, useTable} from "./use-table";
Expand Down Expand Up @@ -82,7 +81,6 @@ const Table = forwardRef<"table", TableProps>((props, ref) => {
)}
</TableHeaderRow>
))}
<Spacer as="tr" tabIndex={-1} y={1} />
</TableRowGroup>
<TableBody
checkboxesProps={values.checkboxesProps}
Expand Down
20 changes: 11 additions & 9 deletions packages/core/theme/src/components/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,30 @@ const table = tv({
variants: {
color: {
primary: {
td: "before:bg-brand/20 data-[selected=true]:text-brand",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
success: {
td: "before:bg-success/20 data-[selected=true]:text-success-600 dark:data-[selected=true]:text-success",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
warning: {
td: "before:bg-warning/20 data-[selected=true]:text-warning-600 dark:data-[selected=true]:text-warning",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
danger: {
td: "before:bg-danger/20 data-[selected=true]:text-danger dark:data-[selected=true]:text-danger-500",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
basic: {
td: "before:bg-neutral/20 data-[selected=true]:text-neutral-800 dark:data-[selected=true]:text-neutral-200",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
white: {
td: "before:bg-brand/20 data-[selected=true]:text-brand dark:data-[selected=true]:text-brand-200",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
transparent: {
td: "before:bg-transparent data-[selected=true]:text-neutral-800 dark:data-[selected=true]:text-neutral-200",
td: "data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-800",
},
},
headerColor: {
default: {
th: "bg-neutral-200",
th: "bg-neutral-100",
},
white: {
th: "bg-white",
Expand Down Expand Up @@ -183,6 +183,8 @@ const table = tv({
td: [
"group-data-[odd=true]:before:bg-neutral-50",
"group-data-[odd=true]:before:opacity-50",
"group-data-[odd=true]:data-[selected=true]:before:bg-neutral-100",
"group-data-[odd=true]:data-[selected=true]:before:text-neutral-800",
],
},
false: {
Expand All @@ -194,7 +196,7 @@ const table = tv({
},
isCompact: {
true: {
td: "py-1",
td: "",
},
false: {},
},
Expand Down
Loading