Skip to content

fix: web paragraph styles not working #2716

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: web paragraph styles not working #2716

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffd89d3
fix: web paragraph styles not working
samuelscheit Oct 30, 2024
602647b
fix: web paragraph styles not working
samuelscheit Oct 30, 2024
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
74 changes: 50 additions & 24 deletions packages/skia/src/skia/web/JsiSkParagraphStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export class JsiSkParagraphStyle {
ps.replaceTabCharacters =
value.replaceTabCharacters ?? ps.replaceTabCharacters;
ps.textAlign =
value.textAlign !== undefined
? { value: value.textAlign }
: undefined ?? ps.textAlign;
value.textAlign !== undefined ? { value: value.textAlign } : ps.textAlign;
ps.textDirection =
value.textDirection !== undefined
? { value: value.textDirection === TextDirection.LTR ? 1 : 0 }
Expand All @@ -32,34 +30,62 @@ export class JsiSkParagraphStyle {
: ps.textHeightBehavior;

ps.strutStyle = ps.strutStyle ?? {};
ps.strutStyle.fontFamilies =
value.strutStyle?.fontFamilies ?? ps.strutStyle.fontFamilies;
ps.strutStyle.fontSize =
value.strutStyle?.fontSize ?? ps.strutStyle.fontSize;
ps.strutStyle.heightMultiplier =
value.strutStyle?.heightMultiplier ?? ps.strutStyle.heightMultiplier;
ps.textStyle = ps.textStyle ?? {};
ps.textStyle.color = value.textStyle?.color ?? ps.textStyle.color;
ps.textStyle.backgroundColor =
value.textStyle?.backgroundColor ?? ps.textStyle.backgroundColor;
ps.textStyle.foregroundColor =
value.textStyle?.foregroundColor ?? ps.textStyle.foregroundColor;
ps.textStyle.decoration =
value.textStyle?.decoration ?? ps.textStyle.decoration;
ps.textStyle.decorationColor =
value.textStyle?.decorationColor ?? ps.textStyle.decorationColor;
ps.textStyle.decorationStyle =
value.textStyle?.decorationStyle !== undefined
? { value: value.textStyle.decorationStyle }
: ps.textStyle.decorationStyle;
ps.textStyle.letterSpacing =
value.textStyle?.letterSpacing ?? ps.textStyle.letterSpacing;
ps.textStyle.decorationThickness =
value.textStyle?.decorationThickness ?? ps.textStyle.decorationThickness;
ps.textStyle.fontFamilies = ps.textStyle.fontFamilies =
value.textStyle?.fontFamilies ?? ps.textStyle.fontFamilies;
ps.textStyle.fontSize = value.textStyle?.fontSize ?? ps.textStyle.fontSize;
ps.textStyle.heightMultiplier =
value.textStyle?.heightMultiplier ?? ps.textStyle.heightMultiplier;
ps.strutStyle.leading = value.strutStyle?.leading ?? ps.strutStyle.leading;
ps.strutStyle.forceStrutHeight =
value.strutStyle?.forceStrutHeight ?? ps.strutStyle.forceStrutHeight;

ps.strutStyle.fontStyle = ps.strutStyle.fontStyle ?? {};
ps.textStyle.fontStyle = ps.textStyle.fontStyle ?? {};

ps.strutStyle.fontStyle.slant =
value.strutStyle?.fontStyle?.slant !== undefined
? { value: value.strutStyle.fontStyle.slant }
: ps.strutStyle.fontStyle.slant;
ps.strutStyle.fontStyle.width =
value.strutStyle?.fontStyle?.width !== undefined
? { value: value.strutStyle.fontStyle.width }
: ps.strutStyle.fontStyle.width;
ps.strutStyle.fontStyle.weight =
value.strutStyle?.fontStyle?.weight !== undefined
? { value: value.strutStyle.fontStyle.weight }
: ps.strutStyle.fontStyle.weight;
ps.strutStyle.halfLeading =
value.strutStyle?.halfLeading ?? ps.strutStyle.halfLeading;
ps.textStyle.fontStyle.slant =
value.textStyle?.fontStyle?.slant !== undefined
? { value: value.textStyle.fontStyle.slant }
: ps.textStyle.fontStyle.slant;
ps.textStyle.fontStyle.width =
value.textStyle?.fontStyle?.width !== undefined
? { value: value.textStyle.fontStyle.width }
: ps.textStyle.fontStyle.width;
ps.textStyle.fontStyle.weight =
value.textStyle?.fontStyle?.weight !== undefined
? { value: value.textStyle.fontStyle.weight }
: ps.textStyle.fontStyle.weight;
ps.textStyle.halfLeading =
value.textStyle?.halfLeading ?? ps.textStyle.halfLeading;
ps.strutStyle.strutEnabled =
value.strutStyle?.strutEnabled ?? ps.strutStyle.strutEnabled;
ps.textStyle.shadows =
value.textStyle?.shadows?.map(shadow => {
return {
color: shadow.color,
offset: shadow.offset ? [shadow.offset.x, shadow.offset.y] : [0, 0],
blurRadius: shadow.blurRadius
};
}) ?? ps.textStyle.shadows;
ps.textStyle.textBaseline = value.textStyle?.textBaseline
? { value: value.textStyle.textBaseline }
: ps.textStyle.textBaseline;

return ps;
}
Expand Down
Loading