Skip to content

List item picker actions #581

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

List item picker actions #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion haxe/ui/components/pickers/ItemPicker.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package haxe.ui.components.pickers;

import haxe.ui.actions.ActionType;
import haxe.ui.components.Image;
import haxe.ui.containers.Box;
import haxe.ui.containers.HBox;
Expand All @@ -13,6 +14,7 @@ import haxe.ui.core.ItemRenderer;
import haxe.ui.core.Screen;
import haxe.ui.data.ArrayDataSource;
import haxe.ui.data.DataSource;
import haxe.ui.events.ActionEvent;
import haxe.ui.events.MouseEvent;
import haxe.ui.events.UIEvent;
import haxe.ui.geom.Size;
Expand Down Expand Up @@ -144,6 +146,7 @@ class ItemPickerBuilder extends CompositeBuilder {
var target = renderer.findComponent("itemPickerTrigger", Component);
if (target != null) {
picker.unregisterEvent(triggerEvent, onTrigger);
picker.unregisterEvent(ActionEvent.ACTION_START, onActionStart);
picker.removeClass("item-picker-trigger");
return target;
}
Expand Down Expand Up @@ -192,7 +195,10 @@ class ItemPickerBuilder extends CompositeBuilder {
private function registerTriggerEvents() {
triggerTarget.addClass("item-picker-trigger");
if (!triggerTarget.hasEvent(triggerEvent, onTrigger)) {
triggerTarget.registerEvent(triggerEvent, onTrigger);
triggerTarget.registerEvent(triggerEvent, onTrigger);
}
if (!triggerTarget.hasEvent(ActionEvent.ACTION_START, onActionStart)) {
triggerTarget.registerEvent(ActionEvent.ACTION_START, onActionStart);
}
}

Expand Down Expand Up @@ -234,6 +240,14 @@ class ItemPickerBuilder extends CompositeBuilder {
hidePanel();
}
}
private function onActionStart(event:ActionEvent) {
switch (event.action) {
case ActionType.CONFIRM | ActionType.PRESS:
event.cancel();
onTrigger(null);
case _:
}
}

private var _panelVisible:Bool = false;
private var _panelFiller:Component = null;
Expand Down
4 changes: 4 additions & 0 deletions haxe/ui/components/pickers/ListItemPicker.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ class ListItemPicker extends ItemPicker {
}

private class Builder extends ItemPickerBuilder {
private override function get_panelSelectionEvent():String {
return UIEvent.SUBMIT;
}

private override function get_handlerClass():Class<ItemPickerHandler> {
return Handler;
}
Expand Down
3 changes: 3 additions & 0 deletions haxe/ui/containers/ListView.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ class ListViewEvents extends ScrollViewEvents {

case SelectionMode.ONE_ITEM:
_listview.selectedIndex = renderer.itemIndex;
dispatch(new UIEvent(UIEvent.SUBMIT));

case SelectionMode.ONE_ITEM_REPEATED:
_listview.selectedIndices = [renderer.itemIndex];
Expand Down Expand Up @@ -325,6 +326,8 @@ class ListViewEvents extends ScrollViewEvents {
_listview.selectedIndex = n;
}
event.repeater = true;
case ActionType.CONFIRM:
dispatch(new UIEvent(UIEvent.SUBMIT));
case _:
}
}
Expand Down