This is an automated email from the ASF dual-hosted git repository.
yishayw 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 16ada08 Emulation - make sure headerRenderers are not ignored
16ada08 is described below
commit 16ada087c82ee0081bcb1217a234e095285e69f5
Author: Yishay Weiss <[email protected]>
AuthorDate: Tue Feb 15 14:34:28 2022 +0200
Emulation - make sure headerRenderers are not ignored
---
.../MXRoyale/src/main/resources/defaults.css | 1 +
.../src/main/resources/mx-royale-manifest.xml | 3 +-
.../controls/beads/layouts/DataGridHeaderLayout.as | 2 -
.../HeaderRendererFactoryForArrayData.as | 204 +++++++++++++++++++++
4 files changed, 207 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 24d52a5..b3f7665 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -82,6 +82,7 @@ Basic|DataGridColumnList {
dg|DataGridButtonBar {
IItemRenderer:
ClassReference("mx.controls.dataGridClasses.DataGridHeaderRenderer");
+ IDataProviderItemRendererMapper:
ClassReference("mx.controls.dataGridClasses.HeaderRendererFactoryForArrayData");
position: absolute;
}
diff --git
a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
index 3cb6244..09c5ba5 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
+++ b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
@@ -234,6 +234,7 @@
<!--<component id="ZipCodeValidator"
class="mx.validators.ZipCodeValidator"/>-->
<component id="PrintDataGrid" class="mx.printing.PrintDataGrid"/>
<component id="HTML" class="mx.controls.HTML"/>
-
+ <component id="HeaderRendererFactoryForArrayData"
class="mx.controls.dataGridClasses.HeaderRendererFactoryForArrayData"/>
+ <component id="DataGridHeaderRenderer"
class="mx.controls.dataGridClasses.DataGridHeaderRenderer"/>
</componentPackage>
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/DataGridHeaderLayout.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/DataGridHeaderLayout.as
index 8c95b90..58d848f 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/DataGridHeaderLayout.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/DataGridHeaderLayout.as
@@ -19,7 +19,6 @@
package mx.controls.beads.layouts
{
- import mx.controls.dataGridClasses.DataGridHeaderRenderer;
import mx.core.EdgeMetrics;
import mx.core.UIComponent;
@@ -148,7 +147,6 @@ public class DataGridHeaderLayout extends LayoutBase
{
var ilc:ILayoutChild = contentView.getElementAt(i) as ILayoutChild;
if (ilc == null || !ilc.visible) continue;
- if (!(ilc is DataGridHeaderRenderer)) continue;
COMPILE::SWF {
if (buttonWidths) {
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/HeaderRendererFactoryForArrayData.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/HeaderRendererFactoryForArrayData.as
new file mode 100644
index 0000000..a9cda3e
--- /dev/null
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/HeaderRendererFactoryForArrayData.as
@@ -0,0 +1,204 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 mx.controls.dataGridClasses
+{
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IDataProviderItemRendererMapper;
+ import org.apache.royale.core.IItemRendererClassFactory;
+ import org.apache.royale.core.IItemRendererOwnerView;
+ import org.apache.royale.core.ISelectionModel;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IStrandWithModelView;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.events.ItemRendererEvent;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.html.beads.IListView;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
+ import org.apache.royale.core.DispatcherBead;
+ import org.apache.royale.utils.sendStrandEvent;
+ import org.apache.royale.core.ILabelFieldItemRenderer;
+ import org.apache.royale.core.IIndexedItemRenderer;
+ import org.apache.royale.html.util.getModelByType;
+ import org.apache.royale.core.IChild;
+ import mx.controls.DataGrid;
+ import mx.controls.dataGridClasses.DataGridColumn;
+ import mx.core.IFactory;
+ import mx.core.UIComponent;
+
+
[Event(name="itemRendererCreated",type="org.apache.royale.events.ItemRendererEvent")]
+
+ /**
+ * The TextItemRendererFactoryForArrayData class is the
+ * IDataProviderItemRendererMapper for creating
+ * ITextItemRenderers and assigning them data from an array.
+ * Other IDataProviderItemRendererMapper implementations
+ * assign specific array or vector types to item
+ * renderers expecting those types.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.9
+ */
+ public class HeaderRendererFactoryForArrayData extends DispatcherBead
implements IDataProviderItemRendererMapper
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.9
+ */
+ public function
HeaderRendererFactoryForArrayData(target:Object=null)
+ {
+ super(target);
+ }
+
+ private var selectionModel:ISelectionModel;
+
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.9
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ */
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ listenOnStrand("initComplete",finishSetup);
+ }
+
+ /**
+ * @royaleignorecoercion
org.apache.royale.core.IItemRendererClassFactory
+ * @royaleignorecoercion org.apache.royale.core.ISelectionModel
+ */
+ private function finishSetup(event:Event):void
+ {
+ selectionModel =
getModelByType(_strand,ISelectionModel) as ISelectionModel;
+ selectionModel.addEventListener("dataProviderChanged",
dataProviderChangeHandler);
+
+ // if the host component inherits from
DataContainerBase, the itemRendererClassFactory will
+ // already have been loaded by
DataContainerBase.addedToParent function.
+ if (!itemRendererFactory)
+ {
+ _itemRendererFactory =
loadBeadFromValuesManager(IItemRendererClassFactory,
"iItemRendererClassFactory", _strand) as IItemRendererClassFactory;
+ }
+
+ dataProviderChangeHandler(null);
+ }
+
+ private var _itemRendererFactory:IItemRendererClassFactory;
+
+ /**
+ * An IItemRendererClassFactory that should generate
ITextItemRenderers
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.9
+ * @royaleignorecoercion
org.apache.royale.core.IItemRendererClassFactory
+ */
+ public function get
itemRendererFactory():IItemRendererClassFactory
+ {
+ if(!_itemRendererFactory)
+ _itemRendererFactory =
loadBeadFromValuesManager(IItemRendererClassFactory,
"iItemRendererClassFactory", _strand) as IItemRendererClassFactory;
+
+ return _itemRendererFactory
+ }
+
+ /**
+ * @private
+ */
+ public function set
itemRendererFactory(value:IItemRendererClassFactory):void
+ {
+ _itemRendererFactory = value;
+ }
+
+ /**
+ * The IItemRendererOwnerView that should parent the
ITextItemRenderers
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.9
+ * @royaleignorecoercion Array
+ * @royaleignorecoercion
org.apache.royale.core.ILabelFieldItemRenderer
+ * @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion
org.apache.royale.core.IStrandWithModelView
+ * @royaleignorecoercion org.apache.royale.html.beads.IListView
+ * @royaleignorecoercion
org.apache.royale.core.IIndexedItemRenderer
+ */
+ protected function dataProviderChangeHandler(event:Event):void
+ {
+ var dp:Array = selectionModel.dataProvider as Array;
+ if (!dp)
+ return;
+
+ var view:IListView = (_strand as
IStrandWithModelView).view as IListView;
+ var dataGroup:IItemRendererOwnerView = view.dataGroup;
+
+ dataGroup.removeAllItemRenderers();
+
+ var n:int = dp.length;
+ for (var i:int = 0; i < n; i++)
+ {
+
+ var ir:IIndexedItemRenderer = null;
+ var owner:DataGrid = ((_strand as
IChild).parent as DataGrid);
+ var columns:Array = owner.columns;
+ if (columns)
+ {
+ var headFactory:IFactory = (columns[i]
as DataGridColumn).headerRenderer;
+ if (headFactory)
+ {
+ ir = headFactory.newInstance()
as IIndexedItemRenderer;
+ if (ir is UIComponent)
+ {
+ (ir as
UIComponent).owner = owner;
+ }
+ }
+ }
+ if (!ir)
+ {
+ ir =
itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
+ }
+ var tf:ILabelFieldItemRenderer = ir as
ILabelFieldItemRenderer;
+ ir.index = i;
+ dataGroup.addItemRenderer(ir, false);
+ if (tf && selectionModel.labelField) {
+ tf.labelField =
selectionModel.labelField;
+ }
+ ir.data = dp[i];
+
+ var newEvent:ItemRendererEvent = new
ItemRendererEvent(ItemRendererEvent.CREATED);
+ newEvent.itemRenderer = ir;
+ dispatchEvent(newEvent);
+ }
+
+ sendStrandEvent(_strand,"itemsCreated");
+ }
+
+ }
+}
