Skip to content

fix: custom style addressed review comments #822

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

Open
hejsztynx wants to merge 15 commits into
base: @kacperzolkiewski/custom-style
Choose a base branch
from
Open

fix: custom style addressed review comments #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fe6523b
fix(android): escape quote characters in html span generation
hejsztynx Oct 16, 2026
2633b99
fix(ios): extended color hex parsing
hejsztynx Oct 16, 2026
0890e5e
fix(ios): properly escape and decode characters inside the spans's st…
hejsztynx Oct 16, 2026
4f5b398
fix(mobile): allow font-size and font-family in the normalizer
hejsztynx Oct 16, 2026
9925ab9
fix(android): invalidate layout on setStyle
hejsztynx Oct 16, 2026
ba59c51
fix(android): properly rebuild custom style spans with fontSize on al…
hejsztynx Oct 16, 2026
d511e0b
fix(web): manual content deletion respects grapheme clusters
hejsztynx Oct 16, 2026
5073cf9
fix(ios, android): flatten nested span tags in the normalizer
hejsztynx Oct 19, 2026
1d063ff
fix(web): flatten nested spans in the normalizer
hejsztynx Oct 19, 2026
2868a77
fix: escape bracket characters
hejsztynx Oct 19, 2026
a1daebd
fix: 'transparent' does not overwrite its ancestor spans during flatt…
hejsztynx Oct 19, 2026
0f98967
fix: distinguish html layout whitespaces when applying span tags
hejsztynx Oct 19, 2026
8bf9d41
fix: font family parsing/generation, proper font-families handling wi…
hejsztynx Oct 19, 2026
9aebd94
fix: make 'inherit' not overwrite the parent style span
hejsztynx Oct 19, 2026
8fc4287
fix(android): escape other characters when generating html for consis…
hejsztynx Oct 20, 2026
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
34 changes: 29 additions & 5 deletions android/src/main/java/com/swmansion/enriched/common/parser/EnrichedParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,13 +374,21 @@ private static void withinParagraph(StringBuilder out, Spanned text, int start,
}
if (fontFamily != null && !fontFamily.isEmpty()) {
if (cssProps.length() > 0) cssProps.append(" ");
if (fontFamily.indexOf(' ') >= 0) {
if (fontFamily.indexOf(' ') >= 0 || fontFamily.indexOf(',') >= 0) {
cssProps.append("font-family: '").append(fontFamily).append("';");
} else {
cssProps.append("font-family: ").append(fontFamily).append(";");
}
}
out.append("<span style=\"").append(cssProps).append("\">");
out.append("<span style=\"")
.append(
cssProps
.toString()
.replace("&", "&amp;")
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace("\"", "&quot;"))
.append("\">");
} else {
out.append("<span>");
}
Expand Down Expand Up @@ -1032,14 +1040,30 @@ private static void startSpan(Editable text, Attributes attributes) {

private static String parseCssFontFamily(String raw) {
if (raw == null) return null;
String value = raw.trim();
if ((value.startsWith("'") && value.endsWith("'"))
|| (value.startsWith("\"") && value.endsWith("\""))) {
String value = firstInFontFamilyString(raw).trim();
if (value.length() >= 2
&& ((value.startsWith("'") && value.endsWith("'"))
|| (value.startsWith("\"") && value.endsWith("\"")))) {
value = value.substring(1, value.length() - 1);
}
return value.isEmpty() ? null : value;
}

private static String firstInFontFamilyString(String value) {
char quote = 0;
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
if (quote != 0) {
if (c == quote) quote = 0;
} else if (c == '\'' || c == '"') {
quote = c;
} else if (c == ',') {
return value.substring(0, i);
}
}
return value;
}

private static <T> void endSpan(Editable text, T style, EnrichedSpanFactory<T> spanFactory) {
CustomStyleMark mark = getLast(text, CustomStyleMark.class);
if (mark == null) return;
Expand Down
2 changes: 0 additions & 2 deletions android/src/main/java/com/swmansion/enriched/common/spans/EnrichedCustomStyleSpan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ open class EnrichedCustomStyleSpan(

protected fun getAssets(): AssetManager = assets

protected fun getAllowFontScaling(): Boolean = allowFontScaling

override fun updateMeasureState(textPaint: TextPaint) {
applyFontState(textPaint)
}
Expand Down
2 changes: 2 additions & 0 deletions android/src/main/java/com/swmansion/enriched/text/EnrichedTextStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ data class EnrichedTextStyle(
override val inlineCodeBackgroundColor: Int,
// Mentions
override val mentionsStyle: Map<String, MentionStyle>,
val allowFontScaling: Boolean,
) : EnrichedStyle {
companion object {
fun fromReadableMap(
Expand Down Expand Up @@ -120,6 +121,7 @@ data class EnrichedTextStyle(
inlineCodeColor = parseColor(context, inlineCode, "color"),
inlineCodeBackgroundColor = parseColorWithOpacity(context, inlineCode, "backgroundColor"),
mentionsStyle = parseMentionsStyle(context, mentions),
allowFontScaling = allowFontScaling,
)
}

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/swmansion/enriched/text/spans/EnrichedTextCustomStyleSpan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ class EnrichedTextCustomStyleSpan(
getFontSize(),
getFontFamily(),
getAssets(),
getAllowFontScaling(),
style.allowFontScaling,
)
}
1 change: 1 addition & 0 deletions android/src/main/java/com/swmansion/enriched/textinput/EnrichedTextInputView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,7 @@ class EnrichedTextInputView :
runAsATransaction {
customStyles?.setStyle(styleJSON)
}
layoutManager.invalidateLayout()

@hejsztynx hejsztynx Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The custom style can introduce a fontSize, which can changes the line heights, etc

}

fun requestHTML(requestId: Int) {
Expand Down
6 changes: 4 additions & 2 deletions android/src/main/java/com/swmansion/enriched/textinput/spans/EnrichedInputCustomStyleSpan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ class EnrichedInputCustomStyleSpan(
allowFontScaling,
),
EnrichedInputSpan {
override val dependsOnHtmlStyle: Boolean = false
// font size depends on the htmlStyle's allowFontScaling
override val dependsOnHtmlStyle: Boolean
get() = getFontSize() != null

override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedInputCustomStyleSpan =
EnrichedInputCustomStyleSpan(
Expand All @@ -30,6 +32,6 @@ class EnrichedInputCustomStyleSpan(
getFontSize(),
getFontFamily(),
getAssets(),
getAllowFontScaling(),
htmlStyle.allowFontScaling,
)
}
5 changes: 4 additions & 1 deletion android/src/main/java/com/swmansion/enriched/textinput/styles/HtmlStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ class HtmlStyle : EnrichedStyle {

override var mentionsStyle: MutableMap<String, MentionStyle> = mutableMapOf()

val allowFontScaling: Boolean
get() = view?.allowFontScaling ?: EnrichedConstants.ALLOW_FONT_SCALING_DEFAULT

constructor(view: EnrichedTextInputView?, style: ReadableMap?) {
this.view = view
this.style = style
Expand Down Expand Up @@ -157,7 +160,7 @@ class HtmlStyle : EnrichedStyle {
): Float {
val safeMap = ensureValueIsSet(map, key)
val value = safeMap.getDouble(key)
return ceil(pixelFromSpOrDp(value, view?.allowFontScaling ?: EnrichedConstants.ALLOW_FONT_SCALING_DEFAULT))
return ceil(pixelFromSpOrDp(value, allowFontScaling))
}

private fun parseColorWithOpacity(
Expand Down
Loading