fix(android): optimize table and list view updates (#12405)

* sync for thread safety * amend table fireEvent * revert to basic optimization * reduce cache size * validate first visible view * amend activity validation * allow marker to fire on partially visible rows * implement noresults event for ListView Fixes TIMOB-28294, TIMOB-28308
tidev · Jan 21, 2021 · 23c0f6c · 23c0f6c
1 parent 5bfa46a
commit 23c0f6c
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 178 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewRowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewRowProxy.java
@@ -113,15 +113,13 @@ public TiUIView createView(Activity activity)
 	}
 
 	/**
-	 * Override fireEvent to inject row data into payload.
+	 * Handle event data to generate payload with table data.
 	 *
 	 * @param eventName Name of fired event.
 	 * @param data      Data payload of fired event.
-	 * @param bubbles   Specify if event should bubble up to parent.
-	 * @return
+	 * @return Object of payload.
 	 */
-	@Override
-	public boolean fireEvent(String eventName, Object data, boolean bubbles)
+	private Object handleEvent(String eventName, Object data)
 	{
 		// Inject row data into events.
 		final TableViewProxy tableViewProxy = getTableViewProxy();
@@ -145,8 +143,29 @@ public boolean fireEvent(String eventName, Object data, boolean bubbles)
 			data = payload;
 		}
 
+		return data;
+	}
+
+	/**
+	 * Override fireEvent to inject row data into payload.
+	 *
+	 * @param eventName Name of fired event.
+	 * @param data      Data payload of fired event.
+	 * @param bubbles   Specify if event should bubble up to parent.
+	 * @return
+	 */
+	@Override
+	public boolean fireEvent(String eventName, Object data, boolean bubbles)
+	{
+		data = handleEvent(eventName, data);
 		return super.fireEvent(eventName, data, bubbles);
 	}
+	@Override
+	public boolean fireSyncEvent(String eventName, Object data, boolean bubbles)
+	{
+		data = handleEvent(eventName, data);
+		return super.fireSyncEvent(eventName, data, bubbles);
+	}
 
 	@Override
 	public String getApiName()

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListItemProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListItemProxy.java
@@ -118,35 +118,14 @@ public TiUIView createView(Activity activity)
 		return null;
 	}
 
-	/**
-	 * Override fireEvent to inject ListItem data into payload.
-	 *
-	 * @param eventName Name of fired event.
-	 * @param data      Data payload of fired event.
-	 * @param bubbles   Specify if event should bubble up to parent.
-	 * @return
-	 */
-	@Override
-	public boolean fireEvent(String eventName, Object data, boolean bubbles)
-	{
-		data = handleFireEvent(eventName, data);
-		return super.fireEvent(eventName, data, bubbles);
-	}
-	@Override
-	public boolean fireSyncEvent(String eventName, Object data, boolean bubbles)
-	{
-		data = handleFireEvent(eventName, data);
-		return super.fireSyncEvent(eventName, data, bubbles);
-	}
-
 	/**
 	 * Handle event payload manipulation.
 	 *
 	 * @param eventName Name of fired event.
 	 * @param data      Data payload of fired event.
 	 * @return Object of event payload.
 	 */
-	public Object handleFireEvent(String eventName, Object data)
+	public Object handleEvent(String eventName, Object data)
 	{
 		// Inject row data into events.
 		final ListViewProxy listViewProxy = getListViewProxy();
@@ -203,6 +182,27 @@ public Object handleFireEvent(String eventName, Object data)
 		return data;
 	}
 
+	/**
+	 * Override fireEvent to inject ListItem data into payload.
+	 *
+	 * @param eventName Name of fired event.
+	 * @param data      Data payload of fired event.
+	 * @param bubbles   Specify if event should bubble up to parent.
+	 * @return
+	 */
+	@Override
+	public boolean fireEvent(String eventName, Object data, boolean bubbles)
+	{
+		data = handleEvent(eventName, data);
+		return super.fireEvent(eventName, data, bubbles);
+	}
+	@Override
+	public boolean fireSyncEvent(String eventName, Object data, boolean bubbles)
+	{
+		data = handleEvent(eventName, data);
+		return super.fireSyncEvent(eventName, data, bubbles);
+	}
+
 	/**
 	 * Generate views from specified template.
 	 *

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java
@@ -269,6 +269,7 @@ private ListItemProxy processItem(Object object)
 
 			item.setParent(this);
 			item.handleCreationDataItem(new KrollDict((HashMap) object));
+
 			return item;
 
 		} else if (object instanceof ListItemProxy) {
@@ -386,10 +387,11 @@ public void replaceItemsAt(int index, int count, Object dataItems,
 	@Kroll.method
 	public void setItems(Object dataItems, @Kroll.argument(optional = true) KrollDict animation)
 	{
+		final List<ListItemProxy> newItems = processItems(dataItems);
+
 		removeAllItems();
 
-		final List<ListItemProxy> items = processItems(dataItems);
-		this.items.addAll(items);
+		this.items.addAll(newItems);
 
 		// Notify ListView of new items.
 		update();

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
@@ -458,7 +458,7 @@ public void handleMarker(ListItemProxy item)
 							continue;
 						}
 						final boolean isVisible =
-							layoutManager.isViewPartiallyVisible(markedItemView, true, true);
+							layoutManager.isViewPartiallyVisible(markedItemView, false, true);
 
 						if (isVisible) {
 							final KrollDict data = new KrollDict();