diff --git a/ReactWindows/Playground/MainPage.xaml b/ReactWindows/Playground/MainPage.xaml index a9946e01fc6..25ab0403cbd 100644 --- a/ReactWindows/Playground/MainPage.xaml +++ b/ReactWindows/Playground/MainPage.xaml @@ -5,9 +5,12 @@ xmlns:local="using:Playground" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:views="using:ReactNative.Views" mc:Ignorable="d"> - + + + diff --git a/ReactWindows/ReactNative.sln b/ReactWindows/ReactNative.sln index b27578ddf15..9508231c3d8 100644 --- a/ReactWindows/ReactNative.sln +++ b/ReactWindows/ReactNative.sln @@ -38,6 +38,8 @@ Global {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.ActiveCfg = Release|x86 {C7673AD5-E3AA-468C-A5FD-FA38154E205C}.Release|x86.Build.0 = Release|x86 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|Any CPU.ActiveCfg = Debug|x86 + {D52267B5-396F-424A-BB26-C9E750032846}.Debug|Any CPU.Build.0 = Debug|x86 + {D52267B5-396F-424A-BB26-C9E750032846}.Debug|Any CPU.Deploy.0 = Debug|x86 {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.ActiveCfg = Debug|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Build.0 = Debug|ARM {D52267B5-396F-424A-BB26-C9E750032846}.Debug|ARM.Deploy.0 = Debug|ARM diff --git a/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs b/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs index 453037b88e7..52d0123e729 100644 --- a/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs +++ b/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs @@ -468,7 +468,7 @@ private IViewManager ResolveViewManager(int tag) return viewManager; } - private void AddRootViewGroup(int tag, Panel view, ThemedReactContext themedContext) + private void AddRootViewGroup(int tag, FrameworkElement view, ThemedReactContext themedContext) { DispatcherHelpers.AssertOnDispatcher(); _tagsToViews.Add(tag, view); diff --git a/ReactWindows/ReactNative/UIManager/RootViewManager.cs b/ReactWindows/ReactNative/UIManager/RootViewManager.cs index 6ed8d344fc3..33fc3c1a54c 100644 --- a/ReactWindows/ReactNative/UIManager/RootViewManager.cs +++ b/ReactWindows/ReactNative/UIManager/RootViewManager.cs @@ -26,7 +26,7 @@ public override string Name /// /// The react context. /// The view instance. - protected override Panel CreateViewInstance(ThemedReactContext reactContext) + protected override FrameworkElement CreateViewInstance(ThemedReactContext reactContext) { return new SizeMonitoringFrameLayout(); } diff --git a/ReactWindows/ReactNative/UIManager/SizeMonitoringFrameLayout.cs b/ReactWindows/ReactNative/UIManager/SizeMonitoringFrameLayout.cs index 99c2a048523..967b6e02752 100644 --- a/ReactWindows/ReactNative/UIManager/SizeMonitoringFrameLayout.cs +++ b/ReactWindows/ReactNative/UIManager/SizeMonitoringFrameLayout.cs @@ -6,7 +6,7 @@ namespace ReactNative.UIManager /// /// allows registering for size change events. The main purpose for this class is to hide complexity of ReactRootView /// - public partial class SizeMonitoringFrameLayout : Panel + public partial class SizeMonitoringFrameLayout : ContentControl { public SizeMonitoringFrameLayout() : base() { diff --git a/ReactWindows/ReactNative/UIManager/ViewGroupManager.cs b/ReactWindows/ReactNative/UIManager/ViewGroupManager.cs index 605f1804077..5ced1c502bd 100644 --- a/ReactWindows/ReactNative/UIManager/ViewGroupManager.cs +++ b/ReactWindows/ReactNative/UIManager/ViewGroupManager.cs @@ -8,7 +8,7 @@ namespace ReactNative.UIManager /// Class providing child management API for view managers of classes /// extending . /// - public abstract class ViewGroupManager : ViewManager + public abstract class ViewGroupManager : ViewManager { /// /// Signals whether the view type needs to handle laying out its own diff --git a/ReactWindows/ReactNative/Views/ReactRootView.xaml.cs b/ReactWindows/ReactNative/Views/ReactRootView.xaml.cs index cff5e1b847e..0c74a3fce77 100644 --- a/ReactWindows/ReactNative/Views/ReactRootView.xaml.cs +++ b/ReactWindows/ReactNative/Views/ReactRootView.xaml.cs @@ -28,7 +28,7 @@ namespace ReactNative.Views /// 1. Add support for events(i.e. define the sendEvents method) /// 2. Add lifecycle functions to ensure the bundle is only loaded once /// - public sealed partial class ReactRootView : SizeMonitoringFrameLayout, IRootView + public sealed partial class ReactRootView : IRootView { private IReactInstanceManager _ReactInstanceManager; private string _JSModuleName;