Skip to content

Commit

Permalink
fix(SelectionControls): fix mouse events on field
Browse files Browse the repository at this point in the history 
fixes #10479
This reverts commit 4b6f14b
  • Loading branch information
@KaelWD
KaelWD committed Feb 6, 2020
1 parent 47b2535 commit 40557a6
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 61 deletions.
12 changes: 6 additions & 6 deletions packages/vuetify/src/components/VCheckbox/VCheckbox.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,19 @@ export default Selectable.extend({
return this.$createElement('div', {
staticClass: 'v-input--selection-controls__input',
}, [
this.genInput('checkbox', {
...this.attrs$,
'aria-checked': this.inputIndeterminate
? 'mixed'
: this.isActive.toString(),
}),
this.$createElement(VIcon, this.setTextColor(this.validationState, {
props: {
dense: this.dense,
dark: this.dark,
light: this.light,
},
}), this.computedIcon),
this.genInput('checkbox', {
...this.attrs$,
'aria-checked': this.inputIndeterminate
? 'mixed'
: this.isActive.toString(),
}),
this.genRipple(this.setTextColor(this.rippleState)),
])
},
Expand Down
40 changes: 20 additions & 20 deletions packages/vuetify/src/components/VCheckbox/__tests__/__snapshots__/VCheckbox.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ exports[`VCheckbox.ts should render themed component 1`] = `
<div class="v-input__control">
<div class="v-input__slot">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
$checkboxOff
</i>
<input aria-checked="false"
id="input-96"
role="checkbox"
type="checkbox"
value
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
$checkboxOff
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -46,17 +46,17 @@ exports[`VCheckbox.ts should use custom icons 1`] = `
<div class="v-input__control">
<div class="v-input__slot">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
fizzbuzz
</i>
<input aria-checked="mixed"
id="input-91"
role="checkbox"
type="checkbox"
value="fizz"
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
fizzbuzz
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -77,17 +77,17 @@ exports[`VCheckbox.ts should use custom icons 2`] = `
<div class="v-input__control">
<div class="v-input__slot">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
fizzbuzz
</i>
<input aria-checked="mixed"
id="input-91"
role="checkbox"
type="checkbox"
value="fizz"
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
fizzbuzz
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -108,17 +108,17 @@ exports[`VCheckbox.ts should use custom icons 3`] = `
<div class="v-input__control">
<div class="v-input__slot">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
fizzbuzz
</i>
<input aria-checked="mixed"
id="input-91"
role="checkbox"
type="checkbox"
value="fizz"
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
fizzbuzz
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions packages/vuetify/src/components/VRadioGroup/VRadio.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,16 @@ export default baseMixins.extend<options>().extend({
return this.$createElement('div', {
staticClass: 'v-input--selection-controls__input',
}, [
this.genInput({
name: this.computedName,
value: this.value,
...this.attrs$,
}),
this.$createElement(VIcon, this.setTextColor(this.validationState, {
props: {
dense: this.radioGroup && this.radioGroup.dense,
},
}), this.computedIcon),
this.genInput({
name: this.computedName,
value: this.value,
...this.attrs$,
}),
this.genRipple(this.setTextColor(this.rippleState)),
])
},
Expand Down
50 changes: 25 additions & 25 deletions packages/vuetify/src/components/VRadioGroup/__tests__/__snapshots__/VRadio.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
exports[`VRadio.ts should not render aria-label attribute with no label value on input group 1`] = `
<div class="v-radio theme--light">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
$radioOff
</i>
<input aria-checked="false"
id="input-4"
role="radio"
type="radio"
value
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
$radioOff
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -23,18 +23,18 @@ exports[`VRadio.ts should not render aria-label attribute with no label value on
exports[`VRadio.ts should render proper input name 1`] = `
<div class="v-radio theme--light">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
$radioOff
</i>
<input aria-checked="false"
id="input-7"
role="radio"
type="radio"
name="name"
value
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
$radioOff
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -44,17 +44,17 @@ exports[`VRadio.ts should render proper input name 1`] = `
exports[`VRadio.ts should render role and aria-checked attributes on input group 1`] = `
<div class="v-radio theme--light">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light primary--text"
>
$radioOn
</i>
<input aria-checked="true"
id="input-1"
role="radio"
type="radio"
value
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light primary--text"
>
$radioOn
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -64,17 +64,17 @@ exports[`VRadio.ts should render role and aria-checked attributes on input group
exports[`VRadio.ts should use custom icons 1`] = `
<div class="v-radio theme--light">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
bar
</i>
<input aria-checked="false"
id="input-16"
role="radio"
type="radio"
value
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light"
>
bar
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand All @@ -84,17 +84,17 @@ exports[`VRadio.ts should use custom icons 1`] = `
exports[`VRadio.ts should use custom icons 2`] = `
<div class="v-radio theme--light">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light primary--text"
>
foo
</i>
<input aria-checked="true"
id="input-16"
role="radio"
type="radio"
value
>
<i aria-hidden="true"
class="v-icon notranslate material-icons theme--light primary--text"
>
foo
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions packages/vuetify/src/components/VRadioGroup/__tests__/__snapshots__/VRadioGroup.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ exports[`VRadioGroup.ts should match dense snapshot 1`] = `
>
<div class="v-radio theme--light">
<div class="v-input--selection-controls__input">
<i aria-hidden="true"
class="v-icon notranslate v-icon--dense material-icons theme--light"
>
$radioOff
</i>
<input aria-checked="false"
id="input-6"
role="radio"
type="radio"
name="radio-5"
value
>
<i aria-hidden="true"
class="v-icon notranslate v-icon--dense material-icons theme--light"
>
$radioOff
</i>
<div class="v-input--selection-controls__ripple primary--text">
</div>
</div>
Expand Down

0 comments on commit 40557a6

Please sign in to comment.