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.5.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: v3.5.18
Choose a head ref
  • 10 commits
  • 12 files changed
  • 4 contributors

Commits on Apr 23, 2024

  1. docs(VTextField): update dense example

    johnleider committed Apr 23, 2024
    Copy the full SHA
    1870ae7 View commit details

Commits on Apr 24, 2024

  1. fix(VCalendar): remove background for week view mode (#19681)

    fixes #18988
    SonTT19 authored Apr 24, 2024
    Copy the full SHA
    1ce2879 View commit details
  2. docs(team): update team members

    johnleider committed Apr 24, 2024
    Copy the full SHA
    d2af7e0 View commit details

Commits on Apr 25, 2024

  1. fix(VDatePicker): stay on current month when selecting multiple

    johnleider committed Apr 25, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    2d13e36 View commit details
  2. fix(VSpeedDial): remove mode designator on transition

    johnleider committed Apr 25, 2024
    Copy the full SHA
    2c726a5 View commit details

Commits on Apr 30, 2024

  1. fix(locale): ko translations (#19687)

    santarosalia authored Apr 30, 2024
    Copy the full SHA
    a063f94 View commit details
  2. fix(useDirectiveComponent): cannot read properties of undefined (#19693)

    kieuminhcanh authored Apr 30, 2024
    Copy the full SHA
    b9a588f View commit details
  3. Copy the full SHA
    9504efa View commit details
  4. fix(VSnackbar): make touchstart listener passive

    johnleider committed Apr 30, 2024
    Copy the full SHA
    24d1066 View commit details
  5. chore(release): publish v3.5.18

    johnleider committed Apr 30, 2024
    Copy the full SHA
    3a90a91 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.5.17",
"version": "3.5.18",
"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.5.17",
"version": "3.5.18",
"private": true,
"description": "",
"scripts": {
@@ -17,7 +17,7 @@
"ts-morph": "^22.0.0",
"tsx": "^4.7.2",
"vue": "^3.4.21",
"vuetify": "^3.5.17"
"vuetify": "^3.5.18"
},
"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.5.17",
"version": "3.5.18",
"repository": {
"type": "git",
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -38,7 +38,7 @@
"vue-i18n": "^9.11.0",
"vue-instantsearch": "^4.15.0",
"vue-prism-component": "^2.0.0",
"vuetify": "^3.5.17"
"vuetify": "^3.5.18"
},
"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.21",
"@vuetify/api-generator": "^3.5.17",
"@vuetify/api-generator": "^3.5.18",
"ajv": "^8.12.0",
"async-es": "^3.2.5",
"date-fns": "^3.6.0",
16 changes: 16 additions & 0 deletions packages/docs/src/data/team.json
Original file line number Diff line number Diff line change
@@ -35,6 +35,22 @@
"work": "COO @ Vuetify",
"joined": "Nov 2019"
},
"alexandriajackson": {
"avatar": "https://cdn.vuetifyjs.com/docs/images/team/alexandria.jpg",
"discord": "alexandriajackson_",
"focus": [
"vuetifyjs/*"
],
"languages": [
"English"
],
"location": "Dallas, TX, USA",
"name": "Alexandria Jackson",
"team": "company",
"twitter": "AlexxJackson96",
"work": "Marketing Coordinator @ Vuetify",
"joined": "Sept 2023"
},
"KaelWD": {
"discord": "kaelwd",
"focus": [
2 changes: 1 addition & 1 deletion packages/docs/src/examples/v-text-field/prop-dense.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-card
class="mx-auto"
color="grey-lighten-3"
color="surface-light"
max-width="400"
>
<v-card-text>
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.5.17",
"version": "3.5.18",
"author": {
"name": "John Leider",
"email": "john@vuetifyjs.com"
8 changes: 4 additions & 4 deletions packages/vuetify/src/components/VDatePicker/VDatePicker.tsx
Original file line number Diff line number Diff line change
@@ -228,10 +228,10 @@ export const VDatePicker = genericComponent<new <
}

watch(model, (val, oldVal) => {
const before = adapter.date(wrapInArray(val)[0])
const after = adapter.date(wrapInArray(oldVal)[0])
const newMonth = adapter.getMonth(before)
const newYear = adapter.getYear(before)
const before = adapter.date(wrapInArray(oldVal)[oldVal.length - 1])
const after = adapter.date(wrapInArray(val)[val.length - 1])
const newMonth = adapter.getMonth(after)
const newYear = adapter.getYear(after)

if (newMonth !== month.value) {
month.value = newMonth
17 changes: 14 additions & 3 deletions packages/vuetify/src/components/VSnackbar/VSnackbar.tsx
Original file line number Diff line number Diff line change
@@ -10,16 +10,18 @@ import { VProgressLinear } from '@/components/VProgressLinear'
// Composables
import { useLayout } from '@/composables'
import { forwardRefs } from '@/composables/forwardRefs'
import { VuetifyLayoutKey } from '@/composables/layout'
import { makeLocationProps } from '@/composables/location'
import { makePositionProps, usePosition } from '@/composables/position'
import { useProxiedModel } from '@/composables/proxiedModel'
import { makeRoundedProps, useRounded } from '@/composables/rounded'
import { useScopeId } from '@/composables/scopeId'
import { makeThemeProps, provideTheme } from '@/composables/theme'
import { useToggleScope } from '@/composables/toggleScope'
import { genOverlays, makeVariantProps, useVariant } from '@/composables/variant'

// Utilities
import { computed, mergeProps, nextTick, onMounted, onScopeDispose, ref, shallowRef, watch } from 'vue'
import { computed, inject, mergeProps, nextTick, onMounted, onScopeDispose, ref, shallowRef, watch, watchEffect } from 'vue'
import { genericComponent, omit, propsFactory, refElement, useRender } from '@/util'

type VSnackbarSlots = {
@@ -96,7 +98,6 @@ export const VSnackbar = genericComponent<VSnackbarSlots>()({

setup (props, { slots }) {
const isActive = useProxiedModel(props, 'modelValue')
const { mainStyles } = useLayout()
const { positionClasses } = usePosition(props)
const { scopeId } = useScopeId()
const { themeClasses } = provideTheme(props)
@@ -108,6 +109,16 @@ export const VSnackbar = genericComponent<VSnackbarSlots>()({
const timerRef = ref<VProgressLinear>()
const isHovering = shallowRef(false)
const startY = shallowRef(0)
const mainStyles = ref()
const hasLayout = inject(VuetifyLayoutKey, undefined)

useToggleScope(() => !!hasLayout, () => {
const layout = useLayout()

watchEffect(() => {
mainStyles.value = layout.mainStyles.value
})
})

watch(isActive, startTimeout)
watch(() => props.timeout, startTimeout)
@@ -210,7 +221,7 @@ export const VSnackbar = genericComponent<VSnackbarSlots>()({
scrim={ false }
scrollStrategy="none"
_disableGlobalStack
onTouchstart={ onTouchstart }
onTouchstartPassive={ onTouchstart }
onTouchend={ onTouchend }
{ ...scopeId }
v-slots={{ activator: slots.activator }}
4 changes: 2 additions & 2 deletions packages/vuetify/src/composables/directiveComponent.ts
Original file line number Diff line number Diff line change
@@ -25,15 +25,15 @@ export const useDirectiveComponent = (
const { value } = binding

// Get the children from the props or directive value, or the element's children
const children = props.text || value.text || el.innerHTML
const children = props?.text || value?.text || el.innerHTML

// If vnode.ctx is the same as the instance, then we're bound to a plain element
// and need to find the nearest parent component instance to inherit provides from
const provides = (vnode.ctx === binding.instance!.$
? findComponentParent(vnode, binding.instance!.$)?.provides
: vnode.ctx?.provides) ?? binding.instance!.$.provides

const node = h(concreteComponent, mergeProps(props, value), children)
const node = h(concreteComponent, mergeProps(props, value), { default: () => children })
node.appContext = Object.assign(
Object.create(null),
(binding.instance as ComponentPublicInstance).$.appContext,
2 changes: 0 additions & 2 deletions packages/vuetify/src/labs/VCalendar/VCalendar.sass
Original file line number Diff line number Diff line change
@@ -7,8 +7,6 @@
flex-direction: column
// https://github.com/vuetifyjs/vuetify/issues/8319
min-height: 0
// Themed
background-color: #fff

.v-calendar__container
border-top: $calendar-line-width solid $calendar-line-color
1 change: 0 additions & 1 deletion packages/vuetify/src/labs/VSpeedDial/VSpeedDial.tsx
Original file line number Diff line number Diff line change
@@ -78,7 +78,6 @@ export const VSpeedDial = genericComponent<OverlaySlots>()({
appear
group
transition={ props.transition }
mode="out-in"
>
{ slots.default?.(slotProps) }
</MaybeTransition>
16 changes: 8 additions & 8 deletions packages/vuetify/src/locale/ko.ts
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ export default {
},
calendar: {
moreEvents: '{0} 더보기',
today: 'Today',
today: '였늘',
},
input: {
clear: 'Clear {0}',
@@ -72,29 +72,29 @@ export default {
timePicker: {
am: 'μ˜€μ „',
pm: 'μ˜€ν›„',
title: 'Select Time',
title: 'μ‹œκ°„μ„ μ„ νƒν•˜μ„Έμš”.',
},
pagination: {
ariaLabel: {
root: 'Pagination Navigation',
next: 'λ‹€μŒ νŽ˜μ΄μ§€',
previous: '이전 νŽ˜μ΄μ§€',
page: 'κ³ ν†  νŽ˜μ΄μ§€ {0}',
page: '{0} νŽ˜μ΄μ§€λ‘œ 이동',
currentPage: 'ν˜„μž¬ νŽ˜μ΄μ§€, νŽ˜μ΄μ§€ {0}',
first: 'First page',
last: 'Last page',
first: '첫 νŽ˜μ΄μ§€',
last: 'λ§ˆμ§€λ§‰ νŽ˜μ΄μ§€',
},
},
stepper: {
next: 'Next',
prev: 'Previous',
next: 'λ‹€μŒ',
prev: '이전',
},
rating: {
ariaLabel: {
item: 'Rating {0} of {1}',
},
},
loading: 'Loading...',
loading: 'λΆˆλŸ¬μ˜€λŠ” 쀑...',
infiniteScroll: {
loadMore: 'Load more',
empty: 'No more',