gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop

Browse Source
This commit is contained in:
Daniil Chemerkin 2025-02-18 13:28:25 +00:00
parent dac5b5dcfc
commit e68a9366a3
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/CompatibilityV2/components/CameraModal/index.tsx
View File

@ -2,7 +2,7 @@ import Webcam from "react-webcam";
import styles from "./styles.module.scss"; import styles from "./styles.module.scss";
import ModalOverlay, { ModalOverlayType } from "@/components/palmistry/modal-overlay/modal-overlay"; import ModalOverlay, { ModalOverlayType } from "@/components/palmistry/modal-overlay/modal-overlay";
import Modal from "@/components/palmistry/modal/modal"; import Modal from "@/components/palmistry/modal/modal";
import { useEffect, useRef, useState } from "react"; import { useRef, useState } from "react";
// import { useDynamicSize } from "@/hooks/useDynamicSize"; // import { useDynamicSize } from "@/hooks/useDynamicSize";
interface CameraModalProps { interface CameraModalProps {
@ -32,9 +32,9 @@ function CameraModal({
// const ratio = isLandscape ? width / height : height / width; // const ratio = isLandscape ? width / height : height / width;
const cameraRef = useRef<Webcam>(null); const cameraRef = useRef<Webcam>(null);
useEffect(() => { // useEffect(() => {
setIsVideoReady(false); // setIsVideoReady(false);
}, [reinitializeKey]); // }, [reinitializeKey]);
const onClickOverlay = (e: React.MouseEvent) => { const onClickOverlay = (e: React.MouseEvent) => {
if (e.target === e.currentTarget) { if (e.target === e.currentTarget) {

6
src/components/CompatibilityV2/pages/Camera/index.tsx
View File

@ -31,7 +31,11 @@ function Camera() {
const isIphoneSafari = useMemo((): boolean => { const isIphoneSafari = useMemo((): boolean => {
const userAgent = navigator.userAgent; const userAgent = navigator.userAgent;
const isIOS = /iPhone/i.test(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; return isIOS && isSafari;
}, []); }, []);

8
src/components/PalmistryV1/components/CameraModal/index.tsx
View File

@ -2,7 +2,7 @@ import Webcam from "react-webcam";
import styles from "./styles.module.scss"; import styles from "./styles.module.scss";
import ModalOverlay, { ModalOverlayType } from "@/components/palmistry/modal-overlay/modal-overlay"; import ModalOverlay, { ModalOverlayType } from "@/components/palmistry/modal-overlay/modal-overlay";
import Modal from "@/components/palmistry/modal/modal"; import Modal from "@/components/palmistry/modal/modal";
import { useEffect, useRef, useState } from "react"; import { useRef, useState } from "react";
// import { useDynamicSize } from "@/hooks/useDynamicSize"; // import { useDynamicSize } from "@/hooks/useDynamicSize";
interface CameraModalProps { interface CameraModalProps {
@ -32,9 +32,9 @@ function CameraModal({
// const ratio = isLandscape ? width / height : height / width; // const ratio = isLandscape ? width / height : height / width;
const cameraRef = useRef<Webcam>(null); const cameraRef = useRef<Webcam>(null);
useEffect(() => { // useEffect(() => {
setIsVideoReady(false); // setIsVideoReady(false);
}, [reinitializeKey]); // }, [reinitializeKey]);
const onClickOverlay = (e: React.MouseEvent) => { const onClickOverlay = (e: React.MouseEvent) => {
if (e.target === e.currentTarget) { if (e.target === e.currentTarget) {

6
src/components/PalmistryV1/pages/Camera/index.tsx
View File

@ -31,7 +31,11 @@ function Camera() {
const isIphoneSafari = useMemo((): boolean => { const isIphoneSafari = useMemo((): boolean => {
const userAgent = navigator.userAgent; const userAgent = navigator.userAgent;
const isIOS = /iPhone/i.test(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; return isIOS && isSafari;
}, []); }, []);