Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: inverted unread indicator due to applied inverted styles #2889

Merged
merged 4 commits into from
Jan 15, 2025
Merged

fix: inverted unread indicator due to applied inverted styles #2889

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
927e87c
fix: inverted unread indicator due to applied inverted styles
khushal87 Jan 10, 2025
b9a7e86
fix: tests snapshots
khushal87 Jan 10, 2025
3471980
fix: unread indicator inverted issue on android
khushal87 Jan 15, 2025
c00450a
fix: tests
khushal87 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions package/src/components/MessageList/MessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,33 +670,36 @@ const MessageListWithContext = <
threadList={threadList}
/>
);

return wrapMessageInTheme ? (
<>
<ThemeProvider mergedStyle={modifiedTheme}>
<View
style={[shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined]}
testID={`message-list-item-${index}`}
>
{shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && (
<InlineUnreadIndicator />
)}
{shouldApplyAndroidWorkaround && renderDateSeperator}
{renderMessage}
</View>
</ThemeProvider>
{!shouldApplyAndroidWorkaround && renderDateSeperator}
{/* Adding indicator below the messages, since the list is inverted */}
{insertInlineUnreadIndicator && <InlineUnreadIndicator />}
{!shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && <InlineUnreadIndicator />}
</>
) : (
<>
<View
style={[shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined]}
testID={`message-list-item-${index}`}
>
{shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && <InlineUnreadIndicator />}
{shouldApplyAndroidWorkaround && renderDateSeperator}
{renderMessage}
</View>
{!shouldApplyAndroidWorkaround && renderDateSeperator}
{/* Adding indicator below the messages, since the list is inverted */}
{insertInlineUnreadIndicator && <InlineUnreadIndicator />}
{!shouldApplyAndroidWorkaround && insertInlineUnreadIndicator && <InlineUnreadIndicator />}
</>
);
};
Expand Down
Loading