Skip to content

Commit

Permalink
Fixes EventAttachInfo struct so it holds onto a ref-counted instance …
Browse files Browse the repository at this point in the history 
…of XamlMetadata, as well as removes dangerous pass-by-reference instances when dealing with async code.
  • Loading branch information
@MaxBen93
MaxBen93 committed Feb 2, 2024
1 parent ca8fc14 commit 338fd78
Show file tree
Hide file tree
Showing 10 changed files with 389 additions and 373 deletions.
7 changes: 0 additions & 7 deletions change/react-native-xaml-5229978a-1a3e-44ec-b021-45601af25ef5.json
View file

This file was deleted.

15 changes: 15 additions & 0 deletions package/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "react-native-xaml",
"entries": [
{
"date": "Fri, 02 Feb 2024 16:44:41 GMT",
"tag": "react-native-xaml_v0.0.77",
"version": "0.0.77",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "react-native-xaml",
"commit": "ca8fc14fea6b09137dd18220312383994d580a28",
"comment": "Fixes EventAttachInfo struct so it holds onto a ref-counted instance of XamlMetadata, as well as removes dangerous pass-by-reference instances when dealing with async code."
}
]
}
},
{
"date": "Tue, 22 Aug 2023 17:45:12 GMT",
"tag": "react-native-xaml_v0.0.76",
Expand Down
10 changes: 9 additions & 1 deletion package/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - react-native-xaml

This log was last generated on Tue, 22 Aug 2023 17:45:12 GMT and should not be manually modified.
This log was last generated on Fri, 02 Feb 2024 16:44:41 GMT and should not be manually modified.

<!-- Start content -->

## 0.0.77

Fri, 02 Feb 2024 16:44:41 GMT

### Patches

- Fixes EventAttachInfo struct so it holds onto a ref-counted instance of XamlMetadata, as well as removes dangerous pass-by-reference instances when dealing with async code. ([email protected])

## 0.0.76

Tue, 22 Aug 2023 17:45:12 GMT
Expand Down
36 changes: 18 additions & 18 deletions package/Codegen/TypeEvents.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,28 @@ public virtual string TransformText()
"\r\n__declspec(noinline) T DoTheTypeChecking(const winrt::Windows::Foundation::IIn" +
"spectable& ii, bool isWrapped) {\r\n auto o = isWrapped ? Unwrap<T>(ii) : ii.try_" +
"as<T>();\r\n return o;\r\n}\r\n\r\ntemplate<typename T>\r\n__declspec(noinline) void Disp" +
"atchTheEvent(const EventAttachInfo& eai, const winrt::Windows::Foundation::IInsp" +
"ectable& sender, const T& args) {\r\n auto senderAsFE = sender.try_as<FrameworkEl" +
"ement>();\r\n auto wEN = winrt::to_hstring(eai.jsEventName);\r\n if (eai.xamlMetad" +
"ata.m_receiveEvent.has_value()) {\r\n const auto tag = XamlMetadata::TagFromEle" +
"atchTheEvent(const EventAttachInfo eai, const winrt::Windows::Foundation::IInspe" +
"ctable& sender, const T& args) {\r\n auto senderAsFE = sender.try_as<FrameworkEle" +
"ment>();\r\n auto wEN = winrt::to_hstring(eai.jsEventName);\r\n if (eai.xamlMetada" +
"ta->m_receiveEvent.has_value()) {\r\n const auto tag = XamlMetadata::TagFromEle" +
"ment(eai.obj.as<xaml::DependencyObject>());\r\n ExecuteJsi(eai.context, [metada" +
"ta = eai.xamlMetadata.shared_from_this(), tag, senderAsFE, args, eventName = eai" +
".jsEventName](facebook::jsi::Runtime& rt) {\r\n auto objSender = std::make_sh" +
"ared<XamlObject>(senderAsFE, metadata);\r\n auto objArgs = std::make_shared<X" +
"amlObject>(args, metadata);\r\n auto obj = std::make_shared<facebook::jsi::Ob" +
"ject>(rt);\r\n obj->setProperty(rt, \"sender\", rt.global().createFromHostObjec" +
"t(rt, objSender));\r\n obj->setProperty(rt, \"args\", rt.global().createFromHos" +
"tObject(rt, objArgs));\r\n\r\n metadata->JsiDispatchEvent(rt, tag, std::string(" +
"eventName), obj);\r\n });\r\n }\r\n else {\r\n XamlUIService::FromContext(eai." +
"context).DispatchEvent(eai.obj.try_as<xaml::FrameworkElement>(), wEN.c_str(),\r\n " +
" [senderAsFE, args](const winrt::Microsoft::ReactNative::IJSValueWriter& evt" +
"DataWriter) {\r\n SerializeEventArgs(evtDataWriter, senderAsFE, args);\r\n " +
" });\r\n }\r\n};\r\n\r\n/*static*/ const EventInfo EventInfo::xamlEventMap[] = {\r\n");
"ta = eai.xamlMetadata, tag, senderAsFE, args, eventName = eai.jsEventName](faceb" +
"ook::jsi::Runtime& rt) {\r\n auto objSender = std::make_shared<XamlObject>(se" +
"nderAsFE, metadata);\r\n auto objArgs = std::make_shared<XamlObject>(args, me" +
"tadata);\r\n auto obj = std::make_shared<facebook::jsi::Object>(rt);\r\n o" +
"bj->setProperty(rt, \"sender\", rt.global().createFromHostObject(rt, objSender));\r" +
"\n obj->setProperty(rt, \"args\", rt.global().createFromHostObject(rt, objArgs" +
"));\r\n\r\n metadata->JsiDispatchEvent(rt, tag, std::string(eventName), obj);\r\n" +
" });\r\n }\r\n else {\r\n XamlUIService::FromContext(eai.context).DispatchEv" +
"ent(eai.obj.try_as<xaml::FrameworkElement>(), wEN.c_str(),\r\n [senderAsFE, a" +
"rgs](const winrt::Microsoft::ReactNative::IJSValueWriter& evtDataWriter) {\r\n " +
" SerializeEventArgs(evtDataWriter, senderAsFE, args);\r\n });\r\n }\r\n};\r\n\r\n" +
"/*static*/ const EventInfo EventInfo::xamlEventMap[] = {\r\n");
foreach (var evt in Events) {
this.Write(" {\"");
this.Write(this.ToStringHelper.ToStringWithCulture(evt.GetName()));
this.Write("\", [](const EventAttachInfo& eai, bool isWrapped, winrt::event_token token) noexc" +
"ept {\r\n if (const auto& c = DoTheTypeChecking<");
this.Write("\", [](const EventAttachInfo eai, bool isWrapped, winrt::event_token token) noexce" +
"pt {\r\n if (const auto& c = DoTheTypeChecking<");
this.Write(this.ToStringHelper.ToStringWithCulture(Util.GetCppWinRTType(evt.DeclaringType)));
this.Write(">(eai.obj, isWrapped)) {\r\n if (!token) {\r\n return c.");
this.Write(this.ToStringHelper.ToStringWithCulture(evt.GetName()));
Expand Down
8 changes: 4 additions & 4 deletions package/Codegen/TypeEvents.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ __declspec(noinline) T DoTheTypeChecking(const winrt::Windows::Foundation::IInsp
}

template<typename T>
__declspec(noinline) void DispatchTheEvent(const EventAttachInfo& eai, const winrt::Windows::Foundation::IInspectable& sender, const T& args) {
__declspec(noinline) void DispatchTheEvent(const EventAttachInfo eai, const winrt::Windows::Foundation::IInspectable& sender, const T& args) {
auto senderAsFE = sender.try_as<FrameworkElement>();
auto wEN = winrt::to_hstring(eai.jsEventName);
if (eai.xamlMetadata.m_receiveEvent.has_value()) {
if (eai.xamlMetadata->m_receiveEvent.has_value()) {
const auto tag = XamlMetadata::TagFromElement(eai.obj.as<xaml::DependencyObject>());
ExecuteJsi(eai.context, [metadata = eai.xamlMetadata.shared_from_this(), tag, senderAsFE, args, eventName = eai.jsEventName](facebook::jsi::Runtime& rt) {
ExecuteJsi(eai.context, [metadata = eai.xamlMetadata, tag, senderAsFE, args, eventName = eai.jsEventName](facebook::jsi::Runtime& rt) {
auto objSender = std::make_shared<XamlObject>(senderAsFE, metadata);
auto objArgs = std::make_shared<XamlObject>(args, metadata);
auto obj = std::make_shared<facebook::jsi::Object>(rt);
Expand All @@ -64,7 +64,7 @@ __declspec(noinline) void DispatchTheEvent(const EventAttachInfo& eai, const win

/*static*/ const EventInfo EventInfo::xamlEventMap[] = {
<# foreach (var evt in Events) { #>
{"<#= evt.GetName() #>", [](const EventAttachInfo& eai, bool isWrapped, winrt::event_token token) noexcept {
{"<#= evt.GetName() #>", [](const EventAttachInfo eai, bool isWrapped, winrt::event_token token) noexcept {
if (const auto& c = DoTheTypeChecking<<#= Util.GetCppWinRTType(evt.DeclaringType) #>>(eai.obj, isWrapped)) {
if (!token) {
return c.<#= evt.GetName() #>([eai] (<#= Util.GetCppWinRTEventSignature(evt) #>) noexcept {
Expand Down
2 changes: 1 addition & 1 deletion package/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-native-xaml",
"title": "React Native Xaml",
"version": "0.0.76",
"version": "0.0.77",
"description": "Allows using XAML directly, inside of a React Native Windows app",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down
Loading

0 comments on commit 338fd78

Please sign in to comment.