Skip to content

Commit 5f84efa

Browse files
authored
feat(web): add PageUp/PageDown chat navigation (pingdotgg#9315)
1 parent 1aa44a0 commit 5f84efa

5 files changed

Lines changed: 685 additions & 0 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import {
6363
Suspense,
6464
useCallback,
6565
useEffect,
66+
useEffectEvent,
6667
useLayoutEffect,
6768
useMemo,
6869
useRef,
@@ -291,6 +292,7 @@ import {
291292
} from "../state/entities";
292293
import { environmentShell } from "../state/shell";
293294
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
295+
import { createPageScrollController, type PageScrollKey } from "./chat/pageScrollController";
294296
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
295297
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
296298
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
@@ -4314,6 +4316,38 @@ function ChatViewContent(props: ChatViewProps) {
43144316
},
43154317
[composerOverlayHeight],
43164318
);
4319+
const pageScrollControllerRef = useRef<ReturnType<typeof createPageScrollController> | null>(
4320+
null,
4321+
);
4322+
const handlePageScrollStart = useEffectEvent((key: PageScrollKey) => {
4323+
if (key === "PageUp" && timelineRealContentOverflowsViewport()) {
4324+
cancelTimelineLiveFollowForUserNavigation();
4325+
}
4326+
});
4327+
useEffect(() => {
4328+
const controller = createPageScrollController({
4329+
getContainer: () => legendListRef.current?.getScrollableNode() ?? null,
4330+
getScrollPaddingBottomPx: () => composerOverlayElement?.getBoundingClientRect().height ?? 0,
4331+
onScrollStart: handlePageScrollStart,
4332+
});
4333+
pageScrollControllerRef.current = controller;
4334+
4335+
return () => {
4336+
controller.dispose();
4337+
if (pageScrollControllerRef.current === controller) {
4338+
pageScrollControllerRef.current = null;
4339+
}
4340+
};
4341+
}, [composerOverlayElement]);
4342+
const onComposerPageScrollKeyDown = useCallback((key: PageScrollKey) => {
4343+
pageScrollControllerRef.current?.handleKeyDown(key);
4344+
}, []);
4345+
const onComposerPageScrollKeyUp = useCallback((key: string) => {
4346+
pageScrollControllerRef.current?.handleKeyUp(key);
4347+
}, []);
4348+
const onComposerPageScrollRelease = useCallback(() => {
4349+
pageScrollControllerRef.current?.releaseActiveKey();
4350+
}, []);
43174351
// Live-follow stays active after send/thread-open until an actual list scroll
43184352
// gesture opts out.
43194353
const scrollToEnd = useCallback((animated = false) => {
@@ -7637,6 +7671,9 @@ function ChatViewContent(props: ChatViewProps) {
76377671
composerFilesRef={composerFilesRef}
76387672
composerTerminalContextsRef={composerTerminalContextsRef}
76397673
composerElementContextsRef={composerElementContextsRef}
7674+
onPageScrollKeyDown={onComposerPageScrollKeyDown}
7675+
onPageScrollKeyUp={onComposerPageScrollKeyUp}
7676+
onPageScrollRelease={onComposerPageScrollRelease}
76407677
onSend={onSend}
76417678
onInterrupt={onInterrupt}
76427679
onImplementPlanInNewThread={onImplementPlanInNewThread}

‎apps/web/src/components/ComposerPromptEditor.tsx‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ import {
8383
} from "./composerInlineChip";
8484
import { FILE_TAG_CHIP_CLASS_NAME, FileTagChipContent } from "./chat/FileTagChip";
8585
import { ComposerPendingTerminalContextChip } from "./chat/ComposerPendingTerminalContexts";
86+
import { getTimelinePageScrollKey } from "./chat/pageScrollController";
8687
import { formatProviderSkillDisplayName } from "@t3tools/client-runtime/providerSkills";
8788
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
8889
import { registerComposerInlineTokenPaste } from "./composerInlineTokenPaste";
@@ -916,6 +917,9 @@ interface ComposerPromptEditorProps {
916917
key: "ArrowDown" | "ArrowUp" | "Enter" | "Tab",
917918
event: KeyboardEvent,
918919
) => boolean;
920+
onPageScrollKeyDown?: (key: "PageUp" | "PageDown") => void;
921+
onPageScrollKeyUp?: (key: string) => void;
922+
onPageScrollRelease?: () => void;
919923
onPaste: React.ClipboardEventHandler<HTMLElement>;
920924
editorRef: React.RefObject<ComposerPromptEditorHandle | null>;
921925
}
@@ -1557,6 +1561,9 @@ function ComposerPromptEditorInner({
15571561
onRemoveTerminalContext,
15581562
onChange,
15591563
onCommandKeyDown,
1564+
onPageScrollKeyDown,
1565+
onPageScrollKeyUp,
1566+
onPageScrollRelease,
15601567
onPaste,
15611568
editorRef,
15621569
}: ComposerPromptEditorProps) {
@@ -1829,6 +1836,46 @@ function ComposerPromptEditorInner({
18291836
data-testid="composer-editor"
18301837
aria-placeholder={placeholder}
18311838
placeholder={<span />}
1839+
onKeyDown={(event) => {
1840+
if (
1841+
event.key === "Control" ||
1842+
event.key === "Meta" ||
1843+
event.key === "Alt" ||
1844+
event.key === "Shift"
1845+
) {
1846+
onPageScrollRelease?.();
1847+
}
1848+
1849+
if (event.key !== "PageUp" && event.key !== "PageDown") {
1850+
return;
1851+
}
1852+
1853+
const pageScrollKey = getTimelinePageScrollKey({
1854+
altKey: event.altKey,
1855+
clientHeight: event.currentTarget.clientHeight,
1856+
ctrlKey: event.ctrlKey,
1857+
defaultPrevented: event.defaultPrevented,
1858+
isComposing: event.nativeEvent.isComposing,
1859+
key: event.key,
1860+
keyCode: event.keyCode,
1861+
metaKey: event.metaKey,
1862+
scrollHeight: event.currentTarget.scrollHeight,
1863+
scrollTop: event.currentTarget.scrollTop,
1864+
shiftKey: event.shiftKey,
1865+
});
1866+
if (!pageScrollKey) {
1867+
onPageScrollRelease?.();
1868+
return;
1869+
}
1870+
if (!onPageScrollKeyDown) {
1871+
return;
1872+
}
1873+
1874+
event.preventDefault();
1875+
onPageScrollKeyDown(pageScrollKey);
1876+
}}
1877+
onKeyUp={(event) => onPageScrollKeyUp?.(event.key)}
1878+
onBlur={onPageScrollRelease}
18321879
onPaste={onPaste}
18331880
/>
18341881
}
@@ -1868,6 +1915,9 @@ export function ComposerPromptEditor({
18681915
onRemoveTerminalContext,
18691916
onChange,
18701917
onCommandKeyDown,
1918+
onPageScrollKeyDown,
1919+
onPageScrollKeyUp,
1920+
onPageScrollRelease,
18711921
onPaste,
18721922
editorRef,
18731923
}: ComposerPromptEditorProps) {
@@ -1912,6 +1962,9 @@ export function ComposerPromptEditor({
19121962
onPaste={onPaste}
19131963
editorRef={editorRef}
19141964
{...(onCommandKeyDown ? { onCommandKeyDown } : {})}
1965+
{...(onPageScrollKeyDown ? { onPageScrollKeyDown } : {})}
1966+
{...(onPageScrollKeyUp ? { onPageScrollKeyUp } : {})}
1967+
{...(onPageScrollRelease ? { onPageScrollRelease } : {})}
19151968
{...(className ? { className } : {})}
19161969
/>
19171970
</LexicalComposer>

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,9 @@ export interface ChatComposerProps {
710710
composerTerminalContextsRef: React.RefObject<TerminalContextDraft[]>;
711711
composerElementContextsRef: React.RefObject<ElementContextDraft[]>;
712712
composerRef: React.RefObject<ChatComposerHandle | null>;
713+
onPageScrollKeyDown: (key: "PageUp" | "PageDown") => void;
714+
onPageScrollKeyUp: (key: string) => void;
715+
onPageScrollRelease: () => void;
713716

714717
// Callbacks
715718
onSend: (e?: { preventDefault: () => void }, intent?: ComposerSubmissionIntent) => void;
@@ -801,6 +804,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
801804
composerFilesRef,
802805
composerTerminalContextsRef,
803806
composerElementContextsRef,
807+
onPageScrollKeyDown,
808+
onPageScrollKeyUp,
809+
onPageScrollRelease,
804810
onSend,
805811
onInterrupt,
806812
onImplementPlanInNewThread,
@@ -4187,6 +4193,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
41874193
onRemoveTerminalContext={removeComposerTerminalContextFromDraft}
41884194
onChange={onPromptChange}
41894195
onCommandKeyDown={onComposerCommandKey}
4196+
onPageScrollKeyDown={onPageScrollKeyDown}
4197+
onPageScrollKeyUp={onPageScrollKeyUp}
4198+
onPageScrollRelease={onPageScrollRelease}
41904199
onPaste={onComposerPaste}
41914200
placeholder={
41924201
isComposerApprovalState

0 commit comments

Comments
 (0)