Cleanup enableAndroidLineHeightCentering flag#48577

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

Closed
NickGerleman wants to merge 1 commit into from
Closed

Cleanup enableAndroidLineHeightCentering flag #48577

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: 1 addition & 7 deletions ...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
* @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
*/

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
@JvmStatic
public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

/**
* When enabled, custom line height calculation will be centered from top to bottom.
*/
@JvmStatic
public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

/**
* Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
*/
Expand Down
12 changes: 1 addition & 11 deletions .../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
* @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
*/

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
private var disableEventLoopOnBridgelessCache: Boolean? = null
private var disableMountItemReorderingAndroidCache: Boolean? = null
private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
private var enableAndroidLineHeightCenteringCache: Boolean? = null
private var enableBridgelessArchitectureCache: Boolean? = null
private var enableCppPropsIteratorSetterCache: Boolean? = null
private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
return cached
}

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

override fun enableBridgelessArchitecture(): Boolean {
var cached = enableBridgelessArchitectureCache
if (cached == null) {
Expand Down
4 changes: 1 addition & 3 deletions ...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
* @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
*/

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

@DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down
4 changes: 1 addition & 3 deletions ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
* @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
*/

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

override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

override fun enableAndroidLineHeightCentering(): Boolean = true

override fun enableBridgelessArchitecture(): Boolean = false

override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down
13 changes: 1 addition & 12 deletions ...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
* @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
*/

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
private var disableEventLoopOnBridgelessCache: Boolean? = null
private var disableMountItemReorderingAndroidCache: Boolean? = null
private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
private var enableAndroidLineHeightCenteringCache: Boolean? = null
private var enableBridgelessArchitectureCache: Boolean? = null
private var enableCppPropsIteratorSetterCache: Boolean? = null
private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
return cached
}

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

override fun enableBridgelessArchitecture(): Boolean {
var cached = enableBridgelessArchitectureCache
if (cached == null) {
Expand Down
4 changes: 1 addition & 3 deletions ...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
* @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
*/

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

@DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

@DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

@DoNotStrip public fun enableBridgelessArchitecture(): Boolean

@DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down
8 changes: 1 addition & 7 deletions ...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
if (!Float.isNaN(effectiveLineHeight)
&& (parentTextAttributes == null
|| parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
} else {
ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
}
ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
}
ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
}
Expand Down
14 changes: 3 additions & 11 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
textAttributes.mTextShadowColor)));
}
if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
ops.add(
new SetSpanOperation(
start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
} else {
ops.add(
new SetSpanOperation(
start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
}
ops.add(
new SetSpanOperation(
start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
}

ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down
69 changes: 0 additions & 69 deletions ...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions ...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

float lineHeight = mTextAttributes.getEffectiveLineHeight();
if (!Float.isNaN(lineHeight)) {
if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
workingText.setSpan(
new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
} else {
workingText.setSpan(
new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
}
workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
}
}

Expand Down
16 changes: 1 addition & 15 deletions ...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
* @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
*/

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
return method(javaProvider_);
}

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

bool enableBridgelessArchitecture() override {
static const auto method =
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
makeNativeMethod(
"enableAccumulatedUpdatesInRawPropsAndroid",
JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
makeNativeMethod(
"enableAndroidLineHeightCentering",
JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
makeNativeMethod(
"enableBridgelessArchitecture",
JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down
5 changes: 1 addition & 4 deletions ...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
* @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
*/

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
static bool enableAccumulatedUpdatesInRawPropsAndroid(
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down
6 changes: 1 addition & 5 deletions packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
* @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
*/

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Cleanup enableAndroidLineHeightCentering flag#48577

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

 Closed

NickGerleman
wants to merge
1
commit into

from

 Closed


Cleanup enableAndroidLineHeightCentering flag
#48577
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: 1 addition & 7 deletions
...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<a5c3dc485960e5f1d86dbdc657eb12a7>>
 * @generated SignedSource<<3e10f8d2f623da3b7b502d8fa78f82a4>>
 */

/**
Expand DownExpand Up@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
 @JvmStatic
 public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()

 /**
 * When enabled, custom line height calculation will be centered from top to bottom.
 */
 @JvmStatic
 public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()

 /**
 * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.
 */
Expand Down

12 changes: 1 addition & 11 deletions
.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<0fc5a042b5d22ea606980f6b53f2f1ec>>
 * @generated SignedSource<<497bbb23778fe0f9763e9bfa715ea3aa>>
 */

/**
Expand All@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -112,15 +111,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<bc9bae61731d639f4a62b8f7ed92959a>>
 * @generated SignedSource<<d801f87c988fbd921e2379f236e1711f>>
 */

/**
Expand DownExpand Up@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {

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

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

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

 @DoNotStrip @JvmStatic public external fun enableCppPropsIteratorSetter(): Boolean
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<c3b554cdb31bf0a29d45889f51295c74>>
 * @generated SignedSource<<5de2cfc00f486b7d07266939ce18a397>>
 */

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

 override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

 override fun enableAndroidLineHeightCentering(): Boolean = true

 override fun enableBridgelessArchitecture(): Boolean = false

 override fun enableCppPropsIteratorSetter(): Boolean = false
Expand Down

13 changes: 1 addition & 12 deletions
...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<ca5452a19b165ae2d7bfaf6657a94a25>>
 * @generated SignedSource<<f1ed4107e24ced5d2673bfb065573062>>
 */

/**
Expand All@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 private var disableEventLoopOnBridgelessCache: Boolean? = null
 private var disableMountItemReorderingAndroidCache: Boolean? = null
 private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
 private var enableAndroidLineHeightCenteringCache: Boolean? = null
 private var enableBridgelessArchitectureCache: Boolean? = null
 private var enableCppPropsIteratorSetterCache: Boolean? = null
 private var enableDeletionOfUnmountedViewsCache: Boolean? = null
Expand DownExpand Up@@ -121,16 +120,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
 return cached
 }

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

 override fun enableBridgelessArchitecture(): Boolean {
 var cached = enableBridgelessArchitectureCache
 if (cached == null) {
Expand Down

4 changes: 1 addition & 3 deletions
...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<9c3445b2d25b3b624a8edd8c7dac74b1>>
 * @generated SignedSource<<3cd802bdd1d383ea0668e43319d53b3f>>
 */

/**
Expand DownExpand Up@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {

 @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

 @DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean

 @DoNotStrip public fun enableBridgelessArchitecture(): Boolean

 @DoNotStrip public fun enableCppPropsIteratorSetter(): Boolean
Expand Down

8 changes: 1 addition & 7 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.IllegalViewOperationException;
import com.facebook.react.uimanager.LayoutShadowNode;
import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
Expand All@@ -35,7 +34,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -231,11 +229,7 @@ private static void buildSpannedFromShadowNode(
 if (!Float.isNaN(effectiveLineHeight)
 && (parentTextAttributes == null
 || parentTextAttributes.getEffectiveLineHeight() != effectiveLineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 } else {
 ops.add(new SetSpanOperation(start, end, new LegacyLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new CustomLineHeightSpan(effectiveLineHeight)));
 }
 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
 }
Expand Down

14 changes: 3 additions & 11 deletions
...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,14 +32,12 @@
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.common.mapbuffer.MapBuffer;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
Expand DownExpand Up@@ -319,15 +317,9 @@ private static void buildSpannableFromFragments(
 textAttributes.mTextShadowColor)));
 }
 if (!Float.isNaN(textAttributes.getEffectiveLineHeight())) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 } else {
 ops.add(
 new SetSpanOperation(
 start, end, new LegacyLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }
 ops.add(
 new SetSpanOperation(
 start, end, new CustomLineHeightSpan(textAttributes.getEffectiveLineHeight())));
 }

 ops.add(new SetSpanOperation(start, end, new ReactTagSpan(reactTag)));
Expand Down

69 changes: 0 additions & 69 deletions
...Android/src/main/java/com/facebook/react/views/text/internal/span/LegacyLineHeightSpan.kt

View file


Open in desktop


This file was deleted.


10 changes: 1 addition & 9 deletions
...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,6 @@
import com.facebook.react.bridge.ReactSoftExceptionLogger;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.build.ReactBuildConfig;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
import com.facebook.react.uimanager.BackgroundStyleApplicator;
import com.facebook.react.uimanager.LengthPercentage;
import com.facebook.react.uimanager.LengthPercentageType;
Expand All@@ -72,7 +71,6 @@
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
import com.facebook.react.views.text.internal.span.LegacyLineHeightSpan;
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
Expand DownExpand Up@@ -873,13 +871,7 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {

 float lineHeight = mTextAttributes.getEffectiveLineHeight();
 if (!Float.isNaN(lineHeight)) {
 if (ReactNativeFeatureFlags.enableAndroidLineHeightCentering()) {
 workingText.setSpan(
 new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 } else {
 workingText.setSpan(
 new LegacyLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 workingText.setSpan(new CustomLineHeightSpan(lineHeight), 0, workingText.length(), spanFlags);
 }
 }

Expand Down

16 changes: 1 addition & 15 deletions
...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<1f6ba072411c3ce3fc3659677da540c1>>
 * @generated SignedSource<<7c3853858da56eb5f471abccf9dcbf55>>
 */

/**
Expand DownExpand Up@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
 return method(javaProvider_);
 }

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

 bool enableBridgelessArchitecture() override {
 static const auto method =
 getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableBridgelessArchitecture");
Expand DownExpand Up@@ -344,11 +338,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
 return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
 return ReactNativeFeatureFlags::enableBridgelessArchitecture();
Expand DownExpand Up@@ -595,9 +584,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
 makeNativeMethod(
 "enableAccumulatedUpdatesInRawPropsAndroid",
 JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
 makeNativeMethod(
 "enableAndroidLineHeightCentering",
 JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),
 makeNativeMethod(
 "enableBridgelessArchitecture",
 JReactNativeFeatureFlagsCxxInterop::enableBridgelessArchitecture),
Expand Down

5 changes: 1 addition & 4 deletions
...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<6a9b64bcb7d6e6115d3125c0fad09f19>>
 * @generated SignedSource<<77b4ed5aa33290ba9da1719544e974cb>>
 */

/**
Expand DownExpand Up@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
 static bool enableAccumulatedUpdatesInRawPropsAndroid(
 facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);

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

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

Expand Down

6 changes: 1 addition & 5 deletions
packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff 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<<406e907a7652665aebfb8e44010068e2>>
 * @generated SignedSource<<7d301656072183649246db8fa738fc4d>>
 */

/**
Expand DownExpand Up@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
 return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
}

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

bool ReactNativeFeatureFlags::enableBridgelessArchitecture() {
 return getAccessor().enableBridgelessArchitecture();
}
Expand Down
Loading