This is an automated email from the ASF dual-hosted git repository.
Harbs 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 a3af2399c5 Fixed types
a3af2399c5 is described below
commit a3af2399c5848d1879ea5256aa8f9444385a0159
Author: Harbs <[email protected]>
AuthorDate: Sun May 24 10:42:37 2026 +0300
Fixed types
---
.../org/apache/royale/style/beads/ListView.as | 20 +--
.../royale/style/beads/MultiSelectionListView.as | 195 +++++++++++++++++++++
2 files changed, 204 insertions(+), 11 deletions(-)
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/ListView.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/ListView.as
index aee0143131..80b189fb8f 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/ListView.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/ListView.as
@@ -24,7 +24,7 @@ package org.apache.royale.style.beads
import org.apache.royale.events.Event;
import org.apache.royale.functional.decorator.debounceLong;
import org.apache.royale.html.beads.DataContainerView;
- import org.apache.royale.style.renderers.ListItemRenderer;
+ import org.apache.royale.style.renderers.IListItemRenderer;
public class ListView extends DataContainerView
{
@@ -55,7 +55,6 @@ package org.apache.royale.style.beads
// Don't call super because we don't need the overhead
of layout
// super.handleInitComplete(event);
}
- private var focusableItemRenderer:ListItemRenderer;
override protected function
itemsCreatedHandler(event:Event):void
{
super.itemsCreatedHandler(event);
@@ -63,17 +62,16 @@ package org.apache.royale.style.beads
}
private var runChangeHandler:Function;
/**
- * TODO move this out of the view bead to handle selection and
multi-selection.
- * @royaleignorecoercion
org.apache.royale.style.renderers.ListItemRenderer
* @royaleignorecoercion org.apache.royale.core.ISelectionModel
+ * @royaleignorecoercion
org.apache.royale.style.renderers.IListItemRenderer
*/
protected function selectionChangeHandler(event:Event):void
{
- var ir:ListItemRenderer =
dataGroup.getItemRendererForIndex(lastSelectedIndex) as ListItemRenderer;
+ var ir:IListItemRenderer =
dataGroup.getItemRendererForIndex(lastSelectedIndex) as IListItemRenderer;
if(ir)
ir.selected = false;
- assert(listModel is ISelectionModel, "ListModel should
implement ISelectionModel");
- ir = dataGroup.getItemRendererForIndex((listModel as
ISelectionModel).selectedIndex) as ListItemRenderer;
+ assert(listModel is ISelectionModel, "ListModel should
implement ISelectionModel. For multi-selection, use MultiSelectionListView.");
+ ir = dataGroup.getItemRendererForIndex((listModel as
ISelectionModel).selectedIndex) as IListItemRenderer;
if(ir)
ir.selected = true;
@@ -84,15 +82,15 @@ package org.apache.royale.style.beads
/**
* @private
- * @royaleignorecoercion
org.apache.royale.style.renderers.ListItemRenderer
- * * @royaleignorecoercion org.apache.royale.core.IRollOverModel
+ * @royaleignorecoercion org.apache.royale.core.IRollOverModel
+ * @royaleignorecoercion
org.apache.royale.style.renderers.IListItemRenderer
*/
protected function rollOverIndexChangeHandler(event:Event):void
{
- var ir:ListItemRenderer =
dataGroup.getItemRendererForIndex(lastRollOverIndex) as ListItemRenderer;
+ var ir:IListItemRenderer =
dataGroup.getItemRendererForIndex(lastRollOverIndex) as IListItemRenderer;
if(ir)
ir.hovered = false;
- ir = dataGroup.getItemRendererForIndex((listModel as
IRollOverModel).rollOverIndex) as ListItemRenderer;
+ ir = dataGroup.getItemRendererForIndex((listModel as
IRollOverModel).rollOverIndex) as IListItemRenderer;
if(ir)
ir.hovered = true;
lastRollOverIndex = (listModel as
IRollOverModel).rollOverIndex;
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/MultiSelectionListView.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/MultiSelectionListView.as
new file mode 100644
index 0000000000..15aaa2ec65
--- /dev/null
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/beads/MultiSelectionListView.as
@@ -0,0 +1,195 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.style.beads
+{
+ import org.apache.royale.core.IMultiSelectionModel;
+ import org.apache.royale.core.IRollOverModel;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.html.beads.DataContainerView;
+ import org.apache.royale.html.util.getModelByType;
+ import org.apache.royale.debugging.assert;
+ import org.apache.royale.style.renderers.IListItemRenderer;
+
+ /**
+ * The List class creates the visual elements of the
org.apache.royale.html.List
+ * component. A List consists of the area to display the data (in the
dataGroup), any
+ * scrollbars, and so forth.
+ *
+ * @viewbead
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ COMPILE::JS
+ public class MultiSelectionListView extends DataContainerView
+ {
+ public function MultiSelectionListView()
+ {
+ super();
+ }
+
+ protected var listModel:IMultiSelectionModel;
+
+ protected var lastSelectedIndices:Array = null;
+
+ /**
+ * @private
+ * @royaleignorecoercion
org.apache.royale.core.IMultiSelectionModel
+ */
+ override protected function handleInitComplete(event:Event):void
+ {
+ listModel =
getModelByType(_strand,IMultiSelectionModel) as IMultiSelectionModel;
+ assert(listModel != null, "ListModel must implement
IMultiSelectionModel when using MultiSelectionListView");
+ listModel.addEventListener("selectedIndicesChanged",
selectionChangeHandler);
+ listModel.addEventListener("rollOverIndexChanged",
rollOverIndexChangeHandler);
+
+ super.handleInitComplete(event);
+ }
+
+ /**
+ * @private
+ * @royaleignorecoercion
org.apache.royale.style.renderers.IListItemRenderer
+ */
+ protected function selectionChangeHandler(event:Event):void
+ {
+ if (lastSelectedIndices)
+ {
+ for (var i:int = 0; i <
lastSelectedIndices.length; i++)
+ {
+ var ir:IListItemRenderer =
dataGroup.getItemRendererForIndex(lastSelectedIndices[i]) as IListItemRenderer;
+ if(ir)
+ ir.selected = false;
+ }
+ }
+ if (listModel.selectedIndices)
+ {
+ for (i = 0; i <
listModel.selectedIndices.length; i++)
+ {
+ ir =
dataGroup.getItemRendererForIndex(listModel.selectedIndices[i]) as
IListItemRenderer;
+ if(ir)
+ ir.selected = true;
+ }
+ }
+
+ lastSelectedIndices = listModel.selectedIndices;
+ }
+
+ protected var lastRollOverIndex:int = -1;
+
+ /**
+ * @private
+ * @royaleignorecoercion
org.apache.royale.style.renderers.IListItemRenderer
+ * @royaleignorecoercion org.apache.royale.core.IRollOverModel
+ */
+ protected function rollOverIndexChangeHandler(event:Event):void
+ {
+ var ir:IListItemRenderer =
dataGroup.getItemRendererForIndex(lastRollOverIndex) as IListItemRenderer;
+ if(ir)
+ ir.hovered = false;
+ ir = dataGroup.getItemRendererForIndex((listModel as
IRollOverModel).rollOverIndex) as IListItemRenderer;
+ if(ir)
+ ir.hovered = true;
+ lastRollOverIndex = (listModel as
IRollOverModel).rollOverIndex;
+ }
+ }
+
+ COMPILE::SWF
+ public class MultiSelectionListView extends DataContainerView
+ {
+ public function MultiSelectionListView()
+ {
+ super();
+ }
+
+ protected var listModel:IMultiSelectionModel;
+
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.7
+ */
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ super.strand = value;
+ }
+
+ /**
+ * @private
+ */
+ override protected function handleInitComplete(event:Event):void
+ {
+ super.handleInitComplete(event);
+
+ listModel =
getModelByType(_strand,IMultiSelectionModel) as IMultiSelectionModel;
+ listModel.addEventListener("selectedIndicesChanged",
selectionChangeHandler);
+ listModel.addEventListener("rollOverIndexChanged",
rollOverIndexChangeHandler);
+ }
+
+ protected var lastSelectedIndices:Array = null;
+
+ /**
+ * @private
+ */
+ protected function selectionChangeHandler(event:Event):void
+ {
+
+ if (lastSelectedIndices)
+ {
+ for (var i:int = 0; i <
lastSelectedIndices.length; i++)
+ {
+ var ir:IListItemRenderer =
dataGroup.getItemRendererForIndex(lastSelectedIndices[i]) as IListItemRenderer;
+ if (ir)
+ ir.selected = false;
+ }
+ }
+ if (listModel.selectedIndices)
+ {
+ for (i = 0; i < listModel.selectedIndices; i++)
+ {
+ ir =
dataGroup.getItemRendererForIndex(listModel.selectedIndices[i]) as
IListItemRenderer;
+ if (ir)
+ ir.selected = true;
+ }
+ }
+ lastSelectedIndices = listModel.selectedIndices;
+ }
+
+ protected var lastRollOverIndex:int = -1;
+
+ /**
+ * @private
+ */
+ protected function rollOverIndexChangeHandler(event:Event):void
+ {
+ var ir:ISelectableItemRenderer =
dataGroup.getItemRendererForIndex(lastRollOverIndex) as ISelectableItemRenderer;
+ if(ir)
+ ir.hovered = false;
+ ir =
dataGroup.getItemRendererForIndex(IRollOverModel(listModel).rollOverIndex) as
ISelectableItemRenderer;
+ if(ir)
+ ir.hovered = true;
+
+ lastRollOverIndex =
IRollOverModel(listModel).rollOverIndex;
+ }
+ }
+}
