Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions lib/formatters/phone_input_formatter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,9 @@ class PhoneInputFormatter extends TextInputFormatter {
}
if (shouldCorrectNumber && onlyNumbers.length >= 2) {
/// хак специально для России, со вводом номера с восьмерки
/// меняем ее на 7
var isRussianWrongNumber =
onlyNumbers[0] == '8' && onlyNumbers[1] == '9' ||
onlyNumbers[0] == '8' && onlyNumbers[1] == '3';
/// меняем ее на 7, но только если это не бразильский номер
final isRussianWrongNumber =
onlyNumbers[0] == '8' && onlyNumbers[1] == '9';
if (isRussianWrongNumber) {
onlyNumbers = '7${onlyNumbers.substring(1)}';
_countryData = null;
Expand Down
62 changes: 62 additions & 0 deletions test/flutter_multi_formatter_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,66 @@ void main() {
});
});
});

group('Brazilian phone numbers', () {
test('should preserve area code 83 when formatting', () {
final formatter = PhoneInputFormatter(defaultCountryCode: 'BR');
final result = formatter.formatEditUpdate(
TextEditingValue(),
TextEditingValue(text: '83987654321'),
);
expect(result.text, '(83) 98765-4321');
});

test('should preserve area code 83 when typing step by step', () {
final formatter = PhoneInputFormatter(defaultCountryCode: 'BR');

final result1 = formatter.formatEditUpdate(
TextEditingValue(),
TextEditingValue(text: '8'),
);
expect(result1.text, '(8');

final result2 = formatter.formatEditUpdate(
result1,
TextEditingValue(text: '83'),
);
expect(result2.text, '(83');

final result3 = formatter.formatEditUpdate(
result2,
TextEditingValue(text: '839'),
);
expect(result3.text, '(83) 9');
});

test('should format Brazilian landline numbers', () {
final formatter = PhoneInputFormatter(defaultCountryCode: 'BR');
final result = formatter.formatEditUpdate(
TextEditingValue(),
TextEditingValue(text: '8332123456'),
);
expect(result.text, '(83) 32123-456');
});
});

group('Russian phone correction', () {
test('should convert 89 to Russian number', () {
final formatter = PhoneInputFormatter();
final result = formatter.formatEditUpdate(
TextEditingValue(),
TextEditingValue(text: '89123456789'),
);
expect(result.text, startsWith('+7 (912)'));
});

test('should not convert 83 to Russian number', () {
final formatter = PhoneInputFormatter();
final result = formatter.formatEditUpdate(
TextEditingValue(),
TextEditingValue(text: '83123456789'),
);
expect(result.text, isNot(startsWith('+7')));
});
});
}