Removes irrelevant headers and fixes namespaces

microsoft · Aug 23, 2021 · 87cf3cd · 87cf3cd
1 parent 6c4ca2d
commit 87cf3cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/vnext/Microsoft.ReactNative/Views/RawTextViewManager.cpp b/vnext/Microsoft.ReactNative/Views/RawTextViewManager.cpp
@@ -4,20 +4,12 @@
 #include "pch.h"
 
 #include "RawTextViewManager.h"
-#include "TextViewManager.h"
-#include "VirtualTextViewManager.h"
 
 #include <Views/ShadowNodeBase.h>
 #include <Views/Text/TextVisitors.h>
 
-#include <INativeUIManager.h>
-#include <Utils/ShadowNodeTypeUtils.h>
-#include <Utils/ValueUtils.h>
-
-#include <Modules/NativeUIManager.h>
-#include <Modules/PaperUIManagerModule.h>
-#include <UI.Xaml.Controls.h>
 #include <UI.Xaml.Documents.h>
+#include <Utils/ValueUtils.h>
 #include <winrt/Windows.Foundation.h>
 
 namespace winrt {

diff --git a/vnext/Microsoft.ReactNative/Views/Text/TextPropertyChangedParentVisitor.cpp b/vnext/Microsoft.ReactNative/Views/Text/TextPropertyChangedParentVisitor.cpp
@@ -4,12 +4,15 @@
 #include "TextPropertyChangedParentVisitor.h"
 #include <UI.Xaml.Automation.Peers.h>
 #include <UI.Xaml.Automation.h>
+#include <UI.Xaml.Controls.h>
+#include <UI.Xaml.Documents.h>
 #include <Views/TextViewManager.h>
 #include <Views/VirtualTextViewManager.h>
 
 namespace winrt {
 using namespace xaml::Automation;
 using namespace xaml::Automation::Peers;
+using namespace xaml::Documents;
 } // namespace winrt
 
 namespace Microsoft::ReactNative {
@@ -30,7 +33,7 @@ void TextPropertyChangedParentVisitor::VisitText(ShadowNodeBase *node) {
     // not set.
     if (xaml::Automation::AutomationProperties::GetLiveSetting(element) != winrt::AutomationLiveSetting::Off &&
         xaml::Automation::AutomationProperties::GetName(element).empty() &&
-        xaml::Automation::AutomationProperties::GetAccessibilityView(element) != winrt::Peers::AccessibilityView::Raw) {
+        xaml::Automation::AutomationProperties::GetAccessibilityView(element) != winrt::AccessibilityView::Raw) {
       if (auto peer = xaml::Automation::Peers::FrameworkElementAutomationPeer::FromElement(element)) {
         peer.RaiseAutomationEvent(winrt::AutomationEvents::LiveRegionChanged);
       }

diff --git a/vnext/Microsoft.ReactNative/Views/Text/TextTransformVisitor.cpp b/vnext/Microsoft.ReactNative/Views/Text/TextTransformVisitor.cpp
@@ -2,12 +2,17 @@
 // Licensed under the MIT License.
 
 #include "TextTransformVisitor.h"
+#include <UI.Xaml.Documents.h>
 #include <Utils/TransformableText.h>
 #include <Views/RawTextViewManager.h>
 #include <Views/TextViewManager.h>
 #include <Views/VirtualTextViewManager.h>
 #include "TextVisitorScope.h"
 
+namespace winrt {
+using namespace xaml::Documents;
+} // namespace winrt
+
 namespace Microsoft::ReactNative {
 
 void TextTransformVisitor::VisitRawText(ShadowNodeBase *node) {

diff --git a/vnext/Microsoft.ReactNative/Views/VirtualTextViewManager.cpp b/vnext/Microsoft.ReactNative/Views/VirtualTextViewManager.cpp
@@ -5,11 +5,6 @@
 
 #include "VirtualTextViewManager.h"
 
-#include <Views/RawTextViewManager.h>
-
-#include <Modules/NativeUIManager.h>
-#include <Modules/PaperUIManagerModule.h>
-#include <UI.Xaml.Controls.h>
 #include <UI.Xaml.Documents.h>
 #include <Utils/PropertyUtils.h>
 #include <Utils/ShadowNodeTypeUtils.h>