@planningcenter/chat-react-native 3.44.1 → 3.44.2-qa-staging.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.
Files changed (54) hide show
  1. package/build/components/conversation/message.js +2 -2
  2. package/build/components/conversation/message.js.map +1 -1
  3. package/build/components/conversation/message_form.js +2 -2
  4. package/build/components/conversation/message_form.js.map +1 -1
  5. package/build/components/conversation/message_reaction.js +4 -4
  6. package/build/components/conversation/message_reaction.js.map +1 -1
  7. package/build/components/display/toggle_button.js +9 -5
  8. package/build/components/display/toggle_button.js.map +1 -1
  9. package/build/hooks/index.d.ts +2 -1
  10. package/build/hooks/index.d.ts.map +1 -1
  11. package/build/hooks/index.js +2 -1
  12. package/build/hooks/index.js.map +1 -1
  13. package/build/hooks/use_interaction_tinted_background_color.d.ts +6 -0
  14. package/build/hooks/use_interaction_tinted_background_color.d.ts.map +1 -0
  15. package/build/hooks/use_interaction_tinted_background_color.js +15 -0
  16. package/build/hooks/use_interaction_tinted_background_color.js.map +1 -0
  17. package/build/hooks/use_rest_away_from_dismiss_edge.d.ts +22 -0
  18. package/build/hooks/use_rest_away_from_dismiss_edge.d.ts.map +1 -0
  19. package/build/hooks/use_rest_away_from_dismiss_edge.js +48 -0
  20. package/build/hooks/use_rest_away_from_dismiss_edge.js.map +1 -0
  21. package/build/hooks/use_selected_chip_background_color.d.ts +7 -0
  22. package/build/hooks/use_selected_chip_background_color.d.ts.map +1 -0
  23. package/build/hooks/use_selected_chip_background_color.js +16 -0
  24. package/build/hooks/use_selected_chip_background_color.js.map +1 -0
  25. package/build/screens/conversation_screen.d.ts.map +1 -1
  26. package/build/screens/conversation_screen.js +8 -3
  27. package/build/screens/conversation_screen.js.map +1 -1
  28. package/build/screens/design_system_screen.js +3 -3
  29. package/build/screens/design_system_screen.js.map +1 -1
  30. package/build/utils/theme.d.ts +16 -0
  31. package/build/utils/theme.d.ts.map +1 -1
  32. package/build/utils/theme.js +9 -0
  33. package/build/utils/theme.js.map +1 -1
  34. package/package.json +3 -3
  35. package/src/__tests__/hooks/use_interaction_tinted_background_color.test.tsx +67 -0
  36. package/src/__tests__/hooks/use_selected_chip_background_color.test.tsx +78 -0
  37. package/src/__tests__/utils/theme.ts +23 -0
  38. package/src/components/conversation/message.tsx +2 -2
  39. package/src/components/conversation/message_form.tsx +2 -2
  40. package/src/components/conversation/message_reaction.tsx +4 -4
  41. package/src/components/display/__tests__/toggle_button.test.tsx +135 -0
  42. package/src/components/display/toggle_button.tsx +9 -5
  43. package/src/hooks/index.ts +2 -1
  44. package/src/hooks/use_interaction_tinted_background_color.ts +20 -0
  45. package/src/hooks/use_rest_away_from_dismiss_edge.ts +63 -0
  46. package/src/hooks/use_selected_chip_background_color.ts +21 -0
  47. package/src/screens/conversation_screen.tsx +12 -2
  48. package/src/screens/design_system_screen.tsx +3 -3
  49. package/src/utils/theme.ts +28 -0
  50. package/build/hooks/use_interaction_ghost_color.d.ts +0 -2
  51. package/build/hooks/use_interaction_ghost_color.d.ts.map +0 -1
  52. package/build/hooks/use_interaction_ghost_color.js +0 -14
  53. package/build/hooks/use_interaction_ghost_color.js.map +0 -1
  54. package/src/hooks/use_interaction_ghost_color.ts +0 -15
@@ -0,0 +1,67 @@
1
+ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
2
+ import { renderHook } from '@testing-library/react-native'
3
+ import React from 'react'
4
+ import { buildTestQueryClient } from '../../__utils__/query_client'
5
+ import { ChatProvider, CreateChatThemeProps } from '../../contexts/chat_context'
6
+ import { useInteractionTintedBackgroundColor } from '../../hooks'
7
+
8
+ let themeProps: CreateChatThemeProps
9
+ let queryClient: QueryClient
10
+
11
+ beforeEach(() => {
12
+ queryClient = buildTestQueryClient({
13
+ defaultOptions: {
14
+ queries: {
15
+ refetchInterval: false,
16
+ refetchOnWindowFocus: false,
17
+ refetchOnReconnect: false,
18
+ },
19
+ },
20
+ })
21
+ })
22
+
23
+ afterEach(() => {
24
+ queryClient.clear()
25
+ queryClient.cancelQueries()
26
+ queryClient.removeQueries()
27
+ })
28
+
29
+ const Wrapper = ({ children }: { children: React.ReactNode }) => {
30
+ return (
31
+ <QueryClientProvider client={queryClient}>
32
+ <ChatProvider value={{ onUnauthorizedResponse: () => {}, theme: themeProps }}>
33
+ {children}
34
+ </ChatProvider>
35
+ </QueryClientProvider>
36
+ )
37
+ }
38
+
39
+ describe('useInteractionTintedBackgroundColor (non-chip surfaces)', () => {
40
+ test('ignores fillColorChipSelected', () => {
41
+ themeProps = {
42
+ theme: {
43
+ colors: {
44
+ interaction: 'rgb(0, 255, 0)',
45
+ fillColorChipSelected: 'rgb(9, 9, 9)',
46
+ },
47
+ },
48
+ }
49
+
50
+ const { result: withChipToken } = renderHook(() => useInteractionTintedBackgroundColor(), {
51
+ wrapper: Wrapper,
52
+ })
53
+
54
+ themeProps = {
55
+ theme: {
56
+ colors: { interaction: 'rgb(0, 255, 0)' },
57
+ },
58
+ }
59
+
60
+ const { result: withoutChipToken } = renderHook(() => useInteractionTintedBackgroundColor(), {
61
+ wrapper: Wrapper,
62
+ })
63
+
64
+ expect(withChipToken.current).toBe(withoutChipToken.current)
65
+ expect(withoutChipToken.current).toBe('hsl(120, 100%, 92%)')
66
+ })
67
+ })
@@ -0,0 +1,78 @@
1
+ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
2
+ import { renderHook } from '@testing-library/react-native'
3
+ import React from 'react'
4
+ import { buildTestQueryClient } from '../../__utils__/query_client'
5
+ import { ChatProvider, CreateChatThemeProps } from '../../contexts/chat_context'
6
+ import { useSelectedChipBackgroundColor } from '../../hooks'
7
+
8
+ let themeProps: CreateChatThemeProps
9
+ let queryClient: QueryClient
10
+
11
+ beforeEach(() => {
12
+ queryClient = buildTestQueryClient({
13
+ defaultOptions: {
14
+ queries: {
15
+ refetchInterval: false,
16
+ refetchOnWindowFocus: false,
17
+ refetchOnReconnect: false,
18
+ },
19
+ },
20
+ })
21
+ })
22
+
23
+ afterEach(() => {
24
+ queryClient.clear()
25
+ queryClient.cancelQueries()
26
+ queryClient.removeQueries()
27
+ })
28
+
29
+ const Wrapper = ({ children }: { children: React.ReactNode }) => {
30
+ return (
31
+ <QueryClientProvider client={queryClient}>
32
+ <ChatProvider value={{ onUnauthorizedResponse: () => {}, theme: themeProps }}>
33
+ {children}
34
+ </ChatProvider>
35
+ </QueryClientProvider>
36
+ )
37
+ }
38
+
39
+ describe('useSelectedChipBackgroundColor', () => {
40
+ test('falls back to colors.interaction when fillColorChipSelected is absent', () => {
41
+ themeProps = { theme: { colors: { interaction: 'rgb(0, 255, 0)' } } }
42
+
43
+ const { result } = renderHook(() => useSelectedChipBackgroundColor(), {
44
+ wrapper: Wrapper,
45
+ })
46
+
47
+ expect(result.current).toBe('hsl(120, 100%, 92%)')
48
+ })
49
+
50
+ test('prefers fillColorChipSelected over colors.interaction when supplied', () => {
51
+ themeProps = {
52
+ theme: {
53
+ colors: { interaction: 'rgb(0, 255, 0)', fillColorChipSelected: 'rgb(255, 0, 0)' },
54
+ },
55
+ }
56
+
57
+ const { result } = renderHook(() => useSelectedChipBackgroundColor(), {
58
+ wrapper: Wrapper,
59
+ })
60
+
61
+ expect(result.current).toBe('hsl(0, 100%, 92%)')
62
+ })
63
+
64
+ test('respects a custom hslLightnessChipSelected', () => {
65
+ themeProps = {
66
+ theme: {
67
+ colors: { interaction: 'rgb(0, 255, 0)' },
68
+ chip: { hslLightnessChipSelected: 50 },
69
+ },
70
+ }
71
+
72
+ const { result } = renderHook(() => useSelectedChipBackgroundColor(), {
73
+ wrapper: Wrapper,
74
+ })
75
+
76
+ expect(result.current).toBe('hsl(120, 100%, 50%)')
77
+ })
78
+ })
@@ -20,4 +20,27 @@ describe('defaultTheme', () => {
20
20
  // render an unstyled or misthemed UI.
21
21
  expect(defaultTheme('unspecified').colors).toMatchObject(aliasTokensColorMap.light)
22
22
  })
23
+
24
+ describe('chip tokens', () => {
25
+ test('seeds static defaults for the non-selected chip trio in both schemes', () => {
26
+ const light = defaultTheme('light').colors
27
+ const dark = defaultTheme('dark').colors
28
+
29
+ expect(light.borderColorChip).toBe('hsl(0, 0%, 88%)')
30
+ expect(light.fillColorChip).toBe('transparent')
31
+ expect(light.textColorChip).toBe('hsl(0, 0%, 45%)')
32
+
33
+ expect(dark.borderColorChip).toBe('hsl(0, 0%, 24%)')
34
+ expect(dark.fillColorChip).toBe('transparent')
35
+ expect(dark.textColorChip).toBe('hsl(0, 0%, 68%)')
36
+ })
37
+
38
+ test('never seeds a static default for the selected chip trio', () => {
39
+ const { colors } = defaultTheme('light')
40
+
41
+ expect(colors.borderColorChipSelected).toBeUndefined()
42
+ expect(colors.fillColorChipSelected).toBeUndefined()
43
+ expect(colors.textColorChipSelected).toBeUndefined()
44
+ })
45
+ })
23
46
  })
@@ -13,7 +13,7 @@ import { MessageReaction } from '../../components/conversation/message_reaction'
13
13
  import { Avatar, Icon, Spinner, Text, TextButton, TextInlineButton } from '../../components/display'
14
14
  import {
15
15
  useAnimatedMessageBackgroundColor,
16
- useInteractionGhostBackgroundColor,
16
+ useInteractionTintedBackgroundColor,
17
17
  useTheme,
18
18
  } from '../../hooks'
19
19
  import { useDeletingIds } from '../../hooks'
@@ -341,7 +341,7 @@ export function Message({
341
341
 
342
342
  const useMessageStyles = (mine: boolean, isDeleting: boolean) => {
343
343
  const { colors } = useTheme()
344
- const myMessageBackgroundColor = useInteractionGhostBackgroundColor()
344
+ const myMessageBackgroundColor = useInteractionTintedBackgroundColor()
345
345
  const { width } = useWindowDimensions()
346
346
  const tabletWidth = width >= 744 // Smallest iPad Mini's width
347
347
 
@@ -17,7 +17,7 @@ import { ChatContext } from '../../contexts/chat_context'
17
17
  import {
18
18
  useCreateAndroidRippleColor,
19
19
  useTheme,
20
- useInteractionGhostBackgroundColor,
20
+ useInteractionTintedBackgroundColor,
21
21
  useScalableNumberOfLines,
22
22
  useFontScale,
23
23
  } from '../../hooks'
@@ -783,7 +783,7 @@ const useMessageFormStyles = () => {
783
783
  const navigationTheme = useNavigationTheme()
784
784
  const buttonSize = 38
785
785
 
786
- const giphyBadgeBackgroundColor = useInteractionGhostBackgroundColor()
786
+ const giphyBadgeBackgroundColor = useInteractionTintedBackgroundColor()
787
787
 
788
788
  return StyleSheet.create({
789
789
  container: {
@@ -3,7 +3,7 @@ import colorFunction from 'color'
3
3
  import React, { useMemo } from 'react'
4
4
  import { StyleSheet } from 'react-native'
5
5
  import { Text } from '../../components/display'
6
- import { useInteractionGhostBackgroundColor, useTheme } from '../../hooks'
6
+ import { useSelectedChipBackgroundColor, useTheme } from '../../hooks'
7
7
  import { useCreateAndroidRippleColor } from '../../hooks/use_create_android_ripple_color'
8
8
  import { useMessageReactionToggle } from '../../hooks/use_message_reaction_toggle'
9
9
  import { MessageResource } from '../../types'
@@ -57,12 +57,12 @@ export function MessageReaction({
57
57
  export const useReactionStyles = ({ mine }: { mine: number }) => {
58
58
  const { colors } = useTheme()
59
59
  const activeBorderColor = useMemo(() => {
60
- return colorFunction(colors.interaction)
60
+ return colorFunction(colors.borderColorChipSelected ?? colors.interaction)
61
61
  .hsl()
62
62
  .lightness(colors.name === 'dark' ? 20 : 80)
63
63
  .string()
64
- }, [colors.interaction, colors.name])
65
- const activeBackgroundColor = useInteractionGhostBackgroundColor()
64
+ }, [colors.borderColorChipSelected, colors.interaction, colors.name])
65
+ const activeBackgroundColor = useSelectedChipBackgroundColor()
66
66
 
67
67
  return StyleSheet.create({
68
68
  reaction: {
@@ -0,0 +1,135 @@
1
+ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
2
+ import { render } from '@testing-library/react-native'
3
+ import React from 'react'
4
+ import { buildTestQueryClient } from '../../../__utils__/query_client'
5
+ import { ChatProvider, CreateChatThemeProps } from '../../../contexts/chat_context'
6
+ import { ToggleButton } from '../toggle_button'
7
+
8
+ let themeProps: CreateChatThemeProps
9
+ let queryClient: QueryClient
10
+
11
+ beforeEach(() => {
12
+ queryClient = buildTestQueryClient({
13
+ defaultOptions: {
14
+ queries: {
15
+ refetchInterval: false,
16
+ refetchOnWindowFocus: false,
17
+ refetchOnReconnect: false,
18
+ },
19
+ },
20
+ })
21
+ })
22
+
23
+ afterEach(() => {
24
+ queryClient.clear()
25
+ queryClient.cancelQueries()
26
+ queryClient.removeQueries()
27
+ })
28
+
29
+ const Wrapper = ({ children }: { children: React.ReactNode }) => {
30
+ return (
31
+ <QueryClientProvider client={queryClient}>
32
+ <ChatProvider
33
+ value={{
34
+ token: {
35
+ access_token: '',
36
+ created_at: 0,
37
+ expires_in: 0,
38
+ scope: '',
39
+ refresh_token: '',
40
+ token_type: '',
41
+ },
42
+ onUnauthorizedResponse: () => {},
43
+ theme: themeProps,
44
+ }}
45
+ >
46
+ {children}
47
+ </ChatProvider>
48
+ </QueryClientProvider>
49
+ )
50
+ }
51
+
52
+ const renderToggleButton = (active: boolean) => {
53
+ const view = render(<ToggleButton active={active} accessibilityLabel="Filter" title="Filter" />, {
54
+ wrapper: Wrapper,
55
+ })
56
+
57
+ return {
58
+ button: view.getByLabelText('Filter'),
59
+ text: view.getByText('Filter'),
60
+ }
61
+ }
62
+
63
+ describe('ToggleButton chip colors', () => {
64
+ describe('backward compatibility (Services / sandbox pass only colors.interaction)', () => {
65
+ const distinctiveGreen = 'rgb(0, 255, 0)'
66
+
67
+ beforeEach(() => {
68
+ themeProps = {
69
+ theme: {
70
+ colors: {
71
+ interaction: distinctiveGreen,
72
+ },
73
+ },
74
+ }
75
+ })
76
+
77
+ test('active state derives border, fill, and text color from colors.interaction', () => {
78
+ const { button, text } = renderToggleButton(true)
79
+
80
+ expect(button).toHaveStyle({ borderColor: distinctiveGreen })
81
+ // The active fill is the green interaction color lightened via the
82
+ // chip-background hook (hsl lightness 92 in the light scheme), not
83
+ // the raw interaction color — pins the hook's transform in place.
84
+ expect(button).toHaveStyle({ backgroundColor: 'hsl(120, 100%, 92%)' })
85
+ expect(text).toHaveStyle({ color: distinctiveGreen })
86
+ })
87
+
88
+ test.each([
89
+ ['light', undefined, 'hsl(0, 0%, 88%)', 'hsl(0, 0%, 45%)'],
90
+ ['dark', 'dark' as const, 'hsl(0, 0%, 24%)', 'hsl(0, 0%, 68%)'],
91
+ ])(
92
+ 'inactive state uses the static chip defaults in the %s scheme',
93
+ (_label, colorScheme, borderColor, color) => {
94
+ themeProps = {
95
+ theme: { colors: { interaction: distinctiveGreen } },
96
+ colorScheme,
97
+ }
98
+
99
+ const { button, text } = renderToggleButton(false)
100
+
101
+ expect(button).toHaveStyle({ borderColor })
102
+ expect(text).toHaveStyle({ color })
103
+ }
104
+ )
105
+ })
106
+
107
+ describe('explicit chip token overrides', () => {
108
+ const explicitBorder = 'rgb(1, 2, 3)'
109
+ const explicitFill = 'rgb(4, 5, 6)'
110
+ const explicitText = 'rgb(7, 8, 9)'
111
+
112
+ beforeEach(() => {
113
+ themeProps = {
114
+ theme: {
115
+ colors: {
116
+ interaction: 'rgb(0, 255, 0)',
117
+ borderColorChipSelected: explicitBorder,
118
+ fillColorChipSelected: explicitFill,
119
+ textColorChipSelected: explicitText,
120
+ },
121
+ },
122
+ }
123
+ })
124
+
125
+ test('active state prefers explicit chip tokens over colors.interaction', () => {
126
+ const { button, text } = renderToggleButton(true)
127
+
128
+ expect(button).toHaveStyle({ borderColor: explicitBorder })
129
+ // fillColorChipSelected still passes through the chip-background hook's
130
+ // lightness transform, so the rendered fill isn't the raw override.
131
+ expect(button).toHaveStyle({ backgroundColor: 'hsl(210, 20%, 92%)' })
132
+ expect(text).toHaveStyle({ color: explicitText })
133
+ })
134
+ })
135
+ })
@@ -5,7 +5,7 @@ import {
5
5
  useTheme,
6
6
  useFontScale,
7
7
  useCreateAndroidRippleColor,
8
- useInteractionGhostBackgroundColor,
8
+ useSelectedChipBackgroundColor,
9
9
  } from '../../hooks'
10
10
  import {
11
11
  MAX_FONT_SIZE_MULTIPLIER_LANDMARK,
@@ -164,16 +164,20 @@ const useStyles = ({ active, maxFontSizeMultiplier }: Partial<ToggleButtonProps>
164
164
  const { colors, button } = useTheme()
165
165
  const fontScale = useFontScale({ maxFontSizeMultiplier })
166
166
 
167
- const activeBackgroundColor = useInteractionGhostBackgroundColor()
167
+ const activeBackgroundColor = useSelectedChipBackgroundColor()
168
168
 
169
- const color = active ? colors.interaction : colors.textColorDefaultSecondary
169
+ const borderColor = active
170
+ ? (colors.borderColorChipSelected ?? colors.interaction)
171
+ : colors.borderColorChip
172
+ const fillColor = active ? activeBackgroundColor : colors.fillColorChip
173
+ const color = active ? (colors.textColorChipSelected ?? colors.interaction) : colors.textColorChip
170
174
 
171
175
  return StyleSheet.create({
172
176
  pressable: {
173
177
  borderRadius: button.borderRadius * fontScale,
174
178
  borderWidth: 1,
175
- borderColor: active ? colors.interaction : colors.borderColorDefaultBase,
176
- backgroundColor: active ? activeBackgroundColor : 'transparent',
179
+ borderColor,
180
+ backgroundColor: fillColor,
177
181
  paddingHorizontal: 16 * fontScale,
178
182
  flexDirection: 'row',
179
183
  alignItems: 'center',
@@ -13,7 +13,8 @@ export * from './use_font_scale'
13
13
  export * from './use_has_direct_messages'
14
14
  export * from './use_groups_groups'
15
15
  export * from './use_groups'
16
- export * from './use_interaction_ghost_color'
16
+ export * from './use_selected_chip_background_color'
17
+ export * from './use_interaction_tinted_background_color'
17
18
  export * from './use_message_reaction_toggle'
18
19
  export * from './use_new_conversation_entry'
19
20
  export * from './use_organization'
@@ -0,0 +1,20 @@
1
+ import colorFunction from 'color'
2
+ import { useMemo } from 'react'
3
+ import { useTheme } from './use_theme'
4
+
5
+ /**
6
+ * Background color for non-chip surfaces (message bubbles, the Giphy badge)
7
+ * that are tinted from `colors.interaction`. Unaffected by chip tokens.
8
+ */
9
+ export function useInteractionTintedBackgroundColor() {
10
+ const { colors } = useTheme()
11
+
12
+ return useMemo(
13
+ () =>
14
+ colorFunction(colors.interaction)
15
+ .hsl()
16
+ .lightness(colors.name === 'dark' ? 12 : 92)
17
+ .string(),
18
+ [colors.interaction, colors.name]
19
+ )
20
+ }
@@ -0,0 +1,63 @@
1
+ import { noop } from 'lodash'
2
+ import { RefObject, useCallback, useRef } from 'react'
3
+ import { FlatList, NativeScrollEvent, NativeSyntheticEvent, Platform } from 'react-native'
4
+
5
+ const REST_OFFSET = 1
6
+
7
+ /**
8
+ * iOS starts a sheet's interactive dismissal once the content scroll view sits at its
9
+ * top content edge — for an inverted list, wherever the newest message rests. Resting
10
+ * the list 1pt in from that edge keeps a drag at the bottom of a conversation scrolling
11
+ * history instead of swiping the modal away.
12
+ *
13
+ * Returns the offset the list rests at plus the scroll listeners that nudge it back
14
+ * there: once on first layout, then after each gesture settles. On Android there is no
15
+ * sheet gesture to avoid, so the offset is 0 and the listeners are undefined.
16
+ */
17
+ export const useRestAwayFromDismissEdge = ({
18
+ listRef,
19
+ enabled = Platform.OS === 'ios',
20
+ }: {
21
+ listRef: RefObject<FlatList | null>
22
+ enabled?: boolean
23
+ }) => {
24
+ const restAwayFromDismissEdge = useCallback(() => {
25
+ listRef.current?.scrollToOffset({ animated: false, offset: REST_OFFSET })
26
+ }, [listRef])
27
+
28
+ const didSetInitialOffset = useRef(false)
29
+ const handleInitialOffset = useCallback(() => {
30
+ if (!didSetInitialOffset.current) {
31
+ didSetInitialOffset.current = true
32
+ restAwayFromDismissEdge()
33
+ }
34
+ }, [restAwayFromDismissEdge])
35
+
36
+ // A negative offset means the bounce is still animating; let it settle first.
37
+ const handleScrollSettled = useCallback(
38
+ (event: NativeSyntheticEvent<NativeScrollEvent>) => {
39
+ const offsetY = event.nativeEvent.contentOffset.y
40
+
41
+ if (offsetY >= 0 && offsetY < REST_OFFSET) {
42
+ restAwayFromDismissEdge()
43
+ }
44
+ },
45
+ [restAwayFromDismissEdge]
46
+ )
47
+
48
+ if (!enabled) {
49
+ return {
50
+ restOffset: 0,
51
+ onContentSizeChange: noop,
52
+ onScrollEndDrag: noop,
53
+ onMomentumScrollEnd: noop,
54
+ }
55
+ }
56
+
57
+ return {
58
+ restOffset: REST_OFFSET,
59
+ onContentSizeChange: handleInitialOffset,
60
+ onScrollEndDrag: handleScrollSettled,
61
+ onMomentumScrollEnd: handleScrollSettled,
62
+ }
63
+ }
@@ -0,0 +1,21 @@
1
+ import colorFunction from 'color'
2
+ import { useMemo } from 'react'
3
+ import { useTheme } from './use_theme'
4
+
5
+ /**
6
+ * Background color for a chip surface (filter button, reaction pill) in its
7
+ * selected state. Falls back to `colors.interaction` when a consumer hasn't
8
+ * supplied `colors.fillColorChipSelected`.
9
+ */
10
+ export function useSelectedChipBackgroundColor() {
11
+ const { colors, chip } = useTheme()
12
+
13
+ return useMemo(
14
+ () =>
15
+ colorFunction(colors.fillColorChipSelected ?? colors.interaction)
16
+ .hsl()
17
+ .lightness(chip.hslLightnessChipSelected)
18
+ .string(),
19
+ [colors.fillColorChipSelected, colors.interaction, chip.hslLightnessChipSelected]
20
+ )
21
+ }
@@ -40,6 +40,7 @@ import {
40
40
  normalizeAnalyticsMetadata,
41
41
  usePublishProductAnalyticsEvent,
42
42
  } from '../hooks/use_product_analytics'
43
+ import { useRestAwayFromDismissEdge } from '../hooks/use_rest_away_from_dismiss_edge'
43
44
  import { useVideoModerationJoltEvents } from '../hooks/use_video_moderation_jolt_events'
44
45
  import { ConversationResource } from '../types/resources/conversation'
45
46
  import { ConversationBadgeResource } from '../types/resources/conversation_badge'
@@ -126,11 +127,17 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
126
127
  setShowJumpToBottomButton(offsetY > 200)
127
128
  }
128
129
 
130
+ const { restOffset, onContentSizeChange, onMomentumScrollEnd, onScrollEndDrag } =
131
+ useRestAwayFromDismissEdge({
132
+ listRef,
133
+ enabled: Platform.OS === 'ios',
134
+ })
135
+
129
136
  const handleReturnToBottom = useCallback(() => {
130
137
  listRef.current?.scrollToOffset({
131
- offset: 0,
138
+ offset: restOffset,
132
139
  })
133
- }, [])
140
+ }, [restOffset])
134
141
 
135
142
  useEffect(() => {
136
143
  if (reply_root_id) {
@@ -181,6 +188,9 @@ function ConversationScreenContent({ route }: ConversationScreenProps) {
181
188
  data={messagesWithSeparators}
182
189
  keyExtractor={item => item.id}
183
190
  onScroll={trackScroll}
191
+ onContentSizeChange={onContentSizeChange}
192
+ onScrollEndDrag={onScrollEndDrag}
193
+ onMomentumScrollEnd={onMomentumScrollEnd}
184
194
  scrollEventThrottle={10}
185
195
  ListFooterComponent={
186
196
  hasNextPage ? null : (
@@ -29,7 +29,7 @@ import {
29
29
  import { VideoAttachmentPreview } from '../components/display/video_attachment_preview'
30
30
  import BannerPrimitive from '../components/primitive/banner_primitive'
31
31
  import BlankState from '../components/primitive/blank_state_primitive'
32
- import { useInteractionGhostBackgroundColor, useTheme } from '../hooks'
32
+ import { useSelectedChipBackgroundColor, useTheme } from '../hooks'
33
33
  import {
34
34
  MAX_FONT_SIZE_MULTIPLIER,
35
35
  platformPressedOpacityStyle,
@@ -1325,7 +1325,7 @@ function HapticButton({ title, onPress }: { title: string; onPress: () => void }
1325
1325
 
1326
1326
  const useStyles = () => {
1327
1327
  const { colors } = useTheme()
1328
- const interactionGhostBackgroundColor = useInteractionGhostBackgroundColor()
1328
+ const selectedChipBackgroundColor = useSelectedChipBackgroundColor()
1329
1329
 
1330
1330
  return StyleSheet.create({
1331
1331
  hapticButton: {
@@ -1334,7 +1334,7 @@ const useStyles = () => {
1334
1334
  padding: 16,
1335
1335
  alignItems: 'center',
1336
1336
  justifyContent: 'center',
1337
- backgroundColor: interactionGhostBackgroundColor,
1337
+ backgroundColor: selectedChipBackgroundColor,
1338
1338
  borderWidth: 1,
1339
1339
  borderColor: colors.interaction,
1340
1340
  borderRadius: 8,
@@ -28,6 +28,9 @@ export interface DefaultTheme {
28
28
  button: {
29
29
  borderRadius: number
30
30
  }
31
+ chip: {
32
+ hslLightnessChipSelected: number
33
+ }
31
34
  showBadgeProductLogo: boolean
32
35
  }
33
36
 
@@ -44,6 +47,9 @@ export const defaultTheme = (colorScheme: ColorSchemeName | null): ChatTheme =>
44
47
  button: {
45
48
  borderRadius: 40,
46
49
  },
50
+ chip: {
51
+ hslLightnessChipSelected: scheme === 'dark' ? 12 : 92,
52
+ },
47
53
  showBadgeProductLogo: true, // Overrides visibility of the product logo in `src/display/badge.tsx`
48
54
  }
49
55
  }
@@ -91,6 +97,22 @@ interface ChatColors {
91
97
  statusNeutralComposedIcon: string
92
98
  statusNeutralComposedText: string
93
99
  statusNeutralComposedBackground: string
100
+ // borderColorChip / textColorChip match the alias tokens
101
+ // `borderColorDefaultBase` / `textColorDefaultSecondary` the unselected
102
+ // `ToggleButton` state used before dedicated chip tokens existed.
103
+ borderColorChip: string
104
+ fillColorChip: string
105
+ textColorChip: string
106
+ /**
107
+ * Selected-chip colors (border/fill/text). Never assign a static default
108
+ * directly — these stay optional so they always fall back to
109
+ * `colors.interaction` via `??` at the read site. Every current consumer
110
+ * overrides `interaction` at runtime, and a seeded default here could win
111
+ * over that override depending on merge order.
112
+ */
113
+ borderColorChipSelected?: string
114
+ fillColorChipSelected?: string
115
+ textColorChipSelected?: string
94
116
  }
95
117
 
96
118
  // 'link' is an iOS-only semantic color name — constructing it on Android is
@@ -138,6 +160,9 @@ const colorsChatLight: ChatColors = {
138
160
  statusNeutralComposedIcon: tokens.iconColorStatusNeutralPrimary,
139
161
  statusNeutralComposedText: tokens.textColorStatusNeutral,
140
162
  statusNeutralComposedBackground: tokens.fillColorStatusNeutralGhost,
163
+ borderColorChip: tokens.colorNeutral88,
164
+ fillColorChip: 'transparent',
165
+ textColorChip: tokens.colorNeutral45,
141
166
  }
142
167
 
143
168
  const colorsChatDark: ChatColors = {
@@ -183,6 +208,9 @@ const colorsChatDark: ChatColors = {
183
208
  statusNeutralComposedIcon: tokens.iconColorStatusNeutralPrimaryDark,
184
209
  statusNeutralComposedText: tokens.textColorStatusNeutralDark,
185
210
  statusNeutralComposedBackground: tokens.fillColorStatusNeutralGhostDark,
211
+ borderColorChip: tokens.colorNeutral24,
212
+ fillColorChip: 'transparent',
213
+ textColorChip: tokens.colorNeutral68,
186
214
  }
187
215
 
188
216
  const chatThemeColorMap = {
@@ -1,2 +0,0 @@
1
- export declare function useInteractionGhostBackgroundColor(): string;
2
- //# sourceMappingURL=use_interaction_ghost_color.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"use_interaction_ghost_color.d.ts","sourceRoot":"","sources":["../../src/hooks/use_interaction_ghost_color.ts"],"names":[],"mappings":"AAIA,wBAAgB,kCAAkC,WAUjD"}
@@ -1,14 +0,0 @@
1
- import colorFunction from 'color';
2
- import { useMemo } from 'react';
3
- import { useTheme } from './use_theme';
4
- export function useInteractionGhostBackgroundColor() {
5
- const { colors } = useTheme();
6
- const interactionGhostColor = useMemo(() => {
7
- return colorFunction(colors.interaction)
8
- .hsl()
9
- .lightness(colors.name === 'dark' ? 12 : 92)
10
- .string();
11
- }, [colors.interaction, colors.name]);
12
- return interactionGhostColor;
13
- }
14
- //# sourceMappingURL=use_interaction_ghost_color.js.map