@nativescript/core 9.0.0-preview.3 → 9.0.1

package/ui/list-view/index.android.js

@@ -1,5 +1,6 @@
 import { ListViewBase, separatorColorProperty, itemTemplatesProperty, stickyHeaderProperty, stickyHeaderTemplateProperty, sectionedProperty, showSearchProperty } from './list-view-common';
 import { View } from '../core/view';
+import { PercentLength } from '../styling/length-shared';
 import { unsetValue } from '../core/properties/property-shared';
 import { Color } from '../../color';
 import { Observable } from '../../data/observable';
@@ -7,6 +8,7 @@ import { StackLayout } from '../layouts/stack-layout';
 import { ProxyViewContainer } from '../proxy-view-container';
 import { LayoutBase } from '../layouts/layout-base';
 import { profile } from '../../profiling';
+import { Trace } from '../../trace';
 import { Builder } from '../builder';
 import { Label } from '../label';
 export * from './list-view-common';
@@ -14,6 +16,8 @@ const ITEMLOADING = ListViewBase.itemLoadingEvent;
 const LOADMOREITEMS = ListViewBase.loadMoreItemsEvent;
 const ITEMTAP = ListViewBase.itemTapEvent;
 const SEARCHCHANGE = ListViewBase.searchChangeEvent;
+const STICKY_HEADER_Z_INDEX = 1000;
+const SEARCH_VIEW_Z_INDEX = 2000;
 // View type constants for sectioned lists
 const ITEM_VIEW_TYPE = 0;
 let ItemClickListener;
@@ -21,30 +25,28 @@ function initializeItemClickListener() {
     if (ItemClickListener) {
         return;
     }
-    var ItemClickListenerImpl = /** @class */ (function (_super) {
-    __extends(ItemClickListenerImpl, _super);
-    function ItemClickListenerImpl(owner) {
-        var _this = _super.call(this) || this;
-        _this.owner = owner;
-        return global.__native(_this);
-    }
-    ItemClickListenerImpl.prototype.onItemClick = function (parent, convertView, index, id) {
-        var owner = this.owner;
-        var view = owner._realizedItems.get(convertView).view;
-        owner.notify({
-            eventName: ITEMTAP,
-            object: owner,
-            index: index,
-            view: view,
-        });
-    };
-    var _a;
-    ItemClickListenerImpl = __decorate([
-        Interfaces([android.widget.AdapterView.OnItemClickListener]),
-        __metadata("design:paramtypes", [typeof (_a = typeof ListView !== "undefined" && ListView) === "function" ? _a : Object])
-    ], ItemClickListenerImpl);
-    return ItemClickListenerImpl;
-}(java.lang.Object));
+    var ItemClickListenerImpl = (function (_super) {
+        __extends(ItemClickListenerImpl, _super);
+        function ItemClickListenerImpl(owner) {
+            var _this = _super.call(this) || this;
+            _this.owner = owner;
+            return global.__native(_this);
+        }
+        ItemClickListenerImpl.prototype.onItemClick = function (parent, convertView, index, id) {
+            var owner = this.owner;
+            var view = owner._realizedItems.get(convertView).view;
+            owner.notify({
+                eventName: ITEMTAP,
+                object: owner,
+                index: index,
+                view: view,
+            });
+        };
+        ItemClickListenerImpl = __decorate([
+            Interfaces([android.widget.AdapterView.OnItemClickListener])
+        ], ItemClickListenerImpl);
+        return ItemClickListenerImpl;
+    }(java.lang.Object));
     ItemClickListener = ItemClickListenerImpl;
 }
 export class ListView extends ListViewBase {
@@ -197,7 +199,9 @@ export class ListView extends ListViewBase {
                 adapter.notifyDataSetChanged();
             }
             catch (error) {
-                console.log('Error refreshing adapter, recreating:', error);
+                if (Trace.isEnabled()) {
+                    Trace.error('Error refreshing adapter, recreating: ' + error);
+                }
                 nativeView.setAdapter(new ListViewAdapterClass(this));
             }
         }
@@ -328,7 +332,7 @@ export class ListView extends ListViewBase {
             this._stickyHeaderView.marginTop = 0; // Reset any previous margin
             // Position sticky header with proper offset using native positioning
             if (this._stickyHeaderView.nativeViewProtected) {
-                this._stickyHeaderView.nativeViewProtected.setZ(1000);
+                this._stickyHeaderView.nativeViewProtected.setZ(STICKY_HEADER_Z_INDEX);
                 // Use a timeout to ensure search view is measured first
                 setTimeout(() => {
                     if (this._searchView && this._searchView._wrapper) {
@@ -347,7 +351,7 @@ export class ListView extends ListViewBase {
         else {
             // No search view - position at top
             if (this._stickyHeaderView.nativeViewProtected) {
-                this._stickyHeaderView.nativeViewProtected.setZ(1000);
+                this._stickyHeaderView.nativeViewProtected.setZ(STICKY_HEADER_Z_INDEX);
                 this._stickyHeaderView.nativeViewProtected.setTranslationY(0);
             }
         }
@@ -374,29 +378,33 @@ export class ListView extends ListViewBase {
         this._stickyHeaderHeight = defaultHeaderHeight;
         // Request layout to ensure proper measurement
         this._stickyHeaderView.requestLayout();
-        // Then measure and adjust padding if needed
-        setTimeout(() => {
-            if (this._stickyHeaderView) {
-                // Get the actual measured height from the native view
-                const nativeView = this._stickyHeaderView.nativeViewProtected;
-                if (nativeView && nativeView.getMeasuredHeight() > 0) {
-                    const measuredHeaderHeight = nativeView.getMeasuredHeight();
-                    let finalSearchHeight = searchViewHeight;
-                    // Re-measure search view if needed
-                    if (this.showSearch && this._searchView && this._searchView._wrapper) {
-                        const searchWrapper = this._searchView._wrapper;
-                        if (searchWrapper.nativeViewProtected && searchWrapper.nativeViewProtected.getMeasuredHeight() > 0) {
-                            finalSearchHeight = searchWrapper.nativeViewProtected.getMeasuredHeight();
+        // Then measure and adjust padding if needed using a layout listener for determinism
+        const stickyHeaderNativeView = this._stickyHeaderView && this._stickyHeaderView.nativeViewProtected;
+        if (stickyHeaderNativeView) {
+            const layoutListener = new android.view.View.OnLayoutChangeListener({
+                onLayoutChange: (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) => {
+                    if (v.getMeasuredHeight() > 0) {
+                        const measuredHeaderHeight = v.getMeasuredHeight();
+                        let finalSearchHeight = searchViewHeight;
+                        // Re-measure search view if needed
+                        if (this.showSearch && this._searchView && this._searchView._wrapper) {
+                            const searchWrapper = this._searchView._wrapper;
+                            if (searchWrapper.nativeViewProtected && searchWrapper.nativeViewProtected.getMeasuredHeight() > 0) {
+                                finalSearchHeight = searchWrapper.nativeViewProtected.getMeasuredHeight();
+                            }
                         }
+                        // Calculate final padding: search height + sticky header height + small buffer
+                        const totalPaddingHeight = finalSearchHeight + measuredHeaderHeight + 4;
+                        this._stickyHeaderHeight = measuredHeaderHeight;
+                        this.nativeViewProtected.setPadding(0, totalPaddingHeight, 0, 0);
+                        this.scrollToIndex(0);
+                        // Remove the listener after first valid layout
+                        v.removeOnLayoutChangeListener(layoutListener);
                     }
-                    // Calculate final padding: search height + sticky header height + small buffer
-                    const totalPaddingHeight = finalSearchHeight + measuredHeaderHeight + 4;
-                    this._stickyHeaderHeight = measuredHeaderHeight;
-                    this.nativeViewProtected.setPadding(0, totalPaddingHeight, 0, 0);
-                    this.scrollToIndex(0);
-                }
-            }
-        }, 150); // Slightly longer delay for more reliable measurement after positioning
+                },
+            });
+            stickyHeaderNativeView.addOnLayoutChangeListener(layoutListener);
+        }
     }
     _setupScrollListener() {
         if (this._scrollListener) {
@@ -427,7 +435,8 @@ export class ListView extends ListViewBase {
         const sectionCount = this._getSectionCount();
         for (let section = 0; section < sectionCount; section++) {
             // Check if firstVisibleItem is in this section (header or items)
-            const itemsInSection = this._getItemsInSection(section).length;
+            const sectionItems = this._getItemsInSection(section) || [];
+            const itemsInSection = sectionItems.length || 0;
             const sectionEndPosition = currentPosition + 1 + itemsInSection; // +1 for header
             if (firstVisibleItem < sectionEndPosition) {
                 return section;
@@ -624,7 +633,7 @@ export class ListView extends ListViewBase {
         }
         // Ensure search view appears above everything else
         if (searchViewWrapper.nativeViewProtected) {
-            searchViewWrapper.nativeViewProtected.setZ(2000); // Higher than sticky header (1000)
+            searchViewWrapper.nativeViewProtected.setZ(SEARCH_VIEW_Z_INDEX);
         }
         // Store reference for cleanup
         this._searchView._wrapper = searchViewWrapper;
@@ -699,301 +708,291 @@ function ensureListViewAdapterClass() {
     if (ListViewAdapterClass) {
         return;
     }
-    var ListViewAdapter = /** @class */ (function (_super) {
-    __extends(ListViewAdapter, _super);
-    function ListViewAdapter(owner) {
-        var _this = _super.call(this) || this;
-        _this.owner = owner;
-        return global.__native(_this);
-    }
-    ListViewAdapter.prototype.getCount = function () {
-        if (!this.owner || !this.owner.items) {
-            return 0;
+    var ListViewAdapter = (function (_super) {
+        __extends(ListViewAdapter, _super);
+        function ListViewAdapter(owner) {
+            var _this = _super.call(this) || this;
+            _this.owner = owner;
+            return global.__native(_this);
         }
-        // Ensure we always have at least the items array length, even if empty
-        var count = 0;
-        if (this.owner.sectioned) {
-            // Count items + section headers
-            var sectionCount = this.owner._getSectionCount();
-            for (var i = 0; i < sectionCount; i++) {
-                var itemsInSection = this.owner._getItemsInSection(i);
-                // Only add header if section has items or we want to show empty sections
-                if (itemsInSection.length > 0) {
-                    count += 1; // Section header
-                    count += itemsInSection.length; // Items in section
+        ListViewAdapter.prototype.getCount = function () {
+            if (!this.owner) {
+                return 0;
+            }
+            var count = 0;
+            if (this.owner.sectioned) {
+                var sectionCount = this.owner._getSectionCount();
+                if (!this.owner.items || sectionCount <= 0) {
+                    return 0;
+                }
+                for (var i = 0; i < sectionCount; i++) {
+                    var itemsInSection = this.owner._getItemsInSection(i) || [];
+                    if (itemsInSection.length > 0) {
+                        count += 1;
+                        count += itemsInSection.length;
+                    }
                 }
             }
-        }
-        else {
-            count = this.owner.items.length;
-        }
-        // Return the count, ensuring it's never negative
-        return Math.max(0, count);
-    };
-    ListViewAdapter.prototype.getItem = function (i) {
-        if (!this.owner || !this.owner.items) {
-            return null;
-        }
-        // Safety check for index bounds
-        var totalCount = this.getCount();
-        if (i < 0 || i >= totalCount) {
-            return null;
-        }
-        if (this.owner.sectioned) {
-            var positionInfo = this._getPositionInfo(i);
-            if (positionInfo.isHeader) {
-                return this.owner._getSectionData(positionInfo.section);
+            else {
+                var src = this.owner.items;
+                count = src && typeof src.length === "number" ? src.length : 0;
+            }
+            return Math.max(0, count);
+        };
+        ListViewAdapter.prototype.getItem = function (i) {
+            if (!this.owner || !this.owner.items) {
+                return null;
+            }
+            var totalCount = this.getCount();
+            if (i < 0 || i >= totalCount) {
+                return null;
+            }
+            if (this.owner.sectioned) {
+                var positionInfo = this._getPositionInfo(i);
+                if (positionInfo.isHeader) {
+                    return this.owner._getSectionData(positionInfo.section);
+                }
+                else {
+                    return this.owner._getDataItemInSection(positionInfo.section, positionInfo.itemIndex);
+                }
             }
             else {
-                return this.owner._getDataItemInSection(positionInfo.section, positionInfo.itemIndex);
+                var src = this.owner.items;
+                if (src && typeof src.length === "number" && i < src.length) {
+                    var getItem = src.getItem;
+                    return getItem ? getItem.call(src, i) : src[i];
+                }
             }
-        }
-        else {
-            if (i < this.owner.items.length) {
-                var getItem = this.owner.items.getItem;
-                return getItem ? getItem.call(this.owner.items, i) : this.owner.items[i];
+            return null;
+        };
+        ListViewAdapter.prototype._getPositionInfo = function (position) {
+            if (!this.owner.sectioned) {
+                return { isHeader: false, section: 0, itemIndex: position };
             }
-        }
-        return null;
-    };
-    // Helper method to determine if position is header and get section/item info
-    ListViewAdapter.prototype._getPositionInfo = function (position) {
-        if (!this.owner.sectioned) {
-            return { isHeader: false, section: 0, itemIndex: position };
-        }
-        var currentPosition = 0;
-        var sectionCount = this.owner._getSectionCount();
-        for (var section = 0; section < sectionCount; section++) {
-            var itemsInSection = this.owner._getItemsInSection(section);
-            // Skip sections with no items (they won't have headers in our count)
-            if (itemsInSection.length === 0) {
-                continue;
-            }
-            // Check if this position is the section header
-            if (currentPosition === position) {
-                return { isHeader: true, section: section, itemIndex: -1 };
-            }
-            currentPosition++; // Move past header
-            // Check if position is within this section's items
-            if (position < currentPosition + itemsInSection.length) {
-                var itemIndex = position - currentPosition;
-                return { isHeader: false, section: section, itemIndex: itemIndex };
-            }
-            currentPosition += itemsInSection.length; // Move past items
-        }
-        // Fallback - should not reach here with proper bounds checking
-        return { isHeader: false, section: 0, itemIndex: 0 };
-    };
-    ListViewAdapter.prototype.getItemId = function (i) {
-        var item = this.getItem(i);
-        var id = i;
-        if (this.owner && item && this.owner.items) {
-            id = this.owner.itemIdGenerator(item, i, this.owner.items);
-        }
-        return long(id);
-    };
-    ListViewAdapter.prototype.hasStableIds = function () {
-        return true;
-    };
-    ListViewAdapter.prototype.isEnabled = function (position) {
-        // Safety check to prevent crashes when adapter is empty
-        var totalCount = this.getCount();
-        if (totalCount === 0 || position < 0 || position >= totalCount) {
-            return false;
-        }
-        // For sectioned lists, check if this is a header position
-        if (this.owner.sectioned) {
-            var positionInfo = this._getPositionInfo(position);
-            // Headers are typically not clickable, items are
-            return !positionInfo.isHeader;
-        }
-        return true;
-    };
-    ListViewAdapter.prototype.getViewTypeCount = function () {
-        var count = this.owner._itemTemplatesInternal.length;
-        // Add 1 for header view type when sectioned
-        if (this.owner.sectioned && this.owner.stickyHeaderTemplate) {
-            count += 1;
-        }
-        return count;
-    };
-    ListViewAdapter.prototype.getItemViewType = function (index) {
-        if (this.owner.sectioned) {
-            var positionInfo = this._getPositionInfo(index);
-            if (positionInfo.isHeader) {
-                // Header view type is the last index (after all item template types)
-                return this.owner._itemTemplatesInternal.length;
+            var currentPosition = 0;
+            var sectionCount = this.owner._getSectionCount();
+            for (var section = 0; section < sectionCount; section++) {
+                var itemsInSection = this.owner._getItemsInSection(section) || [];
+                if (itemsInSection.length === 0) {
+                    continue;
+                }
+                if (currentPosition === position) {
+                    return { isHeader: true, section: section, itemIndex: -1 };
+                }
+                currentPosition++;
+                if (position < currentPosition + itemsInSection.length) {
+                    var itemIndex = position - currentPosition;
+                    return { isHeader: false, section: section, itemIndex: itemIndex };
+                }
+                currentPosition += itemsInSection.length;
+            }
+            return { isHeader: false, section: 0, itemIndex: 0 };
+        };
+        ListViewAdapter.prototype.getItemId = function (i) {
+            var item = this.getItem(i);
+            var id = i;
+            if (this.owner && item && this.owner.items) {
+                id = this.owner.itemIdGenerator(item, i, this.owner.items);
+            }
+            return long(id);
+        };
+        ListViewAdapter.prototype.hasStableIds = function () {
+            return true;
+        };
+        ListViewAdapter.prototype.isEnabled = function (position) {
+            var totalCount = this.getCount();
+            if (totalCount === 0 || position < 0 || position >= totalCount) {
+                return false;
+            }
+            if (this.owner.sectioned) {
+                var positionInfo = this._getPositionInfo(position);
+                return !positionInfo.isHeader;
+            }
+            return true;
+        };
+        ListViewAdapter.prototype.getViewTypeCount = function () {
+            var count = this.owner._itemTemplatesInternal.length;
+            if (this.owner.sectioned && this.owner.stickyHeaderTemplate) {
+                count += 1;
+            }
+            return count;
+        };
+        ListViewAdapter.prototype.getItemViewType = function (index) {
+            if (this.owner.sectioned) {
+                var positionInfo = this._getPositionInfo(index);
+                if (positionInfo.isHeader) {
+                    return this.owner._itemTemplatesInternal.length;
+                }
+                else {
+                    var template = this.owner._getItemTemplate(positionInfo.itemIndex);
+                    return this.owner._itemTemplatesInternal.indexOf(template);
+                }
             }
             else {
-                // Get template for the actual item
-                var template = this.owner._getItemTemplate(positionInfo.itemIndex);
+                var template = this.owner._getItemTemplate(index);
                 return this.owner._itemTemplatesInternal.indexOf(template);
             }
-        }
-        else {
-            var template = this.owner._getItemTemplate(index);
-            return this.owner._itemTemplatesInternal.indexOf(template);
-        }
-    };
-    ListViewAdapter.prototype.getView = function (index, convertView, parent) {
-        //this.owner._dumpRealizedTemplates();
-        if (!this.owner) {
-            return null;
-        }
-        // Safety check for empty adapter
-        var totalCount = this.getCount();
-        if (index < 0 || index >= totalCount) {
-            // Return a minimal empty view to prevent crashes
-            var emptyView = new android.view.View(this.owner._context);
-            var layoutParams = new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT, 0);
-            emptyView.setLayoutParams(layoutParams);
-            return emptyView;
-        }
-        if (this.owner.sectioned) {
-            var positionInfo = this._getPositionInfo(index);
-            if (positionInfo.isHeader) {
-                // Create section header view (pass index for hiding logic)
-                return this._createHeaderView(positionInfo.section, convertView, parent, index);
+        };
+        ListViewAdapter.prototype.getView = function (index, convertView, parent) {
+            if (!this.owner) {
+                return null;
+            }
+            var totalCount = this.getCount();
+            if (index < 0 || index >= totalCount) {
+                var emptyView = new android.view.View(this.owner._context);
+                var layoutParams = new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT, 0);
+                emptyView.setLayoutParams(layoutParams);
+                return emptyView;
+            }
+            if (index === totalCount - 1) {
+                this.owner.notify({
+                    eventName: LOADMOREITEMS,
+                    object: this.owner,
+                });
+            }
+            if (this.owner.sectioned) {
+                var positionInfo = this._getPositionInfo(index);
+                if (positionInfo.isHeader) {
+                    return this._createHeaderView(positionInfo.section, convertView, parent, index);
+                }
+                else {
+                    return this._createItemView(positionInfo.section, positionInfo.itemIndex, convertView, parent);
+                }
             }
             else {
-                // Create regular item view with adjusted index
-                return this._createItemView(positionInfo.section, positionInfo.itemIndex, convertView, parent);
+                return this._createItemView(0, index, convertView, parent);
             }
-        }
-        else {
-            // Non-sectioned - use original logic
-            return this._createItemView(0, index, convertView, parent);
-        }
-    };
-    ListViewAdapter.prototype._createHeaderView = function (section, convertView, parent, index) {
-        // Check if this header should be hidden to avoid duplication with sticky header
-        if (this.owner._hiddenHeaderPositions.has(index)) {
-            // Return an empty view with zero height
-            var emptyView = new android.view.View(this.owner._context);
-            var layoutParams = new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT, 0);
-            emptyView.setLayoutParams(layoutParams);
-            return emptyView;
-        }
-        var headerView = null;
-        var headerViewType = this.owner._itemTemplatesInternal.length; // Same as getItemViewType for headers
-        // Try to reuse convertView if it's the right type
-        if (convertView) {
-            var existingData = this.owner._realizedItems.get(convertView);
-            if (existingData && existingData.templateKey === "header_".concat(headerViewType)) {
-                headerView = existingData.view;
-            }
-        }
-        // Create new header view if we can't reuse
-        if (!headerView) {
-            if (this.owner.stickyHeaderTemplate) {
-                if (typeof this.owner.stickyHeaderTemplate === 'string') {
-                    try {
-                        headerView = Builder.parse(this.owner.stickyHeaderTemplate, this.owner);
-                    }
-                    catch (error) {
-                        // Fallback to simple label
-                        headerView = new Label();
-                        headerView.text = 'Header Error';
-                    }
+        };
+        ListViewAdapter.prototype._createHeaderView = function (section, convertView, parent, index) {
+            if (this.owner._hiddenHeaderPositions.has(index)) {
+                var emptyView = new android.view.View(this.owner._context);
+                var layoutParams = new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT, 0);
+                emptyView.setLayoutParams(layoutParams);
+                return emptyView;
+            }
+            var headerView = null;
+            var headerViewType = this.owner._itemTemplatesInternal.length;
+            if (convertView) {
+                var existingData = this.owner._realizedItems.get(convertView);
+                if (existingData && existingData.templateKey === "header_".concat(headerViewType)) {
+                    headerView = existingData.view;
                 }
             }
             if (!headerView) {
-                // Default header
-                headerView = new Label();
-                headerView.text = "Section ".concat(section);
-            }
-            // Add to parent and get native view
-            if (!headerView.parent) {
-                if (headerView instanceof LayoutBase && !(headerView instanceof ProxyViewContainer)) {
-                    this.owner._addView(headerView);
-                    convertView = headerView.nativeViewProtected;
+                if (this.owner.stickyHeaderTemplate) {
+                    if (typeof this.owner.stickyHeaderTemplate === "string") {
+                        try {
+                            headerView = Builder.parse(this.owner.stickyHeaderTemplate, this.owner);
+                        }
+                        catch (error) {
+                            headerView = new Label();
+                            headerView.text = "Header Error";
+                        }
+                    }
                 }
-                else {
-                    var sp = new StackLayout();
-                    sp.addChild(headerView);
-                    this.owner._addView(sp);
-                    convertView = sp.nativeViewProtected;
+                if (!headerView) {
+                    headerView = new Label();
+                    headerView.text = "Section ".concat(section);
+                }
+                if (!headerView.parent) {
+                    if (headerView instanceof LayoutBase && !(headerView instanceof ProxyViewContainer)) {
+                        this.owner._addView(headerView);
+                        convertView = headerView.nativeViewProtected;
+                    }
+                    else {
+                        var sp = new StackLayout();
+                        sp.addChild(headerView);
+                        this.owner._addView(sp);
+                        convertView = sp.nativeViewProtected;
+                    }
                 }
+                this.owner._realizedItems.set(convertView, {
+                    view: headerView,
+                    templateKey: "header_".concat(headerViewType),
+                });
             }
-            // Register the header view for recycling
-            this.owner._realizedItems.set(convertView, {
-                view: headerView,
-                templateKey: "header_".concat(headerViewType),
-            });
-        }
-        // Set binding context to section data (always update, even for recycled views)
-        var sectionData = this.owner._getSectionData(section);
-        if (sectionData) {
-            headerView.bindingContext = sectionData;
-        }
-        else {
-            headerView.bindingContext = { title: "Section ".concat(section), section: section };
-        }
-        return convertView;
-    };
-    ListViewAdapter.prototype._createItemView = function (section, itemIndex, convertView, parent) {
-        // Use existing item creation logic but with sectioned data
-        var template = this.owner._getItemTemplate(itemIndex);
-        var view;
-        // convertView is of the wrong type
-        if (convertView && this.owner._getKeyFromView(convertView) !== template.key) {
-            this.owner._markViewUnused(convertView); // release this view
-            convertView = this.owner._getAvailableView(template.key); // get a view from the right type or null
-        }
-        if (convertView) {
-            view = this.owner._realizedItems.get(convertView).view;
-        }
-        if (!view) {
-            view = template.createView();
-        }
-        var args = {
-            eventName: ITEMLOADING,
-            object: this.owner,
-            index: itemIndex,
-            view: view,
-            android: parent,
-            ios: undefined,
-        };
-        this.owner.notify(args);
-        if (!args.view) {
-            args.view = this.owner._getDefaultItemContent(itemIndex);
-        }
-        if (args.view) {
-            if (this.owner._effectiveRowHeight > -1) {
-                args.view.height = this.owner.rowHeight;
+            var sectionData = this.owner._getSectionData(section);
+            if (sectionData) {
+                headerView.bindingContext = sectionData;
             }
             else {
-                args.view.height = unsetValue;
+                headerView.bindingContext = { title: "Section ".concat(section), section: section };
             }
-            // Use sectioned item preparation
-            if (this.owner.sectioned) {
-                this.owner._prepareItemInSection(args.view, section, itemIndex);
+            return convertView;
+        };
+        ListViewAdapter.prototype._createItemView = function (section, itemIndex, convertView, parent) {
+            var template = this.owner._getItemTemplate(itemIndex);
+            var view;
+            if (convertView && this.owner._getKeyFromView(convertView) !== template.key) {
+                this.owner._markViewUnused(convertView);
+                convertView = this.owner._getAvailableView(template.key);
+            }
+            if (convertView) {
+                view = this.owner._realizedItems.get(convertView).view;
+            }
+            if (!view) {
+                view = template.createView();
+            }
+            var args = {
+                eventName: ITEMLOADING,
+                object: this.owner,
+                index: itemIndex,
+                view: view,
+                android: parent,
+                ios: undefined,
+            };
+            this.owner.notify(args);
+            if (!args.view) {
+                args.view = this.owner._getDefaultItemContent(itemIndex);
+            }
+            if (args.view) {
+                if (this.owner._effectiveRowHeight > -1) {
+                    args.view.height = this.owner.rowHeight;
+                }
+                else {
+                    args.view.height = unsetValue;
+                }
+                if (this.owner.sectioned) {
+                    this.owner._prepareItemInSection(args.view, section, itemIndex);
+                }
+                else {
+                    this.owner._prepareItem(args.view, itemIndex);
+                }
+                if (!args.view.parent) {
+                    if (args.view instanceof LayoutBase && !(args.view instanceof ProxyViewContainer)) {
+                        var mt = PercentLength.toDevicePixels(args.view.marginTop, 0, Number.NaN);
+                        var mb = PercentLength.toDevicePixels(args.view.marginBottom, 0, Number.NaN);
+                        var ml = PercentLength.toDevicePixels(args.view.marginLeft, 0, Number.NaN);
+                        var mr = PercentLength.toDevicePixels(args.view.marginRight, 0, Number.NaN);
+                        var hasMargins = mt > 0 || mb > 0 || ml > 0 || mr > 0;
+                        if (hasMargins) {
+                            var outer = new StackLayout();
+                            outer.addChild(args.view);
+                            this.owner._addView(outer);
+                            convertView = outer.nativeViewProtected;
+                        }
+                        else {
+                            this.owner._addView(args.view);
+                            convertView = args.view.nativeViewProtected;
+                        }
+                    }
+                    else {
+                        var sp = new StackLayout();
+                        sp.addChild(args.view);
+                        this.owner._addView(sp);
+                        convertView = sp.nativeViewProtected;
+                    }
+                }
+                this.owner._registerViewToTemplate(template.key, convertView, args.view);
+                this.owner._markViewUsed(convertView);
             }
-            else {
-                this.owner._prepareItem(args.view, itemIndex);
-            }
-            if (!args.view.parent) {
-                // Android ListView doesn't properly respect margins on direct child views.
-                // Always wrap item views in a StackLayout container to ensure margins work correctly.
-                var container = new StackLayout();
-                container.addChild(args.view);
-                this.owner._addView(container);
-                convertView = container.nativeViewProtected;
-            }
-            this.owner._registerViewToTemplate(template.key, convertView, args.view);
-            this.owner._markViewUsed(convertView);
-        }
-        return convertView;
-    };
-    var _a, _b, _c, _d, _e, _f;
-    __decorate([
-        profile,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Number, typeof (_b = typeof android !== "undefined" && (_a = android.view) !== void 0 && _a.View) === "function" ? _b : Object, typeof (_d = typeof android !== "undefined" && (_c = android.view) !== void 0 && _c.ViewGroup) === "function" ? _d : Object]),
-        __metadata("design:returntype", typeof (_f = typeof android !== "undefined" && (_e = android.view) !== void 0 && _e.View) === "function" ? _f : Object)
-    ], ListViewAdapter.prototype, "getView", null);
-    return ListViewAdapter;
-}(android.widget.BaseAdapter));
+            return convertView;
+        };
+        __decorate([
+            profile
+        ], ListViewAdapter.prototype, "getView", null);
+        return ListViewAdapter;
+    }(android.widget.BaseAdapter));
     ListViewAdapterClass = ListViewAdapter;
 }
 //# sourceMappingURL=index.android.js.map