Merge branch 'master' into dev

vuetifyjs · Apr 30, 2024 · bd09589 · bd09589
2 parents 1cc6881 + 3a90a91
commit bd09589
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 19 deletions.
diff --git a/packages/docs/src/data/team.json b/packages/docs/src/data/team.json
@@ -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": [

diff --git a/packages/docs/src/examples/v-text-field/prop-dense.vue b/packages/docs/src/examples/v-text-field/prop-dense.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card
     class="mx-auto"
-    color="grey-lighten-3"
+    color="surface-light"
     max-width="400"
   >
     <v-card-text>

diff --git a/packages/vuetify/src/components/VDatePicker/VDatePicker.tsx b/packages/vuetify/src/components/VDatePicker/VDatePicker.tsx
@@ -230,10 +230,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

diff --git a/packages/vuetify/src/components/VSnackbar/VSnackbar.tsx b/packages/vuetify/src/components/VSnackbar/VSnackbar.tsx
@@ -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'
 
 // Types
@@ -99,7 +101,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)
@@ -111,6 +112,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)
@@ -213,7 +224,7 @@ export const VSnackbar = genericComponent<VSnackbarSlots>()({
           scrim={ false }
           scrollStrategy="none"
           _disableGlobalStack
-          onTouchstart={ onTouchstart }
+          onTouchstartPassive={ onTouchstart }
           onTouchend={ onTouchend }
           { ...scopeId }
           v-slots={{ activator: slots.activator }}

diff --git a/packages/vuetify/src/composables/directiveComponent.ts b/packages/vuetify/src/composables/directiveComponent.ts
@@ -66,7 +66,7 @@ export function useDirectiveComponent (
 function mountComponent (component: ConcreteComponent, props?: Record<string, any> | ((binding: DirectiveBinding) => Record<string, any>)) {
   return function (el: HTMLElement, binding: DirectiveBinding, vnode: VNode) {
     const _props = typeof props === 'function' ? props(binding) : props
-    const text = binding.value?.text ?? binding.value
+    const text = binding.value?.text ?? binding.value ?? _props?.text
     const value = isObject(binding.value) ? binding.value : {}
 
     // Get the children from the props or directive value, or the element's children
@@ -78,7 +78,7 @@ function mountComponent (component: ConcreteComponent, props?: Record<string, an
       ? findComponentParent(vnode, binding.instance!.$)?.provides
       : vnode.ctx?.provides) ?? binding.instance!.$.provides
 
-    const node = h(component, mergeProps(_props, value), children)
+    const node = h(component, mergeProps(_props, value), { default: () => children })
     node.appContext = Object.assign(
       Object.create(null),
       (binding.instance as ComponentPublicInstance).$.appContext,

diff --git a/packages/vuetify/src/labs/VSpeedDial/VSpeedDial.tsx b/packages/vuetify/src/labs/VSpeedDial/VSpeedDial.tsx
@@ -86,7 +86,6 @@ export const VSpeedDial = genericComponent<OverlaySlots>()({
                   appear
                   group
                   transition={ props.transition }
-                  mode="out-in"
                 >
                   { slots.default?.(slotProps) }
                 </MaybeTransition>

diff --git a/packages/vuetify/src/locale/ko.ts b/packages/vuetify/src/locale/ko.ts
@@ -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',