fix(android): do not use holder for layout status

tidev · Sep 10, 2021 · 5c3b9d5 · 5c3b9d5
1 parent 60e33ff
commit 5c3b9d5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java
@@ -767,7 +767,7 @@ public void scrollToIndex(int index, @Kroll.argument(optional = true) KrollDict
 
 					// This is a workaround for when `EDITING` mode is set, as it recreates the TableView.
 					// We need to listen for when it has updated before scrolling.
-					if (row.getHolder() == null) {
+					if (!tableView.getHasLaidOutChildren()) {
 						tableView.addOnLayoutChangeListener(new View.OnLayoutChangeListener()
 						{
 							@Override
@@ -829,7 +829,7 @@ public void selectRow(int index)
 
 				// This is a workaround for when `EDITING` mode is set, as it recreates the TableView.
 				// We need to listen for when it has updated before testing visibility/scrolling.
-				if (row.getHolder() == null) {
+				if (!tableView.getHasLaidOutChildren()) {
 					tableView.addOnLayoutChangeListener(new View.OnLayoutChangeListener()
 					{
 						@Override

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListViewProxy.java
@@ -753,7 +753,7 @@ public void scrollToItem(int sectionIndex, int itemIndex, @Kroll.argument(option
 
 					// This is a workaround for when `EDITING` mode is set, as it recreates the ListView.
 					// We need to listen for when it has updated before scrolling.
-					if (item.getHolder() == null) {
+					if (!listView.getHasLaidOutChildren()) {
 						listView.addOnLayoutChangeListener(new View.OnLayoutChangeListener()
 						{
 							@Override
@@ -805,7 +805,7 @@ public void selectItem(int sectionIndex, int itemIndex)
 
 					// This is a workaround for when `EDITING` mode is set, as it recreates the ListView.
 					// We need to listen for when it has updated before testing visibility/scrolling.
-					if (item.getHolder() == null) {
+					if (!listView.getHasLaidOutChildren()) {
 						listView.addOnLayoutChangeListener(new View.OnLayoutChangeListener()
 						{
 							@Override

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -398,6 +398,16 @@ public ListViewAdapter getAdapter()
 		return this.adapter;
 	}
 
+	/**
+	 * Get status of child layouts.
+	 *
+	 * @return Boolean to determine if child layouts are processed.
+	 */
+	public boolean getHasLaidOutChildren()
+	{
+		return this.hasLaidOutChildren;
+	}
+
 	/**
 	 * Get linear layout manager.
 	 *

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java
@@ -60,6 +60,7 @@ public class TiTableView extends TiSwipeRefreshLayout implements OnSearchChangeL
 	private final List<TableViewRowProxy> rows = new ArrayList<>(CACHE_SIZE);
 	private final List<KrollDict> selectedRows = new ArrayList<>();
 
+	private boolean hasLaidOutChildren = false;
 	private SelectionTracker tracker;
 	private boolean isScrolling = false;
 	private int scrollOffsetX = 0;
@@ -77,7 +78,17 @@ public TiTableView(TableViewProxy proxy)
 		this.recyclerView.setFocusable(true);
 		this.recyclerView.setFocusableInTouchMode(true);
 		this.recyclerView.setBackgroundColor(Color.TRANSPARENT);
-		this.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		this.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()) {
+			@Override
+			public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state)
+			{
+				super.onLayoutChildren(recycler, state);
+
+				if (!hasLaidOutChildren) {
+					hasLaidOutChildren = true;
+				}
+			}
+		});
 
 		// Add listener to fire scroll events.
 		this.recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener()
@@ -384,6 +395,16 @@ public TableViewAdapter getAdapter()
 		return this.adapter;
 	}
 
+	/**
+	 * Get status of child layouts.
+	 *
+	 * @return Boolean to determine if child layouts are processed.
+	 */
+	public boolean getHasLaidOutChildren()
+	{
+		return this.hasLaidOutChildren;
+	}
+
 	/**
 	 * Get linear layout manager.
 	 *