diff --git a/ReactWindows/ReactNative.Tests/ReactInstanceManagerTests.cs b/ReactWindows/ReactNative.Tests/ReactInstanceManagerTests.cs index 343c546149b..4e079a75b01 100644 --- a/ReactWindows/ReactNative.Tests/ReactInstanceManagerTests.cs +++ b/ReactWindows/ReactNative.Tests/ReactInstanceManagerTests.cs @@ -7,7 +7,6 @@ namespace ReactNative.Tests [TestClass] public class ReactInstanceManagerTests { - [TestMethod] //TODO: Looking into XAML custom control issue. This test is currently being ignored for the meantime until the issue has been resolved. public async Task ReactInstanceManagerInitializationSuccess() { diff --git a/ReactWindows/ReactNative.Tests/UIManager/ViewManagersPropertyCacheTests.cs b/ReactWindows/ReactNative.Tests/UIManager/ViewManagersPropertyCacheTests.cs index 516ad3487c1..359d92d02b5 100644 --- a/ReactWindows/ReactNative.Tests/UIManager/ViewManagersPropertyCacheTests.cs +++ b/ReactWindows/ReactNative.Tests/UIManager/ViewManagersPropertyCacheTests.cs @@ -14,8 +14,7 @@ public class ViewManagersPropertyCacheTests public void ViewManagersPropertyCache_ArgumentChecks() { AssertEx.Throws( - () => ViewManagersPropertyCache.GetNativePropertiesForView(null, - (object)), + () => ViewManagersPropertyCache.GetNativePropertiesForView(null, typeof(object)), ex => Assert.AreEqual("viewManagerType", ex.ParamName)); AssertEx.Throws( @@ -53,7 +52,7 @@ public void ViewManagersPropertyCache_ViewManager_Set() var setters = ViewManagersPropertyCache.GetNativePropertySettersForViewManagerType(typeof(ViewManagerValueTest)); Assert.AreEqual(3, setters.Count); - + var properties = new CatalystStylesDiffMap(new JObject { { "Foo", "v1" }, @@ -462,4 +461,4 @@ protected override FrameworkElement CreateViewInstance(ThemedReactContext reactC #endregion } } -} +} \ No newline at end of file diff --git a/ReactWindows/ReactNative/ReactNative.csproj b/ReactWindows/ReactNative/ReactNative.csproj index 18b82203670..ad2928d6bda 100644 --- a/ReactWindows/ReactNative/ReactNative.csproj +++ b/ReactWindows/ReactNative/ReactNative.csproj @@ -209,6 +209,7 @@ + diff --git a/ReactWindows/ReactNative/UIManager/RootViewManager.cs b/ReactWindows/ReactNative/UIManager/RootViewManager.cs index a865c3517e2..9b805c027b6 100644 --- a/ReactWindows/ReactNative/UIManager/RootViewManager.cs +++ b/ReactWindows/ReactNative/UIManager/RootViewManager.cs @@ -8,7 +8,6 @@ namespace ReactNative.UIManager class RootViewManager : ViewGroupManager { private readonly string REACT_CLASS = "ReactView"; - /// /// Get the name of the react root view diff --git a/ReactWindows/ReactNative/UIManager/ViewGroupManager.Generic.cs b/ReactWindows/ReactNative/UIManager/ViewGroupManager.Generic.cs index 58f055ceaff..c5a16b88db4 100644 --- a/ReactWindows/ReactNative/UIManager/ViewGroupManager.Generic.cs +++ b/ReactWindows/ReactNative/UIManager/ViewGroupManager.Generic.cs @@ -100,8 +100,6 @@ protected sealed override FrameworkElement CreateViewInstance(ThemedReactContext protected abstract TPanel CreateViewInstanceCore(ThemedReactContext reactContext); /// -<<<<<<< 52b8b626cebd2f4762bc931bf5976f9f958d86ca -======= /// This method should return the subclass of /// which will be then used for measuring the position and size of the /// view. @@ -117,7 +115,6 @@ protected virtual LayoutShadowNode CreateShadowNodeInstanceCore() } /// ->>>>>>> Adding ReactViewManager /// Callback that will be triggered after all properties are updated in /// the current update transation (all handlers /// for properties updated in the current transaction have been called). diff --git a/ReactWindows/ReactNative/Views/View/ReactViewManager.cs b/ReactWindows/ReactNative/Views/View/ReactViewManager.cs index 17f79d2a1ad..daf77a2cdde 100644 --- a/ReactWindows/ReactNative/Views/View/ReactViewManager.cs +++ b/ReactWindows/ReactNative/Views/View/ReactViewManager.cs @@ -26,35 +26,65 @@ public override string Name } } + /// + /// Returns the view instance for . + /// + /// + /// protected override ReactViewPanel CreateViewInstanceCore(ThemedReactContext reactContext) { return new ReactViewPanel(); } + /// + /// The border radius of the . + /// + /// The view panel. + /// The border radius value. [ReactProperty("borderRadius")] public void SetBorderRadius(ReactViewPanel view, float borderRadius) { view.SetBorderRadius(borderRadius); } + /// + /// Sets the elevation transformation effect of the . + /// + /// The view panel. + /// The 3D Z-Location index of the . [ReactProperty("elevation")] public void SetElevation(ReactViewPanel view, float elevation) { view.SetElevationEffect(elevation); } + /// + /// Sets the border thickness of the . + /// + /// The view panel. + /// The border width in pixels. [ReactProperty("borderWidth", DefaultFloat = float.NaN)] public void SetBorderWidth(ReactViewPanel view, float borderWidth) { view.SetBorderThickness(borderWidth); } + /// + /// Set the border color of the . + /// + /// The view panel. + /// The color hex code. [ReactProperty("borderColor")] public void SetBorderColor(ReactViewPanel view, string color) { view.SetBorderBackgroundColor(color); } + /// + /// Sets the pointer events based on a event string key. + /// + /// The view panel. + /// The event to propogate down to the view. [ReactProperty("pointerEvents")] public void SetPointerEvents(ReactViewPanel view, string pointerEventsStr) { diff --git a/ReactWindows/ReactNative/Views/View/ReactViewPanel.cs b/ReactWindows/ReactNative/Views/View/ReactViewPanel.cs index 024ec354804..63f661ad032 100644 --- a/ReactWindows/ReactNative/Views/View/ReactViewPanel.cs +++ b/ReactWindows/ReactNative/Views/View/ReactViewPanel.cs @@ -16,7 +16,8 @@ namespace ReactNative.Views.View { /// /// Backing for a React View. Has support for borders, but since borders - /// aren't common, lazy initializes most of the storage needed for them. + /// aren't common, lazy initializes most of the storage needed for them. Also supports + /// 3D transformations such as elevation depth. /// public class ReactViewPanel : Panel, CatalystInterceptingViewGroup, ReactPointerEventsView {