Skip to content

fix: issue-337 set select coutry on both code and dial code #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: issue-337 set select coutry on both code and dial code #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
522997f
fix: issue-337 set select coutry on both code and dial code
pratikq23 May 8, 2021
b17dc08
fix: issue-337 set select coutry on both code and dial code
pratikq23 May 8, 2021
063c884
fix: issue-337 set select coutry on both code and dial code
pratikq23 May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Or this:
[searchCountryFlag]="true"
[searchCountryField]="[SearchCountryField.Iso2, SearchCountryField.Name]"
[selectFirstCountry]="false"
[selectedCountryISO]="CountryISO.India"
[selectedCountryCode]="CountryISO.India"
[maxLength]="15"
[phoneValidation]="true"
[inputId]="my-input-id"
Expand Down Expand Up @@ -116,7 +116,7 @@ Or this:
| selectFirstCountry | `boolean` | `true` | Selects first country from `preferredCountries` if is set. If not then uses main list. |
| phoneValidation | `boolean` | `true` | Disable phone validation. |
| inputId | `string` | `phone` | Unique ID for `<input>` element. |
| selectedCountryISO | `<CountryISO>` | `None` | Set specific country on load. |
| selectedCountryCode | `string (<CountryISO> or 'dial code' )` | `None` | Set specific country on load. |
| separateDialCode | `boolean` | `false` | Visually separate dialcode into the drop down element. |
| countryChange | `<Country>` | `None` | Emits country value when the user selects a country from the dropdown. |

Expand Down
65 changes: 33 additions & 32 deletions projects/ngx-intl-tel-input/src/lib/ngx-intl-tel-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import * as lpn from 'google-libphonenumber';

import {
Component,
ElementRef,
EventEmitter,
forwardRef,
Input,
OnChanges,
OnInit,
Output,
SimpleChanges,
ViewChild,
Component,
ElementRef,
EventEmitter,
forwardRef,
Input,
OnChanges,
OnInit,
Output,
SimpleChanges,
ViewChild,
} from '@angular/core';
import { NG_VALIDATORS, NG_VALUE_ACCESSOR } from '@angular/forms';

Expand All @@ -25,24 +25,24 @@ import { phoneNumberValidator } from './ngx-intl-tel-input.validator';
import { PhoneNumberFormat } from './enums/phone-number-format.enum';

@Component({
// tslint:disable-next-line: component-selector
selector: 'ngx-intl-tel-input',
templateUrl: './ngx-intl-tel-input.component.html',
styleUrls: ['./bootstrap-dropdown.css', './ngx-intl-tel-input.component.css'],
providers: [
CountryCode,
{
provide: NG_VALUE_ACCESSOR,
// tslint:disable-next-line:no-forward-ref
useExisting: forwardRef(() => NgxIntlTelInputComponent),
multi: true,
},
{
provide: NG_VALIDATORS,
useValue: phoneNumberValidator,
multi: true,
},
],
// tslint:disable-next-line: component-selector
selector: 'ngx-intl-tel-input',
templateUrl: './ngx-intl-tel-input.component.html',
styleUrls: ['./bootstrap-dropdown.css', './ngx-intl-tel-input.component.css'],
providers: [
CountryCode,
{
provide: NG_VALUE_ACCESSOR,
// tslint:disable-next-line:no-forward-ref
useExisting: forwardRef(() => NgxIntlTelInputComponent),
multi: true,
},
{
provide: NG_VALIDATORS,
useValue: phoneNumberValidator,
multi: true,
},
],
})
export class NgxIntlTelInputComponent implements OnInit, OnChanges {
@Input() value = '';
Expand All @@ -58,7 +58,7 @@ export class NgxIntlTelInputComponent implements OnInit, OnChanges {
@Input() searchCountryPlaceholder = 'Search Country';
@Input() maxLength = '';
@Input() selectFirstCountry = true;
@Input() selectedCountryISO: CountryISO;
@Input() selectedCountryCode: string;
@Input() phoneValidation = true;
@Input() inputId = 'phone';
@Input() separateDialCode = false;
Expand Down Expand Up @@ -102,7 +102,7 @@ export class NgxIntlTelInputComponent implements OnInit, OnChanges {
}

ngOnChanges(changes: SimpleChanges) {
const selectedISO = changes['selectedCountryISO'];
const selectedISO = changes['selectedCountryCode'];
if (
this.allCountries &&
selectedISO &&
Expand Down Expand Up @@ -519,9 +519,10 @@ export class NgxIntlTelInputComponent implements OnInit, OnChanges {
* Updates selectedCountry.
*/
private updateSelectedCountry() {
if (this.selectedCountryISO) {
if (this.selectedCountryCode) {
this.selectedCountry = this.allCountries.find((c) => {
return c.iso2.toLowerCase() === this.selectedCountryISO.toLowerCase();
return ((c.iso2.toLowerCase() === this.selectedCountryCode.toLowerCase()) ||
(c.dialCode.toLowerCase() === this.selectedCountryCode.toLowerCase()));
});
if (this.selectedCountry) {
if (this.phoneNumber) {
Expand Down