react-native-windows 0.0.0-canary.435 → 0.0.0-canary.436

package/Microsoft.ReactNative/Modules/Animated/DiffClampAnimatedNode.cpp

@@ -11,7 +11,7 @@ DiffClampAnimatedNode::DiffClampAnimatedNode(
     int64_t tag,
     const folly::dynamic &config,
     const std::shared_ptr<NativeAnimatedNodeManager> &manager)
-    : ValueAnimatedNode(tag, config, manager) {
+    : ValueAnimatedNode(tag, manager) {
   m_inputNodeTag = static_cast<int64_t>(config.find(s_inputName).dereference().second.asDouble());
   m_min = config.find(s_minName).dereference().second.asDouble();
   m_max = config.find(s_maxName).dereference().second.asDouble();

package/Microsoft.ReactNative/Views/RawTextViewManager.cpp

@@ -43,6 +43,7 @@ bool RawTextViewManager::UpdateProperty(
     return true;
 
   if (propertyName == "text") {
+    MarkDirty(nodeToUpdate->m_tag);
     run.Text(asHstring(propertyValue));
     static_cast<RawTextShadowNode *>(nodeToUpdate)->originalText = winrt::hstring{};
     ApplyTextTransformToChild(nodeToUpdate);

package/Microsoft.ReactNative/Views/TextInputViewManager.cpp

@@ -475,16 +475,20 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
   auto passwordBox = control.try_as<xaml::Controls::PasswordBox>();
   auto hasKeyDownEvents = false;
 
+  auto markDirty = false;
   for (auto &pair : props) {
     const std::string &propertyName = pair.first;
     const auto &propertyValue = pair.second;
 
     // Applicable properties for both TextBox and PasswordBox
     if (TryUpdateFontProperties(control, propertyName, propertyValue)) {
+      markDirty = true;
       continue;
     } else if (TryUpdateCharacterSpacing(control, propertyName, propertyValue)) {
+      markDirty = true;
       continue;
     } else if (propertyName == "allowFontScaling") {
+      markDirty = true;
       if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean)
         control.IsTextScaleFactorEnabled(propertyValue.AsBoolean());
       else if (propertyValue.IsNull())
@@ -509,6 +513,7 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
         HideCaretIfNeeded();
       }
     } else if (propertyName == "secureTextEntry") {
+      markDirty = true;
       if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
         if (propertyValue.AsBoolean()) {
           if (m_isTextBox) {
@@ -537,6 +542,7 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
         }
       }
     } else if (propertyName == "maxLength") {
+      markDirty = true;
       if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
           propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64) {
         control.SetValue(
@@ -613,6 +619,7 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
         if (TryUpdateTextAlignment(textBox, propertyName, propertyValue)) {
           continue;
         } else if (propertyName == "multiline") {
+          markDirty = true;
           if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
             const bool isMultiline = propertyValue.AsBoolean();
             textBox.TextWrapping(isMultiline ? xaml::TextWrapping::Wrap : xaml::TextWrapping::NoWrap);
@@ -643,6 +650,7 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
           else if (propertyValue.IsNull())
             textBox.ClearValue(xaml::Controls::TextBox::IsSpellCheckEnabledProperty());
         } else if (propertyName == "text") {
+          markDirty = true;
           SetText(propertyValue);
         } else if (propertyName == "autoCapitalize") {
           if (textBox.try_as<xaml::Controls::ITextBox6>()) {
@@ -659,12 +667,17 @@ void TextInputShadowNode::updateProperties(winrt::Microsoft::ReactNative::JSValu
         }
       } else { // Applicable properties for PasswordBox
         if (propertyName == "text" && !m_isTextBox) {
+          markDirty = true;
           SetText(propertyValue);
         }
       }
     }
   }
 
+  if (markDirty) {
+    GetViewManager()->MarkDirty(m_tag);
+  }
+
   Super::updateProperties(props);
 
   // We need to re-register the PreviewKeyDown handler so it is invoked after the ShadowNodeBase handler

package/Microsoft.ReactNative/Views/TextViewManager.cpp

@@ -197,6 +197,17 @@ XamlView TextViewManager::CreateViewCore(int64_t /*tag*/, const winrt::Microsoft
   return textBlock;
 }
 
+void TextViewManager::UpdateProperties(
+    ShadowNodeBase *nodeToUpdate,
+    winrt::Microsoft::ReactNative::JSValueObject &props) {
+  // This could be optimized further, but rather than paying a penalty to mark
+  // the node dirty for each relevant property in UpdateProperty (which should
+  // be reasonably cheap given it just does an O(1) lookup of the Yoga node
+  // for the tag, for now this just marks the node dirty for any prop update.
+  MarkDirty(nodeToUpdate->m_tag);
+  Super::UpdateProperties(nodeToUpdate, props);
+}
+
 bool TextViewManager::UpdateProperty(
     ShadowNodeBase *nodeToUpdate,
     const std::string &propertyName,

package/Microsoft.ReactNative/Views/TextViewManager.h

@@ -21,6 +21,7 @@ class TextViewManager : public FrameworkElementViewManager {
   void AddView(const XamlView &parent, const XamlView &child, int64_t index) override;
   void RemoveAllChildren(const XamlView &parent) override;
   void RemoveChildAt(const XamlView &parent, int64_t index) override;
+  void UpdateProperties(ShadowNodeBase *nodeToUpdate, winrt::Microsoft::ReactNative::JSValueObject &props) override;
 
   YGMeasureFunc GetYogaCustomMeasureFunc() const override;
 

package/Microsoft.ReactNative/Views/ViewManagerBase.cpp

@@ -240,15 +240,6 @@ void ViewManagerBase::ReplaceChild(const XamlView &parent, const XamlView &oldCh
 void ViewManagerBase::UpdateProperties(
     ShadowNodeBase *nodeToUpdate,
     winrt::Microsoft::ReactNative::JSValueObject &props) {
-  // Directly dirty this node since non-layout changes like the text property do
-  // not trigger relayout
-  //  There isn't actually a yoga node for RawText views, but it will invalidate
-  //  the ancestors which
-  //  will include the containing Text element. And that's what matters.
-  int64_t tag = GetTag(nodeToUpdate->GetView());
-  if (auto uiManager = GetNativeUIManager(GetReactContext()).lock())
-    uiManager->DirtyYogaNode(tag);
-
   for (const auto &pair : props) {
     const std::string &propertyName = pair.first;
     const auto &propertyValue = pair.second;
@@ -392,6 +383,11 @@ bool ViewManagerBase::IsNativeControlWithSelfLayout() const {
   return GetYogaCustomMeasureFunc() != nullptr;
 }
 
+void ViewManagerBase::MarkDirty(int64_t tag) {
+  if (auto uiManager = GetNativeUIManager(GetReactContext()).lock())
+    uiManager->DirtyYogaNode(tag);
+}
+
 void ViewManagerBase::OnPointerEvent(
     ShadowNodeBase *node,
     const winrt::Microsoft::ReactNative::ReactPointerEventArgs &args) {

package/Microsoft.ReactNative/Views/ViewManagerBase.h

@@ -78,6 +78,7 @@ class REACTWINDOWS_EXPORT ViewManagerBase : public IViewManager {
   virtual YGMeasureFunc GetYogaCustomMeasureFunc() const;
   virtual bool RequiresYogaNode() const;
   bool IsNativeControlWithSelfLayout() const;
+  void MarkDirty(int64_t tag);
 
   virtual void OnPointerEvent(ShadowNodeBase *node, const winrt::Microsoft::ReactNative::ReactPointerEventArgs &args);
 

package/Microsoft.ReactNative/Views/VirtualTextViewManager.cpp

@@ -56,6 +56,17 @@ XamlView VirtualTextViewManager::CreateViewCore(int64_t /*tag*/, const winrt::Mi
   return winrt::Span();
 }
 
+void VirtualTextViewManager::UpdateProperties(
+    ShadowNodeBase *nodeToUpdate,
+    winrt::Microsoft::ReactNative::JSValueObject &props) {
+  // This could be optimized further, but rather than paying a penalty to mark
+  // the node dirty for each relevant property in UpdateProperty (which should
+  // be reasonably cheap given it just does an O(1) lookup of the Yoga node
+  // for the tag, for now this just marks the node dirty for any prop update.
+  MarkDirty(nodeToUpdate->m_tag);
+  Super::UpdateProperties(nodeToUpdate, props);
+}
+
 bool VirtualTextViewManager::UpdateProperty(
     ShadowNodeBase *nodeToUpdate,
     const std::string &propertyName,

package/Microsoft.ReactNative/Views/VirtualTextViewManager.h

@@ -43,6 +43,8 @@ class VirtualTextViewManager : public ViewManagerBase {
 
   bool RequiresYogaNode() const override;
 
+  void UpdateProperties(ShadowNodeBase *nodeToUpdate, winrt::Microsoft::ReactNative::JSValueObject &props);
+
  protected:
   bool UpdateProperty(
       ShadowNodeBase *nodeToUpdate,

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.435</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.436</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/Scripts/OfficeReact.Win32.nuspec

@@ -49,7 +49,6 @@
     <file src="$nugetroot$\inc\Shared\InstanceManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IReactRootView.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IRedBoxHandler.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\IUIManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\JSBigAbiString.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\LayoutAnimation.h" target="inc"/>

package/Shared/Shared.vcxitems

@@ -102,7 +102,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)InstanceManager.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IReactRootView.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IRedBoxHandler.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)IUIManager.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IWebSocketResource.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSBigAbiString.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)LayoutAnimation.h" />

package/Shared/Shared.vcxitems.filters

@@ -266,9 +266,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)IRedBoxHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)IUIManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)IWebSocketResource.h">
       <Filter>Header Files</Filter>
     </ClInclude>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.435",
+  "version": "0.0.0-canary.436",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
     "@react-native-windows/cli": "0.0.0-canary.108",
-    "@react-native-windows/virtualized-list": "0.0.0-canary.22",
+    "@react-native-windows/virtualized-list": "0.0.0-canary.23",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -46,8 +46,8 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
-    "react-devtools-core": "4.21.0",
-    "react-native-codegen": "^0.0.11",
+    "react-devtools-core": "4.22.1",
+    "react-native-codegen": "^0.0.12",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "^0.20.2",
@@ -67,13 +67,13 @@
     "@types/react-native": "^0.66.0",
     "eslint": "^7.32.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "flow-bin": "^0.165.0",
+    "flow-bin": "^0.167.1",
     "jscodeshift": "^0.11.0",
     "just-scripts": "^1.3.3",
     "metro-config": "^0.66.0",
     "prettier": "^2.4.1",
     "react": "17.0.2",
-    "react-native": "0.0.0-20211202-2008-9e2ec4d3d",
+    "react-native": "0.0.0-20211217-2008-aef843bfe",
     "react-native-platform-override": "^1.6.2",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
@@ -81,7 +81,7 @@
   },
   "peerDependencies": {
     "react": "17.0.2",
-    "react-native": "0.0.0-20211202-2008-9e2ec4d3d"
+    "react-native": "0.0.0-20211217-2008-aef843bfe"
   },
   "beachball": {
     "defaultNpmTag": "canary",

package/Shared/IUIManager.h

@@ -1,90 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <cxxreact/CxxModule.h>
-
-#include <folly/dynamic.h>
-#include <stdint.h>
-#include <string>
-
-namespace facebook {
-namespace react {
-
-struct INativeUIManager;
-struct IReactRootView;
-class IViewManager;
-struct ShadowNode;
-class MessageQueueThread;
-
-class IUIManager {
- public:
-  virtual ~IUIManager(){};
-  virtual int64_t AddMeasuredRootView(IReactRootView *rootView) = 0;
-
-  // TODO: Remove if moduleRegistry exposes onBatchComplete
-  virtual void onBatchComplete() = 0;
-
-  virtual folly::dynamic getConstantsForViewManager(const std::string &viewManager) = 0;
-  virtual void populateViewManagerConstants(std::map<std::string, folly::dynamic> &constants) = 0;
-  virtual void createView(int64_t tag, std::string &&className, int64_t rootViewTag, folly::dynamic &&props) = 0;
-  virtual void configureNextLayoutAnimation(
-      folly::dynamic &&config,
-      facebook::xplat::module::CxxModule::Callback success,
-      facebook::xplat::module::CxxModule::Callback error) = 0;
-  virtual void removeRootView(int64_t rootViewTag) = 0;
-  virtual void setChildren(int64_t viewTag, folly::dynamic &&childrenTags) = 0;
-  virtual void updateView(int64_t tag, const std::string &className, folly::dynamic &&props) = 0;
-  virtual void removeSubviewsFromContainerWithID(int64_t containerTag) = 0;
-  virtual void manageChildren(
-      int64_t viewTag,
-      folly::dynamic &moveFrom,
-      folly::dynamic &moveTo,
-      folly::dynamic &addChildTags,
-      folly::dynamic &addAtIndices,
-      folly::dynamic &removeFrom) = 0;
-  virtual void
-  dispatchViewManagerCommand(int64_t reactTag, const std::string &commandId, folly::dynamic &&commandArgs) = 0;
-  virtual void replaceExistingNonRootView(int64_t oldTag, int64_t newTag) = 0;
-  virtual void measure(int64_t reactTag, facebook::xplat::module::CxxModule::Callback callback) = 0;
-  virtual void measureInWindow(int64_t reactTag, facebook::xplat::module::CxxModule::Callback callback) = 0;
-  virtual void measureLayout(
-      int64_t reactTag,
-      int64_t ancestorReactTag,
-      facebook::xplat::module::CxxModule::Callback errorCallback,
-      facebook::xplat::module::CxxModule::Callback callback) = 0;
-  virtual INativeUIManager *getNativeUIManager() = 0;
-
-  virtual void focus(int64_t tag) = 0;
-  virtual void blur(int64_t tag) = 0;
-
-  // needed for control specific native modules to get the shadow node from the
-  // UIManager given its tag
-  virtual ShadowNode *FindShadowNodeForTag(int64_t tag) = 0;
-  virtual void findSubviewIn(
-      int64_t reactTag,
-      folly::dynamic &&coordinates,
-      facebook::xplat::module::CxxModule::Callback callback) = 0;
-};
-
-std::shared_ptr<IUIManager> createIUIManager(
-    std::vector<std::unique_ptr<IViewManager>> &&viewManagers,
-    INativeUIManager *nativeManager);
-
-std::unique_ptr<facebook::xplat::module::CxxModule> createUIManagerModule(
-    std::shared_ptr<IUIManager> &&uimanager,
-    std::shared_ptr<MessageQueueThread> &&uiQueue) noexcept;
-
-// Deprecated: use the overloaded version with two parameters.
-// It is here because it is being exported
-std::unique_ptr<facebook::xplat::module::CxxModule> createUIManagerModule(std::shared_ptr<IUIManager> uimanager);
-
-std::shared_ptr<IUIManager> createBatchingUIManager(
-    std::vector<std::unique_ptr<IViewManager>> &&viewManagers,
-    INativeUIManager *nativeManager);
-std::unique_ptr<facebook::xplat::module::CxxModule> createBatchingUIManagerModule(
-    std::shared_ptr<IUIManager> uimanager);
-
-} // namespace react
-} // namespace facebook