Skip to content

Commit

Permalink
trailing button blur behaviour
Browse files Browse the repository at this point in the history
Signed-off-by: DorraJaouad <[email protected]>
  • Loading branch information
DorraJaouad committed Jul 28, 2023
1 parent b32fcae commit 80030a4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
9 changes: 6 additions & 3 deletions src/components/LeftSidebar/LeftSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
:class="{'conversations-search--expanded': isFocused}">
<SearchBox ref="searchBox"
:value.sync="searchText"
:is-searching="isSearching"
:is-focused="isFocused"
@focus="setIsFocused"
@blur="setIsFocused"
@trailing-blur="setIsFocused"
@input="debounceFetchSearchResults"
@abort-search="abortSearch" />
</div>
Expand Down Expand Up @@ -75,7 +76,8 @@
</div>

<!-- Actions -->
<div class="actions">
<div class="actions"
:class="{'hidden-visually': isFocused}">
<NcActions class="conversations-actions">
<template #icon>
<DotsVertical :size="20" />
Expand Down Expand Up @@ -219,6 +221,7 @@ import debounce from 'debounce'
import { ref } from 'vue'
import AtIcon from 'vue-material-design-icons/At.vue'
import ChatPlus from 'vue-material-design-icons/ChatPlus.vue'
import DotsVertical from 'vue-material-design-icons/DotsVertical.vue'
import FilterIcon from 'vue-material-design-icons/Filter.vue'
import FilterRemoveIcon from 'vue-material-design-icons/FilterRemove.vue'
Expand Down Expand Up @@ -279,6 +282,7 @@ export default {
FilterIcon,
FilterRemoveIcon,
Plus,
ChatPlus,
List,
DotsVertical,
},
Expand Down Expand Up @@ -446,7 +450,6 @@ export default {
},
setIsFocused(event) {
console.log(event.type)
if (this.searchText !== '') {
return
}
Expand Down
14 changes: 12 additions & 2 deletions src/components/LeftSidebar/SearchBox/SearchBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,11 @@ export default {
expose: ['focus'],
emits: ['update:value', 'input', 'submit', 'abort-search'],
emits: ['update:value', 'input', 'submit', 'abort-search', 'blur', 'trailing-blur'],
computed: {
listeners() {
return Object.assign({}, this.$listeners, {
focus: this.handleFocus,
blur: this.handleBlur,
})
},
Expand Down Expand Up @@ -155,6 +154,17 @@ export default {
this.$emit('blur', event)
}
},
handleBlur(event) {
if ((event.relatedTarget) && (Array.from(event.relatedTarget.classList).includes('input-field__clear-button'))) {
event.preventDefault()
this.$refs.searchConversations.$el.querySelector('.input-field__clear-button').addEventListener('blur', (event) => {
this.$emit('trailing-blur', event)
})
} else {
this.$emit('blur', event)
}
},
},
}
</script>
Expand Down

0 comments on commit 80030a4

Please sign in to comment.