fix: cap bottom panel above virtual keyboard
This commit is contained in:
1 parent
04686dcc7d
commit
1c330ba44f
2 files changed
+16
-6
No files matched your search
+10
-6
@@ -217,6 +217,10 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
|
|||||||
if (frame !== null) cancelAnimationFrame(frame)
|
if (frame !== null) cancelAnimationFrame(frame)
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
// The bottom panel is offset above the on-screen keyboard. Cap its height
|
||||||
|
// against that same visible area, not the taller layout viewport, so the
|
||||||
|
// conversation keeps PANEL_MIN even on wide touch devices.
|
||||||
|
const layoutViewportHeight = Math.max(0, viewport.height - keyboardInset)
|
||||||
|
|
||||||
// Current conversation (the sessions list feed).
|
// Current conversation (the sessions list feed).
|
||||||
const sessionList = useSyncExternalStore(
|
const sessionList = useSyncExternalStore(
|
||||||
@@ -242,7 +246,7 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
|
|||||||
width: 0,
|
width: 0,
|
||||||
bottomHeight,
|
bottomHeight,
|
||||||
viewportWidth: viewport.width,
|
viewportWidth: viewport.width,
|
||||||
viewportHeight: viewport.height,
|
viewportHeight: layoutViewportHeight,
|
||||||
}).height
|
}).height
|
||||||
|
|
||||||
// The collapsed toggle cluster reclaims the top-right corner, so the DSH
|
// The collapsed toggle cluster reclaims the top-right corner, so the DSH
|
||||||
@@ -821,8 +825,8 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
|
|||||||
bottomOpen: state?.bottomOpen === true,
|
bottomOpen: state?.bottomOpen === true,
|
||||||
width: last?.width ?? state?.width ?? 0,
|
width: last?.width ?? state?.width ?? 0,
|
||||||
bottomHeight: last?.height ?? state?.bottomHeight ?? 0,
|
bottomHeight: last?.height ?? state?.bottomHeight ?? 0,
|
||||||
viewportWidth: window.innerWidth,
|
viewportWidth: viewport.width,
|
||||||
viewportHeight: window.innerHeight,
|
viewportHeight: layoutViewportHeight,
|
||||||
})
|
})
|
||||||
applyDrag(adoptedWidth, adoptedHeight)
|
applyDrag(adoptedWidth, adoptedHeight)
|
||||||
draggingRef.current = false
|
draggingRef.current = false
|
||||||
@@ -847,10 +851,10 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
|
|||||||
width: snapshot.state?.width ?? 0,
|
width: snapshot.state?.width ?? 0,
|
||||||
bottomHeight: snapshot.state?.bottomHeight ?? 0,
|
bottomHeight: snapshot.state?.bottomHeight ?? 0,
|
||||||
viewportWidth: viewport.width,
|
viewportWidth: viewport.width,
|
||||||
viewportHeight: viewport.height,
|
viewportHeight: layoutViewportHeight,
|
||||||
})
|
})
|
||||||
writeGeometry(width, height)
|
writeGeometry(width, height)
|
||||||
}, [narrow, snapshot.state?.panelOpen, snapshot.state?.width, snapshot.state?.bottomOpen, snapshot.state?.bottomHeight, viewport.width, viewport.height])
|
}, [narrow, snapshot.state?.panelOpen, snapshot.state?.width, snapshot.state?.bottomOpen, snapshot.state?.bottomHeight, viewport.width, layoutViewportHeight])
|
||||||
// Unmount must release the push (issue #31): when the boundary swaps the
|
// Unmount must release the push (issue #31): when the boundary swaps the
|
||||||
// whole sidebar after a render crash (or the plugin fiber is disposed /
|
// whole sidebar after a render crash (or the plugin fiber is disposed /
|
||||||
// HMR), the CSS variables would otherwise stay on <html> and layout.css
|
// HMR), the CSS variables would otherwise stay on <html> and layout.css
|
||||||
@@ -974,7 +978,7 @@ export function Sidebar(props: { ctx: Context; store: SidebarStore }) {
|
|||||||
width: state.width,
|
width: state.width,
|
||||||
bottomHeight: state.bottomHeight,
|
bottomHeight: state.bottomHeight,
|
||||||
viewportWidth: viewport.width,
|
viewportWidth: viewport.width,
|
||||||
viewportHeight: viewport.height,
|
viewportHeight: layoutViewportHeight,
|
||||||
}).height
|
}).height
|
||||||
|
|
||||||
const onNewTab = (optionId: string): void => {
|
const onNewTab = (optionId: string): void => {
|
||||||
|
|||||||
@@ -8,4 +8,10 @@ describe('Sidebar layout-push integration', () => {
|
|||||||
expect(source).not.toContain('Math.min(state.bottomHeight, window.innerHeight)')
|
expect(source).not.toContain('Math.min(state.bottomHeight, window.innerHeight)')
|
||||||
expect(source.match(/pushedBottomHeight\(/g)).toHaveLength(3)
|
expect(source.match(/pushedBottomHeight\(/g)).toHaveLength(3)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('caps panel geometry against the viewport visible above the keyboard', () => {
|
||||||
|
expect(source).toContain('viewport.height - keyboardInset')
|
||||||
|
expect(source.match(/viewportHeight: layoutViewportHeight/g)).toHaveLength(4)
|
||||||
|
expect(source).toContain('viewport.width, layoutViewportHeight]')
|
||||||
|
})
|
||||||
})
|
})
|
||||||
Reference in new issue
Block a user