Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
58d7462
GetFacebookReactInstance
ZihanChen-MSFT Dec 10, 2019
be62f8f
def
ZihanChen-MSFT Dec 10, 2019
62e99ab
...
ZihanChen-MSFT Dec 10, 2019
05efde7
Add __cdecl explicitly
ZihanChen-MSFT Dec 10, 2019
a48ce9a
Update ReactUWP.vcxproj
ZihanChen-MSFT Dec 16, 2019
a9234b8
Update E2ETest to use ReactApplication (#3715)
ddalp Dec 6, 2019
4be30ff
applying package updates ***NO_CI***
rnbot Dec 6, 2019
389b1e8
Update ParityStatus.md (#3555)
harinikmsft Dec 6, 2019
8327564
Bump @microsoft/api-extractor from 7.6.1 to 7.7.0 (#3717)
dependabot-preview[bot] Dec 6, 2019
c1e6c72
Bump @microsoft/api-documenter from 7.6.1 to 7.7.2 (#3724)
dependabot-preview[bot] Dec 7, 2019
647f988
Aligning Microsoft.Windows.CppWinRT Versions (#3733)
jonthysell Dec 9, 2019
252434a
applying package updates ***NO_CI***
rnbot Dec 9, 2019
49a3400
Bump @types/react-native from 0.60.22 to 0.60.24 (#3740)
dependabot-preview[bot] Dec 10, 2019
e9f575f
Bump @types/node from 10.17.6 to 10.17.7 (#3741)
dependabot-preview[bot] Dec 10, 2019
13f13d7
Update CONTRIBUTING.md
kmelmon Dec 10, 2019
fd02682
Use ReactNative.V8JSI.Windows.0.1.6 and ReactNative.Hermes.Windows.0.…
licanhua Dec 10, 2019
2d77e1f
applying package updates ***NO_CI***
rnbot Dec 10, 2019
3526c7f
Reduce build time on pipeline (#3734)
licanhua Dec 10, 2019
2e30bad
Add react-native-win32 package (#3762)
acoates-ms Dec 11, 2019
ab16dc0
Publish packages using access public
acoates-ms Dec 11, 2019
0071c7b
applying package updates ***NO_CI***
rnbot Dec 11, 2019
d5fe42f
Miscellaneous fixes in ETW tracing and Systrace (#3745)
mganandraj Dec 11, 2019
b9c3c55
applying package updates ***NO_CI***
rnbot Dec 11, 2019
f65df84
Strongly typed value serialization and deserialization using IJSValue…
vmoroz Dec 11, 2019
d1f70ed
applying package updates ***NO_CI***
rnbot Dec 12, 2019
024d35f
Update to [email protected] (#3769)
rnbot Dec 12, 2019
3b5cc34
applying package updates ***NO_CI***
rnbot Dec 12, 2019
7190da1
Fix toggle debugger setting issue with ReactApplication (#3767)
ddalp Dec 13, 2019
d99775e
applying package updates ***NO_CI***
rnbot Dec 13, 2019
ba05046
Delete .pch after build on pipeline (#3771)
licanhua Dec 13, 2019
119e544
applying package updates ***NO_CI***
rnbot Dec 13, 2019
d7523a0
Redirect build directory to C: on vs2017-win2016 build machine (#3768)
licanhua Dec 14, 2019
148f405
applying package updates ***NO_CI***
rnbot Dec 14, 2019
1cb4133
ignore Bundle folder in sampleapps (#3778)
licanhua Dec 16, 2019
f1a38ab
Add tree dump utility to E2E test framework and fix Image border issu…
ddalp Dec 16, 2019
ff54b9a
applying package updates ***NO_CI***
rnbot Dec 16, 2019
6c83446
merge from master
ZihanChen-MSFT Dec 16, 2019
f35ed1c
Update yarn.lock
ZihanChen-MSFT Dec 16, 2019
c3dce39
Change files
ZihanChen-MSFT Dec 16, 2019
646dbbc
Merge branch 'master' into add-tm
ZihanChen-MSFT Dec 16, 2019
c0b5a0f
Added new unit test projects to ReactWindows-Universal solution. (#3775)
vmoroz Dec 17, 2019
ffa461d
applying package updates ***NO_CI***
rnbot Dec 17, 2019
7780d88
Update document for removing ReleaseBundle and DebugBundle (#3702)
licanhua Dec 17, 2019
81ab92f
applying package updates ***NO_CI***
rnbot Dec 17, 2019
ba3fafc
CLI reads name from app.json if it doesn't exist in package.json (#3781)
licanhua Dec 17, 2019
d71fbcc
applying package updates ***NO_CI***
rnbot Dec 17, 2019
a258407
Change CLI to add prompt if no --template parameter is supplied (#3784)
kmelmon Dec 17, 2019
fb13716
applying package updates ***NO_CI***
rnbot Dec 17, 2019
3cef232
Conditionally use BitmapImage (#3712)
marlenecota Dec 18, 2019
57db8f3
applying package updates ***NO_CI***
rnbot Dec 18, 2019
3383f8b
Bump rnpm-plugin-windows from 0.3.8 to 0.4.0 (#3800)
dependabot-preview[bot] Dec 18, 2019
589c934
Bump pretty-format from 24.8.0 to 24.9.0 (#3764)
dependabot-preview[bot] Dec 18, 2019
cb3bbac
Bump stacktrace-parser from 0.1.6 to 0.1.8 (#3765)
dependabot-preview[bot] Dec 18, 2019
cc1a91d
Bump @types/react-native from 0.60.24 to 0.60.25 (#3757)
dependabot-preview[bot] Dec 18, 2019
3fb7d81
Port windowsbrush code into react-native-windows (#3789)
kmelmon Dec 18, 2019
609b118
applying package updates ***NO_CI***
rnbot Dec 18, 2019
ac63e81
Make sure that C# and C++ SampleApp projects identifiers have proper …
vmoroz Dec 18, 2019
dc434f5
Removed Bridge sub-namespace in favor of Microsoft.ReactNative (#3804)
vmoroz Dec 19, 2019
6a4d504
applying package updates ***NO_CI***
rnbot Dec 19, 2019
328c91e
fixing case issues (#3806)
mike-kaufman Dec 19, 2019
266b31e
Bump @react-native-community/cli from 2.9.0 to 2.10.0 (#3663)
dependabot-preview[bot] Dec 19, 2019
9857d0d
reduce build flavors for RNWUniversalPR (#3773)
licanhua Dec 19, 2019
6e0fb10
Bunch of style properties fixes and TreeDump utility updates (#3793)
ddalp Dec 20, 2019
433d669
applying package updates ***NO_CI***
rnbot Dec 20, 2019
2b39791
Get flow clean, and turn on flow-check during build (#3730)
acoates-ms Dec 20, 2019
66893fd
applying package updates ***NO_CI***
rnbot Dec 20, 2019
9bb7d51
SourceCode module should provide scriptURL when running livereload wi…
acoates-ms Dec 20, 2019
fc8ad0a
applying package updates ***NO_CI***
rnbot Dec 20, 2019
d216220
Remove remaining need for fork of RN for win32 JS (#3811)
acoates-ms Dec 21, 2019
258b3cc
applying package updates ***NO_CI***
rnbot Dec 21, 2019
6e07ec9
Export ability to query names of loaded native modules (master branch…
NickGerleman Dec 21, 2019
c8ccf61
applying package updates ***NO_CI***
rnbot Dec 21, 2019
42acd93
Changed Microsoft.ReactNative to be independent from ReactUWP (#3809)
vmoroz Dec 27, 2019
f9fcc02
applying package updates ***NO_CI***
rnbot Dec 27, 2019
b89bd04
Allow UAP SDK to be in other folder other than ProgramFiles (#3815)
licanhua Dec 30, 2019
b2ab0c2
applying package updates ***NO_CI***
rnbot Dec 30, 2019
c45c827
Add InjectBundleContent target (#3821)
licanhua Dec 30, 2019
caeaaf7
applying package updates ***NO_CI***
rnbot Dec 30, 2019
5877cfb
Bump @types/react-native from 0.60.25 to 0.60.28 (#3831)
dependabot-preview[bot] Jan 6, 2020
2ae7f08
[Security] Bump handlebars from 4.1.2 to 4.5.3 (#3818)
dependabot-preview[bot] Jan 6, 2020
5c3f4c3
Call StartAnimation on m_scaleCombined for ScaleX / ScaleY animations…
Thristhart Jan 6, 2020
d8352a9
applying package updates ***NO_CI***
rnbot Jan 6, 2020
499403d
Remove remaining need for fork of RN for win32 JS (#3834)
acoates-ms Jan 7, 2020
b055943
applying package updates ***NO_CI***
rnbot Jan 7, 2020
e6191b8
Rename GetFacebookReactInstance
ZihanChen-MSFT Jan 7, 2020
2c4ed97
Merge branch 'master' into add-tm
ZihanChen-MSFT Jan 7, 2020
af31d87
Merge branch 'add-tm' of https://github.com/ZihanChen-MSFT/react-nati…
ZihanChen-MSFT Jan 7, 2020
bd46b38
Fix code review comment
ZihanChen-MSFT Jan 8, 2020
3481685
Update TurboModuleUtils.cpp
ZihanChen-MSFT Jan 8, 2020
be69794
Fix lint errors
ZihanChen-MSFT Jan 9, 2020
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "minor",
"comment": "Add GetFacebookReactInstance :: uwp::Instance -> react::Instance",
"packageName": "@office-iss/react-native-win32",
"email": "[email protected]",
"commit": "f35ed1c42cd2a1d9ed098082bf97babe3bc9c8e6",
"date": "2019-12-16T22:16:35.515Z"
}
8 changes: 8 additions & 0 deletions change/react-native-windows-2019-12-16-14-17-19-add-tm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Add GetFacebookReactInstance :: uwpInstance -> react::Instance",
"packageName": "react-native-windows",
"email": "[email protected]",
"commit": "f35ed1c42cd2a1d9ed098082bf97babe3bc9c8e6",
"date": "2019-12-16T22:17:19.866Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "none",
"comment": "Add GetFacebookReactInstance :: uwpInstance -> react::Instance",
"packageName": "react-native-windows-extended",
"email": "[email protected]",
"commit": "f35ed1c42cd2a1d9ed098082bf97babe3bc9c8e6",
"date": "2019-12-16T22:17:02.605Z"
}
2 changes: 2 additions & 0 deletions vnext/ReactUWP/EndPoints/dll/react-native-uwp.arm.def
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ xallocxWeak
??0TurboModule@react@facebook@@QAA@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
??1TurboModule@react@facebook@@UAA@XZ
?get@TurboModule@react@facebook@@UAA?AVValue@jsi@3@AAVRuntime@53@ABVPropNameID@53@@Z
?GetReactInstanceFromUwpInstance@uwp@react@@YA?AV?$shared_ptr@VInstance@react@facebook@@@std@@ABUInstance@12winrt@@@Z
??0BridgeJSCallInvoker@react@facebook@@QAA@V?$weak_ptr@VInstance@react@facebook@@@std@@@Z
2 changes: 2 additions & 0 deletions vnext/ReactUWP/EndPoints/dll/react-native-uwp.x64.def
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,5 @@ xallocxWeak
??0TurboModule@react@facebook@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
??1TurboModule@react@facebook@@UEAA@XZ
?get@TurboModule@react@facebook@@UEAA?AVValue@jsi@3@AEAVRuntime@53@AEBVPropNameID@53@@Z
?GetReactInstanceFromUwpInstance@uwp@react@@YA?AV?$shared_ptr@VInstance@react@facebook@@@std@@AEBUInstance@12winrt@@@Z
??0BridgeJSCallInvoker@react@facebook@@QEAA@V?$weak_ptr@VInstance@react@facebook@@@std@@@Z
2 changes: 2 additions & 0 deletions vnext/ReactUWP/EndPoints/dll/react-native-uwp.x86.def
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,5 @@ xallocxWeak
??0TurboModule@react@facebook@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$shared_ptr@VJSCallInvoker@react@facebook@@@4@@Z
??1TurboModule@react@facebook@@UAE@XZ
?get@TurboModule@react@facebook@@UAE?AVValue@jsi@3@AAVRuntime@53@ABVPropNameID@53@@Z
?GetReactInstanceFromUwpInstance@uwp@react@@YA?AV?$shared_ptr@VInstance@react@facebook@@@std@@ABUInstance@12winrt@@@Z
??0BridgeJSCallInvoker@react@facebook@@QAE@V?$weak_ptr@VInstance@react@facebook@@@std@@@Z
2 changes: 2 additions & 0 deletions vnext/ReactUWP/ReactUWP.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
<ClInclude Include="Modules\Animated\CalculatedAnimationDriver.h" />
<ClInclude Include="Modules\Animated\SpringAnimationDriver.h" />
<ClInclude Include="Modules\Animated\TrackingAnimatedNode.h" />
<ClInclude Include="..\include\ReactUWP\TurboModuleUtils.h" />
<ClInclude Include="Utils\ResourceBrushUtils.h" />
<ClInclude Include="Threading\BatchingUIMessageQueueThread.h" />
<ClInclude Include="Utils\CppWinrtLessExceptions.h" />
Expand Down Expand Up @@ -267,6 +268,7 @@
<ClCompile Include="Modules\Animated\CalculatedAnimationDriver.cpp" />
<ClCompile Include="Modules\Animated\SpringAnimationDriver.cpp" />
<ClCompile Include="Modules\Animated\TrackingAnimatedNode.cpp" />
<ClCompile Include="TurboModule\TurboModuleUtils.cpp" />
<ClCompile Include="Utils\ResourceBrushUtils.cpp" />
<ClCompile Include="Threading\BatchingUIMessageQueueThread.cpp" />
<ClCompile Include="Utils\UwpPreparedScriptStore.cpp" Condition="'$(OSS_RN)' != 'true'" />
Expand Down
10 changes: 10 additions & 0 deletions vnext/ReactUWP/ReactUWP.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@
<ClCompile Include="Utils\ResourceBrushUtils.cpp">
<Filter>Utils</Filter>
</ClCompile>
<ClCompile Include="TurboModule\TurboModuleUtils.cpp">
<Filter>TurboModule</Filter>
</ClCompile>
<ClCompile Include="Views\SIPEventHandler.cpp">
<Filter>Views</Filter>
</ClCompile>
Expand Down Expand Up @@ -627,6 +630,10 @@
<ClInclude Include="Utils\ResourceBrushUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Utils\StandardControlResourceKeyNames.h" />
<ClInclude Include="..\include\ReactUWP\TurboModuleUtils.h">
<Filter>TurboModule</Filter>
</ClInclude>
<ClInclude Include="Utils\StandardControlResourceKeyNames.h">
<Filter>Utils</Filter>
</ClInclude>
Expand Down Expand Up @@ -707,6 +714,9 @@
<Filter Include="Views\Image">
<UniqueIdentifier>{6d877886-1c5c-45b8-8eae-2e1354cf673e}</UniqueIdentifier>
</Filter>
<Filter Include="TurboModule">
<UniqueIdentifier>{174cd180-bab8-464e-9f7a-d2fac567f899}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Version.rc" />
Expand Down
21 changes: 21 additions & 0 deletions vnext/ReactUWP/TurboModule/TurboModuleUtils.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#include "pch.h"
#include <ReactUWPABI.h>
#include <TurboModuleUtils.h>
#include "../ABI/Instance_rt.h"

namespace react::uwp {

std::shared_ptr<facebook::react::Instance> __cdecl GetReactInstanceFromUwpInstance(
const winrt::react::uwp::Instance &uwpInstance) {
auto abiInstance = reinterpret_cast<ABI::react::uwp::Instance *>(winrt::get_abi(uwpInstance));
auto reactInstance = abiInstance->getInstance();
assert(reactInstance);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I prefer if-else over assert.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine, it can't fail, or it is a bug. So I prefer to crash.

auto fbInstance = reactInstance->GetInnerInstance();
assert(fbInstance);
return fbInstance;
}

} // namespace react::uwp
15 changes: 15 additions & 0 deletions vnext/include/ReactUWP/TurboModuleUtils.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#pragma once

#include <winrt/react.uwp.h>

namespace facebook::react {
class Instance;
}

namespace react::uwp {
extern std::shared_ptr<facebook::react::Instance> __cdecl GetReactInstanceFromUwpInstance(
const winrt::react::uwp::Instance &uwpInstance);
}