Skip to content

Commit d2c48f3

Browse files
jorge-cabfacebook-github-bot
authored andcommitted
Remove experimental_ and cleanup mixBlendMode experiment (#46650)
Summary: Pull Request resolved: #46650 tsia Changelog: [General] [Added] - Removed `experimental` prefix and fully released `mixBlendMode` prop Reviewed By: joevilches Differential Revision: D63407473 fbshipit-source-id: 892ababcfe19b82d3f4c73d3cbc13fb46b7425b6
1 parent 513e966 commit d2c48f3

30 files changed

Lines changed: 91 additions & 206 deletions

packages/react-native/Libraries/Components/View/ReactNativeStyleAttributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
125125
/**
126126
* MixBlendMode
127127
*/
128-
experimental_mixBlendMode: true,
128+
mixBlendMode: true,
129129

130130
/**
131131
* Isolation

packages/react-native/Libraries/NativeComponent/BaseViewConfig.android.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ const validAttributesForNonEventProps = {
175175
filter: {
176176
process: require('../StyleSheet/processFilter').default,
177177
},
178-
experimental_mixBlendMode: true,
178+
mixBlendMode: true,
179179
isolation: true,
180180
opacity: true,
181181
elevation: true,

packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ const validAttributesForNonEventProps = {
231231
boxShadow: {
232232
process: require('../StyleSheet/processBoxShadow').default,
233233
},
234-
experimental_mixBlendMode: true,
234+
mixBlendMode: true,
235235
isolation: true,
236236

237237
borderTopWidth: true,

packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ export type ____ViewStyle_InternalCore = $ReadOnly<{
794794
cursor?: CursorValue,
795795
boxShadow?: $ReadOnlyArray<BoxShadowValue> | string,
796796
filter?: $ReadOnlyArray<FilterFunction> | string,
797-
experimental_mixBlendMode?: ____BlendMode_Internal,
797+
mixBlendMode?: ____BlendMode_Internal,
798798
experimental_backgroundImage?: $ReadOnlyArray<GradientValue> | string,
799799
isolation?: 'auto' | 'isolate',
800800
}>;

packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8108,7 +8108,7 @@ export type ____ViewStyle_InternalCore = $ReadOnly<{
81088108
cursor?: CursorValue,
81098109
boxShadow?: $ReadOnlyArray<BoxShadowValue> | string,
81108110
filter?: $ReadOnlyArray<FilterFunction> | string,
8111-
experimental_mixBlendMode?: ____BlendMode_Internal,
8111+
mixBlendMode?: ____BlendMode_Internal,
81128112
experimental_backgroundImage?: $ReadOnlyArray<GradientValue> | string,
81138113
isolation?: \\"auto\\" | \\"isolate\\",
81148114
}>;

packages/react-native/React/Views/RCTViewManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ - (void)updateAccessibilityTraitsForRole:(RCTView *)view withDefaultView:(RCTVie
446446
// filtered by view configs.
447447
}
448448

449-
RCT_CUSTOM_VIEW_PROPERTY(experimental_mixBlendMode, NSString *, RCTView)
449+
RCT_CUSTOM_VIEW_PROPERTY(mixBlendMode, NSString *, RCTView)
450450
{
451451
// Property is only to be used in the new renderer.
452452
// It is necessary to add it here, otherwise it gets

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<<bce0548a9e58299746c75aad95a25275>>
7+
* @generated SignedSource<<70e68165b567734a2609b77656b2c183>>
88
*/
99

1010
/**
@@ -70,12 +70,6 @@ public object ReactNativeFeatureFlags {
7070
@JvmStatic
7171
public fun enableAndroidLineHeightCentering(): Boolean = accessor.enableAndroidLineHeightCentering()
7272

73-
/**
74-
* Enables mix-blend-mode prop on Android.
75-
*/
76-
@JvmStatic
77-
public fun enableAndroidMixBlendModeProp(): Boolean = accessor.enableAndroidMixBlendModeProp()
78-
7973
/**
8074
* Use BackgroundStyleApplicator in place of other background/border drawing code
8175
*/

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<<19dca512d93d689e927ee5988a43e646>>
7+
* @generated SignedSource<<2f8da8585f1ac040bd26953263b08392>>
88
*/
99

1010
/**
@@ -27,7 +27,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
2727
private var destroyFabricSurfacesInReactInstanceManagerCache: Boolean? = null
2828
private var enableAlignItemsBaselineOnFabricIOSCache: Boolean? = null
2929
private var enableAndroidLineHeightCenteringCache: Boolean? = null
30-
private var enableAndroidMixBlendModePropCache: Boolean? = null
3130
private var enableBackgroundStyleApplicatorCache: Boolean? = null
3231
private var enableBridgelessArchitectureCache: Boolean? = null
3332
private var enableCleanTextInputYogaNodeCache: Boolean? = null
@@ -138,15 +137,6 @@ public class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccesso
138137
return cached
139138
}
140139

141-
override fun enableAndroidMixBlendModeProp(): Boolean {
142-
var cached = enableAndroidMixBlendModePropCache
143-
if (cached == null) {
144-
cached = ReactNativeFeatureFlagsCxxInterop.enableAndroidMixBlendModeProp()
145-
enableAndroidMixBlendModePropCache = cached
146-
}
147-
return cached
148-
}
149-
150140
override fun enableBackgroundStyleApplicator(): Boolean {
151141
var cached = enableBackgroundStyleApplicatorCache
152142
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<<76eebf045692e945d39a4ea27a63ae02>>
7+
* @generated SignedSource<<4055cd2fa9070549fba3eda675e8d6f6>>
88
*/
99

1010
/**
@@ -42,8 +42,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
4242

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

45-
@DoNotStrip @JvmStatic public external fun enableAndroidMixBlendModeProp(): Boolean
46-
4745
@DoNotStrip @JvmStatic public external fun enableBackgroundStyleApplicator(): Boolean
4846

4947
@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<<8155a9c1309145fefdb19feb33c241db>>
7+
* @generated SignedSource<<340a2b27d0a0281746e3f4b02be5e1bb>>
88
*/
99

1010
/**
@@ -37,8 +37,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
3737

3838
override fun enableAndroidLineHeightCentering(): Boolean = false
3939

40-
override fun enableAndroidMixBlendModeProp(): Boolean = false
41-
4240
override fun enableBackgroundStyleApplicator(): Boolean = true
4341

4442
override fun enableBridgelessArchitecture(): Boolean = false

0 commit comments

Comments
 (0)