Skip to content

Commit ce306ac

Browse files
javachefacebook-github-bot
authored andcommitted
Remove redundant check for NativeReactNativeFeatureFlags (#52354)
Summary: Pull Request resolved: #52354 These should no longer be needed as `ReactNativeFeatureFlags` handles the missing native module gracefully. Changelog: [Internal] Reviewed By: rubennorte Differential Revision: D77365271 fbshipit-source-id: 92c6789b2175f24c79838118f681107a43c9ff0a
1 parent 5cc4d0a commit ce306ac

File tree

3 files changed

+18
-45
lines changed

3 files changed

+18
-45
lines changed

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import type {AnyAttributeType} from '../../Renderer/shims/ReactNativeTypes';
1212

1313
import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
14-
import NativeReactNativeFeatureFlags from '../../../src/private/featureflags/specs/NativeReactNativeFeatureFlags';
1514
import processAspectRatio from '../../StyleSheet/processAspectRatio';
1615
import processBackgroundImage from '../../StyleSheet/processBackgroundImage';
1716
import processBoxShadow from '../../StyleSheet/processBoxShadow';
@@ -123,13 +122,9 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
123122
/**
124123
* Filter
125124
*/
126-
filter:
127-
NativeReactNativeFeatureFlags != null &&
128-
ReactNativeFeatureFlags.enableNativeCSSParsing()
129-
? true
130-
: {
131-
process: processFilter,
132-
},
125+
filter: ReactNativeFeatureFlags.enableNativeCSSParsing()
126+
? true
127+
: {process: processFilter},
133128

134129
/**
135130
* MixBlendMode
@@ -144,13 +139,9 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
144139
/*
145140
* BoxShadow
146141
*/
147-
boxShadow:
148-
NativeReactNativeFeatureFlags != null &&
149-
ReactNativeFeatureFlags.enableNativeCSSParsing()
150-
? true
151-
: {
152-
process: processBoxShadow,
153-
},
142+
boxShadow: ReactNativeFeatureFlags.enableNativeCSSParsing()
143+
? true
144+
: {process: processBoxShadow},
154145

155146
/**
156147
* Linear Gradient

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import type {PartialViewConfigWithoutName} from './PlatformBaseViewConfig';
1212

1313
import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
14-
import NativeReactNativeFeatureFlags from '../../src/private/featureflags/specs/NativeReactNativeFeatureFlags';
1514
import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
1615
import {DynamicallyInjectedByGestureHandler} from './ViewConfigIgnore';
1716

@@ -183,20 +182,12 @@ const validAttributesForNonEventProps = {
183182
experimental_backgroundImage: {
184183
process: require('../StyleSheet/processBackgroundImage').default,
185184
},
186-
boxShadow:
187-
NativeReactNativeFeatureFlags != null &&
188-
ReactNativeFeatureFlags.enableNativeCSSParsing()
189-
? (true as const)
190-
: {
191-
process: require('../StyleSheet/processBoxShadow').default,
192-
},
193-
filter:
194-
NativeReactNativeFeatureFlags != null &&
195-
ReactNativeFeatureFlags.enableNativeCSSParsing()
196-
? (true as const)
197-
: {
198-
process: require('../StyleSheet/processFilter').default,
199-
},
185+
boxShadow: ReactNativeFeatureFlags.enableNativeCSSParsing()
186+
? (true as const)
187+
: {process: require('../StyleSheet/processBoxShadow').default},
188+
filter: ReactNativeFeatureFlags.enableNativeCSSParsing()
189+
? (true as const)
190+
: {process: require('../StyleSheet/processFilter').default},
200191
mixBlendMode: true,
201192
isolation: true,
202193
opacity: true,

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import type {PartialViewConfigWithoutName} from './PlatformBaseViewConfig';
1212

1313
import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
14-
import NativeReactNativeFeatureFlags from '../../src/private/featureflags/specs/NativeReactNativeFeatureFlags';
1514
import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
1615
import {
1716
ConditionallyIgnoredEventHandlers,
@@ -229,20 +228,12 @@ const validAttributesForNonEventProps = {
229228
hitSlop: {diff: require('../Utilities/differ/insetsDiffer').default},
230229
collapsable: true,
231230
collapsableChildren: true,
232-
filter:
233-
NativeReactNativeFeatureFlags != null &&
234-
ReactNativeFeatureFlags.enableNativeCSSParsing()
235-
? (true as const)
236-
: {
237-
process: require('../StyleSheet/processFilter').default,
238-
},
239-
boxShadow:
240-
NativeReactNativeFeatureFlags != null &&
241-
ReactNativeFeatureFlags.enableNativeCSSParsing()
242-
? (true as const)
243-
: {
244-
process: require('../StyleSheet/processBoxShadow').default,
245-
},
231+
filter: ReactNativeFeatureFlags.enableNativeCSSParsing()
232+
? (true as const)
233+
: {process: require('../StyleSheet/processFilter').default},
234+
boxShadow: ReactNativeFeatureFlags.enableNativeCSSParsing()
235+
? (true as const)
236+
: {process: require('../StyleSheet/processBoxShadow').default},
246237
mixBlendMode: true,
247238
isolation: true,
248239

0 commit comments

Comments
 (0)