react-native-windows 0.0.0-canary.503 → 0.0.0-canary.504

package/Chakra/ChakraHelpers.cpp

@@ -459,7 +459,7 @@ JsValueRef JSValueToStringCopy(JsValueRef obj, JsValueRef *exception) {
 }
 
 JsValueRef ValueMakeUndefined() {
-  JsValueRef value;
+  JsValueRef value = nullptr;
   JsGetUndefinedValue(&value);
   return value;
 }

package/Chakra/ChakraPlatform.cpp

@@ -27,7 +27,7 @@ JsValueRef __stdcall nowHookJNF(
     void * /*callbackState*/) {
   assert(argumentCount == 1);
   double now = nowHook != nullptr ? nowHook() : 0;
-  JsValueRef value;
+  JsValueRef value = nullptr;
   CHAKRA_ASSERTDO(JsDoubleToNumber(now, &value));
   return value;
 }

package/Chakra/ChakraValue.h

@@ -178,7 +178,7 @@ class ChakraObject {
   }
 
   static ChakraObject getGlobalObject() {
-    JsValueRef value;
+    JsValueRef value = nullptr;
     JsGetGlobalObject(&value);
     return ChakraObject(value);
   }

package/Microsoft.ReactNative/IReactContext.cpp

@@ -96,6 +96,23 @@ Windows::Foundation::IInspectable ReactContext::JSRuntime() noexcept {
   return m_context->JsiRuntime();
 }
 
+LoadingState ReactContext::LoadingState() noexcept {
+  switch (m_context->State()) {
+    case Mso::React::ReactInstanceState::Loading:
+    case Mso::React::ReactInstanceState::WaitingForDebugger:
+      return LoadingState::Loading;
+    case Mso::React::ReactInstanceState::Loaded:
+      return LoadingState::Loaded;
+    case Mso::React::ReactInstanceState::HasError:
+      return LoadingState::HasError;
+    case Mso::React::ReactInstanceState::Unloaded:
+      return LoadingState::Unloaded;
+    default:
+      assert(false);
+      return LoadingState::HasError;
+  };
+}
+
 #ifndef CORE_ABI
 // Deprecated: Use XamlUIService directly.
 void ReactContext::DispatchEvent(

package/Microsoft.ReactNative/IReactContext.h

@@ -42,6 +42,8 @@ struct ReactContext : winrt::implements<ReactContext, IReactContext> {
   IReactDispatcher UIDispatcher() noexcept;
   IReactDispatcher JSDispatcher() noexcept;
   IInspectable JSRuntime() noexcept;
+  LoadingState LoadingState() noexcept;
+
 #ifndef CORE_ABI
   void DispatchEvent(
       xaml::FrameworkElement const &view,

package/Microsoft.ReactNative/IReactContext.idl

@@ -13,6 +13,29 @@ import "IReactPropertyBag.idl";
 
 namespace Microsoft.ReactNative
 {
+
+  DOC_STRING(
+    "Used to represent the state of the React Native JavaScript instance")
+  enum LoadingState
+  {
+    DOC_STRING(
+      "The instance is loading the JavaScript bundle and initial instance setup. Calls to run JavaScript functions will be queued to run once the instance is fully loaded."
+    )
+    Loading = 0,
+    DOC_STRING(
+      "The instance is in a ready state.  Calls to run JavaScript functions will be run as soon as they are posted to the JavaScript instance."
+    )
+    Loaded = 1,
+    DOC_STRING(
+      "The instance has hit an error.  Calls to run JavaScript functions will not be run."
+    )
+    HasError = 2,
+    DOC_STRING(
+      "The instance has successfully unloaded.  Calls to run JavaScript functions will not be run."
+    )
+    Unloaded = 3
+  };
+
   [webhosthidden]
   DOC_STRING("An immutable snapshot of the @ReactInstanceSettings used to create the current React instance.")
   interface IReactSettingsSnapshot
@@ -167,5 +190,9 @@ namespace Microsoft.ReactNative
       "The `paramsArgWriter` is a @JSValueArgWriter delegate that receives @IJSValueWriter to serialize "
       "the event parameters.")
     void EmitJSEvent(String eventEmitterName, String eventName, JSValueArgWriter paramsArgWriter);
+
+    DOC_STRING(
+      "Gets the state of the ReactNative instance.")
+    LoadingState LoadingState { get; };
   }
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -905,16 +905,20 @@ void NativeUIManager::DoLayout() {
     UpdateExtraLayout(rootTag);
 
     ShadowNodeBase &rootShadowNode = static_cast<ShadowNodeBase &>(m_host->GetShadowNodeForTag(rootTag));
-    YGNodeRef rootNode = GetYogaNode(rootTag);
-    auto rootElement = rootShadowNode.GetView().as<xaml::FrameworkElement>();
+    if (YGNodeRef rootNode = GetYogaNode(rootTag)) {
+      auto rootElement = rootShadowNode.GetView().as<xaml::FrameworkElement>();
 
-    float actualWidth = static_cast<float>(rootElement.ActualWidth());
-    float actualHeight = static_cast<float>(rootElement.ActualHeight());
+      float actualWidth = static_cast<float>(rootElement.ActualWidth());
+      float actualHeight = static_cast<float>(rootElement.ActualHeight());
 
-    // We must always run layout in LTR mode, which might seem unintuitive.
-    // We will flip the root of the tree into RTL by forcing the root XAML node's FlowDirection to RightToLeft
-    // which will inherit down the XAML tree, allowing all native controls to pick it up.
-    YGNodeCalculateLayout(rootNode, actualWidth, actualHeight, YGDirectionLTR);
+      // We must always run layout in LTR mode, which might seem unintuitive.
+      // We will flip the root of the tree into RTL by forcing the root XAML node's FlowDirection to RightToLeft
+      // which will inherit down the XAML tree, allowing all native controls to pick it up.
+      YGNodeCalculateLayout(rootNode, actualWidth, actualHeight, YGDirectionLTR);
+    } else {
+      assert(false);
+      return;
+    }
   }
 
   for (auto &tagToYogaNode : m_tagsToYogaNodes) {

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp

@@ -126,20 +126,24 @@ class UIManagerModule : public std::enable_shared_from_this<UIManagerModule>, pu
 
   void createView(int64_t reactTag, std::string viewName, int64_t rootTag, React::JSValueObject &&props) noexcept {
     m_nativeUIManager->ensureInBatch();
-    auto viewManager = GetViewManager(viewName);
-    auto node = viewManager->createShadow();
-    node->m_className = std::move(viewName);
-    node->m_tag = reactTag;
-    node->m_rootTag = rootTag;
-    node->m_viewManager = viewManager;
+    if (auto viewManager = GetViewManager(viewName)) {
+      auto node = viewManager->createShadow();
+      node->m_className = std::move(viewName);
+      node->m_tag = reactTag;
+      node->m_rootTag = rootTag;
+      node->m_viewManager = viewManager;
 
-    node->createView(props);
+      node->createView(props);
 
-    m_nativeUIManager->CreateView(*node, props);
+      m_nativeUIManager->CreateView(*node, props);
 
-    m_nodeRegistry.addNode(shadow_ptr(node), reactTag);
+      m_nodeRegistry.addNode(shadow_ptr(node), reactTag);
 
-    node->updateProperties(props);
+      node->updateProperties(props);
+    } else {
+      assert(false);
+      return;
+    }
   }
 
   void updateView(int64_t reactTag, std::string viewName, React::JSValueObject &&props) noexcept {

package/Microsoft.ReactNative/Utils/Helpers.cpp

@@ -31,7 +31,7 @@ namespace Microsoft::ReactNative {
 // Instead of deduce view id directly from FrameworkElement.Tag, this do
 // additional check by uimanager.
 ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe) {
-  ReactId reactId;
+  ReactId reactId{};
   if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(context).lock()) {
     if (auto peer = uiManager->reactPeerOrContainerFrom(fe)) {
       reactId.isValid = true;

package/Microsoft.ReactNative/Views/TouchEventHandler.cpp

@@ -240,7 +240,7 @@ TouchEventHandler::ReactPointer TouchEventHandler::CreateReactPointer(
   auto point = args.GetCurrentPoint(sourceElement);
   auto props = point.Properties();
 
-  ReactPointer pointer;
+  ReactPointer pointer{};
   pointer.target = tag;
   pointer.identifier = m_touchId++;
   pointer.pointerId = point.PointerId();

package/Mso/src/dispatchQueue/looperScheduler.cpp

@@ -43,38 +43,45 @@ LooperScheduler::~LooperScheduler() noexcept {
 /*static*/ void LooperScheduler::RunLoop(const Mso::WeakPtr<LooperScheduler> &weakSelf) noexcept {
   for (;;) {
     if (auto self = weakSelf.GetStrongPtr()) {
-      if (auto queue = self->m_queue.GetStrongPtr()) {
-        DispatchQueue q{Mso::CntPtr(queue)};
-        DispatchTask task;
-        while (queue->TryDequeTask(task)) {
+      if (auto queue = DispatchQueue{self->m_queue.GetStrongPtr()}) {
+        for (;;) {
+          DispatchTask task;
+          if (!(*GetRawState(queue))->TryDequeTask(task)) {
+            break;
+          }
+
           if (auto &func = self->m_settings.TaskStarting) {
-            func(q);
+            func(queue);
           }
 
-          queue->InvokeTask(std::move(task), std::nullopt);
+          (*GetRawState(queue))->InvokeTask(std::move(task), std::nullopt);
 
           if (auto &func = self->m_settings.TaskCompleted) {
-            func(q);
+            func(queue);
           }
         }
+      }
 
-        if (self->m_isShutdown) {
-          break;
-        }
+      if (self->m_isShutdown) {
+        break;
+      }
 
-        if (auto &func = self->m_settings.IdleWaitStarting) {
-          func(q);
+      if (auto &func = self->m_settings.IdleWaitStarting) {
+        if (auto queue = DispatchQueue{self->m_queue.GetStrongPtr()}) {
+          func(queue);
         }
+      }
 
-        self->m_wakeUpEvent.Wait();
-        self->m_wakeUpEvent.Reset();
+      self->m_wakeUpEvent.Wait();
+      self->m_wakeUpEvent.Reset();
 
-        if (auto &func = self->m_settings.IdleWaitCompleted) {
-          func(q);
+      if (auto &func = self->m_settings.IdleWaitCompleted) {
+        if (auto queue = DispatchQueue{self->m_queue.GetStrongPtr()}) {
+          func(queue);
         }
-
-        continue;
       }
+
+      continue;
     }
 
     break;

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.503</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.504</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/Shared/JSI/ChakraRuntime.cpp

@@ -116,7 +116,7 @@ void ChakraRuntime::PromiseContinuation(JsValueRef funcRef) noexcept {
   if (runtimeArgs().jsQueue) {
     JsAddRef(funcRef, nullptr);
     runtimeArgs().jsQueue->runOnQueue([this, funcRef]() {
-      JsValueRef undefinedValue;
+      JsValueRef undefinedValue = nullptr;
       JsGetUndefinedValue(&undefinedValue);
       ChakraVerifyJsErrorElseThrow(JsCallFunction(funcRef, &undefinedValue, 1, nullptr));
       JsRelease(funcRef, nullptr);
@@ -976,7 +976,7 @@ ChakraRuntime::JsiValueViewArgs::JsiValueViewArgs(JsValueRef *args, size_t argCo
   JsiValueView::StoreType *const pointerStore =
       m_heapPointerStore ? m_heapPointerStore.get() : m_stackPointerStore.data();
   facebook::jsi::Value *const jsiArgs = m_heapArgs ? m_heapArgs.get() : m_stackArgs.data();
-  for (uint32_t i = 0; i < m_size; ++i) {
+  for (size_t i = 0; i < m_size; ++i) {
     jsiArgs[i] = JsiValueView::InitValue(args[i], std::addressof(pointerStore[i]));
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.503",
+  "version": "0.0.0-canary.504",
   "license": "MIT",
   "repository": {
     "type": "git",