Merge pull request #2 from Microsoft/rnwcpp-preview

Rnwcpp preview
microsoft · Mar 25, 2019 · 1ce9127 · 1ce9127
2 parents e07df99 + 0b6ed3f
commit 1ce9127
Show file tree

Hide file tree

Showing 25 changed files with 618 additions and 956 deletions.
diff --git a/RNWCPP/ReactUWP/Base/UwpReactInstance.cpp b/RNWCPP/ReactUWP/Base/UwpReactInstance.cpp
@@ -20,7 +20,6 @@
 
 // Standard View Managers
 #include <Views/ActivityIndicatorViewManager.h>
-#include <Views/CalendarViewViewManager.h>
 #include <Views/CheckboxViewManager.h>
 #include <Views/DatePickerViewManager.h>
 #include <Views/PickerViewManager.h>
@@ -102,7 +101,6 @@ REACTWINDOWS_API_(std::shared_ptr<facebook::react::IUIManager>) CreateUIManager(
 
   // Standard view managers
   viewManagers.push_back(std::make_unique<ActivityIndicatorViewManager>(instance));
-  viewManagers.push_back(std::make_unique<CalendarViewViewManager>(instance));
   viewManagers.push_back(std::make_unique<CheckBoxViewManager>(instance));
   viewManagers.push_back(std::make_unique<DatePickerViewManager>(instance));
   viewManagers.push_back(std::make_unique<ImageViewManager>(instance));

diff --git a/RNWCPP/ReactUWP/CMakeLists.txt b/RNWCPP/ReactUWP/CMakeLists.txt
@@ -35,7 +35,6 @@ set(SOURCES
 	Utils/LocalBundleReader.cpp
 	Utils/ValueUtils.cpp
 	Views/ActivityIndicatorViewManager.cpp
-	Views/CalendarViewViewManager.cpp
 	Views/CheckboxViewManager.cpp
 	Views/ControlViewManager.cpp
 	Views/DatePickerViewManager.cpp
@@ -54,6 +53,7 @@ set(SOURCES
 	Views/TextViewManager.cpp
 	Views/TouchEventHandler.cpp
 	Views/ViewManagerBase.cpp
+	Views/ViewControl.cpp
 	Views/ViewPanel.cpp
 	Views/ViewViewManager.cpp
 	Views/VirtualTextViewManager.cpp

diff --git a/RNWCPP/ReactUWP/ReactUWP.vcxproj b/RNWCPP/ReactUWP/ReactUWP.vcxproj
@@ -180,8 +180,12 @@
     <ClInclude Include="Utils\PropertyHandlerUtils.h" />
     <ClInclude Include="Utils\PropertyUtils.h" />
     <ClInclude Include="Views\ActivityIndicatorViewManager.h" />
-    <ClInclude Include="Views\CalendarViewViewManager.h" />
     <ClInclude Include="Views\CheckboxViewManager.h" />
+    <ClInclude Include="Views\cppwinrt\react.uwp.DynamicAutomationPeer.g.h" />
+    <ClInclude Include="Views\cppwinrt\winrt\impl\react.uwp.0.h" />
+    <ClInclude Include="Views\cppwinrt\winrt\impl\react.uwp.1.h" />
+    <ClInclude Include="Views\cppwinrt\winrt\impl\react.uwp.2.h" />
+    <ClInclude Include="Views\cppwinrt\winrt\react.uwp.h" />
     <ClInclude Include="Views\DatePickerViewManager.h" />
     <ClInclude Include="Views\ImageViewManager.h" />
     <ClInclude Include="Views\PickerViewManager.h" />
@@ -194,6 +198,7 @@
     <ClInclude Include="Views\TextInputViewManager.h" />
     <ClInclude Include="Views\TextViewManager.h" />
     <ClInclude Include="Views\TouchEventHandler.h" />
+    <ClInclude Include="Views\ViewControl.h" />
     <ClInclude Include="Views\ViewPanel.h" />
     <ClInclude Include="Views\ViewViewManager.h" />
     <ClInclude Include="Views\VirtualTextViewManager.h" />
@@ -246,7 +251,6 @@
     <ClCompile Include="Utils\LocalBundleReader.cpp" />
     <ClCompile Include="Utils\ValueUtils.cpp" />
     <ClCompile Include="Views\ActivityIndicatorViewManager.cpp" />
-    <ClCompile Include="Views\CalendarViewViewManager.cpp" />
     <ClCompile Include="Views\CheckboxViewManager.cpp" />
     <ClCompile Include="Views\ControlViewManager.cpp" />
     <ClCompile Include="Views\DatePickerViewManager.cpp" />
@@ -264,6 +268,7 @@
     <ClCompile Include="Views\TextInputViewManager.cpp" />
     <ClCompile Include="Views\TextViewManager.cpp" />
     <ClCompile Include="Views\TouchEventHandler.cpp" />
+    <ClCompile Include="Views\ViewControl.cpp" />
     <ClCompile Include="Views\ViewManagerBase.cpp" />
     <ClCompile Include="Views\ViewPanel.cpp" />
     <ClCompile Include="Views\ViewViewManager.cpp" />

diff --git a/RNWCPP/ReactUWP/ReactUWP.vcxproj.filters b/RNWCPP/ReactUWP/ReactUWP.vcxproj.filters
@@ -163,9 +163,6 @@
     <ClCompile Include="Views\ActivityIndicatorViewManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
-    <ClCompile Include="Views\CalendarViewViewManager.cpp">
-      <Filter>Views</Filter>
-    </ClCompile>
     <ClCompile Include="Views\CheckboxViewManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
@@ -200,6 +197,9 @@
     <ClCompile Include="Views\DatePickerViewManager.cpp">
       <Filter>Views</Filter>
     </ClCompile>
+    <ClCompile Include="Views\ViewControl.cpp">
+      <Filter>Views</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Modules\DeviceInfoModule.h">
@@ -352,9 +352,6 @@
     <ClInclude Include="Views\PickerViewManager.h">
       <Filter>Views</Filter>
     </ClInclude>
-    <ClInclude Include="Views\CalendarViewViewManager.h">
-      <Filter>Views</Filter>
-    </ClInclude>
     <ClInclude Include="Views\PopupViewManager.h">
       <Filter>Views</Filter>
     </ClInclude>
@@ -385,6 +382,24 @@
     <ClInclude Include="..\include\ReactUWP\Utils\ValueUtils.h">
       <Filter>Utils</Filter>
     </ClInclude>
+    <ClInclude Include="Views\cppwinrt\react.uwp.DynamicAutomationPeer.g.h">
+      <Filter>Views\cppwinrt</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\cppwinrt\winrt\react.uwp.h">
+      <Filter>Views\cppwinrt</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\cppwinrt\winrt\impl\react.uwp.0.h">
+      <Filter>Views\cppwinrt</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\cppwinrt\winrt\impl\react.uwp.1.h">
+      <Filter>Views\cppwinrt</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\cppwinrt\winrt\impl\react.uwp.2.h">
+      <Filter>Views\cppwinrt</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\ViewControl.h">
+      <Filter>Views</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="EndPoints\dll\react-native-uwp.arm.def">
@@ -507,6 +522,9 @@
     <Filter Include="ABI\lib">
       <UniqueIdentifier>{6ce02bc1-7b54-4e9f-a950-8d794d89de63}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Views\cppwinrt">
+      <UniqueIdentifier>{4dbf6aed-54f8-4ebd-b99d-667a4b380d8a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <MidlRT Include="ABI\idl\ReactControl.g.idl">