Skip to content

Commit f41f52c

Browse files
lunaleapsfacebook-github-bot
authored andcommitted
Move out enums VirtualViewMode and VirtualViewRenderState (#52798)
Summary: Pull Request resolved: #52798 Changelog: [Internal] - Move out VirtualViewMode and VirtualViewRenderState into separate files for experimental VirtualView Reviewed By: mdvacca Differential Revision: D78825700 fbshipit-source-id: ec21867688b69c4dc88be94a2f3454e07fe4c1bc
1 parent e1ae619 commit f41f52c

4 files changed

Lines changed: 47 additions & 32 deletions

File tree

packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,13 @@
2121
#import <react/renderer/components/virtualview/VirtualViewComponentDescriptor.h>
2222
#import <react/renderer/components/virtualview/VirtualViewShadowNode.h>
2323

24+
#import "../VirtualViewExperimental/RCTVirtualViewMode.h"
25+
#import "../VirtualViewExperimental/RCTVirtualViewRenderState.h"
2426
#import "RCTFabricComponentsPlugins.h"
2527

2628
using namespace facebook;
2729
using namespace facebook::react;
2830

29-
typedef NS_ENUM(NSInteger, RCTVirtualViewMode) {
30-
RCTVirtualViewModeVisible = 0,
31-
RCTVirtualViewModePrerender = 1,
32-
RCTVirtualViewModeHidden = 2,
33-
};
34-
35-
typedef NS_ENUM(NSInteger, RCTVirtualViewRenderState) {
36-
RCTVirtualViewRenderStateUnknown = 0,
37-
RCTVirtualViewRenderStateRendered = 1,
38-
RCTVirtualViewRenderStateNone = 2,
39-
};
40-
4131
/**
4232
* Checks whether one CGRect overlaps with another CGRect.
4333
*
@@ -72,8 +62,8 @@ @interface RCTVirtualViewComponentView () <UIScrollViewDelegate>
7262

7363
@implementation RCTVirtualViewComponentView {
7464
RCTScrollViewComponentView *_lastParentScrollViewComponentView;
75-
std::optional<enum RCTVirtualViewMode> _mode;
76-
enum RCTVirtualViewRenderState _renderState;
65+
std::optional<RCTVirtualViewMode> _mode;
66+
RCTVirtualViewRenderState _renderState;
7767
std::optional<CGRect> _targetRect;
7868
}
7969

@@ -234,7 +224,7 @@ - (void)dispatchOnModeChangeIfNeeded:(BOOL)checkForTargetRectChange
234224
_targetRect = targetRect;
235225
}
236226

237-
enum RCTVirtualViewMode newMode;
227+
RCTVirtualViewMode newMode;
238228
CGRect thresholdRect = CGRectMake(
239229
scrollView.contentOffset.x,
240230
scrollView.contentOffset.y,
@@ -278,7 +268,7 @@ - (void)dispatchOnModeChangeIfNeeded:(BOOL)checkForTargetRectChange
278268
.height = thresholdRect.size.height},
279269
};
280270

281-
const std::optional<enum RCTVirtualViewMode> oldMode = _mode;
271+
const std::optional<RCTVirtualViewMode> oldMode = _mode;
282272
_mode = newMode;
283273

284274
switch (newMode) {

packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.mm

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,12 @@
2222
#import <react/renderer/components/virtualviewexperimental/VirtualViewExperimentalShadowNode.h>
2323

2424
#import "RCTFabricComponentsPlugins.h"
25+
#import "RCTVirtualViewMode.h"
26+
#import "RCTVirtualViewRenderState.h"
2527

2628
using namespace facebook;
2729
using namespace facebook::react;
2830

29-
typedef NS_ENUM(NSInteger, RCTVirtualViewMode) {
30-
RCTVirtualViewModeVisible = 0,
31-
RCTVirtualViewModePrerender = 1,
32-
RCTVirtualViewModeHidden = 2,
33-
};
34-
35-
typedef NS_ENUM(NSInteger, RCTVirtualViewRenderState) {
36-
RCTVirtualViewRenderStateUnknown = 0,
37-
RCTVirtualViewRenderStateRendered = 1,
38-
RCTVirtualViewRenderStateNone = 2,
39-
};
40-
4131
/**
4232
* Checks whether one CGRect overlaps with another CGRect.
4333
*
@@ -72,8 +62,8 @@ @interface RCTVirtualViewExperimentalComponentView () <UIScrollViewDelegate>
7262

7363
@implementation RCTVirtualViewExperimentalComponentView {
7464
RCTScrollViewComponentView *_lastParentScrollViewComponentView;
75-
std::optional<enum RCTVirtualViewMode> _mode;
76-
enum RCTVirtualViewRenderState _renderState;
65+
std::optional<RCTVirtualViewMode> _mode;
66+
RCTVirtualViewRenderState _renderState;
7767
std::optional<CGRect> _targetRect;
7868
}
7969

@@ -234,7 +224,7 @@ - (void)dispatchOnModeChangeIfNeeded:(BOOL)checkForTargetRectChange
234224
_targetRect = targetRect;
235225
}
236226

237-
enum RCTVirtualViewMode newMode;
227+
RCTVirtualViewMode newMode;
238228
CGRect thresholdRect = CGRectMake(
239229
scrollView.contentOffset.x,
240230
scrollView.contentOffset.y,
@@ -278,7 +268,7 @@ - (void)dispatchOnModeChangeIfNeeded:(BOOL)checkForTargetRectChange
278268
.height = thresholdRect.size.height},
279269
};
280270

281-
const std::optional<enum RCTVirtualViewMode> oldMode = _mode;
271+
const std::optional<RCTVirtualViewMode> oldMode = _mode;
282272
_mode = newMode;
283273

284274
switch (newMode) {
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
#import <Foundation/Foundation.h>
9+
#ifndef RCTVirtualViewMode_h
10+
#define RCTVirtualViewMode_h
11+
12+
// Enum for virtual view modes
13+
using RCTVirtualViewMode = NS_ENUM(NSInteger){
14+
RCTVirtualViewModeVisible = 0,
15+
RCTVirtualViewModePrerender = 1,
16+
RCTVirtualViewModeHidden = 2,
17+
};
18+
#endif /* RCTVirtualViewMode_h */
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
#import <Foundation/Foundation.h>
9+
#ifndef RCTVirtualViewRenderState_h
10+
#define RCTVirtualViewRenderState_h
11+
12+
using RCTVirtualViewRenderState = NS_ENUM(NSInteger){
13+
RCTVirtualViewRenderStateUnknown = 0,
14+
RCTVirtualViewRenderStateRendered = 1,
15+
RCTVirtualViewRenderStateNone = 2,
16+
};
17+
#endif /* RCTVirtualViewRenderState_h */

0 commit comments

Comments
 (0)