Skip to content

Commit cbecc44

Browse files
committed
refactor(NcEmojiPicker): simplify clear button
Signed-off-by: Grigorii K. Shartsev <[email protected]>
1 parent dd2f7b5 commit cbecc44

1 file changed

Lines changed: 11 additions & 17 deletions

File tree

src/components/NcEmojiPicker/NcEmojiPicker.vue

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,9 @@ This component allows the user to pick an emoji.
138138
v-bind="$attrs"
139139
@keydown.native.tab.prevent="handleTabNavigationSkippingEmojis"
140140
@select="select">
141-
<template #searchTemplate="slotProps">
141+
<template #searchTemplate="{ onSearch }">
142142
<div class="search__wrapper">
143143
<NcTextField ref="search"
144-
class="search"
145144
autofocus
146145
:value.sync="search"
147146
:label="t('Search')"
@@ -155,8 +154,8 @@ This component allows the user to pick an emoji.
155154
@keydown.down="callPickerArrowHandlerWithScrollFix('onArrowDown', $event)"
156155
@keydown.up="callPickerArrowHandlerWithScrollFix('onArrowUp', $event)"
157156
@keydown.enter="$refs.picker.onEnter"
158-
@trailing-button-click="clearSearch(); slotProps.onSearch(search);"
159-
@update:value="slotProps.onSearch(search)" />
157+
@trailing-button-click="clearSearch(); onSearch('');"
158+
@update:value="onSearch(search)" />
160159
<NcColorPicker palette-only
161160
:container="container"
162161
:palette="skinTonePalette"
@@ -359,10 +358,7 @@ export default {
359358
360359
clearSearch() {
361360
this.search = ''
362-
const input = this.$refs.search?.$refs.inputField?.$refs.input
363-
if (input) {
364-
input.focus()
365-
}
361+
this.$refs.search.focus()
366362
},
367363
368364
/**
@@ -565,15 +561,13 @@ export default {
565561
</style>
566562
567563
<style scoped lang="scss">
568-
.search {
569-
&__wrapper {
570-
display: flex;
571-
flex-direction: row;
572-
gap: var(--default-grid-baseline);
573-
align-items: end;
574-
padding-block: var(--default-grid-baseline);
575-
padding-inline: calc(2 * var(--default-grid-baseline));
576-
}
564+
.search__wrapper {
565+
display: flex;
566+
flex-direction: row;
567+
gap: var(--default-grid-baseline);
568+
align-items: end;
569+
padding-block: var(--default-grid-baseline);
570+
padding-inline: calc(2 * var(--default-grid-baseline));
577571
}
578572
579573
.row-selected {

0 commit comments

Comments
 (0)