Skip to content

Commit 2ab9a8c

Browse files
cortinicofacebook-github-bot
authored andcommitted
Cleanup enableAlignItemsBaselineOnFabricIOS (facebook#48607)
Summary: Pull Request resolved: facebook#48607 This feature flag acted as a killswitch but it was effectively never used, so we can clean it up now. Changelog: [Internal] [Changed] - Cleanup `enableAlignItemsBaselineOnFabricIOS` Reviewed By: cipolleschi Differential Revision: D68018624 fbshipit-source-id: 2340b505021a6632b07a3a872e35b35522b6f361
1 parent a40a885 commit 2ab9a8c

21 files changed

+72
-209
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<cba7d5b72ece69330b97ba0c615502c5>>
7+
* @generated SignedSource<<a5c3dc485960e5f1d86dbdc657eb12a7>>
88
*/
99

1010
/**
@@ -58,12 +58,6 @@ public object ReactNativeFeatureFlags {
5858
@JvmStatic
5959
public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid()
6060

61-
/**
62-
* Kill-switch to turn off support for aling-items:baseline on Fabric iOS.
63-
*/
64-
@JvmStatic
65-
public fun enableAlignItemsBaselineOnFabricIOS(): Boolean = accessor.enableAlignItemsBaselineOnFabricIOS()
66-
6761
/**
6862
* When enabled, custom line height calculation will be centered from top to bottom.
6963
*/

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<ee6d72d1924bffa3a21845a5daa0effd>>
7+
* @generated SignedSource<<0fc5a042b5d22ea606980f6b53f2f1ec>>
88
*/
99

1010
/**
@@ -25,7 +25,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
2525
private var disableEventLoopOnBridgelessCache: Boolean? = null
2626
private var disableMountItemReorderingAndroidCache: Boolean? = null
2727
private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
28-
private var enableAlignItemsBaselineOnFabricIOSCache: Boolean? = null
2928
private var enableAndroidLineHeightCenteringCache: Boolean? = null
3029
private var enableBridgelessArchitectureCache: Boolean? = null
3130
private var enableCppPropsIteratorSetterCache: Boolean? = null
@@ -113,15 +112,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
113112
return cached
114113
}
115114

116-
override fun enableAlignItemsBaselineOnFabricIOS(): Boolean {
117-
var cached = enableAlignItemsBaselineOnFabricIOSCache
118-
if (cached == null) {
119-
cached = ReactNativeFeatureFlagsCxxInterop.enableAlignItemsBaselineOnFabricIOS()
120-
enableAlignItemsBaselineOnFabricIOSCache = cached
121-
}
122-
return cached
123-
}
124-
125115
override fun enableAndroidLineHeightCentering(): Boolean {
126116
var cached = enableAndroidLineHeightCenteringCache
127117
if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<aa6543cc1bf955b467fc977d2bf475eb>>
7+
* @generated SignedSource<<bc9bae61731d639f4a62b8f7ed92959a>>
88
*/
99

1010
/**
@@ -38,8 +38,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
3838

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

41-
@DoNotStrip @JvmStatic public external fun enableAlignItemsBaselineOnFabricIOS(): Boolean
42-
4341
@DoNotStrip @JvmStatic public external fun enableAndroidLineHeightCentering(): Boolean
4442

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

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<7075974bc541d91e275ee370f2a3709b>>
7+
* @generated SignedSource<<c3b554cdb31bf0a29d45889f51295c74>>
88
*/
99

1010
/**
@@ -33,8 +33,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
3333

3434
override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false
3535

36-
override fun enableAlignItemsBaselineOnFabricIOS(): Boolean = true
37-
3836
override fun enableAndroidLineHeightCentering(): Boolean = true
3937

4038
override fun enableBridgelessArchitecture(): Boolean = false

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<0b570bc8931ec25f16ee777f0bfcd04f>>
7+
* @generated SignedSource<<ca5452a19b165ae2d7bfaf6657a94a25>>
88
*/
99

1010
/**
@@ -29,7 +29,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
2929
private var disableEventLoopOnBridgelessCache: Boolean? = null
3030
private var disableMountItemReorderingAndroidCache: Boolean? = null
3131
private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
32-
private var enableAlignItemsBaselineOnFabricIOSCache: Boolean? = null
3332
private var enableAndroidLineHeightCenteringCache: Boolean? = null
3433
private var enableBridgelessArchitectureCache: Boolean? = null
3534
private var enableCppPropsIteratorSetterCache: Boolean? = null
@@ -122,16 +121,6 @@ public class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcces
122121
return cached
123122
}
124123

125-
override fun enableAlignItemsBaselineOnFabricIOS(): Boolean {
126-
var cached = enableAlignItemsBaselineOnFabricIOSCache
127-
if (cached == null) {
128-
cached = currentProvider.enableAlignItemsBaselineOnFabricIOS()
129-
accessedFeatureFlags.add("enableAlignItemsBaselineOnFabricIOS")
130-
enableAlignItemsBaselineOnFabricIOSCache = cached
131-
}
132-
return cached
133-
}
134-
135124
override fun enableAndroidLineHeightCentering(): Boolean {
136125
var cached = enableAndroidLineHeightCenteringCache
137126
if (cached == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<080245bea6e8535f2e8a91c1559e2fcc>>
7+
* @generated SignedSource<<9c3445b2d25b3b624a8edd8c7dac74b1>>
88
*/
99

1010
/**
@@ -33,8 +33,6 @@ public interface ReactNativeFeatureFlagsProvider {
3333

3434
@DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean
3535

36-
@DoNotStrip public fun enableAlignItemsBaselineOnFabricIOS(): Boolean
37-
3836
@DoNotStrip public fun enableAndroidLineHeightCentering(): Boolean
3937

4038
@DoNotStrip public fun enableBridgelessArchitecture(): Boolean

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<5b4977559c424312ed8bd791a96da52d>>
7+
* @generated SignedSource<<1f6ba072411c3ce3fc3659677da540c1>>
88
*/
99

1010
/**
@@ -69,12 +69,6 @@ class ReactNativeFeatureFlagsProviderHolder
6969
return method(javaProvider_);
7070
}
7171

72-
bool enableAlignItemsBaselineOnFabricIOS() override {
73-
static const auto method =
74-
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableAlignItemsBaselineOnFabricIOS");
75-
return method(javaProvider_);
76-
}
77-
7872
bool enableAndroidLineHeightCentering() override {
7973
static const auto method =
8074
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableAndroidLineHeightCentering");
@@ -350,11 +344,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndro
350344
return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
351345
}
352346

353-
bool JReactNativeFeatureFlagsCxxInterop::enableAlignItemsBaselineOnFabricIOS(
354-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
355-
return ReactNativeFeatureFlags::enableAlignItemsBaselineOnFabricIOS();
356-
}
357-
358347
bool JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering(
359348
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
360349
return ReactNativeFeatureFlags::enableAndroidLineHeightCentering();
@@ -606,9 +595,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
606595
makeNativeMethod(
607596
"enableAccumulatedUpdatesInRawPropsAndroid",
608597
JReactNativeFeatureFlagsCxxInterop::enableAccumulatedUpdatesInRawPropsAndroid),
609-
makeNativeMethod(
610-
"enableAlignItemsBaselineOnFabricIOS",
611-
JReactNativeFeatureFlagsCxxInterop::enableAlignItemsBaselineOnFabricIOS),
612598
makeNativeMethod(
613599
"enableAndroidLineHeightCentering",
614600
JReactNativeFeatureFlagsCxxInterop::enableAndroidLineHeightCentering),

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<eead6b4f156908455773230140a7d733>>
7+
* @generated SignedSource<<6a9b64bcb7d6e6115d3125c0fad09f19>>
88
*/
99

1010
/**
@@ -45,9 +45,6 @@ class JReactNativeFeatureFlagsCxxInterop
4545
static bool enableAccumulatedUpdatesInRawPropsAndroid(
4646
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
4747

48-
static bool enableAlignItemsBaselineOnFabricIOS(
49-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
50-
5148
static bool enableAndroidLineHeightCentering(
5249
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
5350

packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<c6042ff720b73ea742b3a3a93b921963>>
7+
* @generated SignedSource<<406e907a7652665aebfb8e44010068e2>>
88
*/
99

1010
/**
@@ -46,10 +46,6 @@ bool ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid() {
4646
return getAccessor().enableAccumulatedUpdatesInRawPropsAndroid();
4747
}
4848

49-
bool ReactNativeFeatureFlags::enableAlignItemsBaselineOnFabricIOS() {
50-
return getAccessor().enableAlignItemsBaselineOnFabricIOS();
51-
}
52-
5349
bool ReactNativeFeatureFlags::enableAndroidLineHeightCentering() {
5450
return getAccessor().enableAndroidLineHeightCentering();
5551
}

packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<8af906cf2c1799274d66979fd2532c57>>
7+
* @generated SignedSource<<3ffac6c04d5fbc9ca34a7b4e6b7de56d>>
88
*/
99

1010
/**
@@ -64,11 +64,6 @@ class ReactNativeFeatureFlags {
6464
*/
6565
RN_EXPORT static bool enableAccumulatedUpdatesInRawPropsAndroid();
6666

67-
/**
68-
* Kill-switch to turn off support for aling-items:baseline on Fabric iOS.
69-
*/
70-
RN_EXPORT static bool enableAlignItemsBaselineOnFabricIOS();
71-
7267
/**
7368
* When enabled, custom line height calculation will be centered from top to bottom.
7469
*/

0 commit comments

Comments
 (0)