@codefast/ui 0.8.0 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/dist/hooks/use-message-scroller-commands.d.ts +3 -1
- package/dist/hooks/use-message-scroller-commands.d.ts.map +1 -1
- package/dist/hooks/use-message-scroller-commands.js +32 -3
- package/dist/hooks/use-message-scroller-commands.js.map +1 -1
- package/dist/hooks/use-message-scroller-controller.d.ts.map +1 -1
- package/dist/hooks/use-message-scroller-controller.js +75 -11
- package/dist/hooks/use-message-scroller-controller.js.map +1 -1
- package/dist/hooks/use-message-scroller-refs.d.ts +1 -0
- package/dist/hooks/use-message-scroller-refs.d.ts.map +1 -1
- package/dist/hooks/use-message-scroller-refs.js +4 -0
- package/dist/hooks/use-message-scroller-refs.js.map +1 -1
- package/dist/lib/message-scroller/geometry.d.ts +2 -2
- package/dist/lib/message-scroller/geometry.d.ts.map +1 -1
- package/dist/lib/message-scroller/stores.js +1 -1
- package/dist/lib/message-scroller/stores.js.map +1 -1
- package/dist/lib/message-scroller/types.d.ts +14 -5
- package/dist/lib/message-scroller/types.d.ts.map +1 -1
- package/dist/lib/message-scroller/types.js +1 -0
- package/dist/lib/message-scroller/types.js.map +1 -1
- package/dist/primitives/message-scroller.d.ts.map +1 -1
- package/dist/primitives/message-scroller.js +16 -7
- package/dist/primitives/message-scroller.js.map +1 -1
- package/package.json +1 -1
- package/src/hooks/use-message-scroller-commands.ts +48 -9
- package/src/hooks/use-message-scroller-controller.ts +93 -11
- package/src/hooks/use-message-scroller-refs.ts +5 -0
- package/src/lib/message-scroller/geometry.ts +2 -2
- package/src/lib/message-scroller/stores.ts +1 -1
- package/src/lib/message-scroller/types.ts +17 -4
- package/src/primitives/message-scroller.tsx +17 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @codefast/ui
|
|
2
2
|
|
|
3
|
+
## 0.9.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#755](https://github.com/codefastlabs/codefast/pull/755) [`663ff36`](https://github.com/codefastlabs/codefast/commit/663ff36be723b752c6f5d41f175e1c3bfeaf44c4) Thanks [@thevuong](https://github.com/thevuong)! - Harden MessageScroller follow-output and turn anchoring. Follow-bottom now releases on a reader's real upward scroll —
|
|
8
|
+
surviving the autoscroll suppression window and slow sub-pixel drags — drops whenever `autoScroll` turns off, and
|
|
9
|
+
re-arms cleanly after an anchored turn unmounts. A freshly anchored turn holds at the reading line while the reply
|
|
10
|
+
streams, hands off to follow-bottom in a single scroll command once the reply fills the viewport, and the handoff no
|
|
11
|
+
longer false-fires when the viewport itself shrinks (keyboard, resize). ResizeObserver handling coalesces onto one
|
|
12
|
+
shared frame (fixing the "loop completed with undelivered notifications" error) with a synchronous fast path while
|
|
13
|
+
following, so streaming stays glued to the live edge without a one-frame gap. The scroll snapshot from
|
|
14
|
+
`useMessageScrollerScrollable` gains a `following` field (mirrored as a `data-following` attribute) and `end` now always
|
|
15
|
+
reports true geometry; `MessageScrollerButton` derives its quiescence from `end && !following` instead of a masked
|
|
16
|
+
snapshot.
|
|
17
|
+
|
|
3
18
|
## 0.8.0
|
|
4
19
|
|
|
5
20
|
### Minor Changes
|
|
@@ -14,7 +14,9 @@ declare function useMessageScrollerCommands({ refs, commitScrollState, scheduleS
|
|
|
14
14
|
scheduleVisibilitySync: () => void;
|
|
15
15
|
}): {
|
|
16
16
|
flushPendingScrollToMessage: () => boolean;
|
|
17
|
-
reanchorToAnchoredMessage: (
|
|
17
|
+
reanchorToAnchoredMessage: ({ followOnSpacerConsumed }?: {
|
|
18
|
+
followOnSpacerConsumed?: boolean;
|
|
19
|
+
}) => boolean;
|
|
18
20
|
scrollToElement: (element: HTMLElement, { align, behavior, scrollMargin }?: MessageScrollerScrollOptions, { keepPreviousPeek, }?: {
|
|
19
21
|
keepPreviousPeek?: boolean;
|
|
20
22
|
}) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-message-scroller-commands.d.ts","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-commands.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAQ7E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAEjF;;;;;;GAMG;AACH,iBAAS,0BAA0B,CAAC,EAClC,IAAI,EACJ,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,GACvB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,sBAAsB,EAAE,MAAM,IAAI,CAAC;CACpC
|
|
1
|
+
{"version":3,"file":"use-message-scroller-commands.d.ts","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-commands.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAQ7E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAEjF;;;;;;GAMG;AACH,iBAAS,0BAA0B,CAAC,EAClC,IAAI,EACJ,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,GACvB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,sBAAsB,EAAE,MAAM,IAAI,CAAC;CACpC;;6DAkMwC;QAAE,sBAAsB,CAAC,EAAE,OAAO,CAAA;KAAE;+BApD9D,WAAW,sCAC4D,4BAA4B,0BAGzG;QACD,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B;iCA7BqB,4BAA4B;iCAmIxC,MAAM,YAAY,4BAA4B;mCApJlC,4BAA4B;EAuNvD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
|
|
@@ -123,15 +123,44 @@ function useMessageScrollerCommands({ refs, commitScrollState, scheduleStateComm
|
|
|
123
123
|
scheduleVisibilitySync();
|
|
124
124
|
return true;
|
|
125
125
|
}, [scheduleVisibilitySync, scrollToPosition, setTailSpacerHeight]);
|
|
126
|
-
const reanchorToAnchoredMessage = useCallback(() => {
|
|
126
|
+
const reanchorToAnchoredMessage = useCallback(({ followOnSpacerConsumed = false } = {}) => {
|
|
127
|
+
if (modeRef.current !== "anchored-to-message") {
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
127
130
|
const element = streamingTurnRef.current;
|
|
128
|
-
if (!element || !element.isConnected
|
|
131
|
+
if (!element || !element.isConnected) {
|
|
132
|
+
// An unmounted anchor can never re-place; drop the hold so the follow
|
|
133
|
+
// arm is not blocked by a mode nothing else exits.
|
|
134
|
+
streamingTurnRef.current = null;
|
|
135
|
+
modeRef.current = "free-scrolling";
|
|
129
136
|
return false;
|
|
130
137
|
}
|
|
138
|
+
const content = contentRef.current;
|
|
139
|
+
const viewport = viewportRef.current;
|
|
140
|
+
// The reply streaming below the anchor consumes the tail spacer as it
|
|
141
|
+
// grows; once the placement would need none, the reader is at the live
|
|
142
|
+
// edge and the hold hands off to follow-bottom in one scroll command.
|
|
143
|
+
if (followOnSpacerConsumed &&
|
|
144
|
+
autoScrollRef.current &&
|
|
145
|
+
spacerHeightRef.current > 0 &&
|
|
146
|
+
content &&
|
|
147
|
+
viewport &&
|
|
148
|
+
content.contains(element)) {
|
|
149
|
+
const scrollTop = getElementScrollTop({
|
|
150
|
+
align: "start",
|
|
151
|
+
element,
|
|
152
|
+
scrollMargin: scrollMarginRef.current + scrollPreviousItemPeekRef.current,
|
|
153
|
+
spacer: spacerRef.current,
|
|
154
|
+
viewport,
|
|
155
|
+
});
|
|
156
|
+
if (getTailSpacerHeight({ content, scrollTop, spacer: spacerRef.current, viewport }) <= 0) {
|
|
157
|
+
return scrollToEnd({ behavior: "auto" });
|
|
158
|
+
}
|
|
159
|
+
}
|
|
131
160
|
// Re-run the placement so the tail spacer is recomputed for the new content
|
|
132
161
|
// height and the turn is held at the reading line.
|
|
133
162
|
return scrollToElement(element, { align: "start" }, { keepPreviousPeek: true });
|
|
134
|
-
}, [scrollToElement]);
|
|
163
|
+
}, [scrollToElement, scrollToEnd]);
|
|
135
164
|
// The target row may not be mounted yet (e.g. an async-loaded transcript).
|
|
136
165
|
// When it is missing the request is queued in pendingScrollToMessageRef and
|
|
137
166
|
// flushed later — on registerMessage for that id, or on the next content
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-message-scroller-commands.js","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-commands.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"use-message-scroller-commands.js","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-message-scroller-controller.d.ts","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-controller.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAsB7E,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC5B,8BAA8B,
|
|
1
|
+
{"version":3,"file":"use-message-scroller-controller.d.ts","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-controller.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAsB7E,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC5B,8BAA8B,EAG/B,MAAM,8BAA8B,CAAC;AAgBtC;;;;;;GAMG;AACH,iBAAS,4BAA4B,CAAC,EACpC,UAAkB,EAClB,qBAA6B,EAC7B,mBAAmD,EACnD,sBAA0D,EAC1D,YAAoC,GACrC,EAAE,4BAA4B;;;EAypB9B;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAC;AACxC,YAAY,EAAE,mBAAmB,EAAE,CAAC"}
|
|
@@ -28,8 +28,10 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
28
28
|
scrollMargin,
|
|
29
29
|
scrollPreviousItemPeek,
|
|
30
30
|
});
|
|
31
|
-
const { streamingTurnRef, autoScrollRef, autoscrollingRef, autoscrollingTimeoutRef, contentRef, defaultScrollPositionAppliedRef, firstItemRef, itemCountRef, messageElementsRef, modeRef, pendingScrollFrameRef, pendingScrollToMessageRef, prependRestoreRef, preserveScrollOnPrependRef, rootRef, scrollEdgeThresholdRef, scrollMarginRef, scrollPreviousItemPeekRef, spacerGapRef, spacerRef, stateFrameRef, stateStore, viewportRef, visibilityFrameRef, visibilityObserverRef, visibilityStore, visibleMessageIdsRef, handledScrollAnchorsRef, } = refs;
|
|
31
|
+
const { streamingTurnRef, autoScrollRef, autoscrollingRef, autoscrollingTimeoutRef, contentRef, defaultScrollPositionAppliedRef, firstItemRef, itemCountRef, lastScrollTopRef, messageElementsRef, modeRef, pendingScrollFrameRef, pendingScrollToMessageRef, prependRestoreRef, preserveScrollOnPrependRef, rootRef, scrollEdgeThresholdRef, scrollMarginRef, scrollPreviousItemPeekRef, spacerGapRef, spacerHeightRef, spacerRef, stateFrameRef, stateStore, viewportRef, visibilityFrameRef, visibilityObserverRef, visibilityStore, visibleMessageIdsRef, handledScrollAnchorsRef, } = refs;
|
|
32
32
|
const previousDefaultScrollPositionRef = useRef(defaultScrollPosition);
|
|
33
|
+
const previousViewportHeightRef = useRef(0);
|
|
34
|
+
const resizeFrameRef = useRef(null);
|
|
33
35
|
if (previousDefaultScrollPositionRef.current !== defaultScrollPosition) {
|
|
34
36
|
previousDefaultScrollPositionRef.current = defaultScrollPosition;
|
|
35
37
|
defaultScrollPositionAppliedRef.current = false;
|
|
@@ -50,27 +52,60 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
50
52
|
element.removeAttribute("data-scrollable");
|
|
51
53
|
}
|
|
52
54
|
element.toggleAttribute("data-autoscrolling", autoScrolling);
|
|
55
|
+
element.toggleAttribute("data-following", state.following);
|
|
53
56
|
}
|
|
54
57
|
}, []);
|
|
55
|
-
// Owns the one follow-bottom transition: arm at the bottom, release on
|
|
56
|
-
// scroll
|
|
57
|
-
//
|
|
58
|
+
// Owns the one follow-bottom transition: arm at the bottom, release on a
|
|
59
|
+
// reader's real scroll up, and drop the mode whenever autoScroll is off so
|
|
60
|
+
// the published follow state can never outlive the prop.
|
|
58
61
|
const reconcileFollowMode = useCallback((scrollable) => {
|
|
59
|
-
|
|
62
|
+
const scrollTop = viewportRef.current?.scrollTop ?? 0;
|
|
63
|
+
// Content growing past the live edge also reads as "not at the end", but
|
|
64
|
+
// only a reader moves scrollTop up — releasing on growth would drop follow
|
|
65
|
+
// before the frame-coalesced resize handler has caught it up.
|
|
66
|
+
const scrolledUp = scrollTop < lastScrollTopRef.current - SCROLL_POSITION_EPSILON;
|
|
67
|
+
if (!autoScrollRef.current) {
|
|
68
|
+
if (modeRef.current === "following-bottom") {
|
|
69
|
+
modeRef.current = "free-scrolling";
|
|
70
|
+
}
|
|
71
|
+
lastScrollTopRef.current = scrollTop;
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
// The tail spacer makes a freshly anchored turn read as "at the end";
|
|
75
|
+
// arming there would let the first streamed chunk yank the reader off the
|
|
76
|
+
// anchor, so the hold hands off to following in the resize pass instead.
|
|
77
|
+
if (!scrollable.end && modeRef.current !== "settling-jump" && modeRef.current !== "anchored-to-message") {
|
|
60
78
|
modeRef.current = "following-bottom";
|
|
79
|
+
lastScrollTopRef.current = scrollTop;
|
|
80
|
+
return;
|
|
61
81
|
}
|
|
62
|
-
|
|
82
|
+
if (modeRef.current === "following-bottom" && scrollable.end && scrolledUp && !autoscrollingRef.current) {
|
|
63
83
|
modeRef.current = "free-scrolling";
|
|
84
|
+
lastScrollTopRef.current = scrollTop;
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
// The baseline advances only outside autoscroll suppression and only
|
|
88
|
+
// downward, so a suppressed or sub-epsilon upward drag keeps accumulating
|
|
89
|
+
// toward a release instead of being consumed commit by commit.
|
|
90
|
+
if (!autoscrollingRef.current && scrollTop > lastScrollTopRef.current) {
|
|
91
|
+
lastScrollTopRef.current = scrollTop;
|
|
64
92
|
}
|
|
65
93
|
}, []);
|
|
66
94
|
const commitScrollState = useCallback(() => {
|
|
67
|
-
const
|
|
95
|
+
const nextEdges = getMessageScrollerScrollable({
|
|
68
96
|
content: contentRef.current,
|
|
69
97
|
scrollEdgeThreshold: scrollEdgeThresholdRef.current,
|
|
70
98
|
spacer: spacerRef.current,
|
|
71
99
|
viewport: viewportRef.current,
|
|
72
100
|
});
|
|
73
|
-
reconcileFollowMode(
|
|
101
|
+
reconcileFollowMode(nextEdges);
|
|
102
|
+
// The edges publish raw geometry; follow-output rides alongside so a
|
|
103
|
+
// consumer (the end button) can stay quiet while the gap is already being
|
|
104
|
+
// closed, without masking the real end state.
|
|
105
|
+
const nextState = {
|
|
106
|
+
...nextEdges,
|
|
107
|
+
following: modeRef.current === "following-bottom",
|
|
108
|
+
};
|
|
74
109
|
writeStateAttributes(nextState);
|
|
75
110
|
stateStore.setSnapshot(nextState);
|
|
76
111
|
}, [reconcileFollowMode, stateStore, writeStateAttributes]);
|
|
@@ -289,6 +324,11 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
289
324
|
scrollToEnd,
|
|
290
325
|
]);
|
|
291
326
|
const handleResize = useCallback(() => {
|
|
327
|
+
const viewportHeight = viewportRef.current?.clientHeight ?? 0;
|
|
328
|
+
// A shrinking viewport consumes tail spacer without any reply growth, so
|
|
329
|
+
// the anchor hold must survive it instead of handing off to the live edge.
|
|
330
|
+
const viewportShrank = viewportHeight < previousViewportHeightRef.current;
|
|
331
|
+
previousViewportHeightRef.current = viewportHeight;
|
|
292
332
|
if (modeRef.current === "following-bottom" && autoScrollRef.current) {
|
|
293
333
|
scrollToEnd({ behavior: "auto" });
|
|
294
334
|
return;
|
|
@@ -296,12 +336,32 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
296
336
|
// Hold the anchored turn in place as content below it resizes (a reply
|
|
297
337
|
// streaming in, or a transient marker collapsing) — otherwise the shrinking
|
|
298
338
|
// content lets the browser clamp scrollTop and the turn drops.
|
|
299
|
-
if (reanchorToAnchoredMessage()) {
|
|
339
|
+
if (reanchorToAnchoredMessage({ followOnSpacerConsumed: !viewportShrank })) {
|
|
300
340
|
return;
|
|
301
341
|
}
|
|
302
342
|
scheduleStateCommit();
|
|
303
343
|
scheduleVisibilitySync();
|
|
304
344
|
}, [reanchorToAnchoredMessage, scheduleStateCommit, scheduleVisibilitySync, scrollToEnd]);
|
|
345
|
+
// Runs the resize pass synchronously only when no spacer write can occur;
|
|
346
|
+
// otherwise it coalesces onto one shared frame, since resizing the observed
|
|
347
|
+
// spacer during ResizeObserver delivery fires the loop-completed error.
|
|
348
|
+
const scheduleResize = useCallback(() => {
|
|
349
|
+
if (modeRef.current !== "anchored-to-message" && spacerHeightRef.current === 0) {
|
|
350
|
+
if (resizeFrameRef.current !== null) {
|
|
351
|
+
window.cancelAnimationFrame(resizeFrameRef.current);
|
|
352
|
+
resizeFrameRef.current = null;
|
|
353
|
+
}
|
|
354
|
+
handleResize();
|
|
355
|
+
return;
|
|
356
|
+
}
|
|
357
|
+
if (resizeFrameRef.current !== null) {
|
|
358
|
+
return;
|
|
359
|
+
}
|
|
360
|
+
resizeFrameRef.current = window.requestAnimationFrame(() => {
|
|
361
|
+
resizeFrameRef.current = null;
|
|
362
|
+
handleResize();
|
|
363
|
+
});
|
|
364
|
+
}, [handleResize]);
|
|
305
365
|
const observeVisibility = useCallback(() => {
|
|
306
366
|
const viewport = viewportRef.current;
|
|
307
367
|
if (!viewport || !visibilityStore.hasListeners()) {
|
|
@@ -395,9 +455,9 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
395
455
|
}, [capturePrependAnchor, commitScrollState, scheduleVisibilitySync]);
|
|
396
456
|
const context = useMemo(() => ({
|
|
397
457
|
handleContentChange,
|
|
398
|
-
handleResize,
|
|
399
458
|
observeVisibility,
|
|
400
459
|
preserveScrollOnPrependRef,
|
|
460
|
+
scheduleResize,
|
|
401
461
|
scrollToEnd,
|
|
402
462
|
scrollToMessage,
|
|
403
463
|
scrollToStart,
|
|
@@ -413,8 +473,8 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
413
473
|
visibilityStore,
|
|
414
474
|
}), [
|
|
415
475
|
handleContentChange,
|
|
416
|
-
handleResize,
|
|
417
476
|
observeVisibility,
|
|
477
|
+
scheduleResize,
|
|
418
478
|
scrollToEnd,
|
|
419
479
|
scrollToMessage,
|
|
420
480
|
scrollToStart,
|
|
@@ -452,6 +512,10 @@ function useMessageScrollerController({ autoScroll = false, defaultScrollPositio
|
|
|
452
512
|
window.cancelAnimationFrame(pendingScrollFrameRef.current);
|
|
453
513
|
pendingScrollFrameRef.current = null;
|
|
454
514
|
}
|
|
515
|
+
if (resizeFrameRef.current !== null) {
|
|
516
|
+
window.cancelAnimationFrame(resizeFrameRef.current);
|
|
517
|
+
resizeFrameRef.current = null;
|
|
518
|
+
}
|
|
455
519
|
visibilityObserverRef.current?.disconnect();
|
|
456
520
|
visibilityObserverRef.current = null;
|
|
457
521
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-message-scroller-controller.js","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"use-message-scroller-controller.js","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ type MessageScrollerRefs = {
|
|
|
16
16
|
defaultScrollPositionAppliedRef: RefObject<boolean>;
|
|
17
17
|
firstItemRef: RefObject<HTMLElement | null>;
|
|
18
18
|
itemCountRef: RefObject<number>;
|
|
19
|
+
lastScrollTopRef: RefObject<number>;
|
|
19
20
|
messageElementsRef: RefObject<Map<string, HTMLElement>>;
|
|
20
21
|
modeRef: RefObject<MessageScrollerMode>;
|
|
21
22
|
pendingScrollFrameRef: RefObject<number | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-message-scroller-refs.d.ts","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-refs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASvC,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,8BAA8B,EAC/B,MAAM,8BAA8B,CAAC;AAEtC;;;;;;GAMG;AACH,KAAK,mBAAmB,GAAG;IACzB,aAAa,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAClC,gBAAgB,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IACrC,uBAAuB,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAClD,gBAAgB,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAChD,UAAU,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC7C,+BAA+B,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IACpD,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC5C,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,kBAAkB,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IACxD,OAAO,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;IACxC,qBAAqB,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChD,yBAAyB,EAAE,SAAS,CAAC;QACnC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,4BAA4B,CAAC;KACxC,GAAG,IAAI,CAAC,CAAC;IACV,iBAAiB,EAAE,SAAS,CAAC;QAC3B,OAAO,EAAE,WAAW,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI,CAAC,CAAC;IACV,0BAA0B,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/C,OAAO,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC1C,sBAAsB,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1C,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACnC,yBAAyB,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC7C,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC5C,aAAa,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,UAAU,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAC5D,WAAW,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC9C,kBAAkB,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,qBAAqB,EAAE,SAAS,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC9D,eAAe,EAAE,8BAA8B,CAAC;IAChD,oBAAoB,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,uBAAuB,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;;;;GAKG;AACH,iBAAS,sBAAsB,CAAC,EAC9B,UAAU,EACV,mBAAmB,EACnB,YAAY,EACZ,sBAAsB,GACvB,EAAE;IACD,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,sBAAsB,EAAE,MAAM,CAAC;CAChC,GAAG,mBAAmB,
|
|
1
|
+
{"version":3,"file":"use-message-scroller-refs.d.ts","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-refs.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,9 @@ function useMessageScrollerRefs({ autoScroll, scrollEdgeThreshold, scrollMargin,
|
|
|
16
16
|
const scrollEdgeThresholdRef = useLatest(scrollEdgeThreshold);
|
|
17
17
|
const itemCountRef = useRef(0);
|
|
18
18
|
const firstItemRef = useRef(null);
|
|
19
|
+
// The scrollTop seen by the previous state commit, so follow-release can tell
|
|
20
|
+
// a reader scrolling up from content growing past the live edge.
|
|
21
|
+
const lastScrollTopRef = useRef(0);
|
|
19
22
|
const modeRef = useRef(autoScroll ? "following-bottom" : "free-scrolling");
|
|
20
23
|
const messageElementsRef = useRef(new Map());
|
|
21
24
|
const pendingScrollToMessageRef = useRef(null);
|
|
@@ -52,6 +55,7 @@ function useMessageScrollerRefs({ autoScroll, scrollEdgeThreshold, scrollMargin,
|
|
|
52
55
|
defaultScrollPositionAppliedRef,
|
|
53
56
|
firstItemRef,
|
|
54
57
|
itemCountRef,
|
|
58
|
+
lastScrollTopRef,
|
|
55
59
|
messageElementsRef,
|
|
56
60
|
modeRef,
|
|
57
61
|
pendingScrollFrameRef,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-message-scroller-refs.js","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-refs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"use-message-scroller-refs.js","sourceRoot":"","sources":["../../src/hooks/use-message-scroller-refs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { MessageScrollerScrollAlign, MessageScrollerScrollEdges, MessageScrollerVisibilityState } from "#/lib/message-scroller/types";
|
|
2
2
|
/**
|
|
3
3
|
* @since 0.5.0-canary.3
|
|
4
4
|
*/
|
|
@@ -7,7 +7,7 @@ declare function getMessageScrollerScrollable({ content, scrollEdgeThreshold, sp
|
|
|
7
7
|
scrollEdgeThreshold: number;
|
|
8
8
|
spacer: HTMLElement | null;
|
|
9
9
|
viewport: HTMLElement | null;
|
|
10
|
-
}):
|
|
10
|
+
}): MessageScrollerScrollEdges;
|
|
11
11
|
/**
|
|
12
12
|
* @since 0.5.0-canary.3
|
|
13
13
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../../src/lib/message-scroller/geometry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,
|
|
1
|
+
{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../../src/lib/message-scroller/geometry.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ function createMessageScrollerVisibilityStore() {
|
|
|
46
46
|
* @since 0.5.0-canary.3
|
|
47
47
|
*/
|
|
48
48
|
function areScrollStatesEqual(current, next) {
|
|
49
|
-
return current.start === next.start && current.end === next.end;
|
|
49
|
+
return current.start === next.start && current.end === next.end && current.following === next.following;
|
|
50
50
|
}
|
|
51
51
|
/**
|
|
52
52
|
* @since 0.5.0-canary.3
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stores.js","sourceRoot":"","sources":["../../../src/lib/message-scroller/stores.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,8BAA8B,CAAC;AAQvF,+EAA+E;AAC/E,+EAA+E;AAC/E,0EAA0E;AAC1E,SAAS,mBAAmB,CAAI,eAAkB,EAAE,OAAgC;IAClF,IAAI,QAAQ,GAAG,eAAe,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAc,CAAC;IAExC,OAAO;QACL,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ;QAC3B,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC;QACtC,WAAW,EAAE,CAAC,YAAe,EAAE,EAAE;YAC/B,IAAI,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,CAAC;gBACpC,OAAO;YACT,CAAC;YAED,QAAQ,GAAG,YAAY,CAAC;YACxB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,SAAS,EAAE,CAAC,QAAoB,EAAE,gBAA6B,EAAE,iBAA8B,EAAE,EAAE;YACjG,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,KAAK,CAAC,CAAC;YAEtC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAExB,IAAI,QAAQ,EAAE,CAAC;gBACb,gBAAgB,EAAE,EAAE,CAAC;YACvB,CAAC;YAED,OAAO,GAAG,EAAE;gBACV,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE3B,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBACzB,iBAAiB,EAAE,EAAE,CAAC;gBACxB,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CAAI,eAAkB,EAAE,OAAgC;IACzF,OAAO,mBAAmB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,SAAS,oCAAoC;IAC3C,OAAO,mBAAmB,CAAC,uCAAuC,EAAE,wBAAwB,CAAC,CAAC;AAChG,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAAC,OAAkC,EAAE,IAA+B;IAC/F,OAAO,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"stores.js","sourceRoot":"","sources":["../../../src/lib/message-scroller/stores.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,8BAA8B,CAAC;AAQvF,+EAA+E;AAC/E,+EAA+E;AAC/E,0EAA0E;AAC1E,SAAS,mBAAmB,CAAI,eAAkB,EAAE,OAAgC;IAClF,IAAI,QAAQ,GAAG,eAAe,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAc,CAAC;IAExC,OAAO;QACL,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ;QAC3B,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC;QACtC,WAAW,EAAE,CAAC,YAAe,EAAE,EAAE;YAC/B,IAAI,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,CAAC;gBACpC,OAAO;YACT,CAAC;YAED,QAAQ,GAAG,YAAY,CAAC;YACxB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,SAAS,EAAE,CAAC,QAAoB,EAAE,gBAA6B,EAAE,iBAA8B,EAAE,EAAE;YACjG,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,KAAK,CAAC,CAAC;YAEtC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAExB,IAAI,QAAQ,EAAE,CAAC;gBACb,gBAAgB,EAAE,EAAE,CAAC;YACvB,CAAC;YAED,OAAO,GAAG,EAAE;gBACV,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE3B,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBACzB,iBAAiB,EAAE,EAAE,CAAC;gBACxB,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CAAI,eAAkB,EAAE,OAAgC;IACzF,OAAO,mBAAmB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,SAAS,oCAAoC;IAC3C,OAAO,mBAAmB,CAAC,uCAAuC,EAAE,wBAAwB,CAAC,CAAC;AAChG,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAAC,OAAkC,EAAE,IAA+B;IAC/F,OAAO,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC;AAC1G,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAAC,OAAuC,EAAE,IAAoC;IAC7G,IAAI,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,KAAK,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,KAAK,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;AAC5G,CAAC;AAED,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,0BAA0B,EAC1B,oCAAoC,GACrC,CAAC"}
|
|
@@ -76,15 +76,24 @@ type MessageScrollerScrollOptions = {
|
|
|
76
76
|
scrollMargin?: number;
|
|
77
77
|
};
|
|
78
78
|
/**
|
|
79
|
-
*
|
|
79
|
+
* The raw geometry half of the scroll snapshot: which edges the viewport can
|
|
80
80
|
* still scroll toward.
|
|
81
81
|
*
|
|
82
|
-
* @since 0.
|
|
82
|
+
* @since 0.9.0
|
|
83
83
|
*/
|
|
84
|
-
type
|
|
84
|
+
type MessageScrollerScrollEdges = {
|
|
85
85
|
start: boolean;
|
|
86
86
|
end: boolean;
|
|
87
87
|
};
|
|
88
|
+
/**
|
|
89
|
+
* Scroll snapshot from useMessageScrollerScrollable: the reachable edges plus
|
|
90
|
+
* whether follow-output is engaged.
|
|
91
|
+
*
|
|
92
|
+
* @since 0.5.0-canary.3
|
|
93
|
+
*/
|
|
94
|
+
type MessageScrollerScrollable = MessageScrollerScrollEdges & {
|
|
95
|
+
following: boolean;
|
|
96
|
+
};
|
|
88
97
|
/**
|
|
89
98
|
* Visibility snapshot from useMessageScrollerVisibility.
|
|
90
99
|
*
|
|
@@ -195,9 +204,9 @@ type MessageScrollerRegisterMessage = (messageId: string, element: HTMLElement |
|
|
|
195
204
|
*/
|
|
196
205
|
type MessageScrollerContextValue = {
|
|
197
206
|
handleContentChange: () => void;
|
|
198
|
-
handleResize: () => void;
|
|
199
207
|
observeVisibility: () => void;
|
|
200
208
|
preserveScrollOnPrependRef: RefObject<boolean>;
|
|
209
|
+
scheduleResize: () => void;
|
|
201
210
|
scrollToEnd: (options?: MessageScrollerScrollOptions) => boolean;
|
|
202
211
|
scrollToMessage: (messageId: string, options?: MessageScrollerScrollOptions) => boolean;
|
|
203
212
|
scrollToStart: (options?: MessageScrollerScrollOptions) => boolean;
|
|
@@ -232,5 +241,5 @@ declare const EMPTY_VISIBLE_MESSAGE_IDS: Array<string>;
|
|
|
232
241
|
*/
|
|
233
242
|
declare const EMPTY_MESSAGE_SCROLLER_VISIBILITY_STATE: MessageScrollerVisibilityState;
|
|
234
243
|
export { AUTOSCROLLING_CLEAR_DELAY, DEFAULT_SCROLL_EDGE_THRESHOLD, DEFAULT_SCROLL_MARGIN, DEFAULT_SCROLL_PREVIOUS_ITEM_PEEK, EMPTY_MESSAGE_SCROLLER_SCROLLABLE, EMPTY_MESSAGE_SCROLLER_VISIBILITY_STATE, EMPTY_VISIBLE_MESSAGE_IDS, SCROLL_POSITION_EPSILON, USER_SCROLL_KEYS, };
|
|
235
|
-
export type { MessageScrollerButtonDirection, MessageScrollerButtonProps, MessageScrollerButtonRenderState, MessageScrollerContentProps, MessageScrollerContextValue, MessageScrollerDefaultScrollPosition, MessageScrollerItemProps, MessageScrollerMode, MessageScrollerProps, MessageScrollerProviderProps, MessageScrollerRegisterMessage, MessageScrollerScrollAlign, MessageScrollerScrollOptions, MessageScrollerScrollable, MessageScrollerStore, MessageScrollerViewportProps, MessageScrollerVisibilityState, MessageScrollerVisibilityStore, };
|
|
244
|
+
export type { MessageScrollerButtonDirection, MessageScrollerButtonProps, MessageScrollerButtonRenderState, MessageScrollerContentProps, MessageScrollerContextValue, MessageScrollerDefaultScrollPosition, MessageScrollerItemProps, MessageScrollerMode, MessageScrollerProps, MessageScrollerProviderProps, MessageScrollerRegisterMessage, MessageScrollerScrollAlign, MessageScrollerScrollEdges, MessageScrollerScrollOptions, MessageScrollerScrollable, MessageScrollerStore, MessageScrollerViewportProps, MessageScrollerVisibilityState, MessageScrollerVisibilityStore, };
|
|
236
245
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/message-scroller/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEhE;;;;;GAKG;AACH,QAAA,MAAM,6BAA6B,IAAI,CAAC;AAExC;;;;;GAKG;AACH,QAAA,MAAM,iCAAiC,KAAK,CAAC;AAE7C;;;;GAIG;AACH,QAAA,MAAM,qBAAqB,IAAI,CAAC;AAEhC;;;;;GAKG;AACH,QAAA,MAAM,uBAAuB,MAAM,CAAC;AAEpC;;;;;GAKG;AACH,QAAA,MAAM,yBAAyB,MAAM,CAAC;AAEtC;;;;GAIG;AACH,QAAA,MAAM,gBAAgB,aAQpB,CAAC;AAEH;;;;;GAKG;AACH,KAAK,mBAAmB,GACpB,kBAAkB,GAClB,gBAAgB,GAChB,qBAAqB,GACrB,eAAe,CAAC;AAEpB;;;;GAIG;AACH,KAAK,oCAAoC,GAAG,OAAO,GAAG,KAAK,GAAG,aAAa,CAAC;AAE5E;;;;GAIG;AACH,KAAK,8BAA8B,GAAG,OAAO,GAAG,KAAK,CAAC;AAEtD;;;;GAIG;AACH,KAAK,0BAA0B,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC;AAEzE;;;;GAIG;AACH,KAAK,4BAA4B,GAAG;IAElC,KAAK,CAAC,EAAE,0BAA0B,CAAC;IAEnC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,KAAK,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/message-scroller/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/message-scroller/types.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAExC;;;;;GAKG;AACH,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAE7C;;;;GAIG;AACH,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAEtC;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,WAAW;IACX,SAAS;IACT,KAAK;IACL,MAAM;IACN,UAAU;IACV,QAAQ;IACR,GAAG,EAAE,aAAa;CACnB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/lib/message-scroller/types.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAExC;;;;;GAKG;AACH,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAE7C;;;;GAIG;AACH,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAEtC;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,WAAW;IACX,SAAS;IACT,KAAK;IACL,MAAM;IACN,UAAU;IACV,QAAQ;IACR,GAAG,EAAE,aAAa;CACnB,CAAC,CAAC;AAuOH;;;;;GAKG;AACH,MAAM,iCAAiC,GAA8B;IACnE,KAAK,EAAE,KAAK;IACZ,GAAG,EAAE,KAAK;IACV,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF;;;;GAIG;AACH,MAAM,yBAAyB,GAAkB,EAAE,CAAC;AAEpD;;;;GAIG;AACH,MAAM,uCAAuC,GAAmC;IAC9E,eAAe,EAAE,IAAI;IACrB,iBAAiB,EAAE,yBAAyB;CAC7C,CAAC;AAEF,OAAO,EACL,yBAAyB,EACzB,6BAA6B,EAC7B,qBAAqB,EACrB,iCAAiC,EACjC,iCAAiC,EACjC,uCAAuC,EACvC,yBAAyB,EACzB,uBAAuB,EACvB,gBAAgB,GACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-scroller.d.ts","sourceRoot":"","sources":["../../src/primitives/message-scroller.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,0BAA0B,EAC1B,2BAA2B,EAE3B,wBAAwB,EACxB,oBAAoB,EACpB,4BAA4B,EAE5B,4BAA4B,EAC7B,MAAM,8BAA8B,CAAC;AA0BtC;;GAEG;AACH,iBAAS,kBAAkB;;;;EAW1B;AAED;;GAEG;AACH,iBAAS,4BAA4B,qEAIpC;AAED;;GAEG;AACH,iBAAS,4BAA4B,0EAQpC;AAED;;GAEG;AACH,iBAAS,uBAAuB,CAAC,EAC/B,UAAkB,EAClB,QAAQ,EACR,qBAA6B,EAC7B,mBAAmB,EACnB,sBAAsB,EACtB,YAAY,GACb,EAAE,4BAA4B,+BAc9B;AAED;;GAEG;AACH,iBAAS,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,oBAAoB,+BAQpE;AAED;;GAEG;AACH,iBAAS,uBAAuB,CAAC,EAC/B,YAAY,EAAE,SAAS,EACvB,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,WAAW,EACX,OAAO,EACP,uBAA8B,EAC9B,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,4BAA4B,+
|
|
1
|
+
{"version":3,"file":"message-scroller.d.ts","sourceRoot":"","sources":["../../src/primitives/message-scroller.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,0BAA0B,EAC1B,2BAA2B,EAE3B,wBAAwB,EACxB,oBAAoB,EACpB,4BAA4B,EAE5B,4BAA4B,EAC7B,MAAM,8BAA8B,CAAC;AA0BtC;;GAEG;AACH,iBAAS,kBAAkB;;;;EAW1B;AAED;;GAEG;AACH,iBAAS,4BAA4B,qEAIpC;AAED;;GAEG;AACH,iBAAS,4BAA4B,0EAQpC;AAED;;GAEG;AACH,iBAAS,uBAAuB,CAAC,EAC/B,UAAkB,EAClB,QAAQ,EACR,qBAA6B,EAC7B,mBAAmB,EACnB,sBAAsB,EACtB,YAAY,GACb,EAAE,4BAA4B,+BAc9B;AAED;;GAEG;AACH,iBAAS,eAAe,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,oBAAoB,+BAQpE;AAED;;GAEG;AACH,iBAAS,uBAAuB,CAAC,EAC/B,YAAY,EAAE,SAAS,EACvB,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,WAAW,EACX,OAAO,EACP,uBAA8B,EAC9B,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,4BAA4B,+BA+E9B;AAED;;GAEG;AACH,iBAAS,sBAAsB,CAAC,EAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EACR,GAAG,EACH,IAAI,EACJ,eAAe,EACf,GAAG,KAAK,EACT,EAAE,2BAA2B,+BA+D7B;AAED;;GAEG;AACH,iBAAS,mBAAmB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,cAAsB,EAAE,GAAG,KAAK,EAAE,EAAE,wBAAwB,+BA2B1G;AAED;;GAEG;AACH,iBAAS,qBAAqB,CAAC,EAC7B,QAAmB,EACnB,QAAQ,EACR,SAAiB,EACjB,OAAO,EACP,MAAM,EACN,QAAQ,EACR,IAAe,EACf,GAAG,KAAK,EACT,EAAE,0BAA0B,qGA4D5B;AAED,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,4BAA4B,EAC5B,4BAA4B,GAC7B,CAAC"}
|
|
@@ -69,7 +69,7 @@ function MessageScroller({ children, ...props }) {
|
|
|
69
69
|
* @since 0.5.0-canary.3
|
|
70
70
|
*/
|
|
71
71
|
function MessageScrollerViewport({ "aria-label": ariaLabel, children, onKeyDown, onScroll, onTouchMove, onWheel, preserveScrollOnPrepend = true, ref, role, tabIndex, ...props }) {
|
|
72
|
-
const {
|
|
72
|
+
const { preserveScrollOnPrependRef, scheduleResize, setViewportElement, syncAfterScroll, userScrollIntent, viewportRef, } = useMessageScrollerContext();
|
|
73
73
|
// Layout effect, not passive: the MutationObserver reads this ref in the same commit's microtask.
|
|
74
74
|
useLayoutEffect(() => {
|
|
75
75
|
preserveScrollOnPrependRef.current = preserveScrollOnPrepend;
|
|
@@ -101,17 +101,19 @@ function MessageScrollerViewport({ "aria-label": ariaLabel, children, onKeyDown,
|
|
|
101
101
|
if (!viewport || typeof ResizeObserver === "undefined") {
|
|
102
102
|
return;
|
|
103
103
|
}
|
|
104
|
-
|
|
104
|
+
// scheduleResize self-coalesces, deferring any pass that would resize the
|
|
105
|
+
// observed spacer out of ResizeObserver delivery.
|
|
106
|
+
const observer = new ResizeObserver(scheduleResize);
|
|
105
107
|
observer.observe(viewport);
|
|
106
108
|
return () => observer.disconnect();
|
|
107
|
-
}, [
|
|
109
|
+
}, [scheduleResize, viewportRef]);
|
|
108
110
|
return (_jsx("div", { ref: setViewportRef, role: role ?? "region", "aria-label": ariaLabel ?? "Messages", tabIndex: tabIndex ?? 0, onKeyDown: handleKeyDown, onScroll: handleScroll, onTouchMove: handleTouchMove, onWheel: handleWheel, ...props, children: children }));
|
|
109
111
|
}
|
|
110
112
|
/**
|
|
111
113
|
* @since 0.5.0-canary.3
|
|
112
114
|
*/
|
|
113
115
|
function MessageScrollerContent({ "aria-relevant": ariaRelevant, children, ref, role, spacerClassName, ...props }) {
|
|
114
|
-
const { handleContentChange,
|
|
116
|
+
const { handleContentChange, scheduleResize, setContentElement, setSpacerElement } = useMessageScrollerContext();
|
|
115
117
|
const contentRef = useRef(null);
|
|
116
118
|
const setContentRef = useCallback((element) => {
|
|
117
119
|
contentRef.current = element;
|
|
@@ -138,10 +140,12 @@ function MessageScrollerContent({ "aria-relevant": ariaRelevant, children, ref,
|
|
|
138
140
|
if (!content || typeof ResizeObserver === "undefined") {
|
|
139
141
|
return;
|
|
140
142
|
}
|
|
141
|
-
|
|
143
|
+
// scheduleResize self-coalesces, deferring any pass that would resize the
|
|
144
|
+
// spacer inside this observed element out of ResizeObserver delivery.
|
|
145
|
+
const observer = new ResizeObserver(scheduleResize);
|
|
142
146
|
observer.observe(content);
|
|
143
147
|
return () => observer.disconnect();
|
|
144
|
-
}, [
|
|
148
|
+
}, [scheduleResize]);
|
|
145
149
|
return (_jsxs("div", { ref: setContentRef, role: role ?? "log", "aria-relevant": ariaRelevant ?? "additions", ...props, children: [children, _jsx("div", { ref: setSpacerElement, "aria-hidden": "true", "data-message-scroller-spacer": "", hidden: true, className: spacerClassName })] }));
|
|
146
150
|
}
|
|
147
151
|
/**
|
|
@@ -168,7 +172,12 @@ function MessageScrollerButton({ behavior = "smooth", children, direction = "end
|
|
|
168
172
|
const subscribe = useCallback((listener) => stateStore.subscribe(listener), [stateStore]);
|
|
169
173
|
const getSnapshot = useCallback(() => {
|
|
170
174
|
const state = stateStore.getSnapshot();
|
|
171
|
-
|
|
175
|
+
if (direction === "start") {
|
|
176
|
+
return state.start;
|
|
177
|
+
}
|
|
178
|
+
// Follow-output is already closing any end gap; advertising it would
|
|
179
|
+
// strobe the button once per streamed chunk.
|
|
180
|
+
return state.end && !state.following;
|
|
172
181
|
}, [direction, stateStore]);
|
|
173
182
|
const isActive = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
|
|
174
183
|
const handleClick = useCallback((event) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-scroller.js","sourceRoot":"","sources":["../../src/primitives/message-scroller.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"message-scroller.js","sourceRoot":"","sources":["../../src/primitives/message-scroller.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -222,17 +222,56 @@ function useMessageScrollerCommands({
|
|
|
222
222
|
[scheduleVisibilitySync, scrollToPosition, setTailSpacerHeight],
|
|
223
223
|
);
|
|
224
224
|
|
|
225
|
-
const reanchorToAnchoredMessage = useCallback(
|
|
226
|
-
|
|
225
|
+
const reanchorToAnchoredMessage = useCallback(
|
|
226
|
+
({ followOnSpacerConsumed = false }: { followOnSpacerConsumed?: boolean } = {}) => {
|
|
227
|
+
if (modeRef.current !== "anchored-to-message") {
|
|
228
|
+
return false;
|
|
229
|
+
}
|
|
227
230
|
|
|
228
|
-
|
|
229
|
-
return false;
|
|
230
|
-
}
|
|
231
|
+
const element = streamingTurnRef.current;
|
|
231
232
|
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
233
|
+
if (!element || !element.isConnected) {
|
|
234
|
+
// An unmounted anchor can never re-place; drop the hold so the follow
|
|
235
|
+
// arm is not blocked by a mode nothing else exits.
|
|
236
|
+
streamingTurnRef.current = null;
|
|
237
|
+
modeRef.current = "free-scrolling";
|
|
238
|
+
|
|
239
|
+
return false;
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
const content = contentRef.current;
|
|
243
|
+
const viewport = viewportRef.current;
|
|
244
|
+
|
|
245
|
+
// The reply streaming below the anchor consumes the tail spacer as it
|
|
246
|
+
// grows; once the placement would need none, the reader is at the live
|
|
247
|
+
// edge and the hold hands off to follow-bottom in one scroll command.
|
|
248
|
+
if (
|
|
249
|
+
followOnSpacerConsumed &&
|
|
250
|
+
autoScrollRef.current &&
|
|
251
|
+
spacerHeightRef.current > 0 &&
|
|
252
|
+
content &&
|
|
253
|
+
viewport &&
|
|
254
|
+
content.contains(element)
|
|
255
|
+
) {
|
|
256
|
+
const scrollTop = getElementScrollTop({
|
|
257
|
+
align: "start",
|
|
258
|
+
element,
|
|
259
|
+
scrollMargin: scrollMarginRef.current + scrollPreviousItemPeekRef.current,
|
|
260
|
+
spacer: spacerRef.current,
|
|
261
|
+
viewport,
|
|
262
|
+
});
|
|
263
|
+
|
|
264
|
+
if (getTailSpacerHeight({ content, scrollTop, spacer: spacerRef.current, viewport }) <= 0) {
|
|
265
|
+
return scrollToEnd({ behavior: "auto" });
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
// Re-run the placement so the tail spacer is recomputed for the new content
|
|
270
|
+
// height and the turn is held at the reading line.
|
|
271
|
+
return scrollToElement(element, { align: "start" }, { keepPreviousPeek: true });
|
|
272
|
+
},
|
|
273
|
+
[scrollToElement, scrollToEnd],
|
|
274
|
+
);
|
|
236
275
|
|
|
237
276
|
// The target row may not be mounted yet (e.g. an async-loaded transcript).
|
|
238
277
|
// When it is missing the request is queued in pendingScrollToMessageRef and
|
|
@@ -31,6 +31,7 @@ import type {
|
|
|
31
31
|
MessageScrollerContextValue,
|
|
32
32
|
MessageScrollerProviderProps,
|
|
33
33
|
MessageScrollerRegisterMessage,
|
|
34
|
+
MessageScrollerScrollEdges,
|
|
34
35
|
MessageScrollerScrollable,
|
|
35
36
|
} from "#/lib/message-scroller/types";
|
|
36
37
|
|
|
@@ -78,6 +79,7 @@ function useMessageScrollerController({
|
|
|
78
79
|
defaultScrollPositionAppliedRef,
|
|
79
80
|
firstItemRef,
|
|
80
81
|
itemCountRef,
|
|
82
|
+
lastScrollTopRef,
|
|
81
83
|
messageElementsRef,
|
|
82
84
|
modeRef,
|
|
83
85
|
pendingScrollFrameRef,
|
|
@@ -89,6 +91,7 @@ function useMessageScrollerController({
|
|
|
89
91
|
scrollMarginRef,
|
|
90
92
|
scrollPreviousItemPeekRef,
|
|
91
93
|
spacerGapRef,
|
|
94
|
+
spacerHeightRef,
|
|
92
95
|
spacerRef,
|
|
93
96
|
stateFrameRef,
|
|
94
97
|
stateStore,
|
|
@@ -101,6 +104,8 @@ function useMessageScrollerController({
|
|
|
101
104
|
} = refs;
|
|
102
105
|
|
|
103
106
|
const previousDefaultScrollPositionRef = useRef(defaultScrollPosition);
|
|
107
|
+
const previousViewportHeightRef = useRef(0);
|
|
108
|
+
const resizeFrameRef = useRef<number | null>(null);
|
|
104
109
|
|
|
105
110
|
if (previousDefaultScrollPositionRef.current !== defaultScrollPosition) {
|
|
106
111
|
previousDefaultScrollPositionRef.current = defaultScrollPosition;
|
|
@@ -125,29 +130,70 @@ function useMessageScrollerController({
|
|
|
125
130
|
}
|
|
126
131
|
|
|
127
132
|
element.toggleAttribute("data-autoscrolling", autoScrolling);
|
|
133
|
+
element.toggleAttribute("data-following", state.following);
|
|
128
134
|
}
|
|
129
135
|
}, []);
|
|
130
136
|
|
|
131
|
-
// Owns the one follow-bottom transition: arm at the bottom, release on
|
|
132
|
-
// scroll
|
|
133
|
-
//
|
|
134
|
-
const reconcileFollowMode = useCallback((scrollable:
|
|
135
|
-
|
|
137
|
+
// Owns the one follow-bottom transition: arm at the bottom, release on a
|
|
138
|
+
// reader's real scroll up, and drop the mode whenever autoScroll is off so
|
|
139
|
+
// the published follow state can never outlive the prop.
|
|
140
|
+
const reconcileFollowMode = useCallback((scrollable: MessageScrollerScrollEdges) => {
|
|
141
|
+
const scrollTop = viewportRef.current?.scrollTop ?? 0;
|
|
142
|
+
// Content growing past the live edge also reads as "not at the end", but
|
|
143
|
+
// only a reader moves scrollTop up — releasing on growth would drop follow
|
|
144
|
+
// before the frame-coalesced resize handler has caught it up.
|
|
145
|
+
const scrolledUp = scrollTop < lastScrollTopRef.current - SCROLL_POSITION_EPSILON;
|
|
146
|
+
|
|
147
|
+
if (!autoScrollRef.current) {
|
|
148
|
+
if (modeRef.current === "following-bottom") {
|
|
149
|
+
modeRef.current = "free-scrolling";
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
lastScrollTopRef.current = scrollTop;
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// The tail spacer makes a freshly anchored turn read as "at the end";
|
|
157
|
+
// arming there would let the first streamed chunk yank the reader off the
|
|
158
|
+
// anchor, so the hold hands off to following in the resize pass instead.
|
|
159
|
+
if (!scrollable.end && modeRef.current !== "settling-jump" && modeRef.current !== "anchored-to-message") {
|
|
136
160
|
modeRef.current = "following-bottom";
|
|
137
|
-
|
|
161
|
+
lastScrollTopRef.current = scrollTop;
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
if (modeRef.current === "following-bottom" && scrollable.end && scrolledUp && !autoscrollingRef.current) {
|
|
138
166
|
modeRef.current = "free-scrolling";
|
|
167
|
+
lastScrollTopRef.current = scrollTop;
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
// The baseline advances only outside autoscroll suppression and only
|
|
172
|
+
// downward, so a suppressed or sub-epsilon upward drag keeps accumulating
|
|
173
|
+
// toward a release instead of being consumed commit by commit.
|
|
174
|
+
if (!autoscrollingRef.current && scrollTop > lastScrollTopRef.current) {
|
|
175
|
+
lastScrollTopRef.current = scrollTop;
|
|
139
176
|
}
|
|
140
177
|
}, []);
|
|
141
178
|
|
|
142
179
|
const commitScrollState = useCallback(() => {
|
|
143
|
-
const
|
|
180
|
+
const nextEdges = getMessageScrollerScrollable({
|
|
144
181
|
content: contentRef.current,
|
|
145
182
|
scrollEdgeThreshold: scrollEdgeThresholdRef.current,
|
|
146
183
|
spacer: spacerRef.current,
|
|
147
184
|
viewport: viewportRef.current,
|
|
148
185
|
});
|
|
149
186
|
|
|
150
|
-
reconcileFollowMode(
|
|
187
|
+
reconcileFollowMode(nextEdges);
|
|
188
|
+
|
|
189
|
+
// The edges publish raw geometry; follow-output rides alongside so a
|
|
190
|
+
// consumer (the end button) can stay quiet while the gap is already being
|
|
191
|
+
// closed, without masking the real end state.
|
|
192
|
+
const nextState: MessageScrollerScrollable = {
|
|
193
|
+
...nextEdges,
|
|
194
|
+
following: modeRef.current === "following-bottom",
|
|
195
|
+
};
|
|
196
|
+
|
|
151
197
|
writeStateAttributes(nextState);
|
|
152
198
|
stateStore.setSnapshot(nextState);
|
|
153
199
|
}, [reconcileFollowMode, stateStore, writeStateAttributes]);
|
|
@@ -422,6 +468,13 @@ function useMessageScrollerController({
|
|
|
422
468
|
]);
|
|
423
469
|
|
|
424
470
|
const handleResize = useCallback(() => {
|
|
471
|
+
const viewportHeight = viewportRef.current?.clientHeight ?? 0;
|
|
472
|
+
// A shrinking viewport consumes tail spacer without any reply growth, so
|
|
473
|
+
// the anchor hold must survive it instead of handing off to the live edge.
|
|
474
|
+
const viewportShrank = viewportHeight < previousViewportHeightRef.current;
|
|
475
|
+
|
|
476
|
+
previousViewportHeightRef.current = viewportHeight;
|
|
477
|
+
|
|
425
478
|
if (modeRef.current === "following-bottom" && autoScrollRef.current) {
|
|
426
479
|
scrollToEnd({ behavior: "auto" });
|
|
427
480
|
return;
|
|
@@ -430,7 +483,7 @@ function useMessageScrollerController({
|
|
|
430
483
|
// Hold the anchored turn in place as content below it resizes (a reply
|
|
431
484
|
// streaming in, or a transient marker collapsing) — otherwise the shrinking
|
|
432
485
|
// content lets the browser clamp scrollTop and the turn drops.
|
|
433
|
-
if (reanchorToAnchoredMessage()) {
|
|
486
|
+
if (reanchorToAnchoredMessage({ followOnSpacerConsumed: !viewportShrank })) {
|
|
434
487
|
return;
|
|
435
488
|
}
|
|
436
489
|
|
|
@@ -438,6 +491,30 @@ function useMessageScrollerController({
|
|
|
438
491
|
scheduleVisibilitySync();
|
|
439
492
|
}, [reanchorToAnchoredMessage, scheduleStateCommit, scheduleVisibilitySync, scrollToEnd]);
|
|
440
493
|
|
|
494
|
+
// Runs the resize pass synchronously only when no spacer write can occur;
|
|
495
|
+
// otherwise it coalesces onto one shared frame, since resizing the observed
|
|
496
|
+
// spacer during ResizeObserver delivery fires the loop-completed error.
|
|
497
|
+
const scheduleResize = useCallback(() => {
|
|
498
|
+
if (modeRef.current !== "anchored-to-message" && spacerHeightRef.current === 0) {
|
|
499
|
+
if (resizeFrameRef.current !== null) {
|
|
500
|
+
window.cancelAnimationFrame(resizeFrameRef.current);
|
|
501
|
+
resizeFrameRef.current = null;
|
|
502
|
+
}
|
|
503
|
+
|
|
504
|
+
handleResize();
|
|
505
|
+
return;
|
|
506
|
+
}
|
|
507
|
+
|
|
508
|
+
if (resizeFrameRef.current !== null) {
|
|
509
|
+
return;
|
|
510
|
+
}
|
|
511
|
+
|
|
512
|
+
resizeFrameRef.current = window.requestAnimationFrame(() => {
|
|
513
|
+
resizeFrameRef.current = null;
|
|
514
|
+
handleResize();
|
|
515
|
+
});
|
|
516
|
+
}, [handleResize]);
|
|
517
|
+
|
|
441
518
|
const observeVisibility = useCallback(() => {
|
|
442
519
|
const viewport = viewportRef.current;
|
|
443
520
|
|
|
@@ -562,9 +639,9 @@ function useMessageScrollerController({
|
|
|
562
639
|
const context = useMemo<MessageScrollerContextValue>(
|
|
563
640
|
() => ({
|
|
564
641
|
handleContentChange,
|
|
565
|
-
handleResize,
|
|
566
642
|
observeVisibility,
|
|
567
643
|
preserveScrollOnPrependRef,
|
|
644
|
+
scheduleResize,
|
|
568
645
|
scrollToEnd,
|
|
569
646
|
scrollToMessage,
|
|
570
647
|
scrollToStart,
|
|
@@ -581,8 +658,8 @@ function useMessageScrollerController({
|
|
|
581
658
|
}),
|
|
582
659
|
[
|
|
583
660
|
handleContentChange,
|
|
584
|
-
handleResize,
|
|
585
661
|
observeVisibility,
|
|
662
|
+
scheduleResize,
|
|
586
663
|
scrollToEnd,
|
|
587
664
|
scrollToMessage,
|
|
588
665
|
scrollToStart,
|
|
@@ -627,6 +704,11 @@ function useMessageScrollerController({
|
|
|
627
704
|
pendingScrollFrameRef.current = null;
|
|
628
705
|
}
|
|
629
706
|
|
|
707
|
+
if (resizeFrameRef.current !== null) {
|
|
708
|
+
window.cancelAnimationFrame(resizeFrameRef.current);
|
|
709
|
+
resizeFrameRef.current = null;
|
|
710
|
+
}
|
|
711
|
+
|
|
630
712
|
visibilityObserverRef.current?.disconnect();
|
|
631
713
|
visibilityObserverRef.current = null;
|
|
632
714
|
};
|
|
@@ -32,6 +32,7 @@ type MessageScrollerRefs = {
|
|
|
32
32
|
defaultScrollPositionAppliedRef: RefObject<boolean>;
|
|
33
33
|
firstItemRef: RefObject<HTMLElement | null>;
|
|
34
34
|
itemCountRef: RefObject<number>;
|
|
35
|
+
lastScrollTopRef: RefObject<number>;
|
|
35
36
|
messageElementsRef: RefObject<Map<string, HTMLElement>>;
|
|
36
37
|
modeRef: RefObject<MessageScrollerMode>;
|
|
37
38
|
pendingScrollFrameRef: RefObject<number | null>;
|
|
@@ -85,6 +86,9 @@ function useMessageScrollerRefs({
|
|
|
85
86
|
const scrollEdgeThresholdRef = useLatest(scrollEdgeThreshold);
|
|
86
87
|
const itemCountRef = useRef(0);
|
|
87
88
|
const firstItemRef = useRef<HTMLElement | null>(null);
|
|
89
|
+
// The scrollTop seen by the previous state commit, so follow-release can tell
|
|
90
|
+
// a reader scrolling up from content growing past the live edge.
|
|
91
|
+
const lastScrollTopRef = useRef(0);
|
|
88
92
|
const modeRef = useRef<MessageScrollerMode>(autoScroll ? "following-bottom" : "free-scrolling");
|
|
89
93
|
const messageElementsRef = useRef(new Map<string, HTMLElement>());
|
|
90
94
|
const pendingScrollToMessageRef = useRef<{
|
|
@@ -130,6 +134,7 @@ function useMessageScrollerRefs({
|
|
|
130
134
|
defaultScrollPositionAppliedRef,
|
|
131
135
|
firstItemRef,
|
|
132
136
|
itemCountRef,
|
|
137
|
+
lastScrollTopRef,
|
|
133
138
|
messageElementsRef,
|
|
134
139
|
modeRef,
|
|
135
140
|
pendingScrollFrameRef,
|
|
@@ -4,8 +4,8 @@ import {
|
|
|
4
4
|
SCROLL_POSITION_EPSILON,
|
|
5
5
|
} from "#/lib/message-scroller/types";
|
|
6
6
|
import type {
|
|
7
|
-
MessageScrollerScrollable,
|
|
8
7
|
MessageScrollerScrollAlign,
|
|
8
|
+
MessageScrollerScrollEdges,
|
|
9
9
|
MessageScrollerVisibilityState,
|
|
10
10
|
} from "#/lib/message-scroller/types";
|
|
11
11
|
|
|
@@ -22,7 +22,7 @@ function getMessageScrollerScrollable({
|
|
|
22
22
|
scrollEdgeThreshold: number;
|
|
23
23
|
spacer: HTMLElement | null;
|
|
24
24
|
viewport: HTMLElement | null;
|
|
25
|
-
}):
|
|
25
|
+
}): MessageScrollerScrollEdges {
|
|
26
26
|
if (!viewport || !content) {
|
|
27
27
|
return EMPTY_MESSAGE_SCROLLER_SCROLLABLE;
|
|
28
28
|
}
|
|
@@ -62,7 +62,7 @@ function createMessageScrollerVisibilityStore(): MessageScrollerVisibilityStore
|
|
|
62
62
|
* @since 0.5.0-canary.3
|
|
63
63
|
*/
|
|
64
64
|
function areScrollStatesEqual(current: MessageScrollerScrollable, next: MessageScrollerScrollable) {
|
|
65
|
-
return current.start === next.start && current.end === next.end;
|
|
65
|
+
return current.start === next.start && current.end === next.end && current.following === next.following;
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
/**
|
|
@@ -104,18 +104,29 @@ type MessageScrollerScrollOptions = {
|
|
|
104
104
|
};
|
|
105
105
|
|
|
106
106
|
/**
|
|
107
|
-
*
|
|
107
|
+
* The raw geometry half of the scroll snapshot: which edges the viewport can
|
|
108
108
|
* still scroll toward.
|
|
109
109
|
*
|
|
110
|
-
* @since 0.
|
|
110
|
+
* @since 0.9.0
|
|
111
111
|
*/
|
|
112
|
-
type
|
|
112
|
+
type MessageScrollerScrollEdges = {
|
|
113
113
|
// The viewport can scroll toward the start (content is hidden above).
|
|
114
114
|
start: boolean;
|
|
115
115
|
// The viewport can scroll toward the end (content is hidden below).
|
|
116
116
|
end: boolean;
|
|
117
117
|
};
|
|
118
118
|
|
|
119
|
+
/**
|
|
120
|
+
* Scroll snapshot from useMessageScrollerScrollable: the reachable edges plus
|
|
121
|
+
* whether follow-output is engaged.
|
|
122
|
+
*
|
|
123
|
+
* @since 0.5.0-canary.3
|
|
124
|
+
*/
|
|
125
|
+
type MessageScrollerScrollable = MessageScrollerScrollEdges & {
|
|
126
|
+
// Follow-output is engaged and already closing any gap toward the end.
|
|
127
|
+
following: boolean;
|
|
128
|
+
};
|
|
129
|
+
|
|
119
130
|
/**
|
|
120
131
|
* Visibility snapshot from useMessageScrollerVisibility.
|
|
121
132
|
*
|
|
@@ -256,9 +267,9 @@ type MessageScrollerRegisterMessage = (
|
|
|
256
267
|
*/
|
|
257
268
|
type MessageScrollerContextValue = {
|
|
258
269
|
handleContentChange: () => void;
|
|
259
|
-
handleResize: () => void;
|
|
260
270
|
observeVisibility: () => void;
|
|
261
271
|
preserveScrollOnPrependRef: RefObject<boolean>;
|
|
272
|
+
scheduleResize: () => void;
|
|
262
273
|
scrollToEnd: (options?: MessageScrollerScrollOptions) => boolean;
|
|
263
274
|
scrollToMessage: (messageId: string, options?: MessageScrollerScrollOptions) => boolean;
|
|
264
275
|
scrollToStart: (options?: MessageScrollerScrollOptions) => boolean;
|
|
@@ -283,6 +294,7 @@ type MessageScrollerContextValue = {
|
|
|
283
294
|
const EMPTY_MESSAGE_SCROLLER_SCROLLABLE: MessageScrollerScrollable = {
|
|
284
295
|
start: false,
|
|
285
296
|
end: false,
|
|
297
|
+
following: false,
|
|
286
298
|
};
|
|
287
299
|
|
|
288
300
|
/**
|
|
@@ -327,6 +339,7 @@ export type {
|
|
|
327
339
|
MessageScrollerProviderProps,
|
|
328
340
|
MessageScrollerRegisterMessage,
|
|
329
341
|
MessageScrollerScrollAlign,
|
|
342
|
+
MessageScrollerScrollEdges,
|
|
330
343
|
MessageScrollerScrollOptions,
|
|
331
344
|
MessageScrollerScrollable,
|
|
332
345
|
MessageScrollerStore,
|
|
@@ -141,8 +141,8 @@ function MessageScrollerViewport({
|
|
|
141
141
|
...props
|
|
142
142
|
}: MessageScrollerViewportProps) {
|
|
143
143
|
const {
|
|
144
|
-
handleResize,
|
|
145
144
|
preserveScrollOnPrependRef,
|
|
145
|
+
scheduleResize,
|
|
146
146
|
setViewportElement,
|
|
147
147
|
syncAfterScroll,
|
|
148
148
|
userScrollIntent,
|
|
@@ -192,12 +192,14 @@ function MessageScrollerViewport({
|
|
|
192
192
|
return;
|
|
193
193
|
}
|
|
194
194
|
|
|
195
|
-
|
|
195
|
+
// scheduleResize self-coalesces, deferring any pass that would resize the
|
|
196
|
+
// observed spacer out of ResizeObserver delivery.
|
|
197
|
+
const observer = new ResizeObserver(scheduleResize);
|
|
196
198
|
|
|
197
199
|
observer.observe(viewport);
|
|
198
200
|
|
|
199
201
|
return () => observer.disconnect();
|
|
200
|
-
}, [
|
|
202
|
+
}, [scheduleResize, viewportRef]);
|
|
201
203
|
|
|
202
204
|
return (
|
|
203
205
|
// The viewport defaults to role="region"; the scroll/key handlers back that landmark.
|
|
@@ -229,7 +231,7 @@ function MessageScrollerContent({
|
|
|
229
231
|
spacerClassName,
|
|
230
232
|
...props
|
|
231
233
|
}: MessageScrollerContentProps) {
|
|
232
|
-
const { handleContentChange,
|
|
234
|
+
const { handleContentChange, scheduleResize, setContentElement, setSpacerElement } = useMessageScrollerContext();
|
|
233
235
|
const contentRef = useRef<HTMLDivElement | null>(null);
|
|
234
236
|
|
|
235
237
|
const setContentRef = useCallback(
|
|
@@ -270,12 +272,14 @@ function MessageScrollerContent({
|
|
|
270
272
|
return;
|
|
271
273
|
}
|
|
272
274
|
|
|
273
|
-
|
|
275
|
+
// scheduleResize self-coalesces, deferring any pass that would resize the
|
|
276
|
+
// spacer inside this observed element out of ResizeObserver delivery.
|
|
277
|
+
const observer = new ResizeObserver(scheduleResize);
|
|
274
278
|
|
|
275
279
|
observer.observe(content);
|
|
276
280
|
|
|
277
281
|
return () => observer.disconnect();
|
|
278
|
-
}, [
|
|
282
|
+
}, [scheduleResize]);
|
|
279
283
|
|
|
280
284
|
return (
|
|
281
285
|
<div ref={setContentRef} role={role ?? "log"} aria-relevant={ariaRelevant ?? "additions"} {...props}>
|
|
@@ -341,7 +345,13 @@ function MessageScrollerButton({
|
|
|
341
345
|
const getSnapshot = useCallback(() => {
|
|
342
346
|
const state = stateStore.getSnapshot();
|
|
343
347
|
|
|
344
|
-
|
|
348
|
+
if (direction === "start") {
|
|
349
|
+
return state.start;
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
// Follow-output is already closing any end gap; advertising it would
|
|
353
|
+
// strobe the button once per streamed chunk.
|
|
354
|
+
return state.end && !state.following;
|
|
345
355
|
}, [direction, stateStore]);
|
|
346
356
|
const isActive = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
|
|
347
357
|
|