Skip to content

Commit 760ba2b

Browse files
committed
fix(mobile): exclude thread head covered by app bar
Signed-off-by: Tom Brow <[email protected]>
1 parent d87c360 commit 760ba2b

3 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎mobile/lib/features/channels/thread_detail_page/head_layout.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ class _ThreadHeadScrollInput extends HookWidget {
4444
final bool enabled;
4545
final ScrollPosition? Function() scrollPosition;
4646
final ValueListenable<Iterable<ItemPosition>> positions;
47+
final double viewportTopEdge;
4748
final Widget child;
4849

4950
const _ThreadHeadScrollInput({
5051
required this.enabled,
5152
required this.scrollPosition,
5253
required this.positions,
54+
required this.viewportTopEdge,
5355
required this.child,
5456
});
5557

@@ -62,7 +64,7 @@ class _ThreadHeadScrollInput extends HookWidget {
6264
(item) =>
6365
item.index == 0 &&
6466
item.itemLeadingEdge < 1 &&
65-
item.itemTrailingEdge > 0,
67+
item.itemTrailingEdge > viewportTopEdge,
6668
);
6769
final drag = useRef<Drag?>(null);
6870
useEffect(

‎mobile/lib/features/channels/thread_detail_page/message_list.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ class _ThreadMessageList extends HookWidget {
314314
enabled: visible,
315315
scrollPosition: () => headScrollPosition.value,
316316
positions: itemPositionsListener.itemPositions,
317+
viewportTopEdge:
318+
frostedAppBarHeight(context) / constraints.maxHeight,
317319
child: ConstrainedBox(
318320
constraints: BoxConstraints(
319321
maxHeight: visible

‎mobile/test/features/channels/channel_detail_page_test/loading_review_tests.dart‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,27 @@ void _loadingReviewTests() {
146146
labels.any((label) => label.contains('Original message')),
147147
isFalse,
148148
);
149+
list.itemScrollController!.jumpTo(index: 1, alignment: 0.04);
150+
await tester.pumpAndSettle();
151+
final headPosition = list.itemPositionsNotifier!.itemPositions.value
152+
.singleWhere((item) => item.index == 0);
153+
expect(headPosition.itemTrailingEdge, greaterThan(0));
154+
expect(headPosition.itemTrailingEdge, lessThan(0.05));
155+
labels.clear();
156+
collectLabels(semanticsOwner.rootSemanticsNode!);
157+
expect(
158+
labels.any((label) => label.contains('Original message')),
159+
isFalse,
160+
reason: 'The frosted app bar covers the remaining head extent.',
161+
);
162+
list.itemScrollController!.jumpTo(index: 0);
163+
await tester.pumpAndSettle();
164+
labels.clear();
165+
collectLabels(semanticsOwner.rootSemanticsNode!);
166+
expect(
167+
labels.any((label) => label.contains('Original message')),
168+
isTrue,
169+
);
149170
semantics.dispose();
150171
}
151172
},

0 commit comments

Comments
 (0)