Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion packages/vuetify/src/components/VChip/VChip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { VAvatar } from '@/components/VAvatar'
import { VChipGroupSymbol } from '@/components/VChipGroup/VChipGroup'
import { VDefaultsProvider } from '@/components/VDefaultsProvider'
import { VIcon } from '@/components/VIcon'
import { VSlideGroupSymbol } from '@/components/VSlideGroup/VSlideGroup'

// Composables
import { makeBorderProps, useBorder } from '@/composables/border'
Expand All @@ -29,7 +30,7 @@ import { genOverlays, makeVariantProps, useVariant } from '@/composables/variant
import vRipple from '@/directives/ripple'

// Utilities
import { computed, toDisplayString, toRef } from 'vue'
import { computed, toDisplayString, toRef, watch } from 'vue'
import { EventProp, genericComponent, propsFactory } from '@/util'

// Types
Expand Down Expand Up @@ -133,7 +134,10 @@ export const VChip = genericComponent<VChipSlots>()({
const { themeClasses } = provideTheme(props)

const isActive = useProxiedModel(props, 'modelValue')

const group = useGroupItem(props, VChipGroupSymbol, false)
const slideGroup = useGroupItem(props, VSlideGroupSymbol, false)

const link = useLink(props, attrs)
const isLink = toRef(() => props.link !== false && link.isLink.value)
const isClickable = computed(() =>
Expand All @@ -154,6 +158,16 @@ export const VChip = genericComponent<VChipSlots>()({
},
}))

watch(isActive, val => {
if (val) {
group?.register()
slideGroup?.register()
} else {
group?.unregister()
slideGroup?.unregister()
}
})

const { colorClasses, colorStyles, variantClasses } = useVariant(() => {
const showColor = !group || group.isSelected.value
return ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ describe('VTabs', () => {
</VTabs>
))

await nextTick()
expect(screen.getAllByCSS('.v-tab')[0]).toHaveClass('v-tab--selected')

model.value = 'bar'
Expand Down
21 changes: 13 additions & 8 deletions packages/vuetify/src/composables/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export interface GroupItemProvide {
value: Ref<unknown>
disabled: Ref<boolean | undefined>
group: GroupProvide
register: () => void
unregister: () => void
}

export const makeGroupProps = propsFactory({
Expand Down Expand Up @@ -118,15 +120,16 @@ export function useGroupItem (
const value = toRef(() => props.value)
const disabled = computed(() => !!(group.disabled.value || props.disabled))

group.register({
id,
value,
disabled,
}, vm)
function register () {
group?.register({ id, value, disabled }, vm)
}

onBeforeUnmount(() => {
group.unregister(id)
})
function unregister () {
group?.unregister(id)
}

onMounted(() => register())
onBeforeUnmount(() => unregister())

const isSelected = computed(() => {
return group.isSelected(id)
Expand Down Expand Up @@ -155,6 +158,8 @@ export function useGroupItem (
value,
disabled,
group,
register,
unregister,
}
}

Expand Down