Skip to content

Commit 16339cc

Browse files
yungstersmeta-codesync[bot]
authored andcommitted
Fling: Rename VirtualView{Experimental => } Native Component (#55089)
Summary: Pull Request resolved: #55089 Renames `VirtualViewExperimental` to `VirtualView`. Changelog: [Internal] Differential Revision: D90289664
1 parent d5bf628 commit 16339cc

File tree

15 files changed

+55
-95
lines changed

15 files changed

+55
-95
lines changed

packages/react-native/Package.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ let CallInvokerPath = "ReactCommon/callinvoker" // header only target
3737
let ReactFBReactNativeSpecPath = "React/FBReactNativeSpec" // generated
3838
let FBLazyVectorPath = "Libraries/FBLazyVector" // header only
3939
let virtualViewPath = "ReactCommon/react/renderer/components/virtualview" // header only
40-
let virtualViewExperimentalPath = "ReactCommon/react/renderer/components/virtualviewexperimental" // header only
4140

4241
// MARK: Prebuilt Dependencies declaration
4342
let reactNativeDependencies = BinaryTarget(
@@ -454,7 +453,6 @@ let reactFabric = RNTarget(
454453
"components/textinput/platform/ios/",
455454
"components/unimplementedview",
456455
"components/virtualview",
457-
"components/virtualviewexperimental",
458456
"components/root/tests",
459457
],
460458
dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga],
@@ -541,7 +539,7 @@ let reactFabricUnimplementedView = RNTarget(
541539
let reactRCTFabric = RNTarget(
542540
name: .reactRCTFabric,
543541
path: "React/Fabric",
544-
searchPaths: [virtualViewPath, virtualViewExperimentalPath],
542+
searchPaths: [virtualViewPath],
545543
dependencies: [.reactNativeDependencies, .reactCore, .reactRCTImage, .yoga, .reactRCTText, .jsi, .reactFabricInputAccessory, .reactFabricModal, .reactFabricSafeAreaView, .reactFabricSwitch, .reactFabricText, .reactFabricTextInput, .reactFabricUnimplementedView, .reactFabricTextLayoutManager, .reactGraphics, .reactImageManager, .reactDebug, .reactUtils, .reactPerformanceTimeline, .reactRendererDebug, .reactRendererConsistency, .reactRuntimeScheduler, .reactRCTAnimation, .reactJsInspector, .reactJsInspectorNetwork, .reactJsInspectorTracing, .reactFabric, .reactFabricImage, .rctSwiftUIWrapper]
546544
)
547545

packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.h renamed to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
NS_ASSUME_NONNULL_BEGIN
1414

15-
@interface RCTVirtualViewExperimentalComponentView : RCTViewComponentView <RCTVirtualViewProtocol>
15+
@interface RCTVirtualViewComponentView : RCTViewComponentView <RCTVirtualViewProtocol>
1616

1717
+ (instancetype)new NS_UNAVAILABLE;
1818
- (instancetype)init NS_UNAVAILABLE;

packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.mm renamed to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
#import "RCTVirtualViewExperimentalComponentView.h"
8+
#import "RCTVirtualViewComponentView.h"
99

1010
#import <React/RCTAssert.h>
1111
#import <React/RCTConversions.h>
@@ -20,8 +20,8 @@
2020
#import <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
2121
#import <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
2222
#import <react/renderer/components/FBReactNativeSpec/Props.h>
23-
#import <react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h>
24-
#import <react/renderer/components/virtualviewexperimental/VirtualViewExperimentalShadowNode.h>
23+
#import <react/renderer/components/virtualview/VirtualViewComponentDescriptor.h>
24+
#import <react/renderer/components/virtualview/VirtualViewShadowNode.h>
2525

2626
#import "RCTFabricComponentsPlugins.h"
2727
#import "RCTVirtualViewMode.h"
@@ -30,13 +30,13 @@
3030
using namespace facebook;
3131
using namespace facebook::react;
3232

33-
@interface RCTVirtualViewExperimentalComponentView () {
33+
@interface RCTVirtualViewComponentView () {
3434
NSString *_virtualViewID;
3535
}
3636

3737
@end
3838

39-
@implementation RCTVirtualViewExperimentalComponentView {
39+
@implementation RCTVirtualViewComponentView {
4040
id<RCTVirtualViewContainerProtocol> _parentVirtualViewContainer;
4141
std::optional<RCTVirtualViewMode> _mode;
4242
RCTVirtualViewRenderState _renderState;
@@ -50,7 +50,7 @@ @implementation RCTVirtualViewExperimentalComponentView {
5050
- (instancetype)initWithFrame:(CGRect)frame
5151
{
5252
if ((self = [super initWithFrame:frame]) != nil) {
53-
_props = VirtualViewExperimentalShadowNode::defaultSharedProps();
53+
_props = VirtualViewShadowNode::defaultSharedProps();
5454
_renderState = RCTVirtualViewRenderStateUnknown;
5555
_virtualViewID = [[NSUUID UUID] UUIDString];
5656
_didLayout = NO;
@@ -61,7 +61,7 @@ - (instancetype)initWithFrame:(CGRect)frame
6161

6262
- (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
6363
{
64-
const auto &newViewProps = static_cast<const VirtualViewExperimentalProps &>(*props);
64+
const auto &newViewProps = static_cast<const VirtualViewProps &>(*props);
6565

6666
if (!_mode.has_value()) {
6767
_mode = newViewProps.initialHidden ? RCTVirtualViewModeHidden : RCTVirtualViewModeVisible;
@@ -177,7 +177,7 @@ - (void)onModeChange:(RCTVirtualViewMode)newMode targetRect:(CGRect)targetRect t
177177

178178
// NOTE: Make sure to keep these props in sync with dispatchSyncModeChange below where we have to explicitly copy
179179
// all props.
180-
VirtualViewExperimentalEventEmitter::OnModeChange event = {
180+
VirtualViewEventEmitter::OnModeChange event = {
181181
.mode = (int)newMode,
182182
.targetRect =
183183
{.x = targetRect.origin.x,
@@ -260,23 +260,23 @@ - (void)_unhideIfNeeded
260260
return nil;
261261
}
262262

263-
- (void)_dispatchAsyncModeChange:(VirtualViewExperimentalEventEmitter::OnModeChange &)event
263+
- (void)_dispatchAsyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event
264264
{
265265
if (!_eventEmitter) {
266266
return;
267267
}
268268

269-
auto &emitter = static_cast<const VirtualViewExperimentalEventEmitter &>(*_eventEmitter);
269+
auto &emitter = static_cast<const VirtualViewEventEmitter &>(*_eventEmitter);
270270
emitter.onModeChange(event);
271271
}
272272

273-
- (void)_dispatchSyncModeChange:(VirtualViewExperimentalEventEmitter::OnModeChange &)event
273+
- (void)_dispatchSyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event
274274
{
275275
if (!_eventEmitter) {
276276
return;
277277
}
278278

279-
auto &emitter = static_cast<const VirtualViewExperimentalEventEmitter &>(*_eventEmitter);
279+
auto &emitter = static_cast<const VirtualViewEventEmitter &>(*_eventEmitter);
280280

281281
// TODO: Move this into a custom event emitter. We had to duplicate the codegen code here from onModeChange in order
282282
// to dispatch synchronously and discrete.
@@ -310,12 +310,12 @@ - (void)_dispatchSyncModeChange:(VirtualViewExperimentalEventEmitter::OnModeChan
310310

311311
+ (ComponentDescriptorProvider)componentDescriptorProvider
312312
{
313-
return concreteComponentDescriptorProvider<VirtualViewExperimentalComponentDescriptor>();
313+
return concreteComponentDescriptorProvider<VirtualViewComponentDescriptor>();
314314
}
315315

316316
@end
317317

318-
Class<RCTComponentViewProtocol> VirtualViewExperimentalCls(void)
318+
Class<RCTComponentViewProtocol> VirtualViewCls(void)
319319
{
320-
return RCTVirtualViewExperimentalComponentView.class;
320+
return RCTVirtualViewComponentView.class;
321321
}

packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewMode.h renamed to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewMode.h

File renamed without changes.

packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewRenderState.h renamed to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewRenderState.h

File renamed without changes.

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6702,7 +6702,7 @@ public final class com/facebook/react/views/virtual/VirtualViewMode : java/lang/
67026702
public static fun values ()[Lcom/facebook/react/views/virtual/VirtualViewMode;
67036703
}
67046704

6705-
public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental : com/facebook/react/views/view/ReactViewGroup, android/view/View$OnLayoutChangeListener, com/facebook/react/views/scroll/VirtualView {
6705+
public final class com/facebook/react/views/virtual/view/ReactVirtualView : com/facebook/react/views/view/ReactViewGroup, android/view/View$OnLayoutChangeListener, com/facebook/react/views/scroll/VirtualView {
67066706
public fun <init> (Landroid/content/Context;)V
67076707
public fun getContainerRelativeRect ()Landroid/graphics/Rect;
67086708
public fun getVirtualViewID ()Ljava/lang/String;
@@ -6712,27 +6712,27 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua
67126712
public fun updateClippingRect (Ljava/util/Set;)V
67136713
}
67146714

6715-
public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager : com/facebook/react/views/view/ReactClippingViewManager, com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface {
6716-
public static final field Companion Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager$Companion;
6715+
public final class com/facebook/react/views/virtual/view/ReactVirtualViewManager : com/facebook/react/views/view/ReactClippingViewManager, com/facebook/react/viewmanagers/VirtualViewManagerInterface {
6716+
public static final field Companion Lcom/facebook/react/views/virtual/view/ReactVirtualViewManager$Companion;
67176717
public static final field REACT_CLASS Ljava/lang/String;
67186718
public fun <init> ()V
67196719
public synthetic fun addEventEmitters (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)V
67206720
public synthetic fun createViewInstance (Lcom/facebook/react/uimanager/ThemedReactContext;)Landroid/view/View;
67216721
public fun getName ()Ljava/lang/String;
67226722
public synthetic fun prepareToRecycleView (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)Landroid/view/View;
67236723
public synthetic fun setInitialHidden (Landroid/view/View;Z)V
6724-
public fun setInitialHidden (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Z)V
6724+
public fun setInitialHidden (Lcom/facebook/react/views/virtual/view/ReactVirtualView;Z)V
67256725
public synthetic fun setNativeId (Landroid/view/View;Ljava/lang/String;)V
6726-
public fun setNativeId (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Ljava/lang/String;)V
6726+
public fun setNativeId (Lcom/facebook/react/views/virtual/view/ReactVirtualView;Ljava/lang/String;)V
67276727
public synthetic fun setRemoveClippedSubviews (Landroid/view/View;Z)V
67286728
public synthetic fun setRenderState (Landroid/view/View;I)V
6729-
public fun setRenderState (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;I)V
6729+
public fun setRenderState (Lcom/facebook/react/views/virtual/view/ReactVirtualView;I)V
67306730
}
67316731

6732-
public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager$Companion {
6732+
public final class com/facebook/react/views/virtual/view/ReactVirtualViewManager$Companion {
67336733
}
67346734

6735-
public final class com/facebook/react/views/virtual/viewexperimental/VirtualViewEventEmitter : com/facebook/react/views/virtual/VirtualViewModeChangeEmitter {
6735+
public final class com/facebook/react/views/virtual/view/VirtualViewEventEmitter : com/facebook/react/views/virtual/VirtualViewModeChangeEmitter {
67366736
public fun <init> (IILcom/facebook/react/uimanager/events/EventDispatcher;)V
67376737
public fun emitModeChange (Lcom/facebook/react/views/virtual/VirtualViewMode;Landroid/graphics/Rect;Landroid/graphics/Rect;Z)V
67386738
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtual.viewexperimental
8+
package com.facebook.react.views.virtual.view
99

1010
import android.content.Context
1111
import android.graphics.Rect
@@ -25,7 +25,7 @@ import com.facebook.react.views.virtual.VirtualViewMode
2525
import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter
2626
import com.facebook.react.views.virtual.VirtualViewRenderState
2727

28-
public class ReactVirtualViewExperimental(context: Context) :
28+
public class ReactVirtualView(context: Context) :
2929
ReactViewGroup(context), VirtualView, View.OnLayoutChangeListener {
3030

3131
internal var mode: VirtualViewMode? = null
@@ -300,6 +300,6 @@ public class ReactVirtualViewExperimental(context: Context) :
300300
}
301301
}
302302

303-
private const val DEBUG_TAG: String = "ReactVirtualViewExperimental"
303+
private const val DEBUG_TAG: String = "ReactVirtualView"
304304
private val IS_DEBUG_BUILD =
305305
ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD || ReactBuildConfig.ENABLE_PERFETTO

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtual.viewexperimental
8+
package com.facebook.react.views.virtual.view
99

1010
import android.graphics.Rect
1111
import androidx.annotation.VisibleForTesting
@@ -16,37 +16,36 @@ import com.facebook.react.uimanager.UIManagerHelper
1616
import com.facebook.react.uimanager.ViewManagerDelegate
1717
import com.facebook.react.uimanager.annotations.ReactProp
1818
import com.facebook.react.uimanager.events.EventDispatcher
19-
import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerDelegate
20-
import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerInterface
19+
import com.facebook.react.viewmanagers.VirtualViewManagerDelegate
20+
import com.facebook.react.viewmanagers.VirtualViewManagerInterface
2121
import com.facebook.react.views.view.ReactClippingViewManager
2222
import com.facebook.react.views.virtual.VirtualViewMode
2323
import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter
2424
import com.facebook.react.views.virtual.VirtualViewModeChangeEvent
2525
import com.facebook.react.views.virtual.VirtualViewRenderState
2626

27-
@ReactModule(name = ReactVirtualViewExperimentalManager.REACT_CLASS)
28-
public class ReactVirtualViewExperimentalManager :
29-
ReactClippingViewManager<ReactVirtualViewExperimental>(),
30-
VirtualViewExperimentalManagerInterface<ReactVirtualViewExperimental> {
27+
@ReactModule(name = ReactVirtualViewManager.REACT_CLASS)
28+
public class ReactVirtualViewManager :
29+
ReactClippingViewManager<ReactVirtualView>(), VirtualViewManagerInterface<ReactVirtualView> {
3130

32-
private val _delegate = VirtualViewExperimentalManagerDelegate(this)
31+
private val _delegate = VirtualViewManagerDelegate(this)
3332

34-
override fun getDelegate(): ViewManagerDelegate<ReactVirtualViewExperimental> = _delegate
33+
override fun getDelegate(): ViewManagerDelegate<ReactVirtualView> = _delegate
3534

3635
override fun getName(): String = REACT_CLASS
3736

38-
override fun createViewInstance(reactContext: ThemedReactContext): ReactVirtualViewExperimental =
39-
ReactVirtualViewExperimental(reactContext)
37+
override fun createViewInstance(reactContext: ThemedReactContext): ReactVirtualView =
38+
ReactVirtualView(reactContext)
4039

4140
@ReactProp(name = "initialHidden")
42-
override fun setInitialHidden(view: ReactVirtualViewExperimental, value: Boolean) {
41+
override fun setInitialHidden(view: ReactVirtualView, value: Boolean) {
4342
if (view.mode == null) {
4443
view.mode = if (value) VirtualViewMode.Hidden else VirtualViewMode.Visible
4544
}
4645
}
4746

4847
@ReactProp(name = "renderState")
49-
override fun setRenderState(view: ReactVirtualViewExperimental, value: Int) {
48+
override fun setRenderState(view: ReactVirtualView, value: Int) {
5049
// If disabled, `renderState` will always be `VirtualViewRenderState.Unknown`.
5150
if (ReactNativeFeatureFlags.enableVirtualViewRenderState()) {
5251
view.renderState =
@@ -58,13 +57,13 @@ public class ReactVirtualViewExperimentalManager :
5857
}
5958
}
6059

61-
override fun setNativeId(view: ReactVirtualViewExperimental, nativeId: String?) {
60+
override fun setNativeId(view: ReactVirtualView, nativeId: String?) {
6261
super.setNativeId(view, nativeId)
6362
}
6463

6564
override fun addEventEmitters(
6665
reactContext: ThemedReactContext,
67-
view: ReactVirtualViewExperimental,
66+
view: ReactVirtualView,
6867
) {
6968
val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return
7069
view.modeChangeEmitter =
@@ -73,14 +72,14 @@ public class ReactVirtualViewExperimentalManager :
7372

7473
override fun prepareToRecycleView(
7574
reactContext: ThemedReactContext,
76-
view: ReactVirtualViewExperimental,
77-
): ReactVirtualViewExperimental? {
75+
view: ReactVirtualView,
76+
): ReactVirtualView? {
7877
view.recycleView()
7978
return super.prepareToRecycleView(reactContext, view)
8079
}
8180

8281
public companion object {
83-
public const val REACT_CLASS: String = "VirtualViewExperimental"
82+
public const val REACT_CLASS: String = "VirtualView"
8483
}
8584
}
8685

packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <react/renderer/components/text/TextComponentDescriptor.h>
2525
#include <react/renderer/components/view/LayoutConformanceComponentDescriptor.h>
2626
#include <react/renderer/components/view/ViewComponentDescriptor.h>
27-
#include <react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h>
27+
#include <react/renderer/components/virtualview/VirtualViewComponentDescriptor.h>
2828

2929
namespace facebook::react::CoreComponentsRegistry {
3030

@@ -81,8 +81,7 @@ void addCoreComponents(
8181
concreteComponentDescriptorProvider<
8282
LayoutConformanceComponentDescriptor>());
8383
providerRegistry->add(
84-
concreteComponentDescriptorProvider<
85-
VirtualViewExperimentalComponentDescriptor>());
84+
concreteComponentDescriptorProvider<VirtualViewComponentDescriptor>());
8685
}
8786

8887
} // namespace facebook::react::CoreComponentsRegistry

packages/react-native/ReactCommon/React-FabricComponents.podspec

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,6 @@ Pod::Spec.new do |s|
149149
sss.header_dir = "react/renderer/components/virtualview"
150150
end
151151

152-
ss.subspec "virtualviewexperimental" do |sss|
153-
sss.source_files = "react/renderer/components/virtualviewexperimental/**/*.{m,mm,cpp,h}"
154-
sss.exclude_files = "react/renderer/components/virtualviewexperimental/tests"
155-
sss.header_dir = "react/renderer/components/virtualviewexperimental"
156-
end
157-
158152
# Legacy header paths for backwards compat
159153
ss.subspec "rncore" do |sss|
160154
sss.source_files = podspec_sources("react/renderer/components/rncore/**/*.h", "react/renderer/components/rncore/**/*.h")

0 commit comments

Comments
 (0)