mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
fix(pwa): make ios safe area viewport height stateless
This commit is contained in:
1 parent
6a9eed3ed6
commit
25209edde4
2 files changed
+21
-12
No files matched your search
@@ -73,9 +73,11 @@ describe('android edge-to-edge inset contract', () => {
|
||||
expect(indexTsx).toContain('installIosPwaViewportHeight();');
|
||||
expect(iosPwaViewport).toContain("window.matchMedia('(display-mode: standalone)').matches");
|
||||
expect(iosPwaViewport).toContain('const MIN_KEYBOARD_HEIGHT = 100');
|
||||
expect(iosPwaViewport).toContain('const keyboardOpen = fullHeight - visibleHeight');
|
||||
expect(iosPwaViewport).toContain('const height = keyboardOpen ? visibleBottom : fullHeight');
|
||||
expect(iosPwaViewport).toContain('isEditableFocused()');
|
||||
expect(iosPwaViewport).toContain('screenHeight - visibleHeight > MIN_KEYBOARD_HEIGHT');
|
||||
expect(iosPwaViewport).toContain('window.setTimeout(updateHeight, 350)');
|
||||
expect(iosPwaViewport).not.toContain('fullHeight');
|
||||
expect(iosPwaViewport).not.toContain('viewportWidth');
|
||||
});
|
||||
|
||||
it('removes the scattered safe-area css consumers', () => {
|
||||
|
||||
@@ -5,13 +5,24 @@ const isStandaloneIosPwa = (): boolean =>
|
||||
window.matchMedia('(display-mode: standalone)').matches &&
|
||||
CSS.supports('-webkit-touch-callout: none');
|
||||
|
||||
const isEditableFocused = (): boolean => {
|
||||
const el = document.activeElement as HTMLElement | null;
|
||||
if (!el) return false;
|
||||
return el.tagName === 'INPUT' || el.tagName === 'TEXTAREA' || el.isContentEditable;
|
||||
};
|
||||
|
||||
const fullScreenHeight = (): number => {
|
||||
const { width, height } = window.screen;
|
||||
return window.matchMedia('(orientation: portrait)').matches
|
||||
? Math.max(width, height)
|
||||
: Math.min(width, height);
|
||||
};
|
||||
|
||||
export function installIosPwaViewportHeight(): void {
|
||||
if (!isStandaloneIosPwa()) return;
|
||||
|
||||
let frame = 0;
|
||||
let settleTimer = 0;
|
||||
let fullHeight = 0;
|
||||
let viewportWidth = window.innerWidth;
|
||||
|
||||
const updateHeight = () => {
|
||||
frame = 0;
|
||||
@@ -19,15 +30,11 @@ export function installIosPwaViewportHeight(): void {
|
||||
const visibleHeight = viewport?.height ?? window.innerHeight;
|
||||
const visibleBottom = visibleHeight + (viewport?.offsetTop ?? 0);
|
||||
|
||||
if (window.innerWidth !== viewportWidth) {
|
||||
viewportWidth = window.innerWidth;
|
||||
fullHeight = visibleBottom;
|
||||
}
|
||||
const screenHeight = fullScreenHeight();
|
||||
const keyboardOpen =
|
||||
isEditableFocused() && screenHeight - visibleHeight > MIN_KEYBOARD_HEIGHT;
|
||||
const height = keyboardOpen ? visibleBottom : screenHeight;
|
||||
|
||||
const keyboardOpen = fullHeight - visibleHeight > MIN_KEYBOARD_HEIGHT;
|
||||
if (!keyboardOpen) fullHeight = Math.max(fullHeight, visibleBottom);
|
||||
|
||||
const height = keyboardOpen ? visibleBottom : fullHeight;
|
||||
document.documentElement.style.setProperty(IOS_PWA_VIEWPORT_HEIGHT, `${Math.round(height)}px`);
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user