Skip to content

fix: do not add opacity for transparent background color #162

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

Merged
exploIF merged 2 commits into from
Sep 23, 2025
Merged

fix: do not add opacity for transparent background color #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
216022f
fix: do not add opacity for transparent background color
exploIF Sep 23, 2025
c7a34d8
chore: prettier
exploIF Sep 23, 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
2 changes: 2 additions & 0 deletions android/src/main/java/com/swmansion/enriched/styles/HtmlStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ class HtmlStyle {
}

private fun withOpacity(color: Int, alpha: Int): Int {
// Do not apply opacity to transparent color
if (Color.alpha(color) == 0) return color
val a = alpha.coerceIn(0, 255)
return (color and 0x00FFFFFF) or (a shl 24)
}
Expand Down
5 changes: 3 additions & 2 deletions ios/styles/InlineCodeStyle.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#import "FontExtension.h"
#import "OccurenceUtils.h"
#import "ParagraphsUtils.h"
#import "ColorExtension.h"

@implementation InlineCodeStyle {
EnrichedTextInputView *_input;
Expand Down Expand Up @@ -33,7 +34,7 @@ - (void)addAttributes:(NSRange)range {
NSRange currentRange = [value rangeValue];
[_input->textView.textStorage beginEditing];

[_input->textView.textStorage addAttribute:NSBackgroundColorAttributeName value:[[_input->config inlineCodeBgColor] colorWithAlphaComponent:0.4] range:currentRange];
[_input->textView.textStorage addAttribute:NSBackgroundColorAttributeName value:[[_input->config inlineCodeBgColor] colorWithAlphaIfNotTransparent:0.4] range:currentRange];
[_input->textView.textStorage addAttribute:NSForegroundColorAttributeName value:[_input->config inlineCodeFgColor] range:currentRange];
[_input->textView.textStorage addAttribute:NSUnderlineColorAttributeName value:[_input->config inlineCodeFgColor] range:currentRange];
[_input->textView.textStorage addAttribute:NSStrikethroughColorAttributeName value:[_input->config inlineCodeFgColor] range:currentRange];
Expand All @@ -53,7 +54,7 @@ - (void)addAttributes:(NSRange)range {

- (void)addTypingAttributes {
NSMutableDictionary *newTypingAttrs = [_input->textView.typingAttributes mutableCopy];
newTypingAttrs[NSBackgroundColorAttributeName] = [[_input->config inlineCodeBgColor] colorWithAlphaComponent:0.4];
newTypingAttrs[NSBackgroundColorAttributeName] = [[_input->config inlineCodeBgColor] colorWithAlphaIfNotTransparent:0.4];
newTypingAttrs[NSForegroundColorAttributeName] = [_input->config inlineCodeFgColor];
newTypingAttrs[NSUnderlineColorAttributeName] = [_input->config inlineCodeFgColor];
newTypingAttrs[NSStrikethroughColorAttributeName] = [_input->config inlineCodeFgColor];
Expand Down
5 changes: 3 additions & 2 deletions ios/styles/MentionStyle.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#import "TextInsertionUtils.h"
#import "WordsUtils.h"
#import "UIView+React.h"
#import "ColorExtension.h"

// custom NSAttributedStringKey to differentiate from links
static NSString *const MentionAttributeName = @"MentionAttributeName";
Expand Down Expand Up @@ -154,7 +155,7 @@ - (void)addMention:(NSString *)indicator text:(NSString *)text attributes:(NSStr
NSForegroundColorAttributeName: styleProps.color,
NSUnderlineColorAttributeName: styleProps.color,
NSStrikethroughColorAttributeName: styleProps.color,
NSBackgroundColorAttributeName: [styleProps.backgroundColor colorWithAlphaComponent:0.4],
NSBackgroundColorAttributeName: [styleProps.backgroundColor colorWithAlphaIfNotTransparent:0.4],
} mutableCopy];

if(styleProps.decorationLine == DecorationUnderline) {
Expand Down Expand Up @@ -186,7 +187,7 @@ - (void)addMentionAtRange:(NSRange)range params:(MentionParams *)params {
NSForegroundColorAttributeName: styleProps.color,
NSUnderlineColorAttributeName: styleProps.color,
NSStrikethroughColorAttributeName: styleProps.color,
NSBackgroundColorAttributeName: [styleProps.backgroundColor colorWithAlphaComponent:0.4],
NSBackgroundColorAttributeName: [styleProps.backgroundColor colorWithAlphaIfNotTransparent:0.4],
} mutableCopy];

if(styleProps.decorationLine == DecorationUnderline) {
Expand Down
1 change: 1 addition & 0 deletions ios/utils/ColorExtension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@

@interface UIColor (ColorExtension)
- (BOOL)isEqualToColor:(UIColor *)otherColor;
- (UIColor *)colorWithAlphaIfNotTransparent:(CGFloat)newAlpha;
@end
9 changes: 9 additions & 0 deletions ios/utils/ColorExtension.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,13 @@ - (BOOL)isEqualToColor:(UIColor *)otherColor {

return [selfColor isEqual:otherColor];
}

- (UIColor *)colorWithAlphaIfNotTransparent:(CGFloat)newAlpha {
CGFloat alpha = 0.0;
[self getRed:nil green:nil blue:nil alpha:&alpha];
if (alpha > 0.0) {
return [self colorWithAlphaComponent:newAlpha];
}
return self;
}
@end
Loading