Skip to content

feat(VSwitch): align with MD3 spec #22879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J-Sek merged 5 commits into from
May 30, 2026
+129 −9
Merged

feat(VSwitch): align with MD3 spec #22879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d5b8fc
feat(VSwitch): align with MD3 spec
J-Sek May 30, 2026
3cdde6e
fix: avoid theme styles leaking into the component
J-Sek May 30, 2026
182df98
feat: add `thumb-color` prop
J-Sek May 30, 2026
3c289c8
extend `inset` as opt-in guard + refine focus/hover/disabled/no-color
J-Sek May 30, 2026
ce57f55
chore: avoid new theme colors + refactor variables
J-Sek May 30, 2026
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
67 changes: 66 additions & 1 deletion packages/vuetify/src/components/VSwitch/VSwitch.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
.v-switch--inset &
height: $switch-inset-thumb-height
width: $switch-inset-thumb-width
transform: scale(calc($switch-inset-thumb-off-height / $switch-inset-thumb-height))
transform: scale(var(--v-switch-inset-thumb-off-scale, #{$switch-inset-thumb-off-scale}))

&--filled
transform: none
Expand All @@ -89,6 +89,68 @@
transform: none
transition: .15s .05s transform settings.$decelerated-easing

.v-switch--inset-material
.v-switch__track
opacity: $switch-inset-track-opacity
background-color: $switch-inset-unselected-track-color
border: $switch-inset-border-width solid $switch-inset-unselected-thumb-color

.v-switch__thumb
background-color: $switch-inset-unselected-thumb-color
color: $switch-inset-unselected-track-color

.v-selection-control--dirty
.v-switch__track
border-color: transparent
background-color: $switch-inset-selected-track-color

.v-switch__thumb
background-color: $switch-inset-selected-thumb-color
color: $switch-inset-selected-track-color

.v-selection-control__input:active .v-switch__thumb
transform: scale(var(--v-switch-inset-thumb-pressed-scale, #{$switch-inset-thumb-pressed-scale}))

.v-selection-control__input:before
--v-hover-opacity: 0.08
z-index: 1

// focus is the track outline, so drop the overlay's focus state layer
.v-selection-control--focus-visible
.v-selection-control__input:before
opacity: 0

.v-switch__track
outline: $switch-focus-outline-width solid $switch-focus-outline-color
outline-offset: $switch-focus-outline-offset

.v-selection-control--disabled
opacity: 1

.v-label
opacity: var(--v-disabled-opacity)

.v-switch__track
background-color: $switch-inset-disabled-unselected-track-color
border-color: $switch-inset-disabled-unselected-border-color

.v-switch__thumb
background-color: $switch-inset-disabled-unselected-thumb-color

.v-icon
opacity: .8

.v-selection-control--disabled.v-selection-control--dirty
.v-switch__track
background-color: $switch-inset-disabled-selected-track-color
border-color: transparent

.v-switch__thumb
background-color: $switch-inset-disabled-selected-thumb-color

.v-icon
opacity: .4

.v-switch
$switch-thumb-transform: $switch-track-width * .5 - $switch-thumb-width * .5 + $switch-thumb-offset

Expand All @@ -102,6 +164,9 @@
border-radius: 50%
transition: $switch-control-input-transition
position: absolute
height: calc(var(--v-switch-thumb-height) * 1.666666667)
width: calc(var(--v-switch-thumb-height) * 1.666666667)

@include tools.ltr()
transform: translateX(-$switch-thumb-transform)
@include tools.rtl()
Expand Down
50 changes: 42 additions & 8 deletions packages/vuetify/src/components/VSwitch/VSwitch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { VProgressCircular } from '@/components/VProgressCircular'
import { makeVSelectionControlProps, VSelectionControl } from '@/components/VSelectionControl/VSelectionControl'

// Composables
import { useBackgroundColor } from '@/composables/color'
import { useFocus } from '@/composables/focus'
import { forwardRefs } from '@/composables/forwardRefs'
import { LoaderSlot, useLoader } from '@/composables/loader'
Expand All @@ -20,7 +21,7 @@ import { ref, toRef, useId } from 'vue'
import { filterInputAttrs, genericComponent, propsFactory, SUPPORTS_MATCH_MEDIA, useRender } from '@/util'

// Types
import type { ComputedRef, Ref } from 'vue'
import type { ComputedRef, PropType, Ref } from 'vue'
import type { VInputSlots } from '@/components/VInput/VInput'
import type { VSelectionControlSlots } from '@/components/VSelectionControl/VSelectionControl'
import type { IconValue } from '@/composables/icons'
Expand All @@ -43,8 +44,12 @@ export type VSwitchSlots =
}

export const makeVSwitchProps = propsFactory({
inset: Boolean,
inset: {
type: [Boolean, String] as PropType<boolean | 'tonal' | 'material'>,
default: false,
},
flat: Boolean,
thumbColor: String,
loading: {
type: [Boolean, String],
default: false,
Expand Down Expand Up @@ -78,6 +83,10 @@ export const VSwitch = genericComponent<new <T>(
const model = useProxiedModel(props, 'modelValue')
const { loaderClasses } = useLoader(props)
const { isFocused, focus, blur } = useFocus(props)
const {
backgroundColorClasses: thumbColorClasses,
backgroundColorStyles: thumbColorStyles,
} = useBackgroundColor(() => props.thumbColor)
const control = ref<VSelectionControl>()
const inputRef = ref<VInput>()
const isForcedColorsModeActive = SUPPORTS_MATCH_MEDIA && window.matchMedia('(forced-colors: active)').matches
Expand Down Expand Up @@ -106,14 +115,17 @@ export const VSwitch = genericComponent<new <T>(
const [rootAttrs, controlAttrs] = filterInputAttrs(attrs)
const inputProps = VInput.filterProps(props)
const controlProps = VSelectionControl.filterProps(props)
const isMaterial = ['material', 'square'].includes(String(props.inset))
const hasThumbColor = !isForcedColorsModeActive && !!props.thumbColor

return (
<VInput
ref={ inputRef }
class={[
'v-switch',
{ 'v-switch--flat': props.flat },
{ 'v-switch--inset': props.inset },
{ 'v-switch--inset': !!props.inset },
{ 'v-switch--inset-material': props.inset === 'material' },
{ 'v-switch--indeterminate': indeterminate.value },
loaderClasses.value,
props.class,
Expand Down Expand Up @@ -179,23 +191,43 @@ export const VSwitch = genericComponent<new <T>(
)}
</div>
),
input: ({ inputNode, icon, backgroundColorClasses, backgroundColorStyles }) => (
input: ({
inputNode,
icon,
model: isSelected,
backgroundColorClasses,
backgroundColorStyles,
textColorClasses,
textColorStyles,
}) => (
<>
{ inputNode }
<div
class={[
'v-switch__thumb',
{ 'v-switch__thumb--filled': icon || props.loading },
props.inset || isForcedColorsModeActive ? undefined : backgroundColorClasses.value,
isForcedColorsModeActive ? undefined
: (hasThumbColor && isSelected.value) ? thumbColorClasses.value
: isMaterial ? backgroundColorClasses.value
: props.inset ? undefined
: backgroundColorClasses.value,
]}
style={[
(hasThumbColor && isSelected.value) ? thumbColorStyles.value
: isMaterial
? (backgroundColorClasses.value.length || backgroundColorStyles.value.backgroundColor
? { backgroundColor: 'currentColor' }
: undefined)
: props.inset ? undefined
: backgroundColorStyles.value,
]}
style={ props.inset ? undefined : backgroundColorStyles.value }
>
{ slots.thumb ? (
<VDefaultsProvider
defaults={{
VIcon: {
icon,
size: 'x-small',
size: isMaterial ? 16 : 'x-small',
},
}}
>
Expand All @@ -207,8 +239,10 @@ export const VSwitch = genericComponent<new <T>(
(icon && (
<VIcon
key={ String(icon) }
class={ isMaterial ? textColorClasses.value : undefined }
style={ isMaterial ? textColorStyles.value : undefined }
icon={ icon }
size="x-small"
size={ isMaterial ? 16 : 'x-small' }
/>
))) : (
<LoaderSlot
Expand Down
21 changes: 21 additions & 0 deletions packages/vuetify/src/components/VSwitch/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,30 @@ $switch-inset-thumb-height: 24px !default;
$switch-inset-thumb-width: 24px !default;
$switch-inset-thumb-off-height: 16px !default;
$switch-inset-thumb-off-width: 16px !default;
$switch-inset-thumb-off-scale: calc(#{$switch-inset-thumb-off-height} / #{$switch-inset-thumb-height}) !default;
$switch-inset-thumb-pressed-scale: calc(28px / #{$switch-inset-thumb-height}) !default;
$switch-inset-track-border-radius: 9999px !default;
$switch-inset-track-height: 32px !default;
$switch-inset-track-width: 52px !default;
$switch-inset-track-opacity: 1 !default;
$switch-inset-border-width: 2px !default;

$switch-inset-unselected-track-color: color-mix(in srgb, rgb(var(--v-theme-on-surface-variant)) 50%, #888) !default;
$switch-inset-unselected-thumb-color: color-mix(in srgb, rgb(var(--v-theme-surface-variant)) 50%, #888) !default;
$switch-inset-unselected-border-color: $switch-inset-unselected-thumb-color !default;

$switch-inset-selected-track-color: color-mix(in srgb, rgb(var(--v-theme-surface-variant)) 90%, white) !default;
$switch-inset-selected-thumb-color: color-mix(in srgb, rgb(var(--v-theme-on-surface-variant)) 80%, white) !default;

$switch-focus-outline-color: rgb(var(--v-theme-primary)) !default;
$switch-focus-outline-width: 2px !default;
$switch-focus-outline-offset: 2px !default;

$switch-inset-disabled-unselected-track-color: color-mix(in srgb, #{$switch-inset-unselected-track-color} 12%, transparent) !default;
$switch-inset-disabled-unselected-thumb-color: rgba(var(--v-theme-on-surface), .38) !default;
$switch-inset-disabled-unselected-border-color: rgba(var(--v-theme-on-surface), .12) !default;
$switch-inset-disabled-selected-track-color: rgba(var(--v-theme-on-surface), .12) !default;
$switch-inset-disabled-selected-thumb-color: rgb(var(--v-theme-surface)) !default;

$switch-label-margin-inline-start: 10px !default;
$switch-loader-color: rgb(var(--v-theme-surface)) !default;
Expand Down
Loading