Skip to content

Commit 565601d

Browse files
authored
fix: channel list redesign fixes (#3425)
1 parent a6f5d9a commit 565601d

3 files changed

Lines changed: 25 additions & 13 deletions

File tree

examples/SampleApp/src/components/ChannelPreview.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,16 @@ const CustomChannelPreviewStatus = (
5858
props: ChannelPreviewStatusProps & { membership: ChannelState['membership'] },
5959
) => {
6060
const { membership } = props;
61+
const {
62+
theme: { semantics },
63+
} = useTheme();
6164

6265
return (
6366
<View style={styles.statusContainer}>
6467
<ChannelPreviewStatus {...props} />
6568
{membership.pinned_at && (
6669
<View style={styles.pinIconContainer}>
67-
<Pin size={24} />
70+
<Pin height={24} width={24} stroke={semantics.textSecondary} />
6871
</View>
6972
)}
7073
</View>

package/src/components/ChannelPreview/ChannelPreviewMessage.tsx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const ChannelPreviewMessage = (props: ChannelPreviewMessageProps) => {
105105

106106
if (isFailedMessage) {
107107
return (
108-
<View style={styles.messagePreviewContainer}>
108+
<View style={styles.container}>
109109
<ErrorBadge size='xs' />
110110
<Text style={styles.errorText}>{t('Message failed to send')}</Text>
111111
</View>
@@ -131,7 +131,10 @@ export const ChannelPreviewMessage = (props: ChannelPreviewMessageProps) => {
131131

132132
const useStyles = ({ isMessageDeleted = false }: { isMessageDeleted?: boolean }) => {
133133
const {
134-
theme: { semantics },
134+
theme: {
135+
semantics,
136+
channelPreview: { message },
137+
},
135138
} = useTheme();
136139

137140
return useMemo(() => {
@@ -141,33 +144,33 @@ const useStyles = ({ isMessageDeleted = false }: { isMessageDeleted?: boolean })
141144
alignItems: 'center',
142145
gap: primitives.spacingXxs,
143146
flexShrink: 1,
144-
},
145-
messagePreviewContainer: {
146-
flexDirection: 'row',
147-
alignItems: 'center',
148-
gap: primitives.spacingXxs,
149-
flexShrink: 1,
147+
...message.container,
150148
},
151149
subtitle: {
152150
color: isMessageDeleted ? semantics.textTertiary : semantics.textSecondary,
153151
fontSize: primitives.typographyFontSizeSm,
154152
fontWeight: primitives.typographyFontWeightRegular,
155153
includeFontPadding: false,
156154
lineHeight: primitives.typographyLineHeightNormal,
155+
flexShrink: 1,
156+
...message.subtitle,
157157
},
158158
draftText: {
159159
color: semantics.accentPrimary,
160160
fontSize: primitives.typographyFontSizeSm,
161161
fontWeight: primitives.typographyFontWeightSemiBold,
162162
lineHeight: primitives.typographyLineHeightNormal,
163+
includeFontPadding: false,
164+
...message.draftText,
163165
},
164166
errorText: {
165167
color: semantics.accentError,
166168
fontSize: primitives.typographyFontSizeSm,
167169
fontWeight: primitives.typographyFontWeightRegular,
168170
includeFontPadding: false,
169171
lineHeight: primitives.typographyLineHeightNormal,
172+
...message.errorText,
170173
},
171174
});
172-
}, [semantics, isMessageDeleted]);
175+
}, [semantics, isMessageDeleted, message]);
173176
};

package/src/contexts/themeContext/utils/theme.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ export type Theme = {
173173
contentContainer: ViewStyle;
174174
date: TextStyle;
175175
mutedStatus: IconProps;
176-
message: {
177-
container: ViewStyle;
178-
};
179176
messageDeliveryStatus: {
180177
container: ViewStyle;
181178
text: TextStyle;
@@ -195,6 +192,12 @@ export type Theme = {
195192
statusContainer: ViewStyle;
196193
titleContainer: ViewStyle;
197194
wrapper: ViewStyle;
195+
message: {
196+
container: ViewStyle;
197+
subtitle: TextStyle;
198+
errorText: TextStyle;
199+
draftText: TextStyle;
200+
};
198201
};
199202
dateHeader: {
200203
container: ViewStyle;
@@ -1013,6 +1016,9 @@ export const defaultTheme: Theme = {
10131016
date: {},
10141017
message: {
10151018
container: {},
1019+
subtitle: {},
1020+
errorText: {},
1021+
draftText: {},
10161022
},
10171023
messageDeliveryStatus: {
10181024
container: {},

0 commit comments

Comments
 (0)