Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-07-26 13:47:03 +02:00
Code Issues Projects Releases Wiki Activity

Prevent settings menu scroll on iOS proxy iframe from shifting entire UI (#17024)

Browse Source
This commit is contained in:
Josh Hawkins 2025-03-08 10:13:07 -06:00 committed by GitHub
parent 74ca009b0b
commit cf3c0b2eb5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/pages/Settings.tsx
View File

@ -20,7 +20,7 @@ import { Drawer, DrawerContent, DrawerTrigger } from "@/components/ui/drawer";
import { Button } from "@/components/ui/button";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import useOptimisticState from "@/hooks/use-optimistic-state";
import { isMobile } from "react-device-detect";
import { isMobile, isMobileSafari } from "react-device-detect";
import { FaVideo } from "react-icons/fa";
import { CameraConfig, FrigateConfig } from "@/types/frigateConfig";
import useSWR from "swr";
@ -40,6 +40,8 @@ import UiSettingsView from "@/views/settings/UiSettingsView";
import { useSearchEffect } from "@/hooks/use-overlay-state";
import { useSearchParams } from "react-router-dom";
import { useInitialCameraState } from "@/api/ws";
import { isInIframe } from "@/utils/isIFrame";
import { isPWA } from "@/utils/isPWA";
import { useIsAdmin } from "@/hooks/use-is-admin";
const allSettingsViews = [
@ -150,7 +152,7 @@ export default function Settings() {
);
if (element instanceof HTMLElement) {
scrollIntoView(element, {
behavior: "smooth",
behavior: isMobileSafari && !isPWA && isInIframe ? "auto" : "smooth",
inline: "start",
});
}

8
web/src/utils/isIFrame.ts Normal file
View File

@ -0,0 +1,8 @@
export const isInIframe = (() => {
try {
return window.self !== window.top;
} catch (e) {
// If we get a security error, we're definitely in an iframe
return true;
}
})();