status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ViewPager behavior with Nodes 

Summary: Add a batch addition operation for ViewPager.

Differential Revision: D3597840

fbshipit-source-id: 1c9c42e03da2492444298220e75f547b6567b4e5
This commit is contained in:
Ahmed El-Helw 2016-07-22 15:30:58 -07:00 committed by Facebook Github Bot 7
parent 32a717892c
commit 5f41769485
2 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
View File

@ -9,15 +9,16 @@
package com.facebook.react.uimanager;
import android.view.View;
import android.view.ViewGroup;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.WeakHashMap;
import android.view.View;
import android.view.ViewGroup;
/**
* Class providing children management API for view managers of classes extending ViewGroup.
*/
@ -45,6 +46,19 @@ public abstract class ViewGroupManager <T extends ViewGroup>
reorderChildrenByZIndex(parent);
}
/**
* Convenience method for batching a set of addView calls
* Note that this adds the views to the beginning of the ViewGroup
*
* @param parent the parent ViewGroup
* @param views the set of views to add
*/
public void addViews(T parent, List<View> views) {
for (int i = 0, size = views.size(); i < size; i++) {
addView(parent, views.get(i), i);
}
}
public static void setViewZIndex(View view, int zIndex) {
mZIndexHash.put(view, zIndex);
// zIndex prop gets set BEFORE the view is added, so parent may be null.

41
ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
View File

@ -28,11 +28,12 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
* views to custom {@link PagerAdapter} instance which is used by {@link NativeViewHierarchyManager}
* to add children nodes according to react views hierarchy.
*/
/* package */ class ReactViewPager extends ViewPager {
public class ReactViewPager extends ViewPager {
private class Adapter extends PagerAdapter {
private final List<View> mViews = new ArrayList<>();
private boolean mIsViewPagerInIntentionallyInconsistentState = false;
void addView(View child, int index) {
mViews.add(index, child);
@ -57,6 +58,32 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
setOffscreenPageLimit(mViews.size());
}
/**
* Replace a set of views to the ViewPager adapter and update the ViewPager
*/
void setViews(List<View> views) {
mViews.clear();
mViews.addAll(views);
notifyDataSetChanged();
// we want to make sure we return POSITION_NONE for every view here, since this is only
// called after a removeAllViewsFromAdapter
mIsViewPagerInIntentionallyInconsistentState = false;
}
/**
* Remove all the views from the adapter and de-parents them from the ViewPager
* After calling this, it is expected that notifyDataSetChanged should be called soon
* afterwards.
*/
void removeAllViewsFromAdapter(ViewPager pager) {
mViews.clear();
pager.removeAllViews();
// set this, so that when the next addViews is called, we return POSITION_NONE for every
// entry so we can remove whichever views we need to and add the ones that we need to.
mIsViewPagerInIntentionallyInconsistentState = true;
}
View getViewAt(int index) {
return mViews.get(index);
}
@ -68,7 +95,9 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
@Override
public int getItemPosition(Object object) {
return mViews.contains(object) ? mViews.indexOf(object) : POSITION_NONE;
// if we've removed all views, we want to return POSITION_NONE intentionally
return mIsViewPagerInIntentionallyInconsistentState || !mViews.contains(object) ?
POSITION_NONE : mViews.indexOf(object);
}
@Override
@ -190,4 +219,12 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
/*package*/ View getViewFromAdapter(int index) {
return getAdapter().getViewAt(index);
}
public void setViews(List<View> views) {
getAdapter().setViews(views);
}
public void removeAllViewsFromAdapter() {
getAdapter().removeAllViewsFromAdapter(this);
}
}