Pick sensible default option for phone country dropdown (#10627)

* Pick sensible default option for phone country dropdown

* Add tests

* Add tests
This commit is contained in:
Michael Telatynski 2023-04-18 09:23:37 +01:00 committed by GitHub
parent f241dea137
commit 82a51e9674
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 2 deletions

View file

@ -57,16 +57,30 @@ export default class CountryDropdown extends React.Component<IProps, IState> {
public constructor(props: IProps) { public constructor(props: IProps) {
super(props); super(props);
let defaultCountry: PhoneNumberCountryDefinition = COUNTRIES[0]; let defaultCountry: PhoneNumberCountryDefinition | undefined;
const defaultCountryCode = SdkConfig.get("default_country_code"); const defaultCountryCode = SdkConfig.get("default_country_code");
if (defaultCountryCode) { if (defaultCountryCode) {
const country = COUNTRIES.find((c) => c.iso2 === defaultCountryCode.toUpperCase()); const country = COUNTRIES.find((c) => c.iso2 === defaultCountryCode.toUpperCase());
if (country) defaultCountry = country; if (country) defaultCountry = country;
} }
if (!defaultCountry) {
try {
const locale = new Intl.Locale(navigator.language ?? navigator.languages[0]);
const code = locale.region ?? locale.language ?? locale.baseName;
const displayNames = new Intl.DisplayNames(["en"], { type: "region" });
const displayName = displayNames.of(code).toUpperCase();
defaultCountry = COUNTRIES.find(
(c) => c.iso2 === code.toUpperCase() || c.name.toUpperCase() === displayName,
);
} catch (e) {
console.warn("Failed to detect default locale", e);
}
}
this.state = { this.state = {
searchQuery: "", searchQuery: "",
defaultCountry, defaultCountry: defaultCountry ?? COUNTRIES[0],
}; };
} }

View file

@ -0,0 +1,68 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import { render } from "@testing-library/react";
import CountryDropdown from "../../../../src/components/views/auth/CountryDropdown";
import SdkConfig from "../../../../src/SdkConfig";
describe("CountryDropdown", () => {
describe("default_country_code", () => {
afterEach(() => {
SdkConfig.unset();
});
it.each([
["GB", 44],
["IE", 353],
["ES", 34],
["FR", 33],
["PL", 48],
["DE", 49],
])("should respect configured default country code for %s", (config, defaultCountryCode) => {
SdkConfig.add({
default_country_code: config,
});
const fn = jest.fn();
render(<CountryDropdown onOptionChange={fn} isSmall={false} showPrefix={false} />);
expect(fn).toHaveBeenCalledWith(expect.objectContaining({ prefix: defaultCountryCode.toString() }));
});
});
describe("defaultCountry", () => {
it.each([
["en-GB", 44],
["en-ie", 353],
["es-ES", 34],
["fr", 33],
["pl", 48],
["de-DE", 49],
])("should pick appropriate default country for %s", (language, defaultCountryCode) => {
Object.defineProperty(navigator, "language", {
configurable: true,
get() {
return language;
},
});
const fn = jest.fn();
render(<CountryDropdown onOptionChange={fn} isSmall={false} showPrefix={false} />);
expect(fn).toHaveBeenCalledWith(expect.objectContaining({ prefix: defaultCountryCode.toString() }));
});
});
});