mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-02 03:57:52 +00:00
# Pull Request Template ## Description This PR will fix this sentry [issue](https://chatwoot-p3.sentry.io/issues/5291039795/) **Issue** The root cause of this issue is the usage of `keyboardEventListenerMixins`. The key events are always active when the edit conversation modal is active, even if the country dropdown is not visible. So, if we press the enter key, this error will be thrown into the console. **Solution** Remove the use of `keyboardEventListenerMixins` and handle it directly in the Vue native key events. Also, always check if the dropdown is active. **Other changes** 1. Remove the `mouseup` event lister and use the click away directive. 2. Use inline Tailwind css Fixes https://linear.app/chatwoot/issue/CW-3282/phonenumberinput-country-undefined-in-onselectcountry ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? **Steps** 1. Open a conversation. 3. And click the edit contact button 4. And click the enter key 5. Now you can see the error in the console ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
261 lines
7.3 KiB
Vue
261 lines
7.3 KiB
Vue
<template>
|
|
<div class="phone-input--wrap relative">
|
|
<div
|
|
class="flex items-center dark:bg-slate-900 justify-start rounded-md border border-solid"
|
|
:class="
|
|
error
|
|
? 'border border-solid border-red-400 dark:border-red-400 mb-1'
|
|
: 'mb-4 border-slate-200 dark:border-slate-600'
|
|
"
|
|
>
|
|
<div
|
|
class="cursor-pointer py-2 pr-1.5 pl-2 rounded-tl-md rounded-bl-md flex items-center justify-center gap-1.5 bg-slate-25 dark:bg-slate-700 h-10 w-14"
|
|
@click.prevent="toggleCountryDropdown"
|
|
>
|
|
<h5 v-if="activeCountry" class="mb-0">
|
|
{{ activeCountry.emoji }}
|
|
</h5>
|
|
<fluent-icon v-else icon="globe" class="fluent-icon" size="16" />
|
|
<fluent-icon icon="chevron-down" class="fluent-icon" size="12" />
|
|
</div>
|
|
<span
|
|
v-if="activeDialCode"
|
|
class="flex bg-white dark:bg-slate-900 text-slate-800 dark:text-slate-100 font-normal text-base leading-normal py-2 pl-2 pr-0"
|
|
>
|
|
{{ activeDialCode }}
|
|
</span>
|
|
<input
|
|
ref="phoneNumberInput"
|
|
:value="phoneNumber"
|
|
type="tel"
|
|
class="!mb-0 !rounded-tl-none !rounded-bl-none !border-0 font-normal !w-full dark:!bg-slate-900 text-base !px-1.5 placeholder:font-normal"
|
|
:placeholder="placeholder"
|
|
:readonly="readonly"
|
|
:style="styles"
|
|
@input="onChange"
|
|
@blur="onBlur"
|
|
/>
|
|
</div>
|
|
<div
|
|
v-if="showDropdown"
|
|
ref="dropdown"
|
|
v-on-clickaway="onOutsideClick"
|
|
tabindex="0"
|
|
class="z-10 absolute h-60 w-[12.5rem] shadow-md overflow-y-auto top-10 rounded px-0 pt-0 pb-1 bg-white dark:bg-slate-900"
|
|
@keydown.prevent.up="moveUp"
|
|
@keydown.prevent.down="moveDown"
|
|
@keydown.prevent.enter="
|
|
onSelectCountry(filteredCountriesBySearch[selectedIndex])
|
|
"
|
|
>
|
|
<div class="top-0 sticky bg-white dark:bg-slate-900 p-1">
|
|
<input
|
|
ref="searchbar"
|
|
v-model="searchCountry"
|
|
type="text"
|
|
placeholder="Search"
|
|
class="!h-8 !mb-0 !text-sm !border !border-solid !border-slate-200 dark:!border-slate-600"
|
|
@input="onSearchCountry"
|
|
/>
|
|
</div>
|
|
<div
|
|
v-for="(country, index) in filteredCountriesBySearch"
|
|
ref="dropdownItem"
|
|
:key="index"
|
|
class="flex items-center h-7 py-0 px-1 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-700"
|
|
:class="{
|
|
'bg-slate-50 dark:bg-slate-700': country.id === activeCountryCode,
|
|
'bg-slate-25 dark:bg-slate-800': index === selectedIndex,
|
|
}"
|
|
@click="onSelectCountry(country)"
|
|
>
|
|
<span class="text-base mr-1">{{ country.emoji }}</span>
|
|
|
|
<span
|
|
class="max-w-[7.5rem] overflow-hidden text-ellipsis whitespace-nowrap"
|
|
>
|
|
{{ country.name }}
|
|
</span>
|
|
<span class="ml-1 text-slate-300 dark:text-slate-300 text-xs">{{
|
|
country.dial_code
|
|
}}</span>
|
|
</div>
|
|
<div v-if="filteredCountriesBySearch.length === 0">
|
|
<span
|
|
class="flex items-center justify-center text-sm text-slate-500 dark:text-slate-300 mt-4"
|
|
>
|
|
No results found
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script>
|
|
import countries from 'shared/constants/countries.js';
|
|
import parsePhoneNumber from 'libphonenumber-js';
|
|
|
|
export default {
|
|
props: {
|
|
value: {
|
|
type: [String, Number],
|
|
default: '',
|
|
},
|
|
placeholder: {
|
|
type: String,
|
|
default: '',
|
|
},
|
|
readonly: {
|
|
type: Boolean,
|
|
default: false,
|
|
},
|
|
styles: {
|
|
type: Object,
|
|
default: () => {},
|
|
},
|
|
error: {
|
|
type: Boolean,
|
|
default: false,
|
|
},
|
|
},
|
|
data() {
|
|
return {
|
|
selectedIndex: -1,
|
|
showDropdown: false,
|
|
searchCountry: '',
|
|
activeCountryCode: '',
|
|
activeDialCode: '',
|
|
phoneNumber: this.value,
|
|
};
|
|
},
|
|
computed: {
|
|
countries() {
|
|
return [
|
|
{
|
|
name: this.dropdownFirstItemName,
|
|
dial_code: '',
|
|
emoji: '',
|
|
id: '',
|
|
},
|
|
...countries,
|
|
];
|
|
},
|
|
dropdownFirstItemName() {
|
|
return this.activeCountryCode ? 'Clear selection' : 'Select Country';
|
|
},
|
|
filteredCountriesBySearch() {
|
|
return this.countries.filter(country => {
|
|
const { name, dial_code, id } = country;
|
|
const search = this.searchCountry.toLowerCase();
|
|
return (
|
|
name.toLowerCase().includes(search) ||
|
|
dial_code.toLowerCase().includes(search) ||
|
|
id.toLowerCase().includes(search)
|
|
);
|
|
});
|
|
},
|
|
activeCountry() {
|
|
if (this.activeCountryCode) {
|
|
return this.countries.find(
|
|
country => country.id === this.activeCountryCode
|
|
);
|
|
}
|
|
return '';
|
|
},
|
|
},
|
|
watch: {
|
|
value() {
|
|
const number = parsePhoneNumber(this.value);
|
|
if (number) {
|
|
this.activeCountryCode = number.country;
|
|
this.activeDialCode = `+${number.countryCallingCode}`;
|
|
this.phoneNumber = this.value.replace(
|
|
`+${number.countryCallingCode}`,
|
|
''
|
|
);
|
|
}
|
|
},
|
|
},
|
|
mounted() {
|
|
this.setActiveCountry();
|
|
},
|
|
methods: {
|
|
onOutsideClick(e) {
|
|
if (
|
|
this.showDropdown &&
|
|
e.target !== this.$refs.dropdown &&
|
|
!this.$refs.dropdown.contains(e.target)
|
|
) {
|
|
this.closeDropdown();
|
|
}
|
|
},
|
|
onChange(e) {
|
|
this.phoneNumber = e.target.value;
|
|
this.$emit('input', e.target.value, this.activeDialCode);
|
|
},
|
|
onBlur(e) {
|
|
this.$emit('blur', e.target.value);
|
|
},
|
|
onSearchCountry() {
|
|
// Reset selected index to 0
|
|
this.selectedIndex = 0;
|
|
},
|
|
moveUp() {
|
|
if (!this.showDropdown) return;
|
|
this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
|
|
this.scrollToSelected();
|
|
},
|
|
moveDown() {
|
|
if (!this.showDropdown) return;
|
|
this.selectedIndex = Math.min(
|
|
this.selectedIndex + 1,
|
|
this.filteredCountriesBySearch.length - 1
|
|
);
|
|
this.scrollToSelected();
|
|
},
|
|
scrollToSelected() {
|
|
this.$nextTick(() => {
|
|
const dropdown = this.$refs.dropdown;
|
|
const selectedItem = this.$refs.dropdownItem[this.selectedIndex];
|
|
const dropdownSearchbarHeight = 40;
|
|
if (selectedItem) {
|
|
const selectedItemTop = selectedItem.offsetTop;
|
|
dropdown.scrollTop = selectedItemTop - dropdownSearchbarHeight;
|
|
}
|
|
});
|
|
},
|
|
onSelectCountry(country) {
|
|
if (!country || !this.showDropdown) return;
|
|
this.activeCountryCode = country.id;
|
|
this.searchCountry = '';
|
|
this.activeDialCode = country.dial_code;
|
|
this.$emit('setCode', country.dial_code);
|
|
this.closeDropdown();
|
|
this.$refs.phoneNumberInput.focus();
|
|
},
|
|
setActiveCountry() {
|
|
const { phoneNumber } = this;
|
|
if (!phoneNumber) return;
|
|
const number = parsePhoneNumber(phoneNumber);
|
|
if (number) {
|
|
this.activeCountryCode = number.country;
|
|
this.activeDialCode = number.countryCallingCode;
|
|
}
|
|
},
|
|
toggleCountryDropdown() {
|
|
this.showDropdown = !this.showDropdown;
|
|
this.selectedIndex = -1;
|
|
if (this.showDropdown) {
|
|
this.$nextTick(() => {
|
|
this.$refs.searchbar.focus();
|
|
});
|
|
}
|
|
},
|
|
closeDropdown() {
|
|
this.selectedIndex = -1;
|
|
this.showDropdown = false;
|
|
},
|
|
},
|
|
};
|
|
</script>
|