react-native-windows 0.0.0-canary.441 → 0.0.0-canary.445
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Microsoft.ReactNative/JsiApi.cpp +3 -3
- package/Microsoft.ReactNative/JsiApi.h +4 -4
- package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp +1 -1
- package/Microsoft.ReactNative/ReactHost/ReactContext.h +2 -2
- package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +1 -1
- package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h +1 -1
- package/Microsoft.ReactNative/Views/TextInputViewManager.cpp +10 -5
- package/PropertySheets/Generated/PackageVersion.g.props +1 -1
- package/Shared/ChakraRuntimeHolder.cpp +4 -0
- package/Shared/ChakraRuntimeHolder.h +2 -1
- package/Shared/DevSettings.h +3 -5
- package/Shared/HermesRuntimeHolder.cpp +4 -0
- package/Shared/HermesRuntimeHolder.h +2 -1
- package/Shared/JSI/NapiJsiV8RuntimeHolder.cpp +6 -2
- package/Shared/JSI/NapiJsiV8RuntimeHolder.h +2 -1
- package/Shared/JSI/RuntimeHolder.h +5 -4
- package/Shared/OInstance.cpp +17 -4
- package/Shared/V8JSIRuntimeHolder.cpp +4 -0
- package/Shared/V8JSIRuntimeHolder.h +2 -1
- package/package.json +5 -5
- package/rntypes/index.d.ts +2 -2
- package/template/cpp-app/proj/MyApp.vcxproj +1 -0
- package/template/cpp-lib/proj/MyLib.vcxproj +1 -0
- package/template/cs-app/proj/MyApp.csproj +1 -0
- package/template/cs-lib/proj/MyLib.csproj +1 -0
|
@@ -395,7 +395,7 @@ facebook::jsi::JSError const &jsError) { \
|
|
|
395
395
|
}
|
|
396
396
|
|
|
397
397
|
/*static*/ ReactNative::JsiRuntime JsiRuntime::GetOrCreate(
|
|
398
|
-
std::shared_ptr
|
|
398
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
|
|
399
399
|
std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept {
|
|
400
400
|
{
|
|
401
401
|
std::scoped_lock lock{s_mutex};
|
|
@@ -409,7 +409,7 @@ facebook::jsi::JSError const &jsError) { \
|
|
|
409
409
|
}
|
|
410
410
|
|
|
411
411
|
/*static*/ ReactNative::JsiRuntime JsiRuntime::Create(
|
|
412
|
-
std::shared_ptr
|
|
412
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
|
|
413
413
|
std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept {
|
|
414
414
|
// There are some functions that we cannot do using JSI such as
|
|
415
415
|
// defining a property or using Symbol as a key.
|
|
@@ -445,7 +445,7 @@ ReactNative::JsiRuntime JsiRuntime::MakeChakraRuntime() {
|
|
|
445
445
|
}
|
|
446
446
|
|
|
447
447
|
JsiRuntime::JsiRuntime(
|
|
448
|
-
std::shared_ptr
|
|
448
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> &&runtimeHolder,
|
|
449
449
|
std::shared_ptr<facebook::jsi::Runtime> &&runtime) noexcept
|
|
450
450
|
: m_runtimeHolder{std::move(runtimeHolder)},
|
|
451
451
|
m_runtime{std::move(runtime)},
|
|
@@ -58,16 +58,16 @@ struct RuntimeAccessor;
|
|
|
58
58
|
|
|
59
59
|
struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
|
|
60
60
|
JsiRuntime(
|
|
61
|
-
std::shared_ptr
|
|
61
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> &&runtimeHolder,
|
|
62
62
|
std::shared_ptr<facebook::jsi::Runtime> &&runtime) noexcept;
|
|
63
63
|
~JsiRuntime() noexcept;
|
|
64
64
|
|
|
65
65
|
static ReactNative::JsiRuntime FromRuntime(facebook::jsi::Runtime &runtime) noexcept;
|
|
66
66
|
static ReactNative::JsiRuntime GetOrCreate(
|
|
67
|
-
std::shared_ptr
|
|
67
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
|
|
68
68
|
std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept;
|
|
69
69
|
static ReactNative::JsiRuntime Create(
|
|
70
|
-
std::shared_ptr
|
|
70
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
|
|
71
71
|
std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept;
|
|
72
72
|
|
|
73
73
|
public: // JsiRuntime
|
|
@@ -168,7 +168,7 @@ struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
|
|
|
168
168
|
void SetError(facebook::jsi::JSINativeException const &nativeException) noexcept;
|
|
169
169
|
|
|
170
170
|
private:
|
|
171
|
-
std::shared_ptr
|
|
171
|
+
std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> m_runtimeHolder;
|
|
172
172
|
std::shared_ptr<facebook::jsi::Runtime> m_runtime;
|
|
173
173
|
RuntimeAccessor *m_runtimeAccessor{};
|
|
174
174
|
std::mutex m_mutex;
|
|
@@ -530,7 +530,7 @@ UIManager::UIManager() : m_module(std::make_shared<UIManagerModule>()) {}
|
|
|
530
530
|
UIManager::~UIManager() {
|
|
531
531
|
// To make sure that we destroy UI components in UI thread.
|
|
532
532
|
if (!m_context.UIDispatcher().HasThreadAccess()) {
|
|
533
|
-
m_context.UIDispatcher().Post([module = std::move(m_module)]() {});
|
|
533
|
+
m_context.UIDispatcher().Post([module = std::move(m_module)]() mutable { module = nullptr; });
|
|
534
534
|
}
|
|
535
535
|
}
|
|
536
536
|
|
|
@@ -869,7 +869,7 @@ void ReactInstanceWin::DispatchEvent(int64_t viewTag, std::string &&eventName, f
|
|
|
869
869
|
}
|
|
870
870
|
|
|
871
871
|
winrt::Microsoft::ReactNative::JsiRuntime ReactInstanceWin::JsiRuntime() noexcept {
|
|
872
|
-
std::shared_ptr<
|
|
872
|
+
std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
|
|
873
873
|
{
|
|
874
874
|
std::scoped_lock lock{m_mutex};
|
|
875
875
|
if (m_jsiRuntime) {
|
|
@@ -182,7 +182,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
|
|
|
182
182
|
Mso::CntPtr<Mso::React::IDispatchQueue2> m_uiQueue;
|
|
183
183
|
std::deque<JSCallEntry> m_jsCallQueue;
|
|
184
184
|
|
|
185
|
-
std::shared_ptr<
|
|
185
|
+
std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> m_jsiRuntimeHolder;
|
|
186
186
|
winrt::Microsoft::ReactNative::JsiRuntime m_jsiRuntime{nullptr};
|
|
187
187
|
};
|
|
188
188
|
|
|
@@ -461,6 +461,7 @@ void TextInputShadowNode::setPasswordBoxPlaceholderForeground(
|
|
|
461
461
|
defaultRD.Insert(winrt::box_value(L"TextControlPlaceholderForeground"), winrt::box_value(solidColorBrush));
|
|
462
462
|
defaultRD.Insert(winrt::box_value(L"TextControlPlaceholderForegroundFocused"), winrt::box_value(solidColorBrush));
|
|
463
463
|
defaultRD.Insert(winrt::box_value(L"TextControlPlaceholderForegroundPointerOver"), winrt::box_value(solidColorBrush));
|
|
464
|
+
defaultRD.Insert(winrt::box_value(L"TextControlPlaceholderForegroundDisabled"), winrt::box_value(solidColorBrush));
|
|
464
465
|
auto passwordBoxResource = xaml::ResourceDictionary();
|
|
465
466
|
auto themeDictionaries = passwordBoxResource.ThemeDictionaries();
|
|
466
467
|
themeDictionaries.Insert(winrt::box_value(L"Default"), defaultRD);
|
|
@@ -614,6 +615,13 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
|
|
|
614
615
|
} else if (propertyName == "autoFocus") {
|
|
615
616
|
if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean)
|
|
616
617
|
m_autoFocus = propertyValue.AsBoolean();
|
|
618
|
+
} else if (propertyName == "editable") {
|
|
619
|
+
if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
|
|
620
|
+
m_isTextBox ? textBox.IsReadOnly(!propertyValue.AsBoolean()) : passwordBox.IsEnabled(propertyValue.AsBoolean());
|
|
621
|
+
} else if (propertyValue.IsNull()) {
|
|
622
|
+
m_isTextBox ? textBox.ClearValue(xaml::Controls::TextBox::IsReadOnlyProperty())
|
|
623
|
+
: passwordBox.ClearValue(xaml::Controls::Control::IsEnabledProperty());
|
|
624
|
+
}
|
|
617
625
|
} else {
|
|
618
626
|
if (m_isTextBox) { // Applicable properties for TextBox
|
|
619
627
|
if (TryUpdateTextAlignment(textBox, propertyName, propertyValue)) {
|
|
@@ -626,11 +634,6 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
|
|
|
626
634
|
textBox.AcceptsReturn(isMultiline);
|
|
627
635
|
} else if (propertyValue.IsNull())
|
|
628
636
|
textBox.ClearValue(xaml::Controls::TextBox::TextWrappingProperty());
|
|
629
|
-
} else if (propertyName == "editable") {
|
|
630
|
-
if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean)
|
|
631
|
-
textBox.IsReadOnly(!propertyValue.AsBoolean());
|
|
632
|
-
else if (propertyValue.IsNull())
|
|
633
|
-
textBox.ClearValue(xaml::Controls::TextBox::IsReadOnlyProperty());
|
|
634
637
|
} else if (propertyName == "scrollEnabled") {
|
|
635
638
|
if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean &&
|
|
636
639
|
textBox.TextWrapping() == xaml::TextWrapping::Wrap) {
|
|
@@ -884,6 +887,7 @@ void TextInputViewManager::TransferProperties(const XamlView &oldView, const Xam
|
|
|
884
887
|
xaml::Controls::TextBox::SelectionHighlightColorProperty(),
|
|
885
888
|
xaml::Controls::PasswordBox::SelectionHighlightColorProperty());
|
|
886
889
|
newView.as<xaml::Controls::PasswordBox>().Password(oldView.as<xaml::Controls::TextBox>().Text());
|
|
890
|
+
newView.as<xaml::Controls::PasswordBox>().IsEnabled(!oldView.as<xaml::Controls::TextBox>().IsReadOnly());
|
|
887
891
|
} else {
|
|
888
892
|
TransferProperty(
|
|
889
893
|
oldView,
|
|
@@ -901,6 +905,7 @@ void TextInputViewManager::TransferProperties(const XamlView &oldView, const Xam
|
|
|
901
905
|
xaml::Controls::PasswordBox::SelectionHighlightColorProperty(),
|
|
902
906
|
xaml::Controls::TextBox::SelectionHighlightColorProperty());
|
|
903
907
|
newView.as<xaml::Controls::TextBox>().Text(oldView.as<xaml::Controls::PasswordBox>().Password());
|
|
908
|
+
newView.as<xaml::Controls::TextBox>().IsReadOnly(!oldView.as<xaml::Controls::PasswordBox>().IsEnabled());
|
|
904
909
|
}
|
|
905
910
|
|
|
906
911
|
TransferInputScope(oldView, newView, copyToPasswordBox);
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
12
12
|
<PropertyGroup>
|
|
13
|
-
<ReactNativeWindowsVersion>0.0.0-canary.
|
|
13
|
+
<ReactNativeWindowsVersion>0.0.0-canary.445</ReactNativeWindowsVersion>
|
|
14
14
|
<ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
|
|
15
15
|
<ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
|
|
16
16
|
<ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
|
|
@@ -9,6 +9,10 @@
|
|
|
9
9
|
|
|
10
10
|
namespace Microsoft::JSI {
|
|
11
11
|
|
|
12
|
+
facebook::react::JSIEngineOverride ChakraRuntimeHolder::getRuntimeType() noexcept {
|
|
13
|
+
return facebook::react::JSIEngineOverride::Chakra;
|
|
14
|
+
}
|
|
15
|
+
|
|
12
16
|
std::shared_ptr<facebook::jsi::Runtime> ChakraRuntimeHolder::getRuntime() noexcept {
|
|
13
17
|
std::call_once(once_flag_, [this]() { initRuntime(); });
|
|
14
18
|
|
|
@@ -12,9 +12,10 @@
|
|
|
12
12
|
|
|
13
13
|
namespace Microsoft::JSI {
|
|
14
14
|
|
|
15
|
-
class ChakraRuntimeHolder final : public
|
|
15
|
+
class ChakraRuntimeHolder final : public Microsoft::JSI::RuntimeHolderLazyInit {
|
|
16
16
|
public:
|
|
17
17
|
std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
|
|
18
|
+
facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
|
|
18
19
|
|
|
19
20
|
ChakraRuntimeHolder(
|
|
20
21
|
std::shared_ptr<facebook::react::DevSettings> devSettings,
|
package/Shared/DevSettings.h
CHANGED
|
@@ -14,11 +14,9 @@
|
|
|
14
14
|
#define STRING_(s) #s
|
|
15
15
|
#define STRING(s) STRING_(s)
|
|
16
16
|
|
|
17
|
-
namespace
|
|
18
|
-
namespace jsi {
|
|
17
|
+
namespace Microsoft::JSI {
|
|
19
18
|
struct RuntimeHolderLazyInit;
|
|
20
|
-
}
|
|
21
|
-
} // namespace facebook
|
|
19
|
+
} // namespace Microsoft::JSI
|
|
22
20
|
|
|
23
21
|
namespace facebook {
|
|
24
22
|
namespace react {
|
|
@@ -81,7 +79,7 @@ struct DevSettings {
|
|
|
81
79
|
/// instance. This object should in general be used only from the JS engine
|
|
82
80
|
/// thread, unless the specific runtime implementation explicitly guarantees
|
|
83
81
|
/// reentrancy.
|
|
84
|
-
std::shared_ptr<
|
|
82
|
+
std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
|
|
85
83
|
|
|
86
84
|
// Until the ABI story is addressed we'll use this instead of the above for
|
|
87
85
|
// the purposes of selecting a JSI Runtime to use.
|
|
@@ -69,6 +69,10 @@ class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::R
|
|
|
69
69
|
|
|
70
70
|
} // namespace
|
|
71
71
|
|
|
72
|
+
facebook::react::JSIEngineOverride HermesRuntimeHolder::getRuntimeType() noexcept {
|
|
73
|
+
return facebook::react::JSIEngineOverride::Hermes;
|
|
74
|
+
}
|
|
75
|
+
|
|
72
76
|
std::shared_ptr<jsi::Runtime> HermesRuntimeHolder::getRuntime() noexcept {
|
|
73
77
|
std::call_once(m_once_flag, [this]() { initRuntime(); });
|
|
74
78
|
|
|
@@ -12,9 +12,10 @@
|
|
|
12
12
|
namespace facebook {
|
|
13
13
|
namespace react {
|
|
14
14
|
|
|
15
|
-
class HermesRuntimeHolder : public
|
|
15
|
+
class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
|
|
16
16
|
public:
|
|
17
17
|
std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
|
|
18
|
+
facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
|
|
18
19
|
|
|
19
20
|
HermesRuntimeHolder(
|
|
20
21
|
std::shared_ptr<facebook::react::DevSettings> devSettings,
|
|
@@ -96,7 +96,11 @@ void NapiJsiV8RuntimeHolder::InitRuntime() noexcept {
|
|
|
96
96
|
m_ownThreadId = std::this_thread::get_id();
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
#pragma region
|
|
99
|
+
#pragma region Microsoft::JSI::RuntimeHolderLazyInit
|
|
100
|
+
|
|
101
|
+
facebook::react::JSIEngineOverride NapiJsiV8RuntimeHolder::getRuntimeType() noexcept {
|
|
102
|
+
return facebook::react::JSIEngineOverride::V8NodeApi;
|
|
103
|
+
}
|
|
100
104
|
|
|
101
105
|
shared_ptr<Runtime> NapiJsiV8RuntimeHolder::getRuntime() noexcept /*override*/
|
|
102
106
|
{
|
|
@@ -112,6 +116,6 @@ shared_ptr<Runtime> NapiJsiV8RuntimeHolder::getRuntime() noexcept /*override*/
|
|
|
112
116
|
return m_runtime;
|
|
113
117
|
}
|
|
114
118
|
|
|
115
|
-
#pragma endregion
|
|
119
|
+
#pragma endregion Microsoft::JSI::RuntimeHolderLazyInit
|
|
116
120
|
|
|
117
121
|
} // namespace Microsoft::JSI
|
|
@@ -10,9 +10,10 @@
|
|
|
10
10
|
|
|
11
11
|
namespace Microsoft::JSI {
|
|
12
12
|
|
|
13
|
-
class NapiJsiV8RuntimeHolder : public
|
|
13
|
+
class NapiJsiV8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
|
|
14
14
|
public:
|
|
15
15
|
std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
|
|
16
|
+
facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
|
|
16
17
|
|
|
17
18
|
NapiJsiV8RuntimeHolder(
|
|
18
19
|
std::shared_ptr<facebook::react::DevSettings> devSettings,
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
#include <jsi/jsi.h>
|
|
4
4
|
#include <memory>
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
#include <DevSettings.h>
|
|
7
|
+
|
|
8
|
+
namespace Microsoft::JSI {
|
|
8
9
|
|
|
9
10
|
// An instance of this interface is expected to
|
|
10
11
|
// a. lazily create a JSI Runtime on the first call to getRuntime
|
|
@@ -15,7 +16,7 @@ namespace jsi {
|
|
|
15
16
|
|
|
16
17
|
struct RuntimeHolderLazyInit {
|
|
17
18
|
virtual std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept = 0;
|
|
19
|
+
virtual facebook::react::JSIEngineOverride getRuntimeType() noexcept = 0;
|
|
18
20
|
};
|
|
19
21
|
|
|
20
|
-
} // namespace
|
|
21
|
-
} // namespace facebook
|
|
22
|
+
} // namespace Microsoft::JSI
|
package/Shared/OInstance.cpp
CHANGED
|
@@ -113,7 +113,7 @@ class OJSIExecutorFactory : public JSExecutorFactory {
|
|
|
113
113
|
}
|
|
114
114
|
|
|
115
115
|
OJSIExecutorFactory(
|
|
116
|
-
std::shared_ptr<
|
|
116
|
+
std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> runtimeHolder,
|
|
117
117
|
NativeLoggingHook loggingHook,
|
|
118
118
|
std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
|
|
119
119
|
bool isProfilingEnabled,
|
|
@@ -125,7 +125,7 @@ class OJSIExecutorFactory : public JSExecutorFactory {
|
|
|
125
125
|
isProfilingEnabled_{isProfilingEnabled} {}
|
|
126
126
|
|
|
127
127
|
private:
|
|
128
|
-
std::shared_ptr<
|
|
128
|
+
std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> runtimeHolder_;
|
|
129
129
|
std::shared_ptr<TurboModuleRegistry> turboModuleRegistry_;
|
|
130
130
|
std::shared_ptr<CallInvoker> jsCallInvoker_;
|
|
131
131
|
NativeLoggingHook loggingHook_;
|
|
@@ -198,6 +198,20 @@ void InstanceImpl::SetInError() noexcept {
|
|
|
198
198
|
m_isInError = true;
|
|
199
199
|
}
|
|
200
200
|
|
|
201
|
+
namespace {
|
|
202
|
+
bool shouldStartHermesInspector(DevSettings &devSettings) {
|
|
203
|
+
bool isHermes =
|
|
204
|
+
((devSettings.jsiEngineOverride == JSIEngineOverride::Hermes) ||
|
|
205
|
+
(devSettings.jsiEngineOverride == JSIEngineOverride::Default && devSettings.jsiRuntimeHolder &&
|
|
206
|
+
devSettings.jsiRuntimeHolder->getRuntimeType() == facebook::react::JSIEngineOverride::Hermes));
|
|
207
|
+
|
|
208
|
+
if (isHermes && devSettings.useDirectDebugger && !devSettings.useWebDebugger)
|
|
209
|
+
return true;
|
|
210
|
+
else
|
|
211
|
+
return false;
|
|
212
|
+
}
|
|
213
|
+
} // namespace
|
|
214
|
+
|
|
201
215
|
InstanceImpl::InstanceImpl(
|
|
202
216
|
std::shared_ptr<Instance> &&instance,
|
|
203
217
|
std::string &&jsBundleBasePath,
|
|
@@ -225,8 +239,7 @@ InstanceImpl::InstanceImpl(
|
|
|
225
239
|
facebook::react::tracing::initializeETW();
|
|
226
240
|
#endif
|
|
227
241
|
|
|
228
|
-
if (m_devSettings
|
|
229
|
-
!m_devSettings->useWebDebugger) {
|
|
242
|
+
if (shouldStartHermesInspector(*m_devSettings)) {
|
|
230
243
|
m_devManager->StartInspector(m_devSettings->sourceBundleHost, m_devSettings->sourceBundlePort);
|
|
231
244
|
}
|
|
232
245
|
|
|
@@ -31,6 +31,10 @@ class TaskRunnerAdapter : public v8runtime::JSITaskRunner {
|
|
|
31
31
|
std::shared_ptr<facebook::react::MessageQueueThread> jsQueue_;
|
|
32
32
|
};
|
|
33
33
|
|
|
34
|
+
facebook::react::JSIEngineOverride V8JSIRuntimeHolder::getRuntimeType() noexcept {
|
|
35
|
+
return facebook::react::JSIEngineOverride::V8;
|
|
36
|
+
}
|
|
37
|
+
|
|
34
38
|
std::shared_ptr<facebook::jsi::Runtime> V8JSIRuntimeHolder::getRuntime() noexcept {
|
|
35
39
|
std::call_once(once_flag_, [this]() { initRuntime(); });
|
|
36
40
|
|
|
@@ -13,9 +13,10 @@
|
|
|
13
13
|
namespace facebook {
|
|
14
14
|
namespace react {
|
|
15
15
|
|
|
16
|
-
class V8JSIRuntimeHolder : public
|
|
16
|
+
class V8JSIRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
|
|
17
17
|
public:
|
|
18
18
|
std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
|
|
19
|
+
facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
|
|
19
20
|
|
|
20
21
|
V8JSIRuntimeHolder(
|
|
21
22
|
std::shared_ptr<facebook::react::DevSettings> devSettings,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-windows",
|
|
3
|
-
"version": "0.0.0-canary.
|
|
3
|
+
"version": "0.0.0-canary.445",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"@react-native-community/cli": "^6.0.0",
|
|
27
27
|
"@react-native-community/cli-platform-android": "^6.0.0",
|
|
28
28
|
"@react-native-community/cli-platform-ios": "^6.0.0",
|
|
29
|
-
"@react-native-windows/cli": "0.0.0-canary.
|
|
30
|
-
"@react-native-windows/virtualized-list": "0.0.0-canary.
|
|
29
|
+
"@react-native-windows/cli": "0.0.0-canary.110",
|
|
30
|
+
"@react-native-windows/virtualized-list": "0.0.0-canary.26",
|
|
31
31
|
"@react-native/assets": "1.0.0",
|
|
32
32
|
"@react-native/normalize-color": "2.0.0",
|
|
33
33
|
"@react-native/polyfills": "2.0.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"ws": "^6.1.4"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@react-native-windows/codegen": "0.0.0-canary.
|
|
61
|
+
"@react-native-windows/codegen": "0.0.0-canary.23",
|
|
62
62
|
"@rnw-scripts/eslint-config": "1.1.10",
|
|
63
63
|
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.4",
|
|
64
64
|
"@rnx-kit/jest-preset": "^0.1.0",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"prettier": "^2.4.1",
|
|
75
75
|
"react": "17.0.2",
|
|
76
76
|
"react-native": "0.0.0-20220107-2008-ca5aaa766",
|
|
77
|
-
"react-native-platform-override": "^1.6.
|
|
77
|
+
"react-native-platform-override": "^1.6.4",
|
|
78
78
|
"react-refresh": "^0.4.0",
|
|
79
79
|
"react-shallow-renderer": "16.14.1",
|
|
80
80
|
"typescript": "^4.4.4"
|
package/rntypes/index.d.ts
CHANGED
|
@@ -452,7 +452,7 @@ export interface PressableAndroidRippleConfig {
|
|
|
452
452
|
foreground?: null | boolean | undefined;
|
|
453
453
|
}
|
|
454
454
|
|
|
455
|
-
export interface PressableProps extends AccessibilityProps, Omit<ViewProps, 'style' | 'hitSlop'> {
|
|
455
|
+
export interface PressableProps extends AccessibilityProps, Omit<ViewProps, 'children' | 'style' | 'hitSlop'> {
|
|
456
456
|
/**
|
|
457
457
|
* Called when a single tap gesture is detected.
|
|
458
458
|
*/
|
|
@@ -6945,7 +6945,7 @@ export interface ActionSheetIOSOptions {
|
|
|
6945
6945
|
message?: string | undefined;
|
|
6946
6946
|
anchor?: number | undefined;
|
|
6947
6947
|
tintColor?: ColorValue | ProcessedColorValue | undefined;
|
|
6948
|
-
userInterfaceStyle?:
|
|
6948
|
+
userInterfaceStyle?: 'light' | 'dark' | undefined;
|
|
6949
6949
|
disabledButtonIndices?: number[] | undefined;
|
|
6950
6950
|
}
|
|
6951
6951
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<!-- This project was created with react-native-windows {{ rnwVersion }} -->
|
|
2
3
|
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
3
4
|
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
|
|
4
5
|
<PropertyGroup Label="Globals">
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<!-- This project was created with react-native-windows {{ rnwVersion }} -->
|
|
2
3
|
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
3
4
|
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
|
|
4
5
|
<PropertyGroup Label="Globals">
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<!-- This project was created with react-native-windows {{ rnwVersion }} -->
|
|
2
3
|
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
3
4
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
4
5
|
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<!-- This project was created with react-native-windows {{ rnwVersion }} -->
|
|
2
3
|
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
3
4
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
4
5
|
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
|