Skip to content

Add enableIOSCompressedTextFrameAdjustment feature flag (#57407) #57407

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
sbuggay wants to merge 1 commit into
base: main
Choose a base branch
from
+197 −80
Open

Add enableIOSCompressedTextFrameAdjustment feature flag (#57407) #57407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<8b571241be0c86847ed265ab665059b2>>
* @generated SignedSource<<c9e8eeefc709e1246577d67155300906>>
*/

/**
Expand Down Expand Up @@ -180,6 +180,12 @@ public object ReactNativeFeatureFlags {
@JvmStatic
public fun enableFontScaleChangesUpdatingLayout(): Boolean = accessor.enableFontScaleChangesUpdatingLayout()

/**
* Adjusts iOS Text drawing frames for compressed explicit line heights.
*/
@JvmStatic
public fun enableIOSCompressedTextFrameAdjustment(): Boolean = accessor.enableIOSCompressedTextFrameAdjustment()

/**
* Applies base offset for each line of text separately on iOS.
*/
Expand Down
12 changes: 11 additions & 1 deletion .../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<856ed167e90b330583c3a6e981927c43>>
* @generated SignedSource<<5ae6b1a0bfa9d680aa61685dbacd69d2>>
*/

/**
Expand Down Expand Up @@ -45,6 +45,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
private var enableFabricLogsCache: Boolean? = null
private var enableFlexboxAutoMinSizeInStrictModeCache: Boolean? = null
private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
private var enableIOSCompressedTextFrameAdjustmentCache: Boolean? = null
private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
private var enableImagePrefetchingAndroidCache: Boolean? = null
Expand Down Expand Up @@ -331,6 +332,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
return cached
}

override fun enableIOSCompressedTextFrameAdjustment(): Boolean {
var cached = enableIOSCompressedTextFrameAdjustmentCache
if (cached == null) {
cached = ReactNativeFeatureFlagsCxxInterop.enableIOSCompressedTextFrameAdjustment()
enableIOSCompressedTextFrameAdjustmentCache = cached
}
return cached
}

override fun enableIOSTextBaselineOffsetPerLine(): Boolean {
var cached = enableIOSTextBaselineOffsetPerLineCache
if (cached == null) {
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<2f68282c0b8c1971acdab2f229189d82>>
* @generated SignedSource<<8b1c3206f7e63790e411f57c2dd64076>>
*/

/**
Expand Down Expand Up @@ -78,6 +78,8 @@ public object ReactNativeFeatureFlagsCxxInterop {

@DoNotStrip @JvmStatic public external fun enableFontScaleChangesUpdatingLayout(): Boolean

@DoNotStrip @JvmStatic public external fun enableIOSCompressedTextFrameAdjustment(): Boolean

@DoNotStrip @JvmStatic public external fun enableIOSTextBaselineOffsetPerLine(): Boolean

@DoNotStrip @JvmStatic public external fun enableIOSViewClipToPaddingBox(): Boolean
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<5f946970ba2e0676b55cc150de4bee01>>
* @generated SignedSource<<5c36c0a5e9e67b43016ab02eab0ecd8f>>
*/

/**
Expand Down Expand Up @@ -73,6 +73,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi

override fun enableFontScaleChangesUpdatingLayout(): Boolean = true

override fun enableIOSCompressedTextFrameAdjustment(): Boolean = false

override fun enableIOSTextBaselineOffsetPerLine(): Boolean = false

override fun enableIOSViewClipToPaddingBox(): Boolean = false
Expand Down
13 changes: 12 additions & 1 deletion ...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<c7adeebaabd6c647865bb5398b823221>>
* @generated SignedSource<<98a6085638c86aaa012c8bd972627ad4>>
*/

/**
Expand Down Expand Up @@ -49,6 +49,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
private var enableFabricLogsCache: Boolean? = null
private var enableFlexboxAutoMinSizeInStrictModeCache: Boolean? = null
private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
private var enableIOSCompressedTextFrameAdjustmentCache: Boolean? = null
private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
private var enableImagePrefetchingAndroidCache: Boolean? = null
Expand Down Expand Up @@ -360,6 +361,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
return cached
}

override fun enableIOSCompressedTextFrameAdjustment(): Boolean {
var cached = enableIOSCompressedTextFrameAdjustmentCache
if (cached == null) {
cached = currentProvider.enableIOSCompressedTextFrameAdjustment()
accessedFeatureFlags.add("enableIOSCompressedTextFrameAdjustment")
enableIOSCompressedTextFrameAdjustmentCache = cached
}
return cached
}

override fun enableIOSTextBaselineOffsetPerLine(): Boolean {
var cached = enableIOSTextBaselineOffsetPerLineCache
if (cached == null) {
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<c4f37ab0fc935a27bae3b92e86abc243>>
* @generated SignedSource<<8b5a9f8966d9f096b7fa4f7020db1f34>>
*/

/**
Expand Down Expand Up @@ -73,6 +73,8 @@ public interface ReactNativeFeatureFlagsProvider {

@DoNotStrip public fun enableFontScaleChangesUpdatingLayout(): Boolean

@DoNotStrip public fun enableIOSCompressedTextFrameAdjustment(): Boolean

@DoNotStrip public fun enableIOSTextBaselineOffsetPerLine(): Boolean

@DoNotStrip public fun enableIOSViewClipToPaddingBox(): Boolean
Expand Down
16 changes: 15 additions & 1 deletion ...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<6719e639a89507a2019fcf1901394152>>
* @generated SignedSource<<d2a114d06852632438ba743805e49f60>>
*/

/**
Expand Down Expand Up @@ -189,6 +189,12 @@ class ReactNativeFeatureFlagsJavaProvider
return method(javaProvider_);
}

bool enableIOSCompressedTextFrameAdjustment() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableIOSCompressedTextFrameAdjustment");
return method(javaProvider_);
}

bool enableIOSTextBaselineOffsetPerLine() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableIOSTextBaselineOffsetPerLine");
Expand Down Expand Up @@ -678,6 +684,11 @@ bool JReactNativeFeatureFlagsCxxInterop::enableFontScaleChangesUpdatingLayout(
return ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout();
}

bool JReactNativeFeatureFlagsCxxInterop::enableIOSCompressedTextFrameAdjustment(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableIOSCompressedTextFrameAdjustment();
}

bool JReactNativeFeatureFlagsCxxInterop::enableIOSTextBaselineOffsetPerLine(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableIOSTextBaselineOffsetPerLine();
Expand Down Expand Up @@ -1084,6 +1095,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
makeNativeMethod(
"enableFontScaleChangesUpdatingLayout",
JReactNativeFeatureFlagsCxxInterop::enableFontScaleChangesUpdatingLayout),
makeNativeMethod(
"enableIOSCompressedTextFrameAdjustment",
JReactNativeFeatureFlagsCxxInterop::enableIOSCompressedTextFrameAdjustment),
makeNativeMethod(
"enableIOSTextBaselineOffsetPerLine",
JReactNativeFeatureFlagsCxxInterop::enableIOSTextBaselineOffsetPerLine),
Expand Down
5 changes: 4 additions & 1 deletion ...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<ea2573be7bc2e1444cd9d157ac282f16>>
* @generated SignedSource<<b4ad11ddb9d9beb0a8b3ae326d45dd97>>
*/

/**
Expand Down Expand Up @@ -105,6 +105,9 @@ class JReactNativeFeatureFlagsCxxInterop
static bool enableFontScaleChangesUpdatingLayout(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

static bool enableIOSCompressedTextFrameAdjustment(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

static bool enableIOSTextBaselineOffsetPerLine(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

Expand Down
6 changes: 5 additions & 1 deletion packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<929bf9431ec07ddc39040cfff5b94754>>
* @generated SignedSource<<b2f1772a72176d689d3152371808480a>>
*/

/**
Expand Down Expand Up @@ -126,6 +126,10 @@ bool ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout() {
return getAccessor().enableFontScaleChangesUpdatingLayout();
}

bool ReactNativeFeatureFlags::enableIOSCompressedTextFrameAdjustment() {
return getAccessor().enableIOSCompressedTextFrameAdjustment();
}

bool ReactNativeFeatureFlags::enableIOSTextBaselineOffsetPerLine() {
return getAccessor().enableIOSTextBaselineOffsetPerLine();
}
Expand Down
7 changes: 6 additions & 1 deletion packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @generated SignedSource<<d7532c66f74b2f5e3b1dcd259089f6cd>>
* @generated SignedSource<<5c7e2061344bf998e5fc6b621af2ff45>>
*/

/**
Expand Down Expand Up @@ -164,6 +164,11 @@ class ReactNativeFeatureFlags {
*/
RN_EXPORT static bool enableFontScaleChangesUpdatingLayout();

/**
* Adjusts iOS Text drawing frames for compressed explicit line heights.
*/
RN_EXPORT static bool enableIOSCompressedTextFrameAdjustment();

/**
* Applies base offset for each line of text separately on iOS.
*/
Expand Down
Loading
Loading