diff --git a/ReactWindows/ReactNative/ReactNative.csproj b/ReactWindows/ReactNative/ReactNative.csproj index 2ac8d0b30a4..15e5cb3486f 100644 --- a/ReactWindows/ReactNative/ReactNative.csproj +++ b/ReactWindows/ReactNative/ReactNative.csproj @@ -289,8 +289,8 @@ - - + + diff --git a/ReactWindows/ReactNative/Touch/IOnInterceptTouchEventListener.cs b/ReactWindows/ReactNative/Touch/IOnInterceptTouchEventListener.cs deleted file mode 100644 index c6245652169..00000000000 --- a/ReactWindows/ReactNative/Touch/IOnInterceptTouchEventListener.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Windows.UI.Xaml.Input; - -namespace ReactNative.Touch -{ - public interface IOnInterceptTouchEventListener - { - /// - /// Called when a touch intercept occurs on a view group. - /// - /// The motion event being dispatched down the hierarchy. - /// - /// true if the touch event should be intercepted from the - /// children and dispatched to this view, or false to - /// allow the event to be delivered to the child view. - /// - bool OnInterceptTouchEvent(object sender, PointerRoutedEventArgs @event); - } -} \ No newline at end of file diff --git a/ReactWindows/ReactNative/Touch/JavaScriptResponderHandler.cs b/ReactWindows/ReactNative/Touch/JavaScriptResponderHandler.cs index 55b9700572d..93b3ac83a30 100644 --- a/ReactWindows/ReactNative/Touch/JavaScriptResponderHandler.cs +++ b/ReactWindows/ReactNative/Touch/JavaScriptResponderHandler.cs @@ -9,7 +9,7 @@ namespace ReactNative.Touch /// This class coordinates JSResponder commands for . /// It should be set as the /// for all newly created native views that implement - /// and will dispatch touch + /// and will dispatch touch /// events to the JavaScript gesture recognizer when the JavaScript /// responder is set to be enabled. /// diff --git a/ReactWindows/ReactNative/UIManager/Events/IOnInterceptTextInputEventListener.cs b/ReactWindows/ReactNative/UIManager/Events/IOnInterceptTextInputEventListener.cs index b3e66c8ea6e..e720d0e50ea 100644 --- a/ReactWindows/ReactNative/UIManager/Events/IOnInterceptTextInputEventListener.cs +++ b/ReactWindows/ReactNative/UIManager/Events/IOnInterceptTextInputEventListener.cs @@ -5,7 +5,7 @@ namespace ReactNative.UIManager.Events public interface IOnInterceptTextInputEventListener { /// - /// Called when a onInterceptTouch is invoked on a view group + /// Called when a onInterceptTouch is invoked on a view parent /// /// The motion event being dispatched down the hierarchy. /// Return true to steal motion event from the children and have the dispatched to this view, or return false to allow motion event to be delivered to children view diff --git a/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs b/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs index 21dfcf9a93b..7cc53b25f28 100644 --- a/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs +++ b/ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs @@ -125,18 +125,18 @@ public void UpdateLayout(int parentTag, int tag, int x, int y, int width, int he var viewToUpdate = ResolveView(tag); var parentViewManager = default(ViewManager); - var parentViewGroupManager = default(ViewGroupManager); + var parentViewParentManager = default(ViewParentManager); if (!_tagsToViewManagers.TryGetValue(parentTag, out parentViewManager) || - (parentViewGroupManager = parentViewManager as ViewGroupManager) == null) + (parentViewParentManager = parentViewManager as ViewParentManager) == null) { throw new InvalidOperationException( string.Format( CultureInfo.InvariantCulture, - "Trying to use view with tag '{0}' as a parent, but its manager doesn't extend ViewGroupManager.", + "Trying to use view with tag '{0}' as a parent, but its manager doesn't extend ViewParentManager.", tag)); } - if (!parentViewGroupManager.NeedsCustomLayoutForChildren) + if (!parentViewParentManager.NeedsCustomLayoutForChildren) { UpdateLayout(viewToUpdate, x, y, width, height); } @@ -212,10 +212,10 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo tag)); } - var viewGroupManager = (ViewGroupManager)viewManager; + var viewParentManager = (ViewParentManager)viewManager; var viewToManage = _tagsToViews[tag]; - var lastIndexToRemove = viewGroupManager.GetChildCount(viewToManage); + var lastIndexToRemove = viewParentManager.GetChildCount(viewToManage); if (indicesToRemove != null) { for (var i = indicesToRemove.Length - 1; i >= 0; --i) @@ -231,7 +231,7 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo tag)); } - if (indexToRemove >= viewGroupManager.GetChildCount(viewToManage)) + if (indexToRemove >= viewParentManager.GetChildCount(viewToManage)) { throw new InvalidOperationException( string.Format( @@ -252,7 +252,7 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo tag)); } - viewGroupManager.RemoveChildAt(viewToManage, indexToRemove); + viewParentManager.RemoveChildAt(viewToManage, indexToRemove); lastIndexToRemove = indexToRemove; } } @@ -272,7 +272,7 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo viewAtIndex.Tag)); } - viewGroupManager.AddView(viewToManage, viewToAdd, viewAtIndex.Index); + viewParentManager.AddView(viewToManage, viewToAdd, viewAtIndex.Index); } } @@ -365,7 +365,7 @@ public void Measure(int tag, int[] outputBuffer) /// The themed context. public void AddRootView(int tag, SizeMonitoringCanvas view, ThemedReactContext themedContext) { - AddRootViewGroup(tag, view, themedContext); + AddRootViewParent(tag, view, themedContext); } /// @@ -515,7 +515,7 @@ private ViewManager ResolveViewManager(int tag) return viewManager; } - private void AddRootViewGroup(int tag, FrameworkElement view, ThemedReactContext themedContext) + private void AddRootViewParent(int tag, FrameworkElement view, ThemedReactContext themedContext) { DispatcherHelpers.AssertOnDispatcher(); _tagsToViews.Add(tag, view); @@ -539,12 +539,12 @@ private void DropView(FrameworkElement view) var viewManager = default(ViewManager); if (_tagsToViewManagers.TryGetValue(tag, out viewManager)) { - var viewGroupManager = viewManager as ViewGroupManager; - if (viewGroupManager != null) + var viewParentManager = viewManager as ViewParentManager; + if (viewParentManager != null) { - for (var i = viewGroupManager.GetChildCount(view) - 1; i >= 0; --i) + for (var i = viewParentManager.GetChildCount(view) - 1; i >= 0; --i) { - var child = viewGroupManager.GetChildAt(view, i); + var child = viewParentManager.GetChildAt(view, i); var managedChild = default(FrameworkElement); if (_tagsToViews.TryGetValue(child.GetTag(), out managedChild)) { @@ -552,7 +552,7 @@ private void DropView(FrameworkElement view) } } - viewGroupManager.RemoveAllChildren(view); + viewParentManager.RemoveAllChildren(view); } } diff --git a/ReactWindows/ReactNative/UIManager/PanelViewGroupManager.cs b/ReactWindows/ReactNative/UIManager/PanelViewParentManager.cs similarity index 94% rename from ReactWindows/ReactNative/UIManager/PanelViewGroupManager.cs rename to ReactWindows/ReactNative/UIManager/PanelViewParentManager.cs index ab9abc5332c..532f398a548 100644 --- a/ReactWindows/ReactNative/UIManager/PanelViewGroupManager.cs +++ b/ReactWindows/ReactNative/UIManager/PanelViewParentManager.cs @@ -9,7 +9,7 @@ namespace ReactNative.UIManager /// extending . /// /// Type of panel. - public abstract class PanelViewGroupManager : ViewGroupManager + public abstract class PanelViewParentManager : ViewParentManager where TPanel : Panel { /// @@ -54,9 +54,9 @@ public sealed override void UpdateExtraData(FrameworkElement root, object extraD } /// - /// Gets the number of children in the view group. + /// Gets the number of children for the view parent. /// - /// The view group. + /// The view parent. /// The number of children. public sealed override int GetChildCount(FrameworkElement parent) { @@ -88,7 +88,7 @@ public sealed override void AddView(FrameworkElement parent, FrameworkElement ch /// /// Removes the child at the given index. /// - /// The view group. + /// The view parent. /// The index. public override void RemoveChildAt(FrameworkElement parent, int index) { @@ -96,9 +96,9 @@ public override void RemoveChildAt(FrameworkElement parent, int index) } /// - /// Removes all children from the view group. + /// Removes all children from the view parent. /// - /// The view group. + /// The view parent. public override void RemoveAllChildren(FrameworkElement parent) { RemoveAllChildren((TPanel)parent); @@ -225,9 +225,9 @@ protected virtual void UpdateExtraData(TPanel root, object extraData) } /// - /// Gets the number of children in the view group. + /// Gets the number of children in the view parent. /// - /// The view group. + /// The view parent. /// The number of children. protected virtual int GetChildCount(TPanel parent) { @@ -259,7 +259,7 @@ protected virtual void AddView(TPanel parent, FrameworkElement child, int index) /// /// Removes the child at the given index. /// - /// The view group. + /// The view parent. /// The index. protected virtual void RemoveChildAt(TPanel parent, int index) { @@ -267,9 +267,9 @@ protected virtual void RemoveChildAt(TPanel parent, int index) } /// - /// Removes all children from the view group. + /// Removes all children from the view parent. /// - /// The view group. + /// The view parent. protected virtual void RemoveAllChildren(TPanel parent) { parent.Children.Clear(); diff --git a/ReactWindows/ReactNative/UIManager/RootViewManager.cs b/ReactWindows/ReactNative/UIManager/RootViewManager.cs index 04925cfa3ab..f6910a59d4d 100644 --- a/ReactWindows/ReactNative/UIManager/RootViewManager.cs +++ b/ReactWindows/ReactNative/UIManager/RootViewManager.cs @@ -3,7 +3,7 @@ /// /// View manager for react root view components. /// - public class RootViewManager : PanelViewGroupManager + public class RootViewManager : PanelViewParentManager { /// /// The name of the react root view. diff --git a/ReactWindows/ReactNative/UIManager/UIImplementation.cs b/ReactWindows/ReactNative/UIManager/UIImplementation.cs index 64ca2ad2816..e388e0a8afd 100644 --- a/ReactWindows/ReactNative/UIManager/UIImplementation.cs +++ b/ReactWindows/ReactNative/UIManager/UIImplementation.cs @@ -735,17 +735,17 @@ private void AssertNodeDoesNotNeedCustomLayoutForChildren(ReactShadowNode node) node.ViewClass)); } - var viewGroupManager = viewManager as ViewGroupManager; - if (viewGroupManager == null) + var viewParentManager = viewManager as ViewParentManager; + if (viewParentManager == null) { throw new InvalidOperationException( string.Format( CultureInfo.InvariantCulture, - "Trying to use view '{0}' as a parent but its manager is not a ViewGroupManager.", + "Trying to use view '{0}' as a parent but its manager is not a ViewParentManager.", node.ViewClass)); } - if (viewGroupManager.NeedsCustomLayoutForChildren) + if (viewParentManager.NeedsCustomLayoutForChildren) { throw new InvalidOperationException( string.Format( diff --git a/ReactWindows/ReactNative/UIManager/ViewGroupManager.cs b/ReactWindows/ReactNative/UIManager/ViewParentManager.cs similarity index 90% rename from ReactWindows/ReactNative/UIManager/ViewGroupManager.cs rename to ReactWindows/ReactNative/UIManager/ViewParentManager.cs index fccbc1df2bc..379849928d4 100644 --- a/ReactWindows/ReactNative/UIManager/ViewGroupManager.cs +++ b/ReactWindows/ReactNative/UIManager/ViewParentManager.cs @@ -6,7 +6,7 @@ namespace ReactNative.UIManager /// /// Class providing child management API for view managers. /// - public abstract class ViewGroupManager : ViewManager + public abstract class ViewParentManager : ViewManager { /// /// The instance that represents the type of shadow @@ -67,9 +67,9 @@ public override void UpdateExtraData(FrameworkElement root, object extraData) public abstract void AddView(FrameworkElement parent, FrameworkElement child, int index); /// - /// Gets the number of children in the view group. + /// Gets the number of children in the view parent. /// - /// The view group. + /// The view parent. /// The number of children. public abstract int GetChildCount(FrameworkElement parent); @@ -84,14 +84,14 @@ public override void UpdateExtraData(FrameworkElement root, object extraData) /// /// Removes the child at the given index. /// - /// The view group. + /// The view parent. /// The index. public abstract void RemoveChildAt(FrameworkElement parent, int index); /// - /// Removes all children from the view group. + /// Removes all children from the view parent. /// - /// The view group. + /// The view parent. public abstract void RemoveAllChildren(FrameworkElement parent); } } diff --git a/ReactWindows/ReactNative/Views/Scroll/ReactScrollViewManager.cs b/ReactWindows/ReactNative/Views/Scroll/ReactScrollViewManager.cs index 7b95f5c9570..391e2778ba8 100644 --- a/ReactWindows/ReactNative/Views/Scroll/ReactScrollViewManager.cs +++ b/ReactWindows/ReactNative/Views/Scroll/ReactScrollViewManager.cs @@ -10,7 +10,7 @@ namespace ReactNative.Views.Scroll /// /// TODO: implement this as a proper ScrollViewer instead of a ListView. /// - public class ReactScrollViewManager : ViewGroupManager + public class ReactScrollViewManager : ViewParentManager { private const string ReactClass = "RCTScrollView"; diff --git a/ReactWindows/ReactNative/Views/View/ReactCanvas.cs b/ReactWindows/ReactNative/Views/View/ReactCanvas.cs index ade98d043c1..35b0d3fbe6a 100644 --- a/ReactWindows/ReactNative/Views/View/ReactCanvas.cs +++ b/ReactWindows/ReactNative/Views/View/ReactCanvas.cs @@ -13,7 +13,7 @@ namespace ReactNative.Views.View /// aren't common, lazy initializes most of the storage needed for them. Also supports /// 3D transformations such as elevation depth. /// - public class ReactCanvas : Canvas, IReactInterceptingViewGroup, IReactPointerEventsView + public class ReactCanvas : Canvas, IReactInterceptingViewParent, IReactPointerEventsView { /// /// Sets an elevation 3D transformation effect on the . diff --git a/ReactWindows/ReactNative/Views/View/ReactViewManager.cs b/ReactWindows/ReactNative/Views/View/ReactViewManager.cs index de689742929..5d06c5ea7d4 100644 --- a/ReactWindows/ReactNative/Views/View/ReactViewManager.cs +++ b/ReactWindows/ReactNative/Views/View/ReactViewManager.cs @@ -9,7 +9,7 @@ namespace ReactNative.Views.View { - public class ReactViewManager : ViewGroupManager + public class ReactViewManager : ViewParentManager { private const string ReactClass = ViewProperties.ViewClassName; private const int CommandSetPressed = 1;