Skip to content

Add null safety to RootComponentView() to prevent crash during island… #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gmacmaster wants to merge 1 commit into
base: main
Choose a base branch
from
+74 −25
Open

Add null safety to RootComponentView() to prevent crash during island… #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 73 additions & 24 deletions vnext/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,10 @@ void CompositionEventHandler::Initialize() noexcept {
if (strongThis->SurfaceId() == -1)
return;

auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
auto *rootView = strongThis->RootComponentView();
if (!rootView)
return;
auto focusedComponent = rootView->GetFocusedComponent();
auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
auto keyArgs =
winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
Expand All @@ -276,7 +279,10 @@ void CompositionEventHandler::Initialize() noexcept {
if (strongThis->SurfaceId() == -1)
return;

auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
auto *rootView = strongThis->RootComponentView();
if (!rootView)
return;
auto focusedComponent = rootView->GetFocusedComponent();
auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
auto keyArgs =
winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
Expand All @@ -303,7 +309,10 @@ void CompositionEventHandler::Initialize() noexcept {
if (strongThis->SurfaceId() == -1)
return;

auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
auto *rootView = strongThis->RootComponentView();
if (!rootView)
return;
auto focusedComponent = rootView->GetFocusedComponent();
auto keyboardSource = winrt::make<CompositionInputKeyboardSource>(source);
auto charArgs = winrt::make<
winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
Expand All @@ -330,7 +339,10 @@ void CompositionEventHandler::Initialize() noexcept {
if (strongThis->SurfaceId() == -1)
return;

auto focusedComponent = strongThis->RootComponentView().GetFocusedComponent();
auto *rootView = strongThis->RootComponentView();
if (!rootView)
return;
auto focusedComponent = rootView->GetFocusedComponent();
if (focusedComponent) {
auto tag =
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)
Expand Down Expand Up @@ -380,10 +392,13 @@ facebook::react::SurfaceId CompositionEventHandler::SurfaceId() const noexcept {
return -1;
}

winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView &
winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *
CompositionEventHandler::RootComponentView() const noexcept {
auto island = m_wkRootView.get();
return *winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(island)->GetComponentView();
if (!island) {
return nullptr;
}
return winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>(island)->GetComponentView();
}

void CompositionEventHandler::onPointerWheelChanged(
Expand All @@ -398,8 +413,11 @@ void CompositionEventHandler::onPointerWheelChanged(

// In the case of a sub rootview, we may have a non-zero origin. hitTest takes a pt in the parent coords, so we
// need to apply the current origin
ptScaled += RootComponentView().layoutMetrics().frame.origin;
auto tag = RootComponentView().hitTest(ptScaled, ptLocal);
auto *rootView = RootComponentView();
if (!rootView)
return;
ptScaled += rootView->layoutMetrics().frame.origin;
auto tag = rootView->hitTest(ptScaled, ptLocal);

if (tag == -1)
return;
Expand Down Expand Up @@ -553,7 +571,10 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
case WM_CHAR:
case WM_SYSCHAR: {
if (auto strongRootView = m_wkRootView.get()) {
auto focusedComponent = RootComponentView().GetFocusedComponent();
auto *rootView = RootComponentView();
if (!rootView)
break;
auto focusedComponent = rootView->GetFocusedComponent();
auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
auto args = winrt::make<
winrt::Microsoft::ReactNative::Composition::Input::implementation::CharacterReceivedRoutedEventArgs>(
Expand All @@ -576,7 +597,10 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w
case WM_SYSKEYDOWN:
case WM_SYSKEYUP: {
if (auto strongRootView = m_wkRootView.get()) {
auto focusedComponent = RootComponentView().GetFocusedComponent();
auto *rootView = RootComponentView();
if (!rootView)
break;
auto focusedComponent = rootView->GetFocusedComponent();
auto keyboardSource = winrt::make<CompositionKeyboardSource>(this);
auto args = winrt::make<winrt::Microsoft::ReactNative::Composition::Input::implementation::KeyRoutedEventArgs>(
focusedComponent
Expand Down Expand Up @@ -608,9 +632,12 @@ int64_t CompositionEventHandler::SendMessage(HWND hwnd, uint32_t msg, uint64_t w

void CompositionEventHandler::onKeyDown(
const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
RootComponentView().UseKeyboardForProgrammaticFocus(true);
auto *rootView = RootComponentView();
if (!rootView)
return;
rootView->UseKeyboardForProgrammaticFocus(true);

if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
if (auto focusedComponent = rootView->GetFocusedComponent()) {
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)->OnKeyDown(args);

if (args.Handled())
Expand All @@ -633,7 +660,7 @@ void CompositionEventHandler::onKeyDown(
}

if (!fCtrl && args.Key() == winrt::Windows::System::VirtualKey::Tab) {
if (RootComponentView().TryMoveFocus(!fShift, winrt::Microsoft::ReactNative::FocusState::Keyboard)) {
if (rootView->TryMoveFocus(!fShift, winrt::Microsoft::ReactNative::FocusState::Keyboard)) {
args.Handled(true);
}

Expand All @@ -643,9 +670,12 @@ void CompositionEventHandler::onKeyDown(

void CompositionEventHandler::onKeyUp(
const winrt::Microsoft::ReactNative::Composition::Input::KeyRoutedEventArgs &args) noexcept {
RootComponentView().UseKeyboardForProgrammaticFocus(true);
auto *rootView = RootComponentView();
if (!rootView)
return;
rootView->UseKeyboardForProgrammaticFocus(true);

if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
if (auto focusedComponent = rootView->GetFocusedComponent()) {
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)->OnKeyUp(args);

if (args.Handled())
Expand All @@ -655,7 +685,10 @@ void CompositionEventHandler::onKeyUp(

void CompositionEventHandler::onCharacterReceived(
const winrt::Microsoft::ReactNative::Composition::Input::CharacterReceivedRoutedEventArgs &args) noexcept {
if (auto focusedComponent = RootComponentView().GetFocusedComponent()) {
auto *rootView = RootComponentView();
if (!rootView)
return;
if (auto focusedComponent = rootView->GetFocusedComponent()) {
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(focusedComponent)
->OnCharacterReceived(args);

Expand Down Expand Up @@ -1028,7 +1061,10 @@ void CompositionEventHandler::getTargetPointerArgs(

// In the case of a sub rootview, we may have a non-zero origin. hitTest takes a pt in the parent coords, so we need
// to apply the current origin
ptScaled += RootComponentView().layoutMetrics().frame.origin;
auto *rootView = RootComponentView();
if (!rootView)
return;
ptScaled += rootView->layoutMetrics().frame.origin;

if (std::find(m_capturedPointers.begin(), m_capturedPointers.end(), pointerId) != m_capturedPointers.end()) {
assert(m_pointerCapturingComponentTag != -1);
Expand All @@ -1042,7 +1078,7 @@ void CompositionEventHandler::getTargetPointerArgs(
ptLocal.y = ptScaled.y - (clientRect.top / strongRootView.ScaleFactor());
}
} else {
tag = RootComponentView().hitTest(ptScaled, ptLocal);
tag = rootView->hitTest(ptScaled, ptLocal);
}
}

Expand Down Expand Up @@ -1101,10 +1137,11 @@ void CompositionEventHandler::onPointerMoved(

auto handler = [&, targetView, pointerEvent, isActiveTouch](
std::vector<winrt::Microsoft::ReactNative::ComponentView> &eventPathViews) {
auto *rootViewForEmitter = RootComponentView();
const auto eventEmitter = targetView
? winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(targetView)
->eventEmitterAtPoint(pointerEvent.offsetPoint)
: RootComponentView().eventEmitterAtPoint(pointerEvent.offsetPoint);
: (rootViewForEmitter ? rootViewForEmitter->eventEmitterAtPoint(pointerEvent.offsetPoint) : nullptr);

if (eventEmitter != nullptr) {
eventEmitter->onPointerMove(pointerEvent);
Expand All @@ -1130,7 +1167,10 @@ void CompositionEventHandler::ClearAllHoveredForPointer(const facebook::react::P
// events. If we get null for the targetView, that means that the mouse is no over any components, so we have no
// element to send the move event to. However we need to send something so that any previously hovered elements
// are no longer hovered.
auto children = RootComponentView().Children();
auto *rootView = RootComponentView();
if (!rootView)
return;
auto children = rootView->Children();
if (auto size = children.Size()) {
auto firstChild = children.GetAt(0);
if (auto childEventEmitter =
Expand Down Expand Up @@ -1175,11 +1215,14 @@ void CompositionEventHandler::onPointerPressed(
winrt::Windows::System::VirtualKeyModifiers keyModifiers) noexcept {
namespace Composition = winrt::Microsoft::ReactNative::Composition;

RootComponentView().UseKeyboardForProgrammaticFocus(false);
auto *rootView = RootComponentView();
if (!rootView)
return;
rootView->UseKeyboardForProgrammaticFocus(false);

// Clears any active text selection when left pointer is pressed
if (pointerPoint.Properties().PointerUpdateKind() != Composition::Input::PointerUpdateKind::RightButtonPressed) {
RootComponentView().ClearCurrentTextSelection();
rootView->ClearCurrentTextSelection();
}

PointerId pointerId = pointerPoint.PointerId();
Expand Down Expand Up @@ -1273,7 +1316,10 @@ void CompositionEventHandler::onPointerReleased(
winrt::Windows::System::VirtualKeyModifiers keyModifiers) noexcept {
int pointerId = pointerPoint.PointerId();

RootComponentView().UseKeyboardForProgrammaticFocus(false);
auto *rootView = RootComponentView();
if (!rootView)
return;
rootView->UseKeyboardForProgrammaticFocus(false);

auto activeTouch = std::find_if(m_activeTouches.begin(), m_activeTouches.end(), [pointerId](const auto &pair) {
return pair.second.touch.identifier == pointerId;
Expand Down Expand Up @@ -1514,7 +1560,10 @@ void CompositionEventHandler::DispatchTouchEvent(
if (!shouldLeave) {
const auto &viewRegistry = fabricuiManager->GetViewRegistry();
facebook::react::Point ptLocal;
auto targetTag = RootComponentView().hitTest(pointerEvent.clientPoint, ptLocal);
auto *rootViewForHit = RootComponentView();
if (!rootViewForHit)
return;
auto targetTag = rootViewForHit->hitTest(pointerEvent.clientPoint, ptLocal);
if (targetTag != -1) {
auto targetComponentViewDescriptor = viewRegistry.componentViewDescriptorWithTag(targetTag);
targetView = FindClosestFabricManagedTouchableView(targetComponentViewDescriptor.view);
Expand Down
2 changes: 1 addition & 1 deletion vnext/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class CompositionEventHandler : public std::enable_shared_from_this<CompositionE
bool releasePointerCapture(PointerId pointerId, facebook::react::Tag tag) noexcept;

facebook::react::SurfaceId SurfaceId() const noexcept;
winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView &RootComponentView() const noexcept;
winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *RootComponentView() const noexcept;

enum class UITouchType {
Mouse,
Expand Down