Skip to content

Commit d6b18bc

Browse files
mozziusclaude
andcommitted
design(mobile): scroll edge effect wraps only the input pill
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c602a57 commit d6b18bc

2 files changed

Lines changed: 36 additions & 31 deletions

File tree

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import {
7777
ComposerAttachmentThumbnail,
7878
} from "../../components/ComposerAttachmentStrip";
7979
import { VideoPreviewModal, type VideoPreviewSource } from "../../components/VideoPreviewModal";
80+
import { ScrollEdgeEffect } from "@bsky.app/expo-scroll-edge-effect";
8081
import { GlassSurface } from "../../components/ui/GlassSurface";
8182
import { ComposerEditor, type ComposerEditorHandle } from "../../components/ComposerEditor";
8283
import { fileRoutePathSegments } from "../files/filePath";
@@ -370,38 +371,42 @@ function ComposerSurface(props: {
370371

371372
// Animate every native frame or glass and content jump to final height inside the clip.
372373
return (
373-
<Animated.View
374-
className={
375-
Platform.OS === "android" ? undefined : "shadow-[0_6px_28px] shadow-adaptive-black-a15-a35"
376-
}
377-
layout={layoutTransition}
378-
style={[
379-
animatedShapeStyle,
380-
{
381-
overflow: "hidden",
382-
},
383-
]}
384-
>
385-
<AnimatedGlassSurface
386-
chrome="none"
387-
fallbackColor={colors["--color-composer-surface"]}
388-
fallbackClassName="border border-composer-border"
389-
glassEffectStyle="regular"
390-
pointerEvents="none"
391-
tintColor="transparent"
392-
layout={layoutTransition}
393-
style={[{ position: "absolute", inset: 0 }, animatedShapeStyle]}
394-
>
395-
{null}
396-
</AnimatedGlassSurface>
374+
<ScrollEdgeEffect edge="bottom" effect="soft">
397375
<Animated.View
398-
collapsable={false}
376+
className={
377+
Platform.OS === "android"
378+
? undefined
379+
: "shadow-[0_6px_28px] shadow-adaptive-black-a15-a35"
380+
}
399381
layout={layoutTransition}
400-
style={[props.style, animatedShapeStyle]}
382+
style={[
383+
animatedShapeStyle,
384+
{
385+
overflow: "hidden",
386+
},
387+
]}
401388
>
402-
{props.children}
389+
<AnimatedGlassSurface
390+
chrome="none"
391+
fallbackColor={colors["--color-composer-surface"]}
392+
fallbackClassName="border border-composer-border"
393+
glassEffectStyle="regular"
394+
pointerEvents="none"
395+
tintColor="transparent"
396+
layout={layoutTransition}
397+
style={[{ position: "absolute", inset: 0 }, animatedShapeStyle]}
398+
>
399+
{null}
400+
</AnimatedGlassSurface>
401+
<Animated.View
402+
collapsable={false}
403+
layout={layoutTransition}
404+
style={[props.style, animatedShapeStyle]}
405+
>
406+
{props.children}
407+
</Animated.View>
403408
</Animated.View>
404-
</Animated.View>
409+
</ScrollEdgeEffect>
405410
);
406411
}
407412

‎apps/mobile/src/features/threads/ThreadDetailScreen.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { createThreadVisitTracker } from "@t3tools/client-runtime/state/thread-v
1515
import { useChildThreadInputs, useThreadReportedModelSelection } from "../../state/entities";
1616
import { UsageLimitRecoveryCard } from "./UsageLimitRecoveryCard";
1717
import { ChatGptUsageLimitNotice } from "./ChatGptUsageLimitNotice";
18-
import { ScrollEdgeEffect, ScrollEdgeEffectProvider } from "@bsky.app/expo-scroll-edge-effect";
18+
import { ScrollEdgeEffectProvider } from "@bsky.app/expo-scroll-edge-effect";
1919
import { useFocusEffect, useNavigation } from "@react-navigation/native";
2020
import {
2121
effectiveSnoozed,
@@ -1685,7 +1685,7 @@ function ThreadDetailBody(props: ThreadDetailScreenProps) {
16851685
/>
16861686
</View>
16871687
) : (
1688-
<ScrollEdgeEffect edge="bottom" effect="soft">
1688+
<>
16891689
<ThreadComposer
16901690
isDraft={Boolean(props.draftMode)}
16911691
canOperateThread={props.canOperateThread}
@@ -1756,7 +1756,7 @@ function ThreadDetailBody(props: ThreadDetailScreenProps) {
17561756
onHeightChange={handleComposerHeightChange}
17571757
onEditorFocusChange={handleOwnedInputFocusChange}
17581758
/>
1759-
</ScrollEdgeEffect>
1759+
</>
17601760
)}
17611761
</View>
17621762
</View>

0 commit comments

Comments
 (0)