Skip to content
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

Fix event setup codepath #202

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Fix event setup codepath #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd4603a
Fix event setup codepath
asklar May 18, 2022
632fccb
Change files
asklar May 18, 2022
ddd7d20
>
asklar May 18, 2022
b3f5fb1
>
asklar Jun 14, 2022
1909d2f
update from main
jonthysell Jul 28, 2023
4062476
Merge branch 'main' into setupevent
jonthysell Jul 28, 2023
12e6e60
Change files
jonthysell Jul 28, 2023
9b29af0
missed change
jonthysell Jul 28, 2023
6717c60
fix for new optional variable name
jonthysell Jul 28, 2023
00f672e
Update package/windows/ReactNativeXaml/XamlMetadata.cpp
jonthysell Jul 28, 2023
eef5b9f
Fix PR attribution
jonthysell Aug 2, 2023
cd926e5
Merge branch 'main' into setupevent
jonthysell Aug 2, 2023
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
7 changes: 7 additions & 0 deletions change/react-native-xaml-e5f739e7-398e-4d89-8d72-0c3559c990cb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Fix event setup codepath",
"packageName": "react-native-xaml",
"email": "[email protected]",
"dependentChangeType": "patch"
}
13 changes: 6 additions & 7 deletions package/windows/ReactNativeXaml/XamlMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ using namespace winrt::Microsoft::ReactNative;
#define MAKE_GET_DP(type, prop) IsType<type>, []() { return type::prop(); }

void XamlMetadata::SetupEventDispatcher(const IReactContext& reactContext) {
m_reactContext = reactContext;
std::once_flag inited;
std::call_once(inited, [ctx = reactContext, this]() {
ExecuteJsi(ctx, [shared = shared_from_this()](facebook::jsi::Runtime& rt) {
if (!m_reactContext) {
m_reactContext = reactContext;
}

auto obj = rt.global().createFromHostObject(rt, std::make_shared<XamlObject>());
rt.global().setProperty(rt, jsi::PropNameID::forAscii(rt, "xaml"), obj);
if (!m_receiveEvent.has_value()) {
ExecuteJsi(m_reactContext, [shared = shared_from_this()](facebook::jsi::Runtime& rt) {
auto batchedBridge = rt.global().getProperty(rt, "__fbBatchedBridge");
if (!batchedBridge.isUndefined() && batchedBridge.isObject()) {
if (auto vm = shared.get()) {
Expand All @@ -46,7 +45,7 @@ void XamlMetadata::SetupEventDispatcher(const IReactContext& reactContext) {
}
}
});
jonthysell marked this conversation as resolved.
Show resolved Hide resolved
});
}
}

FrameworkElement Wrap(const winrt::Windows::Foundation::IInspectable& d) {
Expand Down