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

feat(VDataIterator): loading prop fix and add new slot "loader" #18811

Merged
merged 9 commits into from
Apr 12, 2024
Merged

feat(VDataIterator): loading prop fix and add new slot "loader" #18811

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
805e61b
Fix problem prop loading, implement new option to set custom loader
websitevirtuoso Dec 2, 2023
be389e3
Update doc for new example how to loader
websitevirtuoso Dec 2, 2023
0135a16
chore(VDataIterator): lint and style issues
johnleider Jan 19, 2024
d30cb3b
Change color to surface variant
websitevirtuoso Jan 23, 2024
0faa292
Merge branch 'dev' into feature/v-data-iterator-loading-prop-slot
johnleider Apr 8, 2024
07c1c3f
Merge branch 'dev' into feature/v-data-iterator-loading-prop-slot
johnleider Apr 11, 2024
6f8a899
refactor(VDataIterator): remove built in loader
johnleider Apr 11, 2024
b64925b
refactor(VDataIterator): remove styles
johnleider Apr 11, 2024
69a71a7
chore(slot-loader.vue): fix lint
johnleider Apr 12, 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
Prev Previous commit
Next Next commit
Merge branch 'dev' into feature/v-data-iterator-loading-prop-slot
  • Loading branch information
@johnleider
johnleider committed Apr 8, 2024
commit 0faa2925048097b9283b90d853fdf972c1c770df
5 changes: 2 additions & 3 deletions packages/docs/src/pages/en/components/data-iterators.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,10 @@ The `v-data-iterator` has both a **header** and **footer** slot for adding extra

Sorting, filters and pagination can be controlled externally by using the individual props

<example file="v-data-iterator/misc-filter" />

<ExamplesExample file="v-data-iterator/misc-filter" />

#### Loader props

Loader can be used to change loader on "loading" prop

<example file="v-data-iterator/slot-loader" />
<ExamplesExample file="v-data-iterator/slot-loader" />
9 changes: 5 additions & 4 deletions packages/vuetify/src/components/VDataIterator/VDataIterator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import type { DataIteratorItem } from './composables/items'
import type { Group } from '@/components/VDataTable/composables/group'
import type { SortItem } from '@/components/VDataTable/composables/sort'
import type { LoaderSlotProps } from '@/composables/loader'
import type { GenericProps } from '@/util'

type VDataIteratorSlotProps<T> = {
page: number
Expand All @@ -58,10 +59,10 @@ type VDataIteratorSlotProps<T> = {
groupedItems: readonly (DataIteratorItem<T> | Group<DataIteratorItem<T>>)[]
}

export type VDataIteratorSlots = {
default: VDataIteratorSlotProps
header: VDataIteratorSlotProps
footer: VDataIteratorSlotProps
export type VDataIteratorSlots<T> = {
default: VDataIteratorSlotProps<T>
header: VDataIteratorSlotProps<T>
footer: VDataIteratorSlotProps<T>
loader: LoaderSlotProps
'no-data': never
}
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.