From ef4d87516f640b8a9827e9f5f9b0afaf88558620 Mon Sep 17 00:00:00 2001 From: Jakub Trzebiatowski Date: Thu, 22 Feb 2024 14:51:25 +0100 Subject: [PATCH] WIP: Enable unified `Spannable` building --- .../featureflags/ReactNativeFeatureFlagsCxxAccessor.kt | 7 +------ .../featureflags/ReactNativeFeatureFlagsDefaults.kt | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt index 3e38e9f251cbd8..c28360fea48fae 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt @@ -77,12 +77,7 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso } override fun enableSpannableBuildingUnification(): Boolean { - var cached = enableSpannableBuildingUnificationCache - if (cached == null) { - cached = ReactNativeFeatureFlagsCxxInterop.enableSpannableBuildingUnification() - enableSpannableBuildingUnificationCache = cached - } - return cached + return true } override fun enableCustomDrawOrderFabric(): Boolean { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt index e75ba65f44d08b..bac10df8c70d03 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt @@ -33,7 +33,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun batchRenderingUpdatesInEventLoop(): Boolean = false - override fun enableSpannableBuildingUnification(): Boolean = false + override fun enableSpannableBuildingUnification(): Boolean = true override fun enableCustomDrawOrderFabric(): Boolean = false