Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Issue triage
on:
issues:
types: [opened, labeled]
pull_request:
types: [opened, labeled]

jobs:
triage:
Expand Down
1 change: 1 addition & 0 deletions packages/vuetify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
"babel-plugin-transform-define": "^1.3.1",
"babel-polyfill": "^6.26.0",
"concurrently": "^4.1.1",
"cross-env": "^7.0.2",
"cssnano": "^4.1.10",
"dotenv": "^8.0.0",
"eslint-plugin-jest": "^27.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ export default defineComponent({

if (
e.ctrlKey ||
![keyCodes.home, keyCodes.end].includes(keyCode)
![keyCodes.home, keyCodes.end].includes(keyCode as typeof keyCodes.home | typeof keyCodes.end)
) {
VSelect.methods.onKeyDown.call(this, e)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,13 @@ export default defineComponent({
})
},
genTimedEvent ({ event, left, width }: CalendarEventVisual, day: CalendarDayBodySlotScope): VNode | false {
if (day.timeDelta(event.end) < 0 || day.timeDelta(event.start) >= 1 || isEventHiddenOn(event, day)) {
const endDelta = day.timeDelta(event.end)
const startDelta = day.timeDelta(event.start)
if (
(typeof endDelta === 'number' && endDelta < 0) ||
(typeof startDelta === 'number' && startDelta >= 1) ||
isEventHiddenOn(event, day)
) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VCarousel/VCarousel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default defineComponent({
interval: {
type: [Number, String],
default: 6000,
validator: (value: string | number) => value > 0
validator: (value: string | number) => Number(value) > 0
},
mandatory: {
type: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VCombobox/VCombobox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export default defineComponent({

if (
e.ctrlKey ||
![keyCodes.home, keyCodes.end].includes(keyCode)
![keyCodes.home, keyCodes.end].includes(keyCode as typeof keyCodes.home | typeof keyCodes.end)
) {
VSelect.methods.onKeyDown.call(this, e)
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VMenu/VMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ export default baseMixins.extend({
this.$nextTick(() => activator && activator.focus())
} else if (
!this.isActive &&
[keyCodes.up, keyCodes.down].includes(e.keyCode)
[keyCodes.up, keyCodes.down].includes(e.keyCode as typeof keyCodes.up | typeof keyCodes.down)
) {
this.isActive = true
}
Expand Down
10 changes: 7 additions & 3 deletions packages/vuetify/src/components/VSelect/VSelect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,9 @@ export default baseMixins.extend({

// If menu is active, allow default
// listIndex change from menu
if (this.isMenuActive && [keyCodes.up, keyCodes.down, keyCodes.home, keyCodes.end, keyCodes.enter].includes(keyCode)) {
if (this.isMenuActive && [keyCodes.up, keyCodes.down, keyCodes.home, keyCodes.end, keyCodes.enter].includes(
keyCode as typeof keyCodes.up | typeof keyCodes.down | typeof keyCodes.home | typeof keyCodes.end | typeof keyCodes.enter
)) {
this.$nextTick(() => {
menu.changeListIndex(e)
this.$emit('update:list-index', menu.listIndex)
Expand All @@ -741,15 +743,17 @@ export default baseMixins.extend({
if ([
keyCodes.enter,
keyCodes.space
].includes(keyCode)) this.activateMenu()
].includes(keyCode as typeof keyCodes.enter | typeof keyCodes.space)) this.activateMenu()

// If menu is not active, up/down/home/end can do
// one of 2 things. If multiple, opens the
// menu, if not, will cycle through all
// available options
if (
!this.isMenuActive &&
[keyCodes.up, keyCodes.down, keyCodes.home, keyCodes.end].includes(keyCode)
[keyCodes.up, keyCodes.down, keyCodes.home, keyCodes.end].includes(
keyCode as typeof keyCodes.up | typeof keyCodes.down | typeof keyCodes.home | typeof keyCodes.end
)
) return this.onUpDown(e)

// If escape deactivate the menu
Expand Down
10 changes: 7 additions & 3 deletions packages/vuetify/src/components/VSlider/VSlider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -562,14 +562,18 @@ export default mixins(

const { pageup, pagedown, end, home, left, right, down, up } = keyCodes

if (![pageup, pagedown, end, home, left, right, down, up].includes(e.keyCode)) return
if (
![pageup, pagedown, end, home, left, right, down, up].includes(
e.keyCode as typeof pageup | typeof pagedown | typeof end | typeof home | typeof left | typeof right | typeof down | typeof up
)
) return

e.preventDefault()
const step = this.stepNumeric || 1
const steps = (this.maxValue - this.minValue) / step
if ([left, right, down, up].includes(e.keyCode)) {
if ([left, right, down, up].includes(e.keyCode as typeof left | typeof right | typeof down | typeof up)) {
const increase = this.$vuetify.rtl ? [left, up] : [right, up]
const direction = increase.includes(e.keyCode) ? 1 : -1
const direction = increase.includes(e.keyCode as typeof left | typeof right | typeof up) ? 1 : -1
const multiplier = e.shiftKey ? 3 : (e.ctrlKey ? 2 : 1)

value = value + (direction * step * multiplier)
Expand Down
4 changes: 2 additions & 2 deletions packages/vuetify/src/mixins/overlayable/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ export default defineComponent({
const up = [keyCodes.up, keyCodes.pageup]
const down = [keyCodes.down, keyCodes.pagedown]

if (up.includes(e.keyCode)) {
if (up.includes(e.keyCode as typeof keyCodes.up | typeof keyCodes.pageup)) {
(e as any).deltaY = -1
} else if (down.includes(e.keyCode)) {
} else if (down.includes(e.keyCode as typeof keyCodes.down | typeof keyCodes.pagedown)) {
(e as any).deltaY = 1
} else {
return
Expand Down
Loading