diff --git a/src/components/CompatibilityV2/components/CameraModal/index.tsx b/src/components/CompatibilityV2/components/CameraModal/index.tsx index 2a84566..ffd2ce5 100644 --- a/src/components/CompatibilityV2/components/CameraModal/index.tsx +++ b/src/components/CompatibilityV2/components/CameraModal/index.tsx @@ -2,7 +2,7 @@ import Webcam from "react-webcam"; import styles from "./styles.module.scss"; import ModalOverlay, { ModalOverlayType } from "@/components/palmistry/modal-overlay/modal-overlay"; import Modal from "@/components/palmistry/modal/modal"; -import { useEffect, useRef, useState } from "react"; +import { useRef, useState } from "react"; // import { useDynamicSize } from "@/hooks/useDynamicSize"; interface CameraModalProps { @@ -32,9 +32,9 @@ function CameraModal({ // const ratio = isLandscape ? width / height : height / width; const cameraRef = useRef(null); - useEffect(() => { - setIsVideoReady(false); - }, [reinitializeKey]); + // useEffect(() => { + // setIsVideoReady(false); + // }, [reinitializeKey]); const onClickOverlay = (e: React.MouseEvent) => { if (e.target === e.currentTarget) { diff --git a/src/components/CompatibilityV2/pages/Camera/index.tsx b/src/components/CompatibilityV2/pages/Camera/index.tsx index dd3bebe..e6052ca 100644 --- a/src/components/CompatibilityV2/pages/Camera/index.tsx +++ b/src/components/CompatibilityV2/pages/Camera/index.tsx @@ -31,7 +31,11 @@ function Camera() { const isIphoneSafari = useMemo((): boolean => { const userAgent = navigator.userAgent; const isIOS = /iPhone/i.test(userAgent); - const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent); + const isSafari = /Safari/i.test(userAgent) && + !/CriOS/i.test(userAgent) && // не Chrome + !/FxiOS/i.test(userAgent) && // не Firefox + !/EdgiOS/i.test(userAgent) && // не Edge + !/OPiOS/i.test(userAgent); // не Opera return isIOS && isSafari; }, []); diff --git a/src/components/PalmistryV1/components/CameraModal/index.tsx b/src/components/PalmistryV1/components/CameraModal/index.tsx index 2a84566..ffd2ce5 100644 --- a/src/components/PalmistryV1/components/CameraModal/index.tsx +++ b/src/components/PalmistryV1/components/CameraModal/index.tsx @@ -2,7 +2,7 @@ import Webcam from "react-webcam"; import styles from "./styles.module.scss"; import ModalOverlay, { ModalOverlayType } from "@/components/palmistry/modal-overlay/modal-overlay"; import Modal from "@/components/palmistry/modal/modal"; -import { useEffect, useRef, useState } from "react"; +import { useRef, useState } from "react"; // import { useDynamicSize } from "@/hooks/useDynamicSize"; interface CameraModalProps { @@ -32,9 +32,9 @@ function CameraModal({ // const ratio = isLandscape ? width / height : height / width; const cameraRef = useRef(null); - useEffect(() => { - setIsVideoReady(false); - }, [reinitializeKey]); + // useEffect(() => { + // setIsVideoReady(false); + // }, [reinitializeKey]); const onClickOverlay = (e: React.MouseEvent) => { if (e.target === e.currentTarget) { diff --git a/src/components/PalmistryV1/pages/Camera/index.tsx b/src/components/PalmistryV1/pages/Camera/index.tsx index 8f4f52d..aaf489e 100644 --- a/src/components/PalmistryV1/pages/Camera/index.tsx +++ b/src/components/PalmistryV1/pages/Camera/index.tsx @@ -31,7 +31,11 @@ function Camera() { const isIphoneSafari = useMemo((): boolean => { const userAgent = navigator.userAgent; const isIOS = /iPhone/i.test(userAgent); - const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent); + const isSafari = /Safari/i.test(userAgent) && + !/CriOS/i.test(userAgent) && // не Chrome + !/FxiOS/i.test(userAgent) && // не Firefox + !/EdgiOS/i.test(userAgent) && // не Edge + !/OPiOS/i.test(userAgent); // не Opera return isIOS && isSafari; }, []);