Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuetifyjs/vuetify
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.6.9
Choose a base ref
...
head repository: vuetifyjs/vuetify
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.6.10
Choose a head ref
  • 7 commits
  • 10 files changed
  • 3 contributors

Commits on Jun 12, 2024

  1. fix(VExpansionPanelTitle): propagate VIcon defaults

    johnleider committed Jun 12, 2024
    Copy the full SHA
    cec2094 View commit details
  2. fix(VExpansionPanel): propagate defaults provided by VExpansionPanels

    johnleider committed Jun 12, 2024
    Copy the full SHA
    666484a View commit details

Commits on Jun 14, 2024

  1. docs(data-tables): fix options api examples

    MajesticPotatoe committed Jun 14, 2024
    Copy the full SHA
    f2f2518 View commit details
  2. fix(VExpansionPanel): remove unused toRef

    MajesticPotatoe authored Jun 14, 2024
    Copy the full SHA
    0931cec View commit details

Commits on Jun 17, 2024

  1. chore(team): update members

    johnleider committed Jun 17, 2024
    Copy the full SHA
    35e2ea2 View commit details
  2. fix(VDatePicker): don't update month/year if new model is empty

    fixes #20015
    johnleider committed Jun 17, 2024
    Copy the full SHA
    154e751 View commit details

Commits on Jun 19, 2024

  1. chore(release): publish v3.6.10

    johnleider committed Jun 19, 2024
    Copy the full SHA
    34c7bd5 View commit details
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -13,6 +13,6 @@
}
},
"npmClient": "yarn",
"version": "3.6.9",
"version": "3.6.10",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions packages/api-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vuetify/api-generator",
"version": "3.6.9",
"version": "3.6.10",
"private": true,
"description": "",
"scripts": {
@@ -17,7 +17,7 @@
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.27",
"vuetify": "^3.6.9"
"vuetify": "^3.6.10"
},
"devDependencies": {
"@types/stringify-object": "^4.0.5"
6 changes: 3 additions & 3 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"description": "A Vue.js project",
"private": true,
"author": "John Leider <john@vuetifyjs.com>",
"version": "3.6.9",
"version": "3.6.10",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -38,7 +38,7 @@
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.16.1",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.6.9"
"vuetify": "^3.6.10"
},
"devDependencies": {
"@emailjs/browser": "^4.3.3",
@@ -50,7 +50,7 @@
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.27",
"@vuetify/api-generator": "^3.6.9",
"@vuetify/api-generator": "^3.6.10",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
16 changes: 0 additions & 16 deletions packages/docs/src/data/team.json
Original file line number Diff line number Diff line change
@@ -251,21 +251,5 @@
"name": "Yoones Khoshghadam",
"team": "legends",
"joined": "January 2023"
},
"alexandriajackson": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/alexandria.jpg",
"discord": "alexandriajackson_",
"focus": [
"[vuetifyjs/*](https://github.com/vuetifyjs)"
],
"languages": [
"English"
],
"location": "Dallas, TX, USA",
"name": "Alexandria Jackson",
"team": "company",
"twitter": "AlexxJackson96",
"work": "Marketing Coordinator @ Vuetify",
"joined": "Sept 2023"
}
}
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@
],
},
],
desserts: [
items: [
{
name: 'Great Pyramid of Giza',
location: 'Egypt',
160 changes: 81 additions & 79 deletions packages/docs/src/examples/v-data-table/prop-dense.vue
Original file line number Diff line number Diff line change
@@ -92,84 +92,86 @@

<script>
export default {
headers: [
{ title: 'Plant', align: 'start', sortable: false, key: 'name' },
{ title: 'Light', align: 'end', key: 'light' },
{ title: 'Height', align: 'end', key: 'height' },
{ title: 'Pet Friendly', align: 'end', key: 'petFriendly' },
{ title: 'Price ($)', align: 'end', key: 'price' },
],
plants: [
{
name: 'Fern',
light: 'Low',
height: '20cm',
petFriendly: 'Yes',
price: 20,
},
{
name: 'Snake Plant',
light: 'Low',
height: '50cm',
petFriendly: 'No',
price: 35,
},
{
name: 'Monstera',
light: 'Medium',
height: '60cm',
petFriendly: 'No',
price: 50,
},
{
name: 'Pothos',
light: 'Low to medium',
height: '40cm',
petFriendly: 'Yes',
price: 25,
},
{
name: 'ZZ Plant',
light: 'Low to medium',
height: '90cm',
petFriendly: 'Yes',
price: 30,
},
{
name: 'Spider Plant',
light: 'Bright, indirect',
height: '30cm',
petFriendly: 'Yes',
price: 15,
},
{
name: 'Air Plant',
light: 'Bright, indirect',
height: '15cm',
petFriendly: 'Yes',
price: 10,
},
{
name: 'Peperomia',
light: 'Bright, indirect',
height: '25cm',
petFriendly: 'Yes',
price: 20,
},
{
name: 'Aloe Vera',
light: 'Bright, direct',
height: '30cm',
petFriendly: 'Yes',
price: 15,
},
{
name: 'Jade Plant',
light: 'Bright, direct',
height: '40cm',
petFriendly: 'Yes',
price: 25,
},
],
data: () => ({
headers: [
{ title: 'Plant', align: 'start', sortable: false, key: 'name' },
{ title: 'Light', align: 'end', key: 'light' },
{ title: 'Height', align: 'end', key: 'height' },
{ title: 'Pet Friendly', align: 'end', key: 'petFriendly' },
{ title: 'Price ($)', align: 'end', key: 'price' },
],
plants: [
{
name: 'Fern',
light: 'Low',
height: '20cm',
petFriendly: 'Yes',
price: 20,
},
{
name: 'Snake Plant',
light: 'Low',
height: '50cm',
petFriendly: 'No',
price: 35,
},
{
name: 'Monstera',
light: 'Medium',
height: '60cm',
petFriendly: 'No',
price: 50,
},
{
name: 'Pothos',
light: 'Low to medium',
height: '40cm',
petFriendly: 'Yes',
price: 25,
},
{
name: 'ZZ Plant',
light: 'Low to medium',
height: '90cm',
petFriendly: 'Yes',
price: 30,
},
{
name: 'Spider Plant',
light: 'Bright, indirect',
height: '30cm',
petFriendly: 'Yes',
price: 15,
},
{
name: 'Air Plant',
light: 'Bright, indirect',
height: '15cm',
petFriendly: 'Yes',
price: 10,
},
{
name: 'Peperomia',
light: 'Bright, indirect',
height: '25cm',
petFriendly: 'Yes',
price: 20,
},
{
name: 'Aloe Vera',
light: 'Bright, direct',
height: '30cm',
petFriendly: 'Yes',
price: 15,
},
{
name: 'Jade Plant',
light: 'Bright, direct',
height: '40cm',
petFriendly: 'Yes',
price: 25,
},
],
}),
}
</script>
2 changes: 1 addition & 1 deletion packages/vuetify/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vuetify",
"description": "Vue Material Component Framework",
"version": "3.6.9",
"version": "3.6.10",
"author": {
"name": "John Leider",
"email": "john@vuetifyjs.com"
9 changes: 7 additions & 2 deletions packages/vuetify/src/components/VDatePicker/VDatePicker.tsx
Original file line number Diff line number Diff line change
@@ -230,8 +230,13 @@ export const VDatePicker = genericComponent<new <
}

watch(model, (val, oldVal) => {
const before = adapter.date(wrapInArray(oldVal)[oldVal.length - 1])
const after = adapter.date(wrapInArray(val)[val.length - 1])
const arrBefore = wrapInArray(oldVal)
const arrAfter = wrapInArray(val)

if (!arrAfter.length) return

const before = adapter.date(arrBefore[arrBefore.length - 1])
const after = adapter.date(arrAfter[arrAfter.length - 1])
const newMonth = adapter.getMonth(after)
const newYear = adapter.getYear(after)

44 changes: 25 additions & 19 deletions packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.tsx
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
import { VExpansionPanelSymbol } from './shared'
import { makeVExpansionPanelTextProps, VExpansionPanelText } from './VExpansionPanelText'
import { makeVExpansionPanelTitleProps, VExpansionPanelTitle } from './VExpansionPanelTitle'
import { VDefaultsProvider } from '@/components/VDefaultsProvider'

// Composables
import { useBackgroundColor } from '@/composables/color'
@@ -101,25 +102,30 @@ export const VExpansionPanel = genericComponent<VExpansionPanelSlots>()({
]}
/>

{ hasTitle && (
<VExpansionPanelTitle
key="title"
{ ...expansionPanelTitleProps }
>
{ slots.title ? slots.title() : props.title }
</VExpansionPanelTitle>
)}

{ hasText && (
<VExpansionPanelText
key="text"
{ ...expansionPanelTextProps }
>
{ slots.text ? slots.text() : props.text }
</VExpansionPanelText>
)}

{ slots.default?.() }
<VDefaultsProvider
defaults={{
VExpansionPanelTitle: {
...expansionPanelTitleProps,
},
VExpansionPanelText: {
...expansionPanelTextProps,
},
}}
>
{ hasTitle && (
<VExpansionPanelTitle key="title">
{ slots.title ? slots.title() : props.title }
</VExpansionPanelTitle>
)}

{ hasText && (
<VExpansionPanelText key="text">
{ slots.text ? slots.text() : props.text }
</VExpansionPanelText>
)}

{ slots.default?.() }
</VDefaultsProvider>
</props.tag>
)
})
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Components
import { VExpansionPanelSymbol } from './shared'
import { VDefaultsProvider } from '@/components/VDefaultsProvider'
import { VIcon } from '@/components/VIcon'

// Composables
@@ -75,6 +76,8 @@ export const VExpansionPanelTitle = genericComponent<VExpansionPanelTitleSlots>(
readonly: props.readonly,
}))

const icon = computed(() => expansionPanel.isSelected.value ? props.collapseIcon : props.expandIcon)

useRender(() => (
<button
class={[
@@ -103,12 +106,17 @@ export const VExpansionPanelTitle = genericComponent<VExpansionPanelTitleSlots>(
{ slots.default?.(slotProps.value) }

{ !props.hideActions && (
<span class="v-expansion-panel-title__icon">
{
slots.actions ? slots.actions(slotProps.value)
: <VIcon icon={ expansionPanel.isSelected.value ? props.collapseIcon : props.expandIcon } />
}
</span>
<VDefaultsProvider
defaults={{
VIcon: {
icon: icon.value,
},
}}
>
<span class="v-expansion-panel-title__icon">
{ slots.actions?.(slotProps.value) ?? <VIcon /> }
</span>
</VDefaultsProvider>
)}
</button>
))