Skip to content
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

Jump to bottom

fix(VCalendar): forward all bound events to internal elements #15592

Merged
merged 3 commits into from Aug 9, 2022
Merged

fix(VCalendar): forward all bound events to internal elements #15592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e15509
fix(VCalendar): forward all bound events to internal elements
KaelWD Aug 7, 2022
0a64306
refactor: don't use Object.fromEntries
KaelWD Aug 7, 2022
a32038d
test: don't generate handlers without suffix
KaelWD Aug 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/vuetify/src/components/VCalendar/mixins/__tests__/mouse.spec.ts
View file
Open in desktop
Expand Up @@ -35,11 +35,11 @@ describe('mouse.ts', () => {
const noop = e => e
const wrapper = mount(Mock, {
listeners: {
click: noop,
'click:foo': noop,
},
})

expect(typeof wrapper.vm.getDefaultMouseEventHandlers('', noop).click).toBe('function')
expect(typeof wrapper.vm.getDefaultMouseEventHandlers(':foo', noop).click).toBe('function')
expect(Object.keys(typeof wrapper.vm.getDefaultMouseEventHandlers('', noop))).toHaveLength(6)
})

Expand Down
17 changes: 8 additions & 9 deletions packages/vuetify/src/components/VCalendar/mixins/mouse.ts
View file
Open in desktop
Expand Up @@ -24,17 +24,16 @@ export default Vue.extend({

methods: {
getDefaultMouseEventHandlers (suffix: string, getEvent: MouseHandler): MouseEventsMap {
const listeners = Object.keys(this.$listeners)
.filter(key => key.endsWith(suffix))
.reduce((acc, key) => {
acc[key] = { event: key.slice(0, -suffix.length) }
return acc
}, {} as MouseEvents)

return this.getMouseEventHandlers({
['click' + suffix]: { event: 'click' },
...listeners,
['contextmenu' + suffix]: { event: 'contextmenu', prevent: true, result: false },
['mousedown' + suffix]: { event: 'mousedown' },
['mousemove' + suffix]: { event: 'mousemove' },
['mouseup' + suffix]: { event: 'mouseup' },
['mouseenter' + suffix]: { event: 'mouseenter' },
['mouseleave' + suffix]: { event: 'mouseleave' },
['touchstart' + suffix]: { event: 'touchstart' },
['touchmove' + suffix]: { event: 'touchmove' },
['touchend' + suffix]: { event: 'touchend' },
}, getEvent)
},
getMouseEventHandlers (events: MouseEvents, getEvent: MouseHandler): MouseEventsMap {
Expand Down