Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Jan 15, 2024
2 parents 706565f + 07445bd commit c395868
Show file tree
Hide file tree
Showing 33 changed files with 201 additions and 430 deletions.
77 changes: 72 additions & 5 deletions packages/docs/src/data/team.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,13 @@
},
"nekosaur": {
"discord": ".nekosaur",
"focus": [
"[vuetifyjs](https://github.com/vuetifyjs)"
],
"languages": [
"Swedish",
"English"
],
"location": "Malmö, Sweden",
"name": "Albert Kaaman",
"team": "core",
"team": "legends",
"joined": "Jun 2017"
},
"MajesticPotatoe": {
Expand Down Expand Up @@ -106,7 +103,7 @@
"joined": "Feb 2021"
},
"elvinagarcia": {
"avatar": "https://pbs.twimg.com/profile_images/1641112338995748866/lVvo6nob_400x400.png",
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/elvinagarcia.png",
"discord": "elvinagarcia",
"focus": [
"Design/Animations"
Expand All @@ -132,5 +129,75 @@
"name": "Yuchao Wu",
"team": "core",
"joined": "Mar 2023"
},
"jacekkarczmarczyk": {
"discord": "jacek#3542",
"languages": [
"Polish",
"English"
],
"location": "Warsaw, Poland",
"name": "Jacek Karczmarczyk",
"team": "legends"
},
"chewy94": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/chewy94.jpg",
"discord": "Sean Kimball#0001",
"languages": [
"English"
],
"linkedin": "sean-kimball-b50922126",
"location": "Goodyear, Arizona, USA",
"name": "Sean Kimball",
"team": "legends"
},
"bdeo": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/bdeo.jpg",
"discord": "brandondeo#0001",
"languages": [
"English"
],
"linkedin": "brandondeo",
"location": "Philadelphia, PA, USA",
"name": "Brandon Deo",
"team": "legends"
},
"ElijahKotyluk": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/ElijahKotyluk.jpg",
"discord": "edk#4363",
"languages": [
"English"
],
"location": "USA",
"name": "Elijah Kotyluk",
"team": "legends"
},
"santiagoaloi": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/santiagoaloi.jpg",
"discord": "lannnister",
"languages": [
"Swedish",
"English",
"Spanish"
],
"linkedin": "santiagoaloi",
"location": "Stockholm, Sweden",
"name": "Santiago Aloi",
"team": "legends",
"joined": "Feb 2023"
},
"yooneskh": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/yooneskh.png",
"discord": "YoonesKh#7826",
"languages": [
"English",
"Persian"
],
"twitter": "yooneskh",
"linkedin": "yooneskh ",
"location": "Iran",
"name": "Yoones Khoshghadam",
"team": "legends",
"joined": "January 2023"
}
}
6 changes: 6 additions & 0 deletions packages/docs/src/pages/en/about/meet-the-team.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,9 @@ The core development team are Open Source developers that help guide the directi
<promoted slug="vuetify-open-collective" />

<team-members team="core" />

## Legends

Legends are inactive members of the core team. They have contributed a significant amount of time and effort to the project and are recognized for their contributions.

<team-members team="legends" />
7 changes: 4 additions & 3 deletions packages/docs/src/pages/en/getting-started/upgrade-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ app.use(vuetify)
- `onRowClick (item, data, event)` should be changed to `onRowClick (event, { item })`.
- `item-class` and `item-style` have been combined into `row-props`, and `cell-props` has been added.
- `sort-desc` and `group-desc` have been combined into `sort-by` and `group-by`. These properties now take an array of `{ key: string, order: 'asc' | 'desc' }` objects instead of strings.
- `current-items` event has been renamed to `update:current-items`.

### v-slider/v-range-slider

Expand All @@ -264,9 +265,9 @@ app.use(vuetify)
### v-menu

- `rounded` prop has been removed. Apply a rounded css class to the menu content element instead. e.g. `.rounded-te`
- `internal-activator` prop has been removed without replacement
- `offset-y` and `offset-x` props have been removed. Use `offset` prop instead
- `absolute` variant has been removed. For absolute positioning use css instead
- `internal-activator` prop has been removed, use a ref or unique selector instead.
- `absolute`, `offset-y` and `offset-x` props have been removed. Manual positioning is now done by passing a `[x, y]` array to the `target` prop.
- `nudge-*` props have been removed. There is no direct replacement but `offset` can be used to achieve similar results.

### v-snackbar

Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/store/team.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import team from '@/data/team.json'

export type Member = {
discord?: string
focus: string[]
focus?: string[]
funding?: string[]
languages: string[]
linkedin?: string
Expand Down
7 changes: 0 additions & 7 deletions packages/vuetify/dev/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import vuetify from './vuetify'
import App from './App.vue'

import { createHead } from '@unhead/vue'
import { routes } from './router'
import viteSSR from 'vite-ssr/vue'

Expand All @@ -12,12 +11,6 @@ import { fas } from '@fortawesome/free-solid-svg-icons'
library.add(fas)

export default viteSSR(App, { routes }, ({ app }) => {
const head = createHead()

// app.config.performance = true
app.use(head)
app.use(vuetify)
app.component('FontAwesomeIcon', FontAwesomeIcon)

return { head }
})
2 changes: 2 additions & 0 deletions packages/vuetify/dev/vuetify/date.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// import DateFnsAdapter from '@date-io/date-fns'
// import { enAU, enUS, ja, sv } from 'date-fns/locale'

// import DayJsAdapter from '@date-io/dayjs'

export default {
// adapter: DateFnsAdapter,
formats: {
Expand Down
1 change: 1 addition & 0 deletions packages/vuetify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
"devDependencies": {
"@date-io/core": "2.17.0",
"@date-io/date-fns": "2.17.0",
"@date-io/dayjs": "^3.0.0",
"@formatjs/intl": "^2.9.9",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VBtn/VBtn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export const VBtn = genericComponent<VBtnSlots>()({
)
})

return {}
return { group }
},
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export const VDataIterator = genericComponent<VDataIteratorSlots>()({
'update:sortBy': (value: any) => true,
'update:options': (value: any) => true,
'update:expanded': (value: any) => true,
'update:currentItems': (value: any) => true,
},

setup (props, { slots }) {
Expand Down
1 change: 1 addition & 0 deletions packages/vuetify/src/components/VDataTable/VDataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ export const VDataTable = genericComponent<new <T extends readonly any[], V>(
'update:options': (value: any) => true,
'update:groupBy': (value: any) => true,
'update:expanded': (value: any) => true,
'update:currentItems': (value: any) => true,
},

setup (props, { attrs, slots }) {
Expand Down
13 changes: 9 additions & 4 deletions packages/vuetify/src/components/VDataTable/VDataTableFooter.sass
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,26 @@
justify-content: flex-end

.v-data-table-footer__items-per-page
padding-inline-end: 24px
display: flex
align-items: center
justify-content: space-between
justify-content: center

> span
padding-inline-end: 24px
padding-inline-end: $data-table-footer-items-per-page-padding

> .v-select
width: $data-table-footer-select-width

.v-data-table-footer__info
display: flex
padding-inline-end: 24px
justify-content: flex-end
min-width: $data-table-footer-info-min-width
padding: $data-table-footer-info-padding

.v-data-table-footer__pagination
display: flex
align-items: center
margin-inline-start: $data-table-footer-pagination-margin-inline-start

.v-data-table-footer__page
padding: 0 8px
5 changes: 5 additions & 0 deletions packages/vuetify/src/components/VDataTable/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@use '../../styles/settings';
@use '../../styles/tools';

$data-table-footer-info-min-width: 116px !default;
$data-table-footer-info-padding: 0 16px !default;
$data-table-footer-padding: 4px !default;
$data-table-footer-pagination-margin-inline-start: 16px !default;
$data-table-footer-select-width: 90px !default;
$data-table-footer-items-per-page-padding: 8px !default;
$data-table-header-sort-badge-size: 20px !default;
$data-table-header-sort-badge-color: rgba(var(--v-border-color), var(--v-border-opacity)) !default;
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import { useProxiedModel } from '@/composables/proxiedModel'

// Utilities
import { computed, inject, provide, watchEffect } from 'vue'
import { clamp, propsFactory } from '@/util'
import { computed, inject, provide, watch, watchEffect } from 'vue'
import { clamp, getCurrentInstance, propsFactory } from '@/util'

// Types
import type { InjectionKey, Ref } from 'vue'
Expand Down Expand Up @@ -117,12 +117,18 @@ export function usePaginatedItems <T> (options: {
stopIndex: Ref<number>
itemsPerPage: Ref<number>
}) {
const vm = getCurrentInstance('usePaginatedItems')

const { items, startIndex, stopIndex, itemsPerPage } = options
const paginatedItems = computed(() => {
if (itemsPerPage.value <= 0) return items.value

return items.value.slice(startIndex.value, stopIndex.value)
})

watch(paginatedItems, val => {
vm.emit('update:currentItems', val)
})

return { paginatedItems }
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export const VDatePicker = genericComponent<new <T, Multiple extends boolean = f
})
const text = computed(() => {
return adapter.format(
adapter.setYear(adapter.setMonth(adapter.date(), month.value), year.value),
adapter.setYear(adapter.setMonth(adapter.startOfMonth(adapter.date()), month.value), year.value),
'monthAndYear',
)
})
Expand Down

This file was deleted.

83 changes: 0 additions & 83 deletions packages/vuetify/src/components/VDatePicker/utils.ts

This file was deleted.

Loading

0 comments on commit c395868

Please sign in to comment.