From 3d07b7aa9682bac1d7d2388de0d3f16332608245 Mon Sep 17 00:00:00 2001 From: Jack Nam <30609178+thienlnam@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:02:00 -0600 Subject: [PATCH] Merge pull request #3966 from Expensify/Rory-FixLineHeight Only provide a default lineHeight when the fontSize is default (cherry picked from commit d0c95782a407809b6a7b2f8872053f90aae00a16) --- src/components/Text.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Text.js b/src/components/Text.js index f2c1c62b7d78..16f0836da089 100644 --- a/src/components/Text.js +++ b/src/components/Text.js @@ -54,12 +54,15 @@ const Text = React.forwardRef(({ const componentStyle = { color, fontSize, - lineHeight: 20, textAlign, fontFamily: fontFamily[family], ...mergedStyles, }; + if (componentStyle.fontSize === variables.fontSizeNormal) { + componentStyle.lineHeight = 20; + } + return ( // eslint-disable-next-line react/jsx-props-no-spreading {children}