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(VDataTable): readd missing hide-default-header / hide-default-footer props #19774

Merged
merged 1 commit into from
May 9, 2024
Merged

fix(VDataTable): readd missing hide-default-header / hide-default-footer props #19774

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
3 changes: 2 additions & 1 deletion packages/api-generator/src/locale/en/VDataTable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"headers": "An array of objects that each describe a header column. See the example below for a definition of all properties.",
"headersLength": "Can be used in combination with `hide-default-header` to specify the number of columns in the table to allow expansion rows and loading bar to function properly.",
"height": "Set an explicit height of table.",
"hideDefaultHeader": "Hide the default headers.",
"hideDefaultHeader": "Hides the default header.",
"hideDefaultFooter": "Hides the default footer. This has no effect on `v-data-table-virtual`.",
"hover": "Adds a hover effects to a table rows.",
"itemClass": "Property on supplied `items` that contains item's row class or function that takes an item as an argument and returns the class of corresponding row.",
"itemsPerPage": "Changes how many items per page should be visible. Can be used with `.sync` modifier. Setting this prop to `-1` will display all items on the page.",
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/pages/en/components/data-tables/basics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ The `v-data-table` renders a default footer using the `v-data-footer` component.

<ExamplesExample file="v-data-table/prop-footer-props" /> -->

<!-- #### Hide default header and footer
#### Hide default header and footer

You can apply the **hide-default-header** and **hide-default-footer** props to remove the default header and footer respectively.

<ExamplesExample file="v-data-table/prop-hide-header-footer" /> -->
<ExamplesExample file="v-data-table/prop-hide-header-footer" />

#### Selection

Expand Down
18 changes: 11 additions & 7 deletions packages/vuetify/src/components/VDataTable/VDataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ export type VDataTableSlots<T> = VDataTableRowsSlots<T> & VDataTableHeadersSlots
export const makeDataTableProps = propsFactory({
...makeVDataTableRowsProps(),

hideDefaultFooter: Boolean,
hideDefaultHeader: Boolean,
width: [String, Number],
search: String,

Expand Down Expand Up @@ -240,12 +242,14 @@ export const VDataTable = genericComponent<new <T extends readonly any[], V>(
default: () => slots.default ? slots.default(slotProps.value) : (
<>
{ slots.colgroup?.(slotProps.value) }
<thead>
<VDataTableHeaders
{ ...dataTableHeadersProps }
v-slots={ slots }
/>
</thead>
{ !props.hideDefaultHeader && (
<thead key="thead">
<VDataTableHeaders
{ ...dataTableHeadersProps }
v-slots={ slots }
/>
</thead>
)}
{ slots.thead?.(slotProps.value) }
<tbody>
{ slots['body.prepend']?.(slotProps.value) }
Expand All @@ -263,7 +267,7 @@ export const VDataTable = genericComponent<new <T extends readonly any[], V>(
{ slots.tfoot?.(slotProps.value) }
</>
),
bottom: () => slots.bottom ? slots.bottom(slotProps.value) : (
bottom: () => slots.bottom ? slots.bottom(slotProps.value) : !props.hideDefaultFooter && (
<>
<VDivider />

Expand Down
18 changes: 10 additions & 8 deletions packages/vuetify/src/components/VDataTable/VDataTableServer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,15 @@ export const VDataTableServer = genericComponent<new <T extends readonly any[],
default: () => slots.default ? slots.default(slotProps.value) : (
<>
{ slots.colgroup?.(slotProps.value) }
<thead class="v-data-table__thead" role="rowgroup">
<VDataTableHeaders
{ ...dataTableHeadersProps }
sticky={ props.fixedHeader }
v-slots={ slots }
/>
</thead>
{ !props.hideDefaultHeader && (
<thead key="thead" class="v-data-table__thead" role="rowgroup">
<VDataTableHeaders
{ ...dataTableHeadersProps }
sticky={ props.fixedHeader }
v-slots={ slots }
/>
</thead>
)}
{ slots.thead?.(slotProps.value) }
<tbody class="v-data-table__tbody" role="rowgroup">
{ slots['body.prepend']?.(slotProps.value) }
Expand All @@ -189,7 +191,7 @@ export const VDataTableServer = genericComponent<new <T extends readonly any[],
{ slots.tfoot?.(slotProps.value) }
</>
),
bottom: () => slots.bottom ? slots.bottom(slotProps.value) : (
bottom: () => slots.bottom ? slots.bottom(slotProps.value) : !props.hideDefaultFooter && (
<>
<VDivider />

Expand Down
16 changes: 9 additions & 7 deletions packages/vuetify/src/components/VDataTable/VDataTableVirtual.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,15 @@ export const VDataTableVirtual = genericComponent<new <T extends readonly any[],
>
<table>
{ slots.colgroup?.(slotProps.value) }
<thead>
<VDataTableHeaders
{ ...dataTableHeadersProps }
sticky={ props.fixedHeader }
v-slots={ slots }
/>
</thead>
{ !props.hideDefaultHeader && (
<thead key="thead">
<VDataTableHeaders
{ ...dataTableHeadersProps }
sticky={ props.fixedHeader }
v-slots={ slots }
/>
</thead>
)}
<tbody>
<tr ref={ markerRef } style={{ height: convertToUnit(paddingTop.value), border: 0 }}>
<td colspan={ columns.value.length } style={{ height: 0, border: 0 }}></td>
Expand Down
Loading