Skip to content

Commit

Permalink
fix(VBtn): use <span> inside of html buttons
Browse files Browse the repository at this point in the history
fixes #15029
  • Loading branch information
johnleider committed Jul 15, 2022
1 parent 4f5795b commit 4ee21dc
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions packages/vuetify/src/components/VBtn/VBtn.tsx
Expand Up @@ -163,13 +163,13 @@ export const VBtn = defineComponent({
},
}}
>
<div class="v-btn__prepend">
<span class="v-btn__prepend">
{ slots.prepend?.() ?? (<VIcon />) }
</div>
</span>
</VDefaultsProvider>
) }

<div class="v-btn__content" data-no-activator="">
<span class="v-btn__content" data-no-activator="">
<VDefaultsProvider
key="content"
defaults={{
Expand All @@ -186,7 +186,7 @@ export const VBtn = defineComponent({
)
) }
</VDefaultsProvider>
</div>
</span>

{ !props.icon && hasAppend && (
<VDefaultsProvider
Expand All @@ -197,9 +197,9 @@ export const VBtn = defineComponent({
},
}}
>
<div class="v-btn__append">
<span class="v-btn__append">
{ slots.append?.() ?? (<VIcon />) }
</div>
</span>
</VDefaultsProvider>
) }

Expand Down
Expand Up @@ -72,17 +72,17 @@ export const VExpansionPanelTitle = defineComponent({
onClick={ !props.readonly ? expansionPanel.toggle : undefined }
v-ripple={ props.ripple }
>
<div class="v-expansion-panel-title__overlay" />
<span class="v-expansion-panel-title__overlay" />

{ slots.default?.(slotProps.value) }

{ !props.hideActions && (
<div class="v-expansion-panel-title__icon">
<span class="v-expansion-panel-title__icon">
{
slots.actions ? slots.actions(slotProps.value)
: <VIcon icon={ expansionPanel.isSelected.value ? props.collapseIcon : props.expandIcon } />
}
</div>
</span>
) }
</button>
))
Expand Down
Expand Up @@ -2,7 +2,7 @@

exports[`VListItem should match a snapshot 1`] = `
<div class="v-list-item v-theme--light v-list-item--density-default v-list-item--variant-text">
<div class="v-list-item__underlay">
</div>
<span class="v-list-item__underlay">
</span>
</div>
`;
4 changes: 2 additions & 2 deletions packages/vuetify/src/composables/variant.tsx
Expand Up @@ -28,9 +28,9 @@ export interface VariantProps {
export function genOverlays (isClickable: boolean, name: string) {
return (
<>
{ isClickable && <div key="overlay" class={`${name}__overlay`} /> }
{ isClickable && <span key="overlay" class={`${name}__overlay`} /> }

<div key="underlay" class={`${name}__underlay`} />
<span key="underlay" class={`${name}__underlay`} />
</>
)
}
Expand Down

0 comments on commit 4ee21dc

Please sign in to comment.