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.7.17
Choose a base ref
...
head repository: vuetifyjs/vuetify
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b210f127992253f7daaae5ea3e5a504ee515b025
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Mar 18, 2025

  1. Revert "refactor(VDatePickerMonth): remove useless VDefaultsProvider"

    This reverts commit 80184e4.
    johnleider committed Mar 18, 2025
    Copy the full SHA
    6fb2336 View commit details
  2. chore(release): publish v3.7.18

    johnleider committed Mar 18, 2025
    Copy the full SHA
    b210f12 View commit details
Showing with 31 additions and 19 deletions.
  1. +1 −1 lerna.json
  2. +1 −1 packages/api-generator/package.json
  3. +1 −1 packages/docs/package.json
  4. +1 −1 packages/vuetify/package.json
  5. +27 −15 packages/vuetify/src/components/VDatePicker/VDatePickerMonth.tsx
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -13,5 +13,5 @@
}
},
"npmClient": "pnpm",
"version": "3.7.17"
"version": "3.7.18"
}
2 changes: 1 addition & 1 deletion 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.7.17",
"version": "3.7.18",
"private": true,
"description": "",
"scripts": {
2 changes: 1 addition & 1 deletion 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.7.17",
"version": "3.7.18",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
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.7.17",
"version": "3.7.18",
"author": {
"name": "John Leider",
"email": "john@vuetifyjs.com"
42 changes: 27 additions & 15 deletions packages/vuetify/src/components/VDatePicker/VDatePickerMonth.tsx
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ import './VDatePickerMonth.sass'

// Components
import { VBtn } from '@/components/VBtn'
import { VDefaultsProvider } from '@/components/VDefaultsProvider'

// Composables
import { makeCalendarProps, useCalendar } from '@/composables/calendar'
@@ -11,7 +12,7 @@ import { MaybeTransition } from '@/composables/transition'

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

// Types
import type { PropType } from 'vue'
@@ -151,7 +152,7 @@ export const VDatePickerMonth = genericComponent<VDatePickerMonthSlots>()({
}
}

useRender(() => (
return () => (
<div class="v-date-picker-month">
{ props.showWeek && (
<div key="weeks" class="v-date-picker-month__weeks">
@@ -187,17 +188,6 @@ export const VDatePickerMonth = genericComponent<VDatePickerMonthSlots>()({
{ daysInMonth.value.map((item, i) => {
const slotProps = {
props: {
class: 'v-date-picker-month__day-btn',
color: (item.isSelected || item.isToday) && !item.isDisabled
? props.color
: undefined,
disabled: item.isDisabled,
icon: true,
ripple: false,
text: item.localized,
variant: item.isDisabled
? item.isToday ? 'outlined' : 'text'
: item.isToday && !item.isSelected ? 'outlined' : 'flat',
onClick: () => onClick(item.date),
},
item,
@@ -222,16 +212,38 @@ export const VDatePickerMonth = genericComponent<VDatePickerMonthSlots>()({
]}
data-v-date={ !item.isDisabled ? item.isoDate : undefined }
>

{ (props.showAdjacentMonths || !item.isAdjacent) && (
slots.day?.(slotProps) ?? (<VBtn { ...slotProps.props } />)
<VDefaultsProvider
defaults={{
VBtn: {
class: 'v-date-picker-month__day-btn',
color: (item.isSelected || item.isToday) && !item.isDisabled
? props.color
: undefined,
disabled: item.isDisabled,
icon: true,
ripple: false,
text: item.localized,
variant: item.isDisabled
? item.isToday ? 'outlined' : 'text'
: item.isToday && !item.isSelected ? 'outlined' : 'flat',
onClick: () => onClick(item.date),
},
}}
>
{ slots.day?.(slotProps) ?? (
<VBtn { ...slotProps.props } />
)}
</VDefaultsProvider>
)}
</div>
)
})}
</div>
</MaybeTransition>
</div>
))
)
},
})