Skip to content

Commit 9247f38

Browse files
coadofacebook-github-bot
authored andcommitted
Use View umbrella in generated components
Summary: Update Fabric component codegen to consume the public View module through <React/View.h> for generated props, event emitters, shadow nodes, and dimension conversions. Refresh generated snapshots and checked-in popup-menu bindings, and add strict consumer compile coverage that does not use RN_BUILDING. Make the View umbrella compatible with force-CXX platform configurations discovered by the broader generated-header coverage. On Android, gate the ViewPropsInterpolation rawProps workaround on both ANDROID and RN_SERIALIZABLE_STATE, since rawProps only exists when serializable state is enabled; this preserves existing Android behavior without enabling the runtime/ABI feature globally. For Android, macOS, and Windows platform types, rely on the Buck-selected HostPlatformViewProps and HostPlatformViewEventEmitter headers instead of compiler platform macros: the native implementations already expose NativeDrawable, HostPlatformViewEvents, KeyEvent, MouseEvent, and WindowsViewEvents, while force-CXX builds intentionally do not export those platform-only headers. Changelog: [Internal]. Differential Revision: D119490247
1 parent 70ab58d commit 9247f38

26 files changed

Lines changed: 307 additions & 266 deletions

packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GenerateEventEmitterH-test.js.snap

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Object {
1313
*/
1414
#pragma once
1515
16-
#include <react/renderer/components/view/ViewEventEmitter.h>
16+
#include <React/View.h>
1717
1818
1919
namespace facebook::react {
@@ -42,7 +42,7 @@ Object {
4242
*/
4343
#pragma once
4444
45-
#include <react/renderer/components/view/ViewEventEmitter.h>
45+
#include <React/View.h>
4646
4747
4848
namespace facebook::react {
@@ -71,7 +71,7 @@ Object {
7171
*/
7272
#pragma once
7373
74-
#include <react/renderer/components/view/ViewEventEmitter.h>
74+
#include <React/View.h>
7575
7676
7777
namespace facebook::react {
@@ -100,7 +100,7 @@ Object {
100100
*/
101101
#pragma once
102102
103-
#include <react/renderer/components/view/ViewEventEmitter.h>
103+
#include <React/View.h>
104104
105105
106106
namespace facebook::react {
@@ -129,7 +129,7 @@ Object {
129129
*/
130130
#pragma once
131131
132-
#include <react/renderer/components/view/ViewEventEmitter.h>
132+
#include <React/View.h>
133133
134134
135135
namespace facebook::react {
@@ -158,7 +158,7 @@ Object {
158158
*/
159159
#pragma once
160160
161-
#include <react/renderer/components/view/ViewEventEmitter.h>
161+
#include <React/View.h>
162162
163163
164164
namespace facebook::react {
@@ -187,7 +187,7 @@ Object {
187187
*/
188188
#pragma once
189189
190-
#include <react/renderer/components/view/ViewEventEmitter.h>
190+
#include <React/View.h>
191191
192192
193193
namespace facebook::react {
@@ -237,7 +237,7 @@ Object {
237237
*/
238238
#pragma once
239239
240-
#include <react/renderer/components/view/ViewEventEmitter.h>
240+
#include <React/View.h>
241241
242242
243243
namespace facebook::react {
@@ -314,7 +314,7 @@ Object {
314314
*/
315315
#pragma once
316316
317-
#include <react/renderer/components/view/ViewEventEmitter.h>
317+
#include <React/View.h>
318318
319319
320320
namespace facebook::react {
@@ -343,7 +343,7 @@ Object {
343343
*/
344344
#pragma once
345345
346-
#include <react/renderer/components/view/ViewEventEmitter.h>
346+
#include <React/View.h>
347347
348348
349349
namespace facebook::react {
@@ -372,7 +372,7 @@ Object {
372372
*/
373373
#pragma once
374374
375-
#include <react/renderer/components/view/ViewEventEmitter.h>
375+
#include <React/View.h>
376376
377377
378378
namespace facebook::react {
@@ -401,7 +401,7 @@ Object {
401401
*/
402402
#pragma once
403403
404-
#include <react/renderer/components/view/ViewEventEmitter.h>
404+
#include <React/View.h>
405405
406406
407407
namespace facebook::react {
@@ -432,7 +432,7 @@ Object {
432432
*/
433433
#pragma once
434434
435-
#include <react/renderer/components/view/ViewEventEmitter.h>
435+
#include <React/View.h>
436436
437437
438438
namespace facebook::react {
@@ -461,7 +461,7 @@ Object {
461461
*/
462462
#pragma once
463463
464-
#include <react/renderer/components/view/ViewEventEmitter.h>
464+
#include <React/View.h>
465465
466466
467467
namespace facebook::react {
@@ -490,7 +490,7 @@ Object {
490490
*/
491491
#pragma once
492492
493-
#include <react/renderer/components/view/ViewEventEmitter.h>
493+
#include <React/View.h>
494494
495495
496496
namespace facebook::react {
@@ -519,7 +519,7 @@ Object {
519519
*/
520520
#pragma once
521521
522-
#include <react/renderer/components/view/ViewEventEmitter.h>
522+
#include <React/View.h>
523523
524524
525525
namespace facebook::react {
@@ -548,7 +548,7 @@ Object {
548548
*/
549549
#pragma once
550550
551-
#include <react/renderer/components/view/ViewEventEmitter.h>
551+
#include <React/View.h>
552552
553553
554554
namespace facebook::react {
@@ -577,7 +577,7 @@ Object {
577577
*/
578578
#pragma once
579579
580-
#include <react/renderer/components/view/ViewEventEmitter.h>
580+
#include <React/View.h>
581581
582582
583583
namespace facebook::react {

packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsCpp-test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Object {
1313
*/
1414
1515
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
16+
#include <React/View.h>
1617
#include <react/renderer/components/image/conversions.h>
17-
#include <react/renderer/components/view/conversions.h>
1818
#include <react/renderer/core/PropsParserContext.h>
1919
#include <react/renderer/core/propsConversions.h>
2020
@@ -239,7 +239,7 @@ Object {
239239
*/
240240
241241
#include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
242-
#include <react/renderer/components/view/conversions.h>
242+
#include <React/View.h>
243243
#include <react/renderer/core/PropsParserContext.h>
244244
#include <react/renderer/core/propsConversions.h>
245245

packages/react-native-codegen/e2e/deep_imports/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Object {
1313
*/
1414
#pragma once
1515
16+
#include <React/View.h>
1617
#include <cinttypes>
17-
#include <react/renderer/components/view/ViewProps.h>
1818
#include <react/renderer/core/PropsParserContext.h>
1919
#include <react/renderer/core/graphicsConversions.h>
2020
#include <react/renderer/core/propsConversions.h>
@@ -228,7 +228,7 @@ Object {
228228
*/
229229
#pragma once
230230
231-
#include <react/renderer/components/view/ViewProps.h>
231+
#include <React/View.h>
232232
#include <react/renderer/core/PropsParserContext.h>
233233
#include <react/renderer/debug/DebugStringConvertible.h>
234234
@@ -271,7 +271,7 @@ Object {
271271
*/
272272
#pragma once
273273
274-
#include <react/renderer/components/view/ViewProps.h>
274+
#include <React/View.h>
275275
#include <react/renderer/core/PropsParserContext.h>
276276
#include <react/renderer/debug/DebugStringConvertible.h>
277277
#include <react/renderer/graphics/Color.h>
@@ -314,7 +314,7 @@ Object {
314314
*/
315315
#pragma once
316316
317-
#include <react/renderer/components/view/ViewProps.h>
317+
#include <React/View.h>
318318
#include <react/renderer/core/PropsParserContext.h>
319319
#include <react/renderer/core/graphicsConversions.h>
320320
#include <react/renderer/debug/DebugStringConvertible.h>
@@ -358,7 +358,7 @@ Object {
358358
*/
359359
#pragma once
360360
361-
#include <react/renderer/components/view/ViewProps.h>
361+
#include <React/View.h>
362362
#include <react/renderer/core/PropsParserContext.h>
363363
#include <react/renderer/debug/DebugStringConvertible.h>
364364
@@ -400,7 +400,7 @@ Object {
400400
*/
401401
#pragma once
402402
403-
#include <react/renderer/components/view/ViewProps.h>
403+
#include <React/View.h>
404404
#include <react/renderer/core/PropsParserContext.h>
405405
#include <react/renderer/debug/DebugStringConvertible.h>
406406
@@ -515,7 +515,7 @@ Object {
515515
*/
516516
#pragma once
517517
518-
#include <react/renderer/components/view/ViewProps.h>
518+
#include <React/View.h>
519519
#include <react/renderer/core/PropsParserContext.h>
520520
#include <react/renderer/debug/DebugStringConvertible.h>
521521
@@ -557,7 +557,7 @@ Object {
557557
*/
558558
#pragma once
559559
560-
#include <react/renderer/components/view/ViewProps.h>
560+
#include <React/View.h>
561561
#include <react/renderer/core/PropsParserContext.h>
562562
#include <react/renderer/debug/DebugStringConvertible.h>
563563
@@ -599,7 +599,7 @@ Object {
599599
*/
600600
#pragma once
601601
602-
#include <react/renderer/components/view/ViewProps.h>
602+
#include <React/View.h>
603603
#include <react/renderer/core/PropsParserContext.h>
604604
#include <react/renderer/debug/DebugStringConvertible.h>
605605
@@ -647,7 +647,7 @@ Object {
647647
*/
648648
#pragma once
649649
650-
#include <react/renderer/components/view/ViewProps.h>
650+
#include <React/View.h>
651651
#include <react/renderer/core/PropsParserContext.h>
652652
#include <react/renderer/debug/DebugStringConvertible.h>
653653
#include <react/renderer/imagemanager/primitives.h>
@@ -690,7 +690,7 @@ Object {
690690
*/
691691
#pragma once
692692
693-
#include <react/renderer/components/view/ViewProps.h>
693+
#include <React/View.h>
694694
#include <react/renderer/core/PropsParserContext.h>
695695
#include <react/renderer/debug/DebugStringConvertible.h>
696696
@@ -734,7 +734,7 @@ Object {
734734
*/
735735
#pragma once
736736
737-
#include <react/renderer/components/view/ViewProps.h>
737+
#include <React/View.h>
738738
#include <react/renderer/core/PropsParserContext.h>
739739
#include <react/renderer/debug/DebugStringConvertible.h>
740740
@@ -776,7 +776,7 @@ Object {
776776
*/
777777
#pragma once
778778
779-
#include <react/renderer/components/view/ViewProps.h>
779+
#include <React/View.h>
780780
#include <react/renderer/core/PropsParserContext.h>
781781
#include <react/renderer/debug/DebugStringConvertible.h>
782782
@@ -818,7 +818,7 @@ Object {
818818
*/
819819
#pragma once
820820
821-
#include <react/renderer/components/view/ViewProps.h>
821+
#include <React/View.h>
822822
#include <react/renderer/core/PropsParserContext.h>
823823
#include <react/renderer/debug/DebugStringConvertible.h>
824824
#include <react/renderer/graphics/Color.h>
@@ -866,7 +866,7 @@ Object {
866866
*/
867867
#pragma once
868868
869-
#include <react/renderer/components/view/ViewProps.h>
869+
#include <React/View.h>
870870
#include <react/renderer/core/PropsParserContext.h>
871871
#include <react/renderer/debug/DebugStringConvertible.h>
872872
@@ -908,8 +908,8 @@ Object {
908908
*/
909909
#pragma once
910910
911+
#include <React/View.h>
911912
#include <react/renderer/components/image/conversions.h>
912-
#include <react/renderer/components/view/ViewProps.h>
913913
#include <react/renderer/core/PropsParserContext.h>
914914
#include <react/renderer/core/propsConversions.h>
915915
#include <react/renderer/debug/DebugStringConvertible.h>
@@ -1160,7 +1160,7 @@ Object {
11601160
*/
11611161
#pragma once
11621162
1163-
#include <react/renderer/components/view/ViewProps.h>
1163+
#include <React/View.h>
11641164
#include <react/renderer/core/PropsParserContext.h>
11651165
#include <react/renderer/debug/DebugStringConvertible.h>
11661166
#include <react/renderer/graphics/Point.h>
@@ -1203,7 +1203,7 @@ Object {
12031203
*/
12041204
#pragma once
12051205
1206-
#include <react/renderer/components/view/ViewProps.h>
1206+
#include <React/View.h>
12071207
#include <react/renderer/core/PropsParserContext.h>
12081208
#include <react/renderer/debug/DebugStringConvertible.h>
12091209

0 commit comments

Comments
 (0)