diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm index 2c87bb1e5994a8..fa65e055d05d95 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm +++ b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm @@ -299,7 +299,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag SurfaceId surfaceId = RCTSurfaceIdForView(componentView); Props::Shared oldProps = [componentView props]; Props::Shared newProps = componentDescriptor.cloneProps( - PropsParserContext{surfaceId, *_contextContainer.get()}, oldProps, RawProps(std::move(props))); + PropsParserContext{surfaceId, *_contextContainer}, oldProps, RawProps(std::move(props))); NSSet *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new]; propKeys = [propKeys setByAddingObjectsFromArray:propsKeysToBeUpdated]; diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp index 014dadd86eb284..976454fb66589c 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp @@ -225,7 +225,7 @@ Size SurfaceHandler::measure( link_.shadowTree->getCurrentRevision().rootShadowNode; PropsParserContext propsParserContext{ - parameters_.surfaceId, *parameters_.contextContainer.get()}; + parameters_.surfaceId, *parameters_.contextContainer}; auto rootShadowNode = currentRootShadowNode->clone( propsParserContext, layoutConstraints, layoutContext); @@ -329,7 +329,7 @@ void SurfaceHandler::constraintLayout( } PropsParserContext propsParserContext{ - parameters_.surfaceId, *parameters_.contextContainer.get()}; + parameters_.surfaceId, *parameters_.contextContainer}; react_native_assert( link_.shadowTree && "`link_.shadowTree` must not be null."); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index 22eec48f8edb31..977ec9c4b9291e 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -70,7 +70,7 @@ std::shared_ptr UIManager::createNode( auto fallbackDescriptor = componentDescriptorRegistry_->getFallbackComponentDescriptor(); - PropsParserContext propsParserContext{surfaceId, *contextContainer_.get()}; + PropsParserContext propsParserContext{surfaceId, *contextContainer_}; auto family = componentDescriptor.createFamily( {tag, surfaceId, std::move(instanceHandle)}); @@ -111,7 +111,7 @@ std::shared_ptr UIManager::cloneNode( "UIManager::cloneNode", "componentName", shadowNode.getComponentName()); PropsParserContext propsParserContext{ - shadowNode.getFamily().getSurfaceId(), *contextContainer_.get()}; + shadowNode.getFamily().getSurfaceId(), *contextContainer_}; auto& componentDescriptor = shadowNode.getComponentDescriptor(); auto& family = shadowNode.getFamily(); @@ -455,7 +455,7 @@ void UIManager::setNativeProps_DEPRECATED( componentDescriptorRegistry_->at( shadowNode->getComponentHandle()); PropsParserContext propsParserContext{ - family.getSurfaceId(), *contextContainer_.get()}; + family.getSurfaceId(), *contextContainer_}; auto props = componentDescriptor.cloneProps( propsParserContext, getShadowNodeInSubtree(*shadowNode, ancestorShadowNode)