diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index 0b2ec65ab2b5c0..28549c1a9ac88f 100644 --- a/packages/react-native/Package.swift +++ b/packages/react-native/Package.swift @@ -37,7 +37,6 @@ let CallInvokerPath = "ReactCommon/callinvoker" // header only target let ReactFBReactNativeSpecPath = "React/FBReactNativeSpec" // generated let FBLazyVectorPath = "Libraries/FBLazyVector" // header only let virtualViewPath = "ReactCommon/react/renderer/components/virtualview" // header only -let virtualViewExperimentalPath = "ReactCommon/react/renderer/components/virtualviewexperimental" // header only // MARK: Prebuilt Dependencies declaration let reactNativeDependencies = BinaryTarget( @@ -454,7 +453,6 @@ let reactFabric = RNTarget( "components/textinput/platform/ios/", "components/unimplementedview", "components/virtualview", - "components/virtualviewexperimental", "components/root/tests", ], dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga], @@ -541,7 +539,7 @@ let reactFabricUnimplementedView = RNTarget( let reactRCTFabric = RNTarget( name: .reactRCTFabric, path: "React/Fabric", - searchPaths: [virtualViewPath, virtualViewExperimentalPath], + searchPaths: [virtualViewPath], 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] ) diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.h b/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.h similarity index 84% rename from packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.h rename to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.h index 519e9aa6037aa2..cc42f586938f9f 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.h +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface RCTVirtualViewExperimentalComponentView : RCTViewComponentView +@interface RCTVirtualViewComponentView : RCTViewComponentView + (instancetype)new NS_UNAVAILABLE; - (instancetype)init NS_UNAVAILABLE; diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm similarity index 88% rename from packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.mm rename to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm index 81187c7b2ecc0f..c76ee87bd3b88b 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewExperimentalComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewComponentView.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTVirtualViewExperimentalComponentView.h" +#import "RCTVirtualViewComponentView.h" #import #import @@ -20,8 +20,8 @@ #import #import #import -#import -#import +#import +#import #import "RCTFabricComponentsPlugins.h" #import "RCTVirtualViewMode.h" @@ -30,13 +30,13 @@ using namespace facebook; using namespace facebook::react; -@interface RCTVirtualViewExperimentalComponentView () { +@interface RCTVirtualViewComponentView () { NSString *_virtualViewID; } @end -@implementation RCTVirtualViewExperimentalComponentView { +@implementation RCTVirtualViewComponentView { id _parentVirtualViewContainer; std::optional _mode; RCTVirtualViewRenderState _renderState; @@ -50,7 +50,7 @@ @implementation RCTVirtualViewExperimentalComponentView { - (instancetype)initWithFrame:(CGRect)frame { if ((self = [super initWithFrame:frame]) != nil) { - _props = VirtualViewExperimentalShadowNode::defaultSharedProps(); + _props = VirtualViewShadowNode::defaultSharedProps(); _renderState = RCTVirtualViewRenderStateUnknown; _virtualViewID = [[NSUUID UUID] UUIDString]; _didLayout = NO; @@ -61,7 +61,7 @@ - (instancetype)initWithFrame:(CGRect)frame - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps { - const auto &newViewProps = static_cast(*props); + const auto &newViewProps = static_cast(*props); if (!_mode.has_value()) { _mode = newViewProps.initialHidden ? RCTVirtualViewModeHidden : RCTVirtualViewModeVisible; @@ -177,7 +177,7 @@ - (void)onModeChange:(RCTVirtualViewMode)newMode targetRect:(CGRect)targetRect t // NOTE: Make sure to keep these props in sync with dispatchSyncModeChange below where we have to explicitly copy // all props. - VirtualViewExperimentalEventEmitter::OnModeChange event = { + VirtualViewEventEmitter::OnModeChange event = { .mode = (int)newMode, .targetRect = {.x = targetRect.origin.x, @@ -260,23 +260,23 @@ - (void)_unhideIfNeeded return nil; } -- (void)_dispatchAsyncModeChange:(VirtualViewExperimentalEventEmitter::OnModeChange &)event +- (void)_dispatchAsyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event { if (!_eventEmitter) { return; } - auto &emitter = static_cast(*_eventEmitter); + auto &emitter = static_cast(*_eventEmitter); emitter.onModeChange(event); } -- (void)_dispatchSyncModeChange:(VirtualViewExperimentalEventEmitter::OnModeChange &)event +- (void)_dispatchSyncModeChange:(VirtualViewEventEmitter::OnModeChange &)event { if (!_eventEmitter) { return; } - auto &emitter = static_cast(*_eventEmitter); + auto &emitter = static_cast(*_eventEmitter); // TODO: Move this into a custom event emitter. We had to duplicate the codegen code here from onModeChange in order // to dispatch synchronously and discrete. @@ -310,12 +310,12 @@ - (void)_dispatchSyncModeChange:(VirtualViewExperimentalEventEmitter::OnModeChan + (ComponentDescriptorProvider)componentDescriptorProvider { - return concreteComponentDescriptorProvider(); + return concreteComponentDescriptorProvider(); } @end -Class VirtualViewExperimentalCls(void) +Class VirtualViewCls(void) { - return RCTVirtualViewExperimentalComponentView.class; + return RCTVirtualViewComponentView.class; } diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewMode.h b/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewMode.h similarity index 100% rename from packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewMode.h rename to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewMode.h diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewRenderState.h b/packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewRenderState.h similarity index 100% rename from packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualViewExperimental/RCTVirtualViewRenderState.h rename to packages/react-native/React/Fabric/Mounting/ComponentViews/VirtualView/RCTVirtualViewRenderState.h diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 3a8e4513db9900..aa31d38cc437d6 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -6702,7 +6702,7 @@ public final class com/facebook/react/views/virtual/VirtualViewMode : java/lang/ public static fun values ()[Lcom/facebook/react/views/virtual/VirtualViewMode; } -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 { +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 { public fun (Landroid/content/Context;)V public fun getContainerRelativeRect ()Landroid/graphics/Rect; public fun getVirtualViewID ()Ljava/lang/String; @@ -6712,8 +6712,8 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua public fun updateClippingRect (Ljava/util/Set;)V } -public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager : com/facebook/react/views/view/ReactClippingViewManager, com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface { - public static final field Companion Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager$Companion; +public final class com/facebook/react/views/virtual/view/ReactVirtualViewManager : com/facebook/react/views/view/ReactClippingViewManager, com/facebook/react/viewmanagers/VirtualViewManagerInterface { + public static final field Companion Lcom/facebook/react/views/virtual/view/ReactVirtualViewManager$Companion; public static final field REACT_CLASS Ljava/lang/String; public fun ()V public synthetic fun addEventEmitters (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)V @@ -6721,18 +6721,18 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua public fun getName ()Ljava/lang/String; public synthetic fun prepareToRecycleView (Lcom/facebook/react/uimanager/ThemedReactContext;Landroid/view/View;)Landroid/view/View; public synthetic fun setInitialHidden (Landroid/view/View;Z)V - public fun setInitialHidden (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Z)V + public fun setInitialHidden (Lcom/facebook/react/views/virtual/view/ReactVirtualView;Z)V public synthetic fun setNativeId (Landroid/view/View;Ljava/lang/String;)V - public fun setNativeId (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Ljava/lang/String;)V + public fun setNativeId (Lcom/facebook/react/views/virtual/view/ReactVirtualView;Ljava/lang/String;)V public synthetic fun setRemoveClippedSubviews (Landroid/view/View;Z)V public synthetic fun setRenderState (Landroid/view/View;I)V - public fun setRenderState (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;I)V + public fun setRenderState (Lcom/facebook/react/views/virtual/view/ReactVirtualView;I)V } -public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager$Companion { +public final class com/facebook/react/views/virtual/view/ReactVirtualViewManager$Companion { } -public final class com/facebook/react/views/virtual/viewexperimental/VirtualViewEventEmitter : com/facebook/react/views/virtual/VirtualViewModeChangeEmitter { +public final class com/facebook/react/views/virtual/view/VirtualViewEventEmitter : com/facebook/react/views/virtual/VirtualViewModeChangeEmitter { public fun (IILcom/facebook/react/uimanager/events/EventDispatcher;)V public fun emitModeChange (Lcom/facebook/react/views/virtual/VirtualViewMode;Landroid/graphics/Rect;Landroid/graphics/Rect;Z)V } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt index 0bb160bff67adb..32737d6dd77e00 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.virtual.viewexperimental +package com.facebook.react.views.virtual.view import android.content.Context import android.graphics.Rect @@ -25,7 +25,7 @@ import com.facebook.react.views.virtual.VirtualViewMode import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter import com.facebook.react.views.virtual.VirtualViewRenderState -public class ReactVirtualViewExperimental(context: Context) : +public class ReactVirtualView(context: Context) : ReactViewGroup(context), VirtualView, View.OnLayoutChangeListener { internal var mode: VirtualViewMode? = null @@ -300,6 +300,6 @@ public class ReactVirtualViewExperimental(context: Context) : } } -private const val DEBUG_TAG: String = "ReactVirtualViewExperimental" +private const val DEBUG_TAG: String = "ReactVirtualView" private val IS_DEBUG_BUILD = ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD || ReactBuildConfig.ENABLE_PERFETTO diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt similarity index 72% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt index a604f4fc5117e2..b5ca31bf6ccf8b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.views.virtual.viewexperimental +package com.facebook.react.views.virtual.view import android.graphics.Rect import androidx.annotation.VisibleForTesting @@ -16,37 +16,36 @@ import com.facebook.react.uimanager.UIManagerHelper import com.facebook.react.uimanager.ViewManagerDelegate import com.facebook.react.uimanager.annotations.ReactProp import com.facebook.react.uimanager.events.EventDispatcher -import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerDelegate -import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerInterface +import com.facebook.react.viewmanagers.VirtualViewManagerDelegate +import com.facebook.react.viewmanagers.VirtualViewManagerInterface import com.facebook.react.views.view.ReactClippingViewManager import com.facebook.react.views.virtual.VirtualViewMode import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter import com.facebook.react.views.virtual.VirtualViewModeChangeEvent import com.facebook.react.views.virtual.VirtualViewRenderState -@ReactModule(name = ReactVirtualViewExperimentalManager.REACT_CLASS) -public class ReactVirtualViewExperimentalManager : - ReactClippingViewManager(), - VirtualViewExperimentalManagerInterface { +@ReactModule(name = ReactVirtualViewManager.REACT_CLASS) +public class ReactVirtualViewManager : + ReactClippingViewManager(), VirtualViewManagerInterface { - private val _delegate = VirtualViewExperimentalManagerDelegate(this) + private val _delegate = VirtualViewManagerDelegate(this) - override fun getDelegate(): ViewManagerDelegate = _delegate + override fun getDelegate(): ViewManagerDelegate = _delegate override fun getName(): String = REACT_CLASS - override fun createViewInstance(reactContext: ThemedReactContext): ReactVirtualViewExperimental = - ReactVirtualViewExperimental(reactContext) + override fun createViewInstance(reactContext: ThemedReactContext): ReactVirtualView = + ReactVirtualView(reactContext) @ReactProp(name = "initialHidden") - override fun setInitialHidden(view: ReactVirtualViewExperimental, value: Boolean) { + override fun setInitialHidden(view: ReactVirtualView, value: Boolean) { if (view.mode == null) { view.mode = if (value) VirtualViewMode.Hidden else VirtualViewMode.Visible } } @ReactProp(name = "renderState") - override fun setRenderState(view: ReactVirtualViewExperimental, value: Int) { + override fun setRenderState(view: ReactVirtualView, value: Int) { // If disabled, `renderState` will always be `VirtualViewRenderState.Unknown`. if (ReactNativeFeatureFlags.enableVirtualViewRenderState()) { view.renderState = @@ -58,13 +57,13 @@ public class ReactVirtualViewExperimentalManager : } } - override fun setNativeId(view: ReactVirtualViewExperimental, nativeId: String?) { + override fun setNativeId(view: ReactVirtualView, nativeId: String?) { super.setNativeId(view, nativeId) } override fun addEventEmitters( reactContext: ThemedReactContext, - view: ReactVirtualViewExperimental, + view: ReactVirtualView, ) { val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return view.modeChangeEmitter = @@ -73,14 +72,14 @@ public class ReactVirtualViewExperimentalManager : override fun prepareToRecycleView( reactContext: ThemedReactContext, - view: ReactVirtualViewExperimental, - ): ReactVirtualViewExperimental? { + view: ReactVirtualView, + ): ReactVirtualView? { view.recycleView() return super.prepareToRecycleView(reactContext, view) } public companion object { - public const val REACT_CLASS: String = "VirtualViewExperimental" + public const val REACT_CLASS: String = "VirtualView" } } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp index 9f9624b8848b9e..03d455ee92f460 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace facebook::react::CoreComponentsRegistry { @@ -81,8 +81,7 @@ void addCoreComponents( concreteComponentDescriptorProvider< LayoutConformanceComponentDescriptor>()); providerRegistry->add( - concreteComponentDescriptorProvider< - VirtualViewExperimentalComponentDescriptor>()); + concreteComponentDescriptorProvider()); } } // namespace facebook::react::CoreComponentsRegistry diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index 86786a77585060..a501b020470bdd 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -149,12 +149,6 @@ Pod::Spec.new do |s| sss.header_dir = "react/renderer/components/virtualview" end - ss.subspec "virtualviewexperimental" do |sss| - sss.source_files = "react/renderer/components/virtualviewexperimental/**/*.{m,mm,cpp,h}" - sss.exclude_files = "react/renderer/components/virtualviewexperimental/tests" - sss.header_dir = "react/renderer/components/virtualviewexperimental" - end - # Legacy header paths for backwards compat ss.subspec "rncore" do |sss| sss.source_files = podspec_sources("react/renderer/components/rncore/**/*.h", "react/renderer/components/rncore/**/*.h") diff --git a/packages/react-native/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/virtualview/VirtualViewComponentDescriptor.h similarity index 64% rename from packages/react-native/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h rename to packages/react-native/ReactCommon/react/renderer/components/virtualview/VirtualViewComponentDescriptor.h index 35928f9eb3bd03..9a01e3e664ca4c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/virtualview/VirtualViewComponentDescriptor.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include namespace facebook::react { @@ -15,5 +15,5 @@ namespace facebook::react { /* * Descriptor for component. */ -using VirtualViewExperimentalComponentDescriptor = ConcreteComponentDescriptor; +using VirtualViewComponentDescriptor = ConcreteComponentDescriptor; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/virtualview/VirtualViewShadowNode.h similarity index 63% rename from packages/react-native/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalShadowNode.h rename to packages/react-native/ReactCommon/react/renderer/components/virtualview/VirtualViewShadowNode.h index 04e1badac21e5d..7b1d1fc6cc0dc8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/virtualview/VirtualViewShadowNode.h @@ -13,15 +13,13 @@ namespace facebook::react { -constexpr const char VirtualViewExperimentalComponentName[] = "VirtualViewExperimental"; +constexpr const char VirtualViewComponentName[] = "VirtualView"; /* - * `ShadowNode` for component. + * `ShadowNode` for component. */ -class VirtualViewExperimentalShadowNode final : public ConcreteViewShadowNode< - VirtualViewExperimentalComponentName, - VirtualViewExperimentalProps, - VirtualViewExperimentalEventEmitter> { +class VirtualViewShadowNode final + : public ConcreteViewShadowNode { public: using ConcreteViewShadowNode::ConcreteViewShadowNode; diff --git a/packages/react-native/src/private/components/virtualview/VirtualView.js b/packages/react-native/src/private/components/virtualview/VirtualView.js index ed0844801b6175..7f952492cd16db 100644 --- a/packages/react-native/src/private/components/virtualview/VirtualView.js +++ b/packages/react-native/src/private/components/virtualview/VirtualView.js @@ -11,7 +11,7 @@ import type {ViewStyleProp} from '../../../../Libraries/StyleSheet/StyleSheet'; import type {NativeSyntheticEvent} from '../../../../Libraries/Types/CoreEventTypes'; import type {HostInstance} from '../../types/HostInstance'; -import type {NativeModeChangeEvent} from './VirtualViewExperimentalNativeComponent'; +import type {NativeModeChangeEvent} from './VirtualViewNativeComponent'; import UIManager from '../../../../Libraries/ReactNative/UIManager'; import StyleSheet from '../../../../Libraries/StyleSheet/StyleSheet'; diff --git a/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js b/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js index 555016e048e3be..1115fd9201e249 100644 --- a/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js +++ b/packages/react-native/src/private/components/virtualview/__tests__/VirtualView-itest.js @@ -11,7 +11,7 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment'; import type {Rect} from '../VirtualView'; -import type {NativeModeChangeEvent} from '../VirtualViewExperimentalNativeComponent'; +import type {NativeModeChangeEvent} from '../VirtualViewNativeComponent'; import ensureInstance from '../../../__tests__/utilities/ensureInstance'; import isUnreachable from '../../../__tests__/utilities/isUnreachable'; diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 5addd20bc01b9f..6f3dcbc20306f1 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -1277,7 +1277,6 @@ PODS: - React-FabricComponents/components/textinput (= 1000.0.0) - React-FabricComponents/components/unimplementedview (= 1000.0.0) - React-FabricComponents/components/virtualview (= 1000.0.0) - - React-FabricComponents/components/virtualviewexperimental (= 1000.0.0) - React-featureflags - React-graphics - React-jsi @@ -1560,33 +1559,6 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - React-FabricComponents/components/virtualviewexperimental (1000.0.0): - - boost - - DoubleConversion - - fast_float - - fmt - - glog - - hermes-engine - - RCT-Folly - - RCT-Folly/Fabric - - RCTRequired - - RCTTypeSafety - - React-Core - - React-cxxreact - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-jsi - - React-jsiexecutor - - React-logger - - React-RCTFBReactNativeSpec - - React-rendererdebug - - React-runtimescheduler - - React-utils - - ReactCommon/turbomodule/core - - SocketRocket - - Yoga - React-FabricComponents/textlayoutmanager (1000.0.0): - boost - DoubleConversion