Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(android): amend child event ListView properties #12456

Merged
merged 4 commits into from
Feb 10, 2021
Merged

fix(android): amend child event ListView properties #12456

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a63a3f
fix(android): amend child event ListView properties
garymathews Feb 9, 2021
c594651
fix(android): remove duplicate code
garymathews Feb 9, 2021
9ada710
fix(android): prevent duplicate itemclick event
garymathews Feb 9, 2021
19e72b7
Merge branch 'master' into TIMOB-28337
garymathews Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 6 additions & 40 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListItemProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class ListItemProxy extends TiViewProxy

private final HashMap<String, TiViewProxy> binds = new HashMap<>();
private final HashMap<String, Object> childProperties = new HashMap<>();
private final List<String> ignoredTemplateKeys = new ArrayList<>();
private final List<String> ignoredTemplateKeys = new ArrayList<>();

public int index;

Expand Down Expand Up @@ -125,7 +125,7 @@ public TiUIView createView(Activity activity)
* @param data Data payload of fired event.
* @return Object of event payload.
*/
public Object handleEvent(String eventName, Object data)
public Object handleEvent(String eventName, Object data, boolean fireItemClick)
{
// Inject row data into events.
final ListViewProxy listViewProxy = getListViewProxy();
Expand Down Expand Up @@ -174,7 +174,7 @@ public Object handleEvent(String eventName, Object data)
data = payload;

// Fire `itemclick` event on ListView.
if (eventName.equals(TiC.EVENT_CLICK)) {
if (fireItemClick && eventName.equals(TiC.EVENT_CLICK)) {
listViewProxy.fireSyncEvent(TiC.EVENT_ITEM_CLICK, data);
}
}
Expand All @@ -193,13 +193,13 @@ public Object handleEvent(String eventName, Object data)
@Override
public boolean fireEvent(String eventName, Object data, boolean bubbles)
{
data = handleEvent(eventName, data);
data = handleEvent(eventName, data, true);
return super.fireEvent(eventName, data, bubbles);
}
@Override
public boolean fireSyncEvent(String eventName, Object data, boolean bubbles)
{
data = handleEvent(eventName, data);
data = handleEvent(eventName, data, true);
return super.fireSyncEvent(eventName, data, bubbles);
}

Expand Down Expand Up @@ -274,42 +274,8 @@ protected TiViewProxy generateViewFromTemplate(TiViewProxy parent, KrollDict tem
@Override
public void call(Object data)
{
if (data instanceof KrollDict) {
final KrollDict payload = new KrollDict((KrollDict) data);

// Inject row data into events.
final ListViewProxy listViewProxy = getListViewProxy();
if (listViewProxy != null) {

final Object parent = getParent();
if (parent instanceof ListSectionProxy) {
final ListSectionProxy section = (ListSectionProxy) parent;

// Include section specific properties.
payload.put(TiC.PROPERTY_SECTION, section);
payload.put(TiC.PROPERTY_SECTION_INDEX, listViewProxy.getIndexOfSection(section));
payload.put(TiC.PROPERTY_ITEM_INDEX, getIndexInSection());
}

final String itemId = getProperties().optString(TiC.PROPERTY_ITEM_ID, null);
if (itemId != null) {

// Include `itemId` if specified.
payload.put(TiC.PROPERTY_ITEM_ID, itemId);
}

if (template.containsKey(TiC.PROPERTY_BIND_ID)) {

// Include `bindId` of template if specified.
payload.put(TiC.PROPERTY_BIND_ID, template.getString(TiC.PROPERTY_BIND_ID));
}
}

data = payload;
}

// Call callback defined in template.
callback.call(krollObject, new Object[] { data });
callback.call(krollObject, new Object[] { handleEvent(eventName, data, false) });
}
});
krollObject.setHasListenersForEventType(eventName, true);
Expand Down