Skip to content

Commit

Permalink
fix(VMenu): allow more than 1 content node (#10525)
Browse files Browse the repository at this point in the history 
* fix(VMenu): allow more than 1 content node

fixes #10522

* test

* fix(VMenu): show transitions

Co-authored-by: Kael <kaelwd@gmail.com>
  • Loading branch information
@jacekkarczmarczyk @KaelWD
jacekkarczmarczyk and KaelWD authored Feb 12, 2020
1 parent f33aefa commit 5d8d487
Show file tree
Hide file tree
Showing 12 changed files with 140 additions and 173 deletions.
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VAutocomplete/__tests__/VAutocomplete2.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ describe('VAutocomplete.ts', () => {
it('should propagate content class', () => {
const wrapper = mountFunction({
propsData: {
menuProps: { contentClass: 'foobar' },
menuProps: { contentClass: 'foobar', eager: true },
},
})

Expand Down
16 changes: 8 additions & 8 deletions ...ges/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataFooter.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`VDataFooter.ts should disable last page button if no items 1`] = `
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-60"
aria-owns="list-55"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -18,7 +18,7 @@ exports[`VDataFooter.ts should disable last page button if no items 1`] = `
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-60"
id="input-55"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down Expand Up @@ -110,7 +110,7 @@ exports[`VDataFooter.ts should render first & last icons with showFirstLastPage
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-26"
aria-owns="list-24"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -119,7 +119,7 @@ exports[`VDataFooter.ts should render first & last icons with showFirstLastPage
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-26"
id="input-24"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down Expand Up @@ -207,7 +207,7 @@ exports[`VDataFooter.ts should render in RTL mode 1`] = `
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-12"
aria-owns="list-11"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -216,7 +216,7 @@ exports[`VDataFooter.ts should render in RTL mode 1`] = `
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-12"
id="input-11"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down Expand Up @@ -380,7 +380,7 @@ exports[`VDataFooter.ts should show current page if has showCurrentPage 1`] = `
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-50"
aria-owns="list-46"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -389,7 +389,7 @@ exports[`VDataFooter.ts should show current page if has showCurrentPage 1`] = `
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-50"
id="input-46"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down
16 changes: 8 additions & 8 deletions ...s/vuetify/src/components/VDataIterator/__tests__/__snapshots__/VDataIterator.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ exports[`VDataIterator.ts should render and match snapshot with data 1`] = `
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-17"
aria-owns="list-16"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -121,7 +121,7 @@ exports[`VDataIterator.ts should render and match snapshot with data 1`] = `
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-17"
id="input-16"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down Expand Up @@ -194,7 +194,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-29"
aria-owns="list-27"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -203,7 +203,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-29"
id="input-27"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down Expand Up @@ -276,7 +276,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-29"
aria-owns="list-27"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -285,7 +285,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-29"
id="input-27"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down Expand Up @@ -358,7 +358,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
<div role="button"
aria-haspopup="listbox"
aria-expanded="false"
aria-owns="list-29"
aria-owns="list-27"
class="v-input__slot"
>
<div class="v-select__slot">
Expand All @@ -367,7 +367,7 @@ exports[`VDataIterator.ts should render valid no-data, loading and no-results st
10
</div>
<input aria-label="$vuetify.dataFooter.itemsPerPageText"
id="input-29"
id="input-27"
readonly="readonly"
type="text"
aria-readonly="false"
Expand Down
Loading

0 comments on commit 5d8d487

Please sign in to comment.