From 27c1ebf701e09133b0aa26776bf3444b7f9fe454 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Mon, 18 Dec 2023 18:08:44 -0300 Subject: [PATCH 1/6] fix: unable to open phone input country picker on mobile --- src/components/PhoneInput/index.js | 4 +++- src/libs/hooks/useIsMobile.d.ts | 2 ++ src/libs/hooks/useIsMobile.js | 8 ++++++++ src/libs/utils/isMobile.d.ts | 2 ++ src/libs/utils/isMobile.js | 17 +++++++++++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/libs/hooks/useIsMobile.d.ts create mode 100644 src/libs/hooks/useIsMobile.js create mode 100644 src/libs/utils/isMobile.d.ts create mode 100644 src/libs/utils/isMobile.js diff --git a/src/components/PhoneInput/index.js b/src/components/PhoneInput/index.js index 2ce9ef066..b24315165 100644 --- a/src/components/PhoneInput/index.js +++ b/src/components/PhoneInput/index.js @@ -29,6 +29,7 @@ import { import { useCountry, useCountries } from './hooks'; import CountriesDropdown from './countriesDropdown'; import positionResolver from './helpers/positionResolver'; +import useIsMobile from '../../libs/hooks/useIsMobile'; /** * phone input are used for freeform data entry. @@ -89,6 +90,7 @@ const PhoneInput = React.forwardRef((props, ref) => { const [isOpen, setIsOpen] = useState(false); const [hasFocus, setHasFocus] = useState(false); + const isMobile = useIsMobile(); useOutsideClick( pickerRef, event => { @@ -108,7 +110,7 @@ const PhoneInput = React.forwardRef((props, ref) => { triggerElementRef: () => triggerRef, threshold: 10, }); - useWindowResize(() => setIsOpen(false), isOpen); + useWindowResize(() => setIsOpen(false), isOpen && !isMobile); useEffect(() => { if (isOpen) searchRef.current.focus(); diff --git a/src/libs/hooks/useIsMobile.d.ts b/src/libs/hooks/useIsMobile.d.ts new file mode 100644 index 000000000..6f40b4f89 --- /dev/null +++ b/src/libs/hooks/useIsMobile.d.ts @@ -0,0 +1,2 @@ +declare function useIsMobile(): boolean; +export default useIsMobile; diff --git a/src/libs/hooks/useIsMobile.js b/src/libs/hooks/useIsMobile.js new file mode 100644 index 000000000..42c5f5c0f --- /dev/null +++ b/src/libs/hooks/useIsMobile.js @@ -0,0 +1,8 @@ +import { useMemo } from 'react'; +import isMobileFn from '../utils/isMobile'; + +export default function useIsMobile() { + const isMobile = useMemo(() => isMobileFn(), []); + + return isMobile; +} diff --git a/src/libs/utils/isMobile.d.ts b/src/libs/utils/isMobile.d.ts new file mode 100644 index 000000000..b9fd7cf59 --- /dev/null +++ b/src/libs/utils/isMobile.d.ts @@ -0,0 +1,2 @@ +declare function isMobile(): boolean; +export default isMobile; diff --git a/src/libs/utils/isMobile.js b/src/libs/utils/isMobile.js new file mode 100644 index 000000000..7330ce8dc --- /dev/null +++ b/src/libs/utils/isMobile.js @@ -0,0 +1,17 @@ +/* eslint-disable no-useless-escape */ +export default function isMobile() { + let check = false; + (agent => { + if ( + /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test( + agent, + ) || + /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test( + agent.substr(0, 4), + ) + ) + check = true; + })(navigator.userAgent || navigator.vendor || window.opera); + + return check; +} From 774b84d7faacc4f196b4ace33477e470cf127074 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Tue, 19 Dec 2023 15:47:58 -0300 Subject: [PATCH 2/6] test: add tests to `isMobile` function --- src/libs/utils/__test__/isMobile.spec.js | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/libs/utils/__test__/isMobile.spec.js diff --git a/src/libs/utils/__test__/isMobile.spec.js b/src/libs/utils/__test__/isMobile.spec.js new file mode 100644 index 000000000..e0c2f9357 --- /dev/null +++ b/src/libs/utils/__test__/isMobile.spec.js @@ -0,0 +1,38 @@ +import isMobile from '../isMobile'; + +describe('isMobile', () => { + it('should return true if mobile', () => { + const useAgents = [ + 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Mobile/15E148 Safari/604.1', + 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/114.0.5735.99 Mobile/15E148 Safari/604.1', + 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/114.1 Mobile/15E148 Safari/605.1.15', + 'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36', + 'Mozilla/5.0 (Linux; Android 13; SAMSUNG SM-S918B) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/21.0 Chrome/110.0.5481.154 Mobile Safari/537.36', + 'Mozilla/5.0 (Linux; Android 13; SM-S918B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Mobile Safari/537.36 EdgA/113.0.1774.63', + 'Mozilla/5.0 (Linux; Android 10; JNY-LX1; HMSCore 6.11.0.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.88 HuaweiBrowser/13.0.5.303 Mobile Safari/537.36', + ]; + useAgents.forEach(agent => { + Object.defineProperty(window.navigator, 'userAgent', { + value: agent, + configurable: true, + }); + expect(isMobile()).toBe(true); + }); + }); + + it('should return true if not bmobile', () => { + const useAgents = [ + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246', + 'Mozilla/5.0 (X11; CrOS x86_64 8172.45.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.64 Safari/537.36', + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9', + 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1', + ]; + useAgents.forEach(agent => { + Object.defineProperty(window.navigator, 'userAgent', { + value: agent, + configurable: true, + }); + expect(isMobile()).toBe(false); + }); + }); +}); From 13d922ff9c3806c145a2b024b910b02156b3f89d Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Tue, 19 Dec 2023 16:01:10 -0300 Subject: [PATCH 3/6] fix: integration tests --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2782a95c8..f1d53aff8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,7 +74,6 @@ jobs: - run: yarn install - browser-tools/install-chrome: - chrome-version: 103.0.5060.53 - run: command: yarn start From e830c2f6ef83b88223bd929e52de131b28ce01f5 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Tue, 19 Dec 2023 16:13:12 -0300 Subject: [PATCH 4/6] fix: circleci config typo --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f1d53aff8..df9ae2e8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,7 @@ jobs: - *create_env_file - run: yarn install - - browser-tools/install-chrome: + - browser-tools/install-chrome - run: command: yarn start From ac7b70f0e2f463de2f7affcbdf76b8c31a5323f3 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Tue, 19 Dec 2023 16:53:48 -0300 Subject: [PATCH 5/6] fix: integration tests --- .circleci/config.yml | 3 ++- wdio.conf.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df9ae2e8a..8134da6e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,8 @@ jobs: - *create_env_file - run: yarn install - - browser-tools/install-chrome + - browser-tools/install-chrome: + chrome-version: 114.0.5735.90 - run: command: yarn start diff --git a/wdio.conf.js b/wdio.conf.js index 328e7df8e..6a26e6d0a 100644 --- a/wdio.conf.js +++ b/wdio.conf.js @@ -1,5 +1,5 @@ const drivers = { - chrome: { version: '103.0.5060.53' }, // https://chromedriver.chromium.org/ + chrome: { version: '114.0.5735.90' }, // https://chromedriver.chromium.org/ firefox: { version: '0.31.0' }, // https://github.com/mozilla/geckodriver/releases chromiumedge: { version: '103.0.1264.37' }, // https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/ }; From 039b40bb67d3db8e46a0c57c7cecf87a88e69073 Mon Sep 17 00:00:00 2001 From: David Rodriguez Date: Tue, 19 Dec 2023 17:11:59 -0300 Subject: [PATCH 6/6] fix: rollback integration tests changes --- .circleci/config.yml | 2 +- wdio.conf.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8134da6e9..2782a95c8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,7 +74,7 @@ jobs: - run: yarn install - browser-tools/install-chrome: - chrome-version: 114.0.5735.90 + chrome-version: 103.0.5060.53 - run: command: yarn start diff --git a/wdio.conf.js b/wdio.conf.js index 6a26e6d0a..328e7df8e 100644 --- a/wdio.conf.js +++ b/wdio.conf.js @@ -1,5 +1,5 @@ const drivers = { - chrome: { version: '114.0.5735.90' }, // https://chromedriver.chromium.org/ + chrome: { version: '103.0.5060.53' }, // https://chromedriver.chromium.org/ firefox: { version: '0.31.0' }, // https://github.com/mozilla/geckodriver/releases chromiumedge: { version: '103.0.1264.37' }, // https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/ };