diff --git a/RNTester/js/TextExample.android.js b/RNTester/js/TextExample.android.js index c0f660ecf..f2c555c3f 100644 --- a/RNTester/js/TextExample.android.js +++ b/RNTester/js/TextExample.android.js @@ -461,6 +461,26 @@ class TextExample extends React.Component<{}> { keep writing it{"'"}ll just keep going and going + + + By default, text will respect Text Size accessibility setting on + Android. It means that all font sizes will be increased or decreased + depending on the value of the Text Size setting in the OS's Settings + app. + + + You can disable scaling for your Text component by passing {'"'}allowFontScaling={ + '{' + }false{'}"'} prop. + + + This text will not scale.{' '} + + This text also won't scale because it inherits "allowFontScaling" + from its parent. + + + This text is selectable if you click-and-hold, and will offer the diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js index 439c9c714..d52f9a8c6 100644 --- a/RNTester/js/TextExample.ios.js +++ b/RNTester/js/TextExample.ios.js @@ -869,7 +869,7 @@ exports.examples = [ By default, text will respect Text Size accessibility setting on - iOS. It means that all font sizes will be increased or descreased + iOS. It means that all font sizes will be increased or decreased depending on the value of Text Size setting in{' '} Settings.app - Display & Brightness - Text Size @@ -880,8 +880,12 @@ exports.examples = [ '{' }false{'}"'} prop. - - This text will not scale. + + This text will not scale.{' '} + + This text also won't scale because it inherits "allowFontScaling" + from its parent. + ); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributes.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributes.java index d0fdbc767..a9f35e149 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributes.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributes.java @@ -5,6 +5,11 @@ * LICENSE file in the root directory of this source tree. */ +package com.facebook.react.views.text; + +import com.facebook.react.uimanager.PixelUtil; +import com.facebook.react.uimanager.ViewDefaults; + /* * Currently, TextAttributes consists of a subset of text props that need to be passed from parent * to child so inheritance can be implemented correctly. An example complexity that causes a prop @@ -12,12 +17,6 @@ * the rendered aka effective value. For example, to figure out the rendered/effective font size, * you need to take into account the fontSize and allowFontScaling props. */ - -package com.facebook.react.views.text; - -import com.facebook.react.uimanager.PixelUtil; -import com.facebook.react.uimanager.ViewDefaults; - public class TextAttributes { private boolean mAllowFontScaling = true; private float mFontSize = Float.NaN;