Skip to content

Commit e87d7c8

Browse files
committed
refactor(mention): merge arrowEnterDown to arrowKeyDown
1 parent 3feff35 commit e87d7c8

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

Diff for: packages/devui-vue/devui/mention/src/mention.tsx

+7-14
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ export default defineComponent({
9595

9696
const arrowKeyDown = (e: KeyboardEvent) => {
9797
if (showSuggestions.value && filteredSuggestions.value.length) {
98+
if (e.key === 'Enter') {
99+
e.stopPropagation();
100+
e.preventDefault();
101+
showSuggestions.value = false;
102+
handleCompleteText(filteredSuggestions.value[currentIndex.value][props.dmValueParse.value as keyof IMentionSuggestionItem]);
103+
emit('select', filteredSuggestions.value[currentIndex.value]);
104+
}
98105
if (e.key === 'ArrowDown') {
99106
currentIndex.value++;
100107
if (currentIndex.value === filteredSuggestions.value.length) {
@@ -119,18 +126,6 @@ export default defineComponent({
119126
}
120127
};
121128

122-
const enterKeyDown = (e: KeyboardEvent) => {
123-
if (showSuggestions.value && filteredSuggestions.value.length) {
124-
if (e.key === 'Enter') {
125-
e.stopPropagation();
126-
e.preventDefault();
127-
showSuggestions.value = false;
128-
handleCompleteText(filteredSuggestions.value[currentIndex.value][props.dmValueParse.value as keyof IMentionSuggestionItem]);
129-
emit('select', filteredSuggestions.value[currentIndex.value]);
130-
}
131-
}
132-
};
133-
134129
watch(
135130
() => props.suggestions,
136131
(val) => {
@@ -142,13 +137,11 @@ export default defineComponent({
142137

143138
onMounted(() => {
144139
window.addEventListener('keydown', arrowKeyDown);
145-
window.addEventListener('keydown', enterKeyDown);
146140
document.addEventListener('click', handleBlur);
147141
});
148142

149143
onUnmounted(() => {
150144
window.removeEventListener('keydown', arrowKeyDown);
151-
window.removeEventListener('keydown', enterKeyDown);
152145
document.removeEventListener('click', handleBlur);
153146
});
154147

0 commit comments

Comments
 (0)