Fix update of flag better

Author: ebaynaud

lib/index.js

@@ -148,19 +148,19 @@ export default class PhoneInput extends Component {
 
   updateFlagAndFormatNumber(number, actionAfterSetState = null) {
     const { allowZeroAfterCountryCode, initialCountry } = this.props;
-    let iso2 = initialCountry;
+    let iso2 = this.getISOCode() || initialCountry;
     let formattedPhoneNumber = number;
-    let countryCode = this.getCountryCode();
     if (number) {
+      const countryCode = this.getCountryCode();
       if (formattedPhoneNumber[0] !== "+" && countryCode !== null) {
         formattedPhoneNumber = '+' + countryCode.toString() + formattedPhoneNumber.toString();
       }
       formattedPhoneNumber = allowZeroAfterCountryCode
         ? formattedPhoneNumber
         : this.possiblyEliminateZeroAfterCountryCode(formattedPhoneNumber);
       iso2 = PhoneNumber.getCountryCodeOfNumber(formattedPhoneNumber);
-      this.setState({ iso2, formattedNumber: formattedPhoneNumber, inputValue: number }, actionAfterSetState);
     }
+    this.setState({ iso2, formattedNumber: formattedPhoneNumber, inputValue: number }, actionAfterSetState);
   }
 
   possiblyEliminateZeroAfterCountryCode(number) {