Skip to content

Commit 76fbabf

Browse files
authored
Merge pull request #72 from retejs/fix/vue2-context-menu
fix(context-menu): events on vue 2
2 parents 9bd182d + 04751db commit 76fbabf

3 files changed

Lines changed: 29 additions & 18 deletions

File tree

src/presets/context-menu/components/Block.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
border-bottom: 1px solid $context-color-dark;
1313
background-color: $context-color;
1414
cursor: pointer;
15+
box-sizing: border-box;
1516
width: 100%;
1617
position: relative;
1718

src/presets/context-menu/components/Item.vue

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<template lang="pug">
2-
Block.item(
2+
Block.block(
33
:class="{ hasSubitems: subitems }"
4-
@click.stop="$emit('select', $event); $emit('hide')"
5-
@wheel.stop=""
6-
@pointerover="hide.cancel(); visibleSubitems = true"
7-
@pointerleave="hide.call()"
8-
@pointerdown.stop=""
94
data-testid="context-menu-item"
105
)
11-
slot
12-
.subitems(v-if="subitems && visibleSubitems")
13-
Item(
14-
v-for="item of subitems"
15-
:key="item.key"
16-
@select="item.handler($event)"
17-
:delay="delay"
18-
@hide="$emit('hide')"
19-
:subitems="item.subitems"
20-
) {{ item.label }}
6+
.content(
7+
@click.stop="$emit('select', $event); $emit('hide')"
8+
@wheel.stop=""
9+
@pointerover="hide.cancel(); visibleSubitems = true"
10+
@pointerleave="hide.call()"
11+
@pointerdown.stop=""
12+
)
13+
slot
14+
.subitems(v-if="subitems && visibleSubitems")
15+
Item(
16+
v-for="item of subitems"
17+
:key="item.key"
18+
@select="item.handler($event)"
19+
:delay="delay"
20+
@hide="$emit('hide')"
21+
:subitems="item.subitems"
22+
) {{ item.label }}
2123
</template>
2224

2325
<script>
@@ -47,6 +49,14 @@ export default {
4749
<style lang="scss" scoped>
4850
@import "../context-vars";
4951
52+
.block {
53+
padding: 0;
54+
}
55+
56+
.content {
57+
padding: 4px;
58+
}
59+
5060
.hasSubitems {
5161
&:after {
5262
content: '';

src/presets/context-menu/components/Menu.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
)
88
Block(v-if="searchBar")
99
Search(:text="filter" @change="filter = $event")
10-
Item.item(
10+
Item(
1111
v-for="item of getItems()"
1212
:key="item.key"
1313
@select="item.handler($event)"
1414
:delay="delay"
15-
@hide="$emit('hide')"
15+
@hide="onHide()"
1616
:subitems="item.subitems"
1717
)
1818
| {{ item.label }}

0 commit comments

Comments
 (0)