Skip to content

feat(VDataTable): apply color to internal controls #22157

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
Oct 8, 2025
Merged

feat(VDataTable): apply color to internal controls #22157

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
6 changes: 4 additions & 2 deletions packages/vuetify/src/components/VDataTable/VDataTableFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ import { useLocale } from '@/composables/locale'

// Utilities
import { computed } from 'vue'
import { genericComponent, propsFactory, useRender } from '@/util'
import { genericComponent, omit, propsFactory, useRender } from '@/util'

// Types
import type { PropType } from 'vue'

export const makeVDataTableFooterProps = propsFactory({
color: String,
prevIcon: {
type: IconValue,
default: '$prev',
Expand Down Expand Up @@ -110,6 +111,7 @@ export const VDataTableFooter = genericComponent<{ prepend: never }>()({

<VSelect
items={ itemsPerPageOptions.value }
itemColor={ props.color }
modelValue={ itemsPerPage.value }
onUpdate:modelValue={ v => setItemsPerPage(Number(v)) }
density="compact"
Expand Down Expand Up @@ -137,7 +139,7 @@ export const VDataTableFooter = genericComponent<{ prepend: never }>()({
showFirstLastPage
totalVisible={ props.showCurrentPage ? 1 : 0 }
variant="plain"
{ ...paginationProps }
{ ...omit(paginationProps, ['color']) }
></VPagination>
</div>
</div>
Expand Down
24 changes: 14 additions & 10 deletions packages/vuetify/src/components/VDataTable/VDataTableHeaders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ export const VDataTableHeaders = genericComponent<VDataTableHeadersSlots>()({
if (column.key === 'data-table-select') {
return slots['header.data-table-select']?.(columnSlotProps) ?? (showSelectAll.value && (
<VCheckboxBtn
color={ props.color }
density={ props.density }
modelValue={ allSelected.value }
indeterminate={ someSelected.value && !allSelected.value }
Expand Down Expand Up @@ -247,14 +248,6 @@ export const VDataTableHeaders = genericComponent<VDataTableHeadersSlots>()({
return columns.value.filter(column => column?.sortable && !props.disableSort)
})

const appendIcon = computed(() => {
const showSelectColumn = columns.value.find(column => column.key === 'data-table-select')

if (showSelectColumn == null) return

return allSelected.value ? '$checkboxOn' : someSelected.value ? '$checkboxIndeterminate' : '$checkboxOff'
})

return (
<VDataTableColumn
tag="th"
Expand All @@ -267,6 +260,7 @@ export const VDataTableHeaders = genericComponent<VDataTableHeadersSlots>()({
<div class="v-data-table-header__content">
<VSelect
chips
color={ props.color }
class="v-data-table__td-sort-select"
clearable
density="default"
Expand All @@ -275,10 +269,18 @@ export const VDataTableHeaders = genericComponent<VDataTableHeadersSlots>()({
multiple={ props.multiSort }
variant="underlined"
onClick:clear={ () => sortBy.value = [] }
appendIcon={ appendIcon.value }
onClick:append={ () => selectAll(!allSelected.value) }
>
{{
append: () => (
<VCheckboxBtn
color={ props.color }
density="compact"
modelValue={ allSelected.value }
indeterminate={ someSelected.value && !allSelected.value }
onUpdate:modelValue={ selectAll }
/>
),
chip: props => (
<VChip
onClick={ props.item.raw?.sortable ? () => toggleSort(props.item.raw) : undefined }
Expand Down Expand Up @@ -329,7 +331,9 @@ export const VDataTableHeaders = genericComponent<VDataTableHeadersSlots>()({
name="v-data-table-progress"
absolute
active
color={ typeof props.loading === 'boolean' ? undefined : props.loading }
color={ typeof props.loading === 'boolean' || props.loading === 'true'
? props.color
: props.loading }
indeterminate
v-slots={{ default: slots.loader }}
/>
Expand Down
3 changes: 3 additions & 0 deletions packages/vuetify/src/components/VDataTable/VDataTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export type VDataTableRowSlots<T> = {
}

export const makeVDataTableRowProps = propsFactory({
color: String,
index: Number,
item: Object as PropType<DataTableItem>,
cellProps: [Object, Function] as PropType<CellProps<any>>,
Expand Down Expand Up @@ -163,12 +164,14 @@ export const VDataTableRow = genericComponent<new <T>(
return slots['item.data-table-select']?.({
...slotProps,
props: {
color: props.color,
disabled: !item.selectable,
modelValue: isSelected([item]),
onClick: withModifiers(() => toggleSelect(item), ['stop']),
},
}) ?? (
<VCheckboxBtn
color={ props.color }
disabled={ !item.selectable }
density={ props.density }
modelValue={ isSelected([item]) }
Expand Down
2 changes: 2 additions & 0 deletions packages/vuetify/src/components/VDataTable/VDataTableRows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export type VDataTableRowsSlots<T> = VDataTableGroupHeaderRowSlots & VDataTableR
}

export const makeVDataTableRowsProps = propsFactory({
color: String,
loading: [Boolean, String],
loadingText: {
type: String,
Expand Down Expand Up @@ -162,6 +163,7 @@ export const VDataTableRows = genericComponent<new <T>(
} : undefined,
index,
item,
color: props.color,
cellProps: props.cellProps,
collapseIcon: props.collapseIcon,
expandIcon: props.expandIcon,
Expand Down