You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/04/22 23:24:36 UTC
[royale-asjs] branch develop updated: jewel-list: move key handling
to jewel ListSingleSelectionMouseController
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 3d011e5 jewel-list: move key handling to jewel ListSingleSelectionMouseController
3d011e5 is described below
commit 3d011e595b0496f94b6a0842f6a77d3225b61a36
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Apr 23 01:24:31 2020 +0200
jewel-list: move key handling to jewel ListSingleSelectionMouseController
---
.../ListSingleSelectionMouseController.as | 48 ++++++++++++++++++++++
.../apache/royale/jewel/beads/views/ListView.as | 38 -----------------
2 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as
index 458be51..c239ecc 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as
@@ -18,11 +18,15 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.controllers
{
+ import org.apache.royale.core.IFocusable;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.KeyboardEvent;
import org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController;
import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
+ import org.apache.royale.jewel.beads.views.IScrollToIndexView;
+ import org.apache.royale.utils.sendEvent;
/**
* The Jewel ListSingleSelectionMouseController class is a controller for
@@ -72,6 +76,8 @@ package org.apache.royale.jewel.beads.controllers
{
super.strand = value;
+ IEventDispatcher(_strand).addEventListener(KeyboardEvent.KEY_DOWN, keyEventHandler);
+
//if the list is composed as part of another component, with a shared model (e.g. ComboBox) then it should not be the primary dispatcher
if (listModel is IJewelSelectionModel && !(IJewelSelectionModel(listModel).hasDispatcher)) {
IJewelSelectionModel(listModel).dispatcher = IEventDispatcher(value);
@@ -90,5 +96,47 @@ package org.apache.royale.jewel.beads.controllers
protected function modelChangeHandler(event:Event):void{
IEventDispatcher(_strand).dispatchEvent(new Event(event.type));
}
+
+ /**
+ * @private
+ */
+ protected function keyEventHandler(event:KeyboardEvent):void
+ {
+
+ // avoid Tab loose the normal behaviour, for navigation we don't want build int scrolling support in browsers
+ if(event.key === KeyboardEvent.KEYCODE__TAB)
+ return;
+
+ event.preventDefault();
+
+ // if(event.key === KeyboardEvent.KEYCODE__ENTER)
+ // {
+ // return;
+ // }
+
+ var prevIndex:int = listModel.selectedIndex;
+
+ if(event.key === KeyboardEvent.KEYCODE__UP || event.key === KeyboardEvent.KEYCODE__LEFT)
+ {
+ if(prevIndex > 0)
+ listModel.selectedIndex -=1;
+ }
+ else if(event.key === KeyboardEvent.KEYCODE__DOWN || event.key === KeyboardEvent.KEYCODE__RIGHT)
+ {
+ listModel.selectedIndex +=1;
+ }
+
+ if(prevIndex != listModel.selectedIndex)
+ {
+ sendEvent(listView.host, 'selectionChanged');
+ (listView as IScrollToIndexView).scrollToIndex(listModel.selectedIndex);
+
+ var ir:IFocusable = listView.dataGroup.getItemRendererForIndex(listModel.selectedIndex) as IFocusable;
+ ir.setFocus();
+
+ // do this?
+ //sendEvent(listView.host, 'change');
+ }
+ }
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
index 21e34b3..117b7be 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
@@ -32,10 +32,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.core.ISelectableItemRenderer;
import org.apache.royale.core.ISelectionModel;
- import org.apache.royale.core.StyledUIBase;
import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.events.KeyboardEvent;
import org.apache.royale.html.beads.DataContainerView;
import org.apache.royale.jewel.beads.models.ListPresentationModel;
import org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
@@ -92,46 +89,11 @@ package org.apache.royale.jewel.beads.views
listModel.addEventListener("selectionChanged", selectionChangeHandler);
listModel.addEventListener("rollOverIndexChanged", rollOverIndexChangeHandler);
- IEventDispatcher(_strand).addEventListener(KeyboardEvent.KEY_DOWN, keyEventHandler);
-
super.handleInitComplete(event);
}
/**
* @private
- */
- protected function keyEventHandler(event:KeyboardEvent):void
- {
- // avoid Tab loose the normal behaviour, for navigation we don't want build int scrolling support in browsers
- if(event.key === KeyboardEvent.KEYCODE__TAB)
- return;
-
- event.preventDefault();
-
- var prevIndex:int = listModel.selectedIndex;
-
- if(event.key === KeyboardEvent.KEYCODE__UP || event.key === KeyboardEvent.KEYCODE__LEFT)
- {
- if(prevIndex > 0)
- listModel.selectedIndex -=1;
- }
- else if(event.key === KeyboardEvent.KEYCODE__DOWN || event.key === KeyboardEvent.KEYCODE__RIGHT)
- {
- listModel.selectedIndex +=1;
- }
-
- if(prevIndex != listModel.selectedIndex)
- {
- selectionChangeHandler(null);
- scrollToIndex(listModel.selectedIndex);
-
- var ir:StyledUIBase = dataGroup.getItemRendererForIndex(listModel.selectedIndex) as StyledUIBase;
- ir.setFocus();
- }
- }
-
- /**
- * @private
* Ensure the list selects the selectedItem if some is set by the user at creation time
*/
override protected function itemsCreatedHandler(event:Event):void