Skip to content

[Mobile] - Global styles - Add support to render font sizes and line height #34144

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
enejb merged 17 commits into from
Sep 8, 2021
Merged

[Mobile] - Global styles - Add support to render font sizes and line height #34144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e2e8de
Mobile - Global styles - Add support to render font sizes
Aug 18, 2021
6139c4c
Mobile - Rich text - Trigger font size update in the native side of a…
Aug 23, 2021
669a8b4
Mobile - Temp - Comment out line height removal
Aug 23, 2021
47c1727
Fix Android lineHeight control changes.
enejb Aug 27, 2021
513f8a1
Merge branch 'trunk' into rnmobile/global-styles-font-size
Aug 30, 2021
80bda81
Merge branch 'rnmobile/global-styles-font-size' of github.com:WordPre…
Aug 31, 2021
3cbe843
Mobile - Global styles - Get font sizes values
Aug 31, 2021
a24d11d
Mobile - AztecView - Support line height
Aug 31, 2021
843ff68
Mobile - Update AztecView comment for line height values
Sep 1, 2021
98d18d2
Merge branch 'trunk' into rnmobile/global-styles-font-size
Sep 1, 2021
33ce805
Merge branch 'trunk' into rnmobile/global-styles-font-size
Sep 3, 2021
0af2be9
Mobile - Line height support - iOS tweaks and makes it available only…
Sep 6, 2021
f3a5d81
Mobile - Update snapshots
Sep 6, 2021
e71d4ac
Merge branch 'trunk' into rnmobile/global-styles-font-size
Sep 6, 2021
ad5d8c4
Merge branch 'trunk' into rnmobile/global-styles-font-size
Sep 7, 2021
cf6a6fc
Mobile - Remove default line height
Sep 7, 2021
628474a
Mobile - Rich text - Unify force native update for font size and line…
Sep 7, 2021
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
Prev Previous commit
Next Next commit
Fix Android lineHeight control changes.
  • Loading branch information
@enejb
enejb committed Aug 27, 2021
commit 47c172737058a8c1ac94c72ca58d077240d640fb
6 changes: 6 additions & 0 deletions ...-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ public void setFontSize(ReactAztecText view, float fontSize) {
(int) Math.ceil(PixelUtil.toPixelFromSP(fontSize)));
}

@ReactProp(name = ViewProps.LINE_HEIGHT)
public void setLineHeight(ReactAztecText view, float lineHeight) {
float textSize = view.getTextSize();
view.setLineSpacing((lineHeight - textSize), (float) (lineHeight / textSize));
}

@ReactProp(name = ViewProps.FONT_FAMILY)
public void setFontFamily(ReactAztecText view, String fontFamily) {
int style = Typeface.NORMAL;
Expand Down
11 changes: 9 additions & 2 deletions packages/rich-text/src/component/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const gutenbergFormatNamesToAztec = {

const EMPTY_PARAGRAPH_TAGS = '<p></p>';
const DEFAULT_FONT_SIZE = 16;
const DEFAULT_LINE_HEIGHT = 1.5;
const DEFAULT_LINE_HEIGHT = 1.6;

export class RichText extends Component {
constructor( {
Expand Down Expand Up @@ -771,6 +771,13 @@ export class RichText extends Component {
this.needsSelectionUpdate = true;
this.manipulateEventCounterToForceNativeToRefresh(); // force a refresh on the native side
}

if (
nextProps?.style?.lineHeight !== this.props?.style?.lineHeight
) {
this.needsSelectionUpdate = true;
this.manipulateEventCounterToForceNativeToRefresh(); // force a refresh on the native side
}
}

return true;
Expand Down Expand Up @@ -1016,7 +1023,6 @@ export class RichText extends Component {
? { width }
: { maxWidth } ),
minHeight: this.state.height,
lineHeight,
} }
text={ {
text: html,
Expand Down Expand Up @@ -1061,6 +1067,7 @@ export class RichText extends Component {
maxImagesWidth={ 200 }
fontFamily={ this.props.fontFamily || defaultFontFamily }
fontSize={ fontSize }
lineHeight={ lineHeight }
fontWeight={ this.props.fontWeight }
fontStyle={ this.props.fontStyle }
disableEditingMenu={ disableEditingMenu }
Expand Down