@nativescript-community/ui-pager 13.0.33 → 13.0.36

package/index.ios.js

@@ -1,6 +1,7 @@
-import { ChangeType, Color, Observable, ObservableArray, Property, ProxyViewContainer, StackLayout, Utils, View, profile } from '@nativescript/core';
+var PagerCell_1, UICollectionDelegateImpl_1, UICollectionViewDataSourceImpl_1, UICollectionViewFlowLinearLayoutImpl_1;
+import { ChangeType, Color, Observable, ObservableArray, Property, ProxyViewContainer, StackLayout, Utils, View, ViewBase, profile } from '@nativescript/core';
 import { layout } from '@nativescript/core/utils/utils';
-import { ITEMDISPOSING, ITEMLOADING, Indicator, LOADMOREITEMS, PagerBase, autoPlayProperty, autoplayDelayProperty, disableSwipeProperty, indicatorColorProperty, indicatorProperty, indicatorSelectedColorProperty, itemTemplatesProperty, itemsProperty, orientationProperty, selectedIndexProperty, showIndicatorProperty } from './index.common';
+import { Indicator, PagerBase, PagerItem, autoPlayProperty, autoplayDelayProperty, disableSwipeProperty, indicatorColorProperty, indicatorProperty, indicatorSelectedColorProperty, itemTemplatesProperty, itemsProperty, orientationProperty, selectedIndexProperty, showIndicatorProperty } from './index.common';
 export * from './index.common';
 export { Transformer } from './index.common';
 function notifyForItemAtIndex(owner, nativeView, view, eventName, index) {
@@ -46,47 +47,45 @@ export const contentInsetAdjustmentBehaviorProperty = new Property({
     valueConverter: parseContentInsetAdjustmentBehavior,
     defaultValue: ContentInsetAdjustmentBehavior.Automatic
 });
-var UICellView = /** @class */ (function (_super) {
-    __extends(UICellView, _super);
-    function UICellView() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    UICellView.prototype.layoutSubviews = function () {
-        var view = this.view && this.view.get();
+let UICellView = class UICellView extends UIView {
+    layoutSubviews() {
+        const view = this.view && this.view.get();
         if (!view) {
             return;
         }
         this.frame = this.superview.bounds;
-        var size = this.bounds.size;
+        const size = this.bounds.size;
         View.layoutChild(null, view, 0, 0, Utils.layout.toDevicePixels(size.width), Utils.layout.toDevicePixels(size.height));
-    };
-    return UICellView;
-}(UIView));
+    }
+};
+UICellView = __decorate([
+    NativeClass
+], UICellView);
 const PFLAG_FORCE_LAYOUT = 1;
 export class Pager extends PagerBase {
     constructor() {
         super();
         this.lastEvent = 0;
-        this._disableSwipe = false;
-        this._disableAnimation = false;
-        this._preparingCell = false;
-        this._isRefreshing = false;
-        this._isInit = false;
-        this._innerWidth = 0;
-        this._innerHeight = 0;
+        this.mDisableSwipe = false;
+        this.mDisableAnimation = false;
+        this.mPreparingCell = false;
+        this.mIsRefreshing = false;
+        this.mIsInit = false;
+        this.mInnerWidth = 0;
+        this.mInnerHeight = 0;
         this._observableArrayHandler = (args) => {
             if (!this.pager) {
                 return;
             }
-            if (this.indicatorView && this._observableArrayInstance && this._observableArrayInstance.length) {
-                this.indicatorView.numberOfPages = this._observableArrayInstance.length;
+            if (this.indicatorView && this.mObservableArrayInstance && this.mObservableArrayInstance.length) {
+                this.indicatorView.numberOfPages = this.mObservableArrayInstance.length;
             }
             const collectionView = this.pager;
             if (collectionView) {
                 try {
                     let offset = 0;
                     collectionView.performBatchUpdatesCompletion(() => {
-                        this._isRefreshing = true;
+                        this.mIsRefreshing = true;
                         const array = [];
                         switch (args.action) {
                             case ChangeType.Add:
@@ -125,7 +124,7 @@ export class Pager extends PagerBase {
                         }
                         this._initAutoPlay(this.autoPlay);
                         if (this.itemCount === 0) {
-                            this._isInit = false;
+                            this.mIsInit = false;
                         }
                     }, null);
                 }
@@ -134,20 +133,20 @@ export class Pager extends PagerBase {
         };
         this._isDataDirty = false;
         this.iosOverflowSafeAreaEnabledLayoutHackNeeded = true;
-        this._map = new Map();
+        this.mMap = new Map();
     }
     get pager() {
-        return this._pager;
+        return this.mPager;
     }
     get indicatorView() {
-        return this._indicatorView;
+        return this.mIndicatorView;
     }
     createNativeView() {
         const nativeView = UIView.new();
-        this._layout = UICollectionViewFlowLinearLayoutImpl.initWithOwner(new WeakRef(this));
-        this._layout.scrollDirection = 1;
-        this._layout.minimumInteritemSpacing = 0;
-        const pager = (this._pager = UICollectionView.alloc().initWithFrameCollectionViewLayout(CGRectZero, this._layout));
+        this.mLayout = UICollectionViewFlowLinearLayoutImpl.initWithOwner(new WeakRef(this));
+        this.mLayout.scrollDirection = 1;
+        this.mLayout.minimumInteritemSpacing = 0;
+        const pager = (this.mPager = UICollectionView.alloc().initWithFrameCollectionViewLayout(CGRectZero, this.mLayout));
         pager.backgroundColor = UIColor.clearColor;
         pager.autoresizesSubviews = false;
         pager.autoresizingMask = 0;
@@ -161,20 +160,23 @@ export class Pager extends PagerBase {
         super.initNativeView();
         const nativeView = this.pager;
         nativeView.registerClassForCellWithReuseIdentifier(PagerCell.class(), this._defaultTemplate.key);
-        nativeView.dataSource = this._dataSource = UICollectionViewDataSourceImpl.initWithOwner(new WeakRef(this));
+        nativeView.backgroundColor = UIColor.clearColor;
+        nativeView.autoresizesSubviews = false;
+        nativeView.autoresizingMask = 0;
+        nativeView.dataSource = this.mDataSource = UICollectionViewDataSourceImpl.initWithOwner(new WeakRef(this));
         nativeView.scrollEnabled = !this.disableSwipe;
         if (this.orientation === 'vertical') {
-            this._layout.scrollDirection = 0;
+            this.mLayout.scrollDirection = 0;
             nativeView.alwaysBounceVertical = true;
             nativeView.alwaysBounceHorizontal = false;
         }
         else {
-            this._layout.scrollDirection = 1;
+            this.mLayout.scrollDirection = 1;
             nativeView.alwaysBounceHorizontal = true;
             nativeView.alwaysBounceVertical = false;
         }
         this._setIndicator(this.indicator);
-        this._delegate = UICollectionDelegateImpl.initWithOwner(new WeakRef(this));
+        this.mDelegate = UICollectionDelegateImpl.initWithOwner(new WeakRef(this));
         this._setNativeClipToBounds();
         this._initAutoPlay(this.autoPlay);
     }
@@ -250,33 +252,47 @@ export class Pager extends PagerBase {
         return this.lastIndex;
     }
     _setIndicator(value) {
-        if (this._indicatorView) {
-            this._indicatorView.removeFromSuperview();
+        if (this.mIndicatorView) {
+            this.mIndicatorView.removeFromSuperview();
         }
         switch (value) {
             case Indicator.None:
-                this._indicatorView = CHIPageControlAji.new();
+                this.mIndicatorView = CHIPageControlAji.new();
                 break;
             case Indicator.Worm:
-                this._indicatorView = CHIPageControlAleppo.new();
+                this.mIndicatorView = CHIPageControlAleppo.new();
                 break;
             case Indicator.Fill:
-                this._indicatorView = CHIPageControlChimayo.new();
+                this.mIndicatorView = CHIPageControlChimayo.new();
                 break;
             case Indicator.Swap:
-                this._indicatorView = CHIPageControlPuya.new();
+                this.mIndicatorView = CHIPageControlPuya.new();
                 break;
             case Indicator.THIN_WORM:
-                this._indicatorView = CHIPageControlJalapeno.new();
+                this.mIndicatorView = CHIPageControlJalapeno.new();
                 break;
             case Indicator.Flat:
-                this._indicatorView = CHIPageControlJaloro.new();
+                this.mIndicatorView = CHIPageControlJaloro.new();
                 break;
             default:
                 break;
         }
-        this._indicatorView.tintColor = UIColor.whiteColor;
-        this._indicatorView.currentPageTintColor = UIColor.whiteColor;
+        this.mIndicatorView.tintColor = UIColor.whiteColor;
+        this.mIndicatorView.currentPageTintColor = UIColor.whiteColor;
+        switch (value) {
+            case Indicator.None:
+            case Indicator.Worm:
+            case Indicator.Fill:
+            case Indicator.Swap:
+            case Indicator.THIN_WORM:
+            case Indicator.Disabled:
+                this.mIndicatorView.radius = 4;
+                break;
+            case Indicator.Flat:
+                this.mIndicatorView.radius = 2;
+                this.mIndicatorView.transform = CGAffineTransformScale(CGAffineTransformIdentity, 0.7, 0.5);
+                break;
+        }
     }
     get _childrenCount() {
         var _a, _b;
@@ -288,17 +304,17 @@ export class Pager extends PagerBase {
     }
     [orientationProperty.setNative](value) {
         if (value === 'horizontal') {
-            this._layout.scrollDirection = 1;
+            this.mLayout.scrollDirection = 1;
         }
         else {
-            this._layout.scrollDirection = 0;
+            this.mLayout.scrollDirection = 0;
         }
     }
     eachChildView(callback) {
-        this._map.forEach((view, key) => callback(view));
+        this.mMap.forEach((view, key) => callback(view));
     }
     eachChild(callback) {
-        this._map.forEach((view, key) => callback(view));
+        this.mMap.forEach((view, key) => callback(view));
     }
     _updateScrollPosition() {
         const view = this.pager;
@@ -329,19 +345,19 @@ export class Pager extends PagerBase {
         if (this.indicatorView && value && value.length) {
             this.indicatorView.numberOfPages = value.length;
         }
-        if (this._observableArrayInstance) {
-            this._observableArrayInstance.off(ObservableArray.changeEvent, this._observableArrayHandler);
-            this._observableArrayInstance = null;
+        if (this.mObservableArrayInstance) {
+            this.mObservableArrayInstance.off(ObservableArray.changeEvent, this._observableArrayHandler);
+            this.mObservableArrayInstance = null;
         }
         if (value instanceof ObservableArray) {
-            this._observableArrayInstance = value;
-            this._observableArrayInstance.on(ObservableArray.changeEvent, this._observableArrayHandler);
+            this.mObservableArrayInstance = value;
+            this.mObservableArrayInstance.on(ObservableArray.changeEvent, this._observableArrayHandler);
         }
         else {
             this.refresh();
         }
         if (!value) {
-            this._isInit = false;
+            this.mIsInit = false;
         }
         selectedIndexProperty.coerce(this);
     }
@@ -403,7 +419,7 @@ export class Pager extends PagerBase {
             }
         }
         dispatch_async(main_queue, () => {
-            if (this._dataSource.collectionViewNumberOfItemsInSection(this.pager, 0) > maxMinIndex) {
+            if (this.mDataSource.collectionViewNumberOfItemsInSection(this.pager, 0) > maxMinIndex) {
                 this.pager.scrollToItemAtIndexPathAtScrollPositionAnimated(NSIndexPath.indexPathForItemInSection(maxMinIndex, 0), this.orientation === 'vertical' ? 2 : 16, !!animate);
             }
             selectedIndexProperty.nativeValueChange(this, maxMinIndex);
@@ -418,8 +434,8 @@ export class Pager extends PagerBase {
             return;
         }
         this._isDataDirty = false;
-        this._lastLayoutKey = this._innerWidth + '_' + this._innerHeight;
-        this._map.forEach((view, nativeView, map) => {
+        this.mLastLayoutKey = this.mInnerWidth + '_' + this.mInnerHeight;
+        this.mMap.forEach((view, nativeView, map) => {
             if (!(view.bindingContext instanceof Observable)) {
                 view.bindingContext = null;
             }
@@ -434,10 +450,10 @@ export class Pager extends PagerBase {
         if (this.showIndicator && this.indicatorView) {
             this.nativeView.addSubview(this.indicatorView);
         }
-        if (this._isDataDirty && this._innerWidth !== undefined && this._innerHeight !== undefined) {
+        if (this._isDataDirty && this.mInnerWidth !== undefined && this.mInnerHeight !== undefined) {
             this.refresh();
         }
-        this.pager.delegate = this._delegate;
+        this.pager.delegate = this.mDelegate;
         if (!this.items && this._childrenCount > 0) {
             selectedIndexProperty.coerce(this);
             this._updateScrollPosition();
@@ -450,28 +466,28 @@ export class Pager extends PagerBase {
         super.onUnloaded();
     }
     disposeNativeView() {
-        this._delegate = null;
-        this._dataSource = null;
-        if (this.pager) {
-            this.pager.delegate = null;
-            this._pager = null;
-        }
-        this._indicatorView = null;
-        this._layout = null;
-        if (this._observableArrayInstance) {
-            this._observableArrayInstance.off(ObservableArray.changeEvent, this._observableArrayHandler);
-            this._observableArrayInstance = null;
+        this.mDelegate = null;
+        this.mDataSource = null;
+        if (this.mPager) {
+            this.mPager.delegate = null;
+            this.mPager = null;
+        }
+        this.mIndicatorView = null;
+        this.mLayout = null;
+        if (this.mObservableArrayInstance) {
+            this.mObservableArrayInstance.off(ObservableArray.changeEvent, this._observableArrayHandler);
+            this.mObservableArrayInstance = null;
         }
         this.clearRealizedCells();
         super.disposeNativeView();
     }
     clearRealizedCells() {
         const that = new WeakRef(this);
-        this._map.forEach(function (value, key) {
+        this.mMap.forEach(function (value, key) {
             that.get()._removeContainer(key);
             that.get()._clearCellViews(key);
         }, that);
-        this._map.clear();
+        this.mMap.clear();
     }
     _clearCellViews(cell) {
         const view = cell.view;
@@ -482,8 +498,8 @@ export class Pager extends PagerBase {
             this._removeView(view.parent);
         }
         cell.owner = undefined;
-        const preparing = this._preparingCell;
-        this._preparingCell = true;
+        const preparing = this.mPreparingCell;
+        this.mPreparingCell = true;
         if (view.parent && !(view.parent instanceof Pager)) {
             if (!(view.parent instanceof Pager)) {
                 this._removeView(view.parent);
@@ -492,8 +508,8 @@ export class Pager extends PagerBase {
                 view.parent._removeView(view);
             }
         }
-        this._preparingCell = preparing;
-        this._map.delete(cell);
+        this.mPreparingCell = preparing;
+        this.mMap.delete(cell);
     }
     [indicatorProperty.setNative](value) {
         this._setIndicator(value);
@@ -511,22 +527,22 @@ export class Pager extends PagerBase {
         }
     }
     [disableSwipeProperty.setNative](value) {
-        this._pager.scrollEnabled = !value;
-        this._disableSwipe = value;
+        this.mPager.scrollEnabled = !value;
+        this.mDisableSwipe = value;
     }
     [contentInsetAdjustmentBehaviorProperty.setNative](value) {
-        this._pager.contentInsetAdjustmentBehavior = value;
+        this.mPager.contentInsetAdjustmentBehavior = value;
     }
     get disableAnimation() {
-        return this._disableAnimation;
+        return this.mDisableAnimation;
     }
     set disableAnimation(value) {
-        this._disableAnimation = value;
+        this.mDisableAnimation = value;
     }
     _removeContainer(cell, index) {
         let view = cell.view;
         const args = {
-            eventName: ITEMDISPOSING,
+            eventName: Pager.itemDisposingEvent,
             object: this,
             index,
             android: undefined,
@@ -541,19 +557,19 @@ export class Pager extends PagerBase {
             }
             view.parent._removeView(view);
         }
-        this._map.delete(cell);
+        this.mMap.delete(cell);
     }
     onMeasure(widthMeasureSpec, heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        this._map.forEach((childView, pagerCell) => {
+        this.mMap.forEach((childView, pagerCell) => {
             View.measureChild(this, childView, childView._currentWidthMeasureSpec, childView._currentHeightMeasureSpec);
         });
     }
     updateInnerSize() {
         const width = this.getMeasuredWidth();
         const height = this.getMeasuredHeight();
-        this._innerWidth = width - this.effectivePaddingLeft - this.effectivePaddingRight;
-        this._innerHeight = height - this.effectivePaddingTop - this.effectivePaddingBottom;
+        this.mInnerWidth = width - this.effectivePaddingLeft - this.effectivePaddingRight;
+        this.mInnerHeight = height - this.effectivePaddingTop - this.effectivePaddingBottom;
     }
     onLayout(left, top, right, bottom) {
         super.onLayout(left, top, right, bottom);
@@ -571,24 +587,24 @@ export class Pager extends PagerBase {
         }
         layoutView.invalidateLayout();
         const size = this._getSize();
-        this._map.forEach((childView, pagerCell) => {
+        this.mMap.forEach((childView, pagerCell) => {
             const width = layout.toDevicePixels(size.width);
             const height = layout.toDevicePixels(size.height);
             View.layoutChild(this, childView, 0, 0, width, height);
         });
-        const layoutKey = this._innerWidth + '_' + this._innerHeight;
-        if (this._lastLayoutKey !== layoutKey) {
+        const layoutKey = this.mInnerWidth + '_' + this.mInnerHeight;
+        if (this.mLastLayoutKey !== layoutKey) {
             this.refresh();
         }
     }
     requestLayout() {
-        if (!this._preparingCell) {
+        if (!this.mPreparingCell) {
             super.requestLayout();
         }
     }
     _prepareCell(cell, indexPath) {
         try {
-            this._preparingCell = true;
+            this.mPreparingCell = true;
             const index = indexPath.row;
             let view = cell.view;
             const template = this._getItemTemplate(indexPath.row);
@@ -600,7 +616,7 @@ export class Pager extends PagerBase {
             }
             const bindingContext = this._getDataItem(indexPath.row);
             const args = {
-                eventName: ITEMLOADING,
+                eventName: Pager.itemLoadingEvent,
                 object: this,
                 index,
                 android: undefined,
@@ -619,7 +635,7 @@ export class Pager extends PagerBase {
                 cell.owner = new WeakRef(view);
             }
             else if (cell.view !== view) {
-                this._map.delete(cell);
+                this.mMap.delete(cell);
                 this._removeContainer(cell, index);
                 cell.view.nativeViewProtected.removeFromSuperview();
                 cell.owner = new WeakRef(view);
@@ -627,7 +643,7 @@ export class Pager extends PagerBase {
             if (view) {
                 view.bindingContext = bindingContext;
             }
-            this._map.set(cell, view);
+            this.mMap.set(cell, view);
             if (view && !view.parent) {
                 this._addView(view);
                 if (this.iosOverflowSafeArea) {
@@ -643,7 +659,7 @@ export class Pager extends PagerBase {
             this._layoutCell(view, indexPath);
         }
         finally {
-            this._preparingCell = false;
+            this.mPreparingCell = false;
         }
     }
     _layoutCell(cellView, index) {
@@ -689,49 +705,35 @@ export class Pager extends PagerBase {
 __decorate([
     profile
 ], Pager.prototype, "refresh", null);
-var PagerCell = /** @class */ (function (_super) {
-    __extends(PagerCell, _super);
-    function PagerCell() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(PagerCell.prototype, "view", {
-        get: function () {
-            return this.owner ? this.owner.get() : null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    PagerCell.initWithEmptyBackground = function () {
-        var cell = PagerCell.new();
-        // Clear background by default - this will make cells transparent
+let PagerCell = PagerCell_1 = class PagerCell extends UICollectionViewCell {
+    get view() {
+        return this.owner ? this.owner.get() : null;
+    }
+    static initWithEmptyBackground() {
+        const cell = PagerCell_1.new();
         cell.backgroundColor = null;
         return cell;
-    };
-    PagerCell.prototype.willMoveToSuperview = function (newSuperview) {
-        var parent = (this.view ? this.view.parent : null);
-        // When inside Pager and there is no newSuperview this cell is
-        // removed from native visual tree so we remove it from our tree too.
+    }
+    willMoveToSuperview(newSuperview) {
+        const parent = (this.view ? this.view.parent : null);
         if (parent && !newSuperview) {
             parent._removeContainer(this, this.index);
         }
-    };
-    return PagerCell;
-}(UICollectionViewCell));
-var UICollectionDelegateImpl = /** @class */ (function (_super) {
-    __extends(UICollectionDelegateImpl, _super);
-    function UICollectionDelegateImpl() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    UICollectionDelegateImpl_1 = UICollectionDelegateImpl;
-    UICollectionDelegateImpl.initWithOwner = function (owner) {
-        var delegate = UICollectionDelegateImpl_1.alloc().init();
+    }
+};
+PagerCell = PagerCell_1 = __decorate([
+    NativeClass
+], PagerCell);
+let UICollectionDelegateImpl = UICollectionDelegateImpl_1 = class UICollectionDelegateImpl extends NSObject {
+    static initWithOwner(owner) {
+        const delegate = UICollectionDelegateImpl_1.alloc().init();
         delegate._owner = owner;
         return delegate;
-    };
-    UICollectionDelegateImpl.prototype.collectionViewLayoutInsetForSectionAtIndex = function (collectionView, collectionViewLayout, section) {
-        var owner = this._owner ? this._owner.get() : null;
+    }
+    collectionViewLayoutInsetForSectionAtIndex(collectionView, collectionViewLayout, section) {
+        const owner = this._owner ? this._owner.get() : null;
         if (owner) {
-            var inset = owner._getSpacing() + owner._getPeaking();
+            const inset = owner._getSpacing() + owner._getPeaking();
             if (owner.orientation === 'vertical') {
                 return new UIEdgeInsets({
                     bottom: inset,
@@ -748,24 +750,24 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
             });
         }
         return new UIEdgeInsets({ bottom: 0, left: 0, right: 0, top: 0 });
-    };
-    UICollectionDelegateImpl.prototype.collectionViewLayoutSizeForItemAtIndexPath = function (collectionView, collectionViewLayout, indexPath) {
-        var owner = this._owner && this._owner.get();
+    }
+    collectionViewLayoutSizeForItemAtIndexPath(collectionView, collectionViewLayout, indexPath) {
+        const owner = this._owner && this._owner.get();
         if (!owner)
             return CGSizeZero;
-        var size = owner._getSize();
+        const size = owner._getSize();
         return CGSizeMake(size.width, size.height);
-    };
-    UICollectionDelegateImpl.prototype.collectionViewWillDisplayCellForItemAtIndexPath = function (collectionView, cell, indexPath) {
-        var owner = this._owner && this._owner.get();
+    }
+    collectionViewWillDisplayCellForItemAtIndexPath(collectionView, cell, indexPath) {
+        const owner = this._owner && this._owner.get();
         if (owner) {
-            if (!owner._isInit) {
+            if (!owner.mIsInit) {
                 owner._updateScrollPosition();
-                owner._isInit = true;
+                owner.mIsInit = true;
             }
             if (owner.items && indexPath.row === owner.lastIndex - owner.loadMoreCount) {
                 owner.notify({
-                    eventName: LOADMOREITEMS,
+                    eventName: Pager.loadMoreItemsEvent,
                     object: owner
                 });
             }
@@ -776,16 +778,16 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
         if (cell.layoutMargins) {
             cell.layoutMargins = UIEdgeInsetsZero;
         }
-    };
-    UICollectionDelegateImpl.prototype.collectionViewLayoutMinimumLineSpacingForSectionAtIndex = function (collectionView, collectionViewLayout, section) {
-        var owner = this._owner ? this._owner.get() : null;
+    }
+    collectionViewLayoutMinimumLineSpacingForSectionAtIndex(collectionView, collectionViewLayout, section) {
+        const owner = this._owner ? this._owner.get() : null;
         if (!owner)
             return 0;
-        var result = owner._getSpacing();
+        const result = owner._getSpacing();
         return result;
-    };
-    UICollectionDelegateImpl.prototype.scrollViewWillBeginDragging = function (scrollView) {
-        var owner = this._owner && this._owner.get();
+    }
+    scrollViewWillBeginDragging(scrollView) {
+        const owner = this._owner && this._owner.get();
         if (owner) {
             if (owner.lastEvent === 0) {
                 owner.notify({
@@ -795,23 +797,23 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
                 owner.lastEvent = 1;
             }
         }
-    };
-    UICollectionDelegateImpl.prototype.scrollViewDidEndScrollingAnimation = function (scrollView) {
-        var owner = this._owner ? this._owner.get() : null;
+    }
+    scrollViewDidEndScrollingAnimation(scrollView) {
+        const owner = this._owner ? this._owner.get() : null;
         if (owner) {
             owner.notify({
                 eventName: Pager.swipeEvent,
                 object: owner
             });
         }
-    };
-    UICollectionDelegateImpl.prototype.scrollViewDidScroll = function (scrollView) {
-        var owner = this._owner.get();
+    }
+    scrollViewDidScroll(scrollView) {
+        const owner = this._owner.get();
         if (owner) {
-            var width = void 0;
-            var offset = void 0;
-            var size = owner._getRealWidthHeight();
-            var total = void 0;
+            let width;
+            let offset;
+            const size = owner._getRealWidthHeight();
+            let total;
             if (owner.orientation === 'vertical') {
                 width = size.height;
                 offset = scrollView.contentOffset.y;
@@ -822,14 +824,13 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
                 offset = scrollView.contentOffset.x;
                 total = scrollView.contentSize.width - scrollView.bounds.size.width;
             }
-            var percent = offset / total;
-            var progress = percent * (owner.itemCount - 1);
+            const percent = offset / total;
+            const progress = percent * (owner.itemCount - 1);
             if (owner.indicatorView && owner.indicatorView.setWithProgressAnimated && !Number.isNaN(progress)) {
                 owner.indicatorView.progress = progress;
             }
-            var index = parseInt(progress.toFixed(0), 10);
+            const index = parseInt(progress.toFixed(0), 10);
             if (owner.selectedIndex !== index && !Number.isNaN(index)) {
-                //  selectedIndexProperty.nativeValueChange(owner, index);
             }
             owner.notify({
                 object: owner,
@@ -846,83 +847,11 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
                 });
                 owner.lastEvent = 1;
             }
-            // (scrollView as any).scrollToItemAtIndexPathAtScrollPositionAnimated(
-            //     NSIndexPath.indexPathForRowInSection(Math.round(width),0), UICollectionViewScrollPosition.CenteredHorizontally, true
-            // );
-            // if(owner.circularMode){
-            //     if(nextIndex === 0){
-            //         selectedIndexProperty.nativeValueChange(owner, owner._childrenCount - 3);
-            //     }else if(nextIndex === owner._childrenCount -1){
-            //         selectedIndexProperty.nativeValueChange(owner, 0);
-            //     }else {
-            //         selectedIndexProperty.nativeValueChange(owner, nextIndex - 1);
-            //     }
-            // }else {
-            //     selectedIndexProperty.nativeValueChange(owner, nextIndex);
-            // }
-            /* if (!Number.isNaN(width)) {
-                 let page = Math.ceil(width);
-                 const doScroll = () => {
-                     if (!Number.isNaN(width)) {
-                         // scrollView.setContentOffsetAnimated(point, false);
-                         scrollView.contentOffset = CGPointMake(Math.ceil(w) * page, scrollView.contentOffset.y);
-                     }
-                 };
-                 console.log('page', page, owner.itemCount, page === owner.itemCount);
-                 if (page === 0) {
-                     page = owner.itemCount - 2;
-                     doScroll();
-                     // selectedIndexProperty.nativeValueChange(owner, owner.itemCount - 3);
-                 } else if (page === owner.itemCount) {
-                     page = 1;
-                     doScroll();
-                     //  selectedIndexProperty.nativeValueChange(owner, 0);
-                 } else {
-                     if (page === owner._childrenCount + 1) {
-                         //    selectedIndexProperty.nativeValueChange(owner, 0);
-                     } else {
-                         //   selectedIndexProperty.nativeValueChange(owner, page - 1);
-                     }
-
-                 }
-             } */
-            /* if(owner){
-                 let width = 0;
-                 let w = (layout.toDeviceIndependentPixels(owner._effectiveItemWidth) - (((owner.perPage * 2) * owner._getSpacing()) + (owner._getPeaking() * 2))) / owner.perPage;
-                 let h = (layout.toDeviceIndependentPixels(owner._effectiveItemHeight) - (((owner.perPage * 2) * owner._getSpacing()) + (owner._getPeaking() * 2))) / owner.perPage;
-                 width = scrollView.contentOffset.x / w;
-                 if (!Number.isNaN(width)) {
-                     let page = Math.ceil(width);
-                     const doScroll = () => {
-                         if (!Number.isNaN(width)) {
-                             const point = CGPointMake(Math.ceil(w) * page, scrollView.contentOffset.y);
-                             scrollView.setContentOffsetAnimated(point, false);
-                         }
-                     };
-                     if (page === 0) {
-                         page = owner.itemCount - 2;
-                         doScroll();
-                         selectedIndexProperty.nativeValueChange(owner, owner.itemCount - 3);
-                     } else if (page === owner.itemCount -1) {
-                         page = 1;
-                         doScroll();
-                         selectedIndexProperty.nativeValueChange(owner, 0);
-                     } else {
-                         if(page === owner.itemCount + 1){
-                             selectedIndexProperty.nativeValueChange(owner, 0);
-                         }else {
-                             selectedIndexProperty.nativeValueChange(owner, page - 1);
-                         }
-                     }
-                 }
-             } */
-            // scrollView.setContentOffsetAnimated(CGPointMake((w * width) + 1, 0),false);
-            // (owner.nativeView as UICollectionView).setContentOffsetAnimated(CGPointMake((w * width) + 1, 0),false);
         }
-    };
-    UICollectionDelegateImpl.prototype.scrollViewDidEndDraggingWillDecelerate = function (scrollView, decelerate) { };
-    UICollectionDelegateImpl.prototype.scrollViewWillEndDraggingWithVelocityTargetContentOffset = function (scrollView, velocity, targetContentOffset) {
-        var owner = this._owner ? this._owner.get() : null;
+    }
+    scrollViewDidEndDraggingWillDecelerate(scrollView, decelerate) { }
+    scrollViewWillEndDraggingWithVelocityTargetContentOffset(scrollView, velocity, targetContentOffset) {
+        const owner = this._owner ? this._owner.get() : null;
         if (!owner)
             return;
         if (owner.lastEvent === 1) {
@@ -932,28 +861,22 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
             });
             owner.lastEvent = 0;
         }
-    };
-    var UICollectionDelegateImpl_1;
-    UICollectionDelegateImpl = UICollectionDelegateImpl_1 = __decorate([
-        ObjCClass(UICollectionViewDelegate, UICollectionViewDelegateFlowLayout)
-    ], UICollectionDelegateImpl);
-    return UICollectionDelegateImpl;
-}(NSObject));
-var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
-    __extends(UICollectionViewDataSourceImpl, _super);
-    function UICollectionViewDataSourceImpl() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    UICollectionViewDataSourceImpl_1 = UICollectionViewDataSourceImpl;
-    UICollectionViewDataSourceImpl.initWithOwner = function (owner) {
-        var delegate = UICollectionViewDataSourceImpl_1.alloc().init();
+    }
+};
+UICollectionDelegateImpl = UICollectionDelegateImpl_1 = __decorate([
+    NativeClass,
+    ObjCClass(UICollectionViewDelegate, UICollectionViewDelegateFlowLayout)
+], UICollectionDelegateImpl);
+let UICollectionViewDataSourceImpl = UICollectionViewDataSourceImpl_1 = class UICollectionViewDataSourceImpl extends NSObject {
+    static initWithOwner(owner) {
+        const delegate = UICollectionViewDataSourceImpl_1.alloc().init();
         delegate._owner = owner;
         return delegate;
-    };
-    UICollectionViewDataSourceImpl.prototype.collectionViewCellForItemAtIndexPath = function (collectionView, indexPath) {
-        var owner = this._owner ? this._owner.get() : null;
-        var cell;
-        var count = 0;
+    }
+    collectionViewCellForItemAtIndexPath(collectionView, indexPath) {
+        const owner = this._owner ? this._owner.get() : null;
+        let cell;
+        let count = 0;
         if (owner) {
             count = owner._childrenCount;
             if (owner.circularMode) {
@@ -972,70 +895,48 @@ var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
             }
         }
         if (owner && !owner.items && count > 0) {
-            var index = indexPath.row;
-            var data = owner._childrenViews[index];
-            var viewType = data.type;
-            owner._preparingCell = true;
-            collectionView.registerClassForCellWithReuseIdentifier(PagerCell.class(), "static-" + viewType);
-            cell = collectionView.dequeueReusableCellWithReuseIdentifierForIndexPath("static-" + viewType, indexPath) || PagerCell.initWithEmptyBackground();
+            const index = indexPath.row;
+            const data = owner._childrenViews[index];
+            const viewType = data.type;
+            owner.mPreparingCell = true;
+            collectionView.registerClassForCellWithReuseIdentifier(PagerCell.class(), `static-${viewType}`);
+            cell = collectionView.dequeueReusableCellWithReuseIdentifierForIndexPath(`static-${viewType}`, indexPath) || PagerCell.initWithEmptyBackground();
             cell.index = index;
-            var view = data.view;
-            // if (view instanceof ProxyViewContainer) {
-            //     let sp = new StackLayout();
-            //     sp.addChild(view);
-            //     view = sp;
-            // }
-            // If cell is reused it has old content - remove it first.
+            const view = data.view;
             if (!cell.view) {
                 cell.owner = new WeakRef(view);
             }
             else if (cell.view !== view) {
                 owner._removeView(view);
-                // (cell.view.nativeViewProtected as UIView).removeFromSuperview();
                 cell.owner = new WeakRef(view);
             }
             if (view && !view.parent) {
-                // view['performLayout'] = () => {
-                //     View.measureChild(
-                //         owner,
-                //         view,
-                //         view._currentWidthMeasureSpec,
-                //         view._currentHeightMeasureSpec
-                //     );
-                //     if (view && view.isLayoutRequired) {
-                //         View.layoutChild(owner, view, 0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
-                //     }
-                // };
                 owner._addView(view);
-                // if (owner.iosOverflowSafeArea) {
-                var innerView = UICellView.new();
+                const innerView = UICellView.new();
                 innerView.view = new WeakRef(view);
                 innerView.addSubview(view.nativeViewProtected);
                 cell.contentView.addSubview(innerView);
-                owner._map.set(cell, view);
-                // } else {
-                //     cell.contentView.addSubview(view.nativeViewProtected);
-                // }
+                owner.mMap.set(cell, view);
             }
             view.iosOverflowSafeArea = owner.iosOverflowSafeArea;
             view['iosIgnoreSafeArea'] = owner['iosIgnoreSafeArea'];
             owner._layoutCell(view, indexPath);
-            var size = owner._getSize();
-            var width = layout.toDevicePixels(size.width);
-            var height = layout.toDevicePixels(size.height);
+            const size = owner._getSize();
+            const width = layout.toDevicePixels(size.width);
+            const height = layout.toDevicePixels(size.height);
             if (view && view.isLayoutRequired) {
                 View.layoutChild(owner, view, 0, 0, width, height);
             }
-            owner._preparingCell = false;
+            owner.mPreparingCell = false;
             return cell;
         }
-        var template = owner && owner._getItemTemplate(indexPath.row);
+        const template = owner && owner._getItemTemplate(indexPath.row);
         cell = collectionView.dequeueReusableCellWithReuseIdentifierForIndexPath(template.key, indexPath) || PagerCell.initWithEmptyBackground();
         cell.index = indexPath;
         if (owner) {
-            var size = owner._getSize();
+            const size = owner._getSize();
             owner._prepareCell(cell, indexPath);
-            var cellView = cell.view;
+            const cellView = cell.view;
             cellView.iosOverflowSafeArea = owner.iosOverflowSafeArea;
             cellView['iosIgnoreSafeArea'] = owner['iosIgnoreSafeArea'];
             if (!owner.iosOverflowSafeAreaEnabled && cellView && cellView.isLayoutRequired) {
@@ -1043,53 +944,46 @@ var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
             }
         }
         return cell;
-    };
-    UICollectionViewDataSourceImpl.prototype.collectionViewNumberOfItemsInSection = function (collectionView, section) {
-        var owner = this._owner ? this._owner.get() : null;
-        // make sure we dont start to load static view if the pager is not loaded.
-        // otherwise static items wont "load"
+    }
+    collectionViewNumberOfItemsInSection(collectionView, section) {
+        const owner = this._owner ? this._owner.get() : null;
         if (!owner || !owner.isLoaded)
             return 0;
         return owner.circularMode ? owner.itemCount : owner._childrenCount;
-    };
-    UICollectionViewDataSourceImpl.prototype.numberOfSectionsInCollectionView = function (collectionView) {
+    }
+    numberOfSectionsInCollectionView(collectionView) {
         return 1;
-    };
-    var UICollectionViewDataSourceImpl_1;
-    UICollectionViewDataSourceImpl = UICollectionViewDataSourceImpl_1 = __decorate([
-        ObjCClass(UICollectionViewDataSource)
-    ], UICollectionViewDataSourceImpl);
-    return UICollectionViewDataSourceImpl;
-}(NSObject));
-var UICollectionViewFlowLinearLayoutImpl = /** @class */ (function (_super) {
-    __extends(UICollectionViewFlowLinearLayoutImpl, _super);
-    function UICollectionViewFlowLinearLayoutImpl() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    UICollectionViewFlowLinearLayoutImpl.initWithOwner = function (owner) {
-        var layout = UICollectionViewFlowLinearLayoutImpl.new();
+    }
+};
+UICollectionViewDataSourceImpl = UICollectionViewDataSourceImpl_1 = __decorate([
+    NativeClass,
+    ObjCClass(UICollectionViewDataSource)
+], UICollectionViewDataSourceImpl);
+let UICollectionViewFlowLinearLayoutImpl = UICollectionViewFlowLinearLayoutImpl_1 = class UICollectionViewFlowLinearLayoutImpl extends UICollectionViewFlowLayout {
+    static initWithOwner(owner) {
+        const layout = UICollectionViewFlowLinearLayoutImpl_1.new();
         layout._owner = owner;
         layout._curl = CATransition.animation();
         return layout;
-    };
-    UICollectionViewFlowLinearLayoutImpl.prototype.layoutAttributesForElementsInRect = function (rect) {
-        var owner = this._owner ? this._owner.get() : null;
-        var originalLayoutAttribute = _super.prototype.layoutAttributesForElementsInRect.call(this, rect);
-        var visibleLayoutAttributes = [];
+    }
+    layoutAttributesForElementsInRect(rect) {
+        const owner = this._owner ? this._owner.get() : null;
+        const originalLayoutAttribute = super.layoutAttributesForElementsInRect(rect);
+        const visibleLayoutAttributes = [];
         if (owner) {
             if (owner.transformers && owner.transformers.indexOf('scale') > -1) {
-                var count = originalLayoutAttribute.count;
-                for (var i = 0; i < count; i++) {
-                    var attributes = originalLayoutAttribute.objectAtIndex(i);
+                const count = originalLayoutAttribute.count;
+                for (let i = 0; i < count; i++) {
+                    const attributes = originalLayoutAttribute.objectAtIndex(i);
                     visibleLayoutAttributes[i] = attributes;
-                    var frame = attributes.frame;
-                    var width = attributes.frame.size.width * 0.75;
-                    var height = attributes.frame.size.height * 0.75;
+                    const frame = attributes.frame;
+                    const width = attributes.frame.size.width * 0.75;
+                    const height = attributes.frame.size.height * 0.75;
                     attributes.frame.size.width = width;
                     attributes.frame.size.height = height;
-                    var spacing = owner.convertToSize(owner.spacing);
-                    var distance = Math.abs(this.collectionView.contentOffset.x + this.collectionView.contentInset.left + spacing - frame.origin.x);
-                    var scale = Math.min(Math.max(1 - distance / this.collectionView.bounds.size.width, 0.75), 1);
+                    const spacing = owner.convertToSize(owner.spacing);
+                    const distance = Math.abs(this.collectionView.contentOffset.x + this.collectionView.contentInset.left + spacing - frame.origin.x);
+                    const scale = Math.min(Math.max(1 - distance / this.collectionView.bounds.size.width, 0.75), 1);
                     attributes.transform = CGAffineTransformScale(attributes.transform, 1, scale);
                 }
             }
@@ -1098,61 +992,51 @@ var UICollectionViewFlowLinearLayoutImpl = /** @class */ (function (_super) {
             }
         }
         return visibleLayoutAttributes;
-    };
-    UICollectionViewFlowLinearLayoutImpl.prototype.shouldInvalidateLayoutForBoundsChange = function (newBounds) {
+    }
+    shouldInvalidateLayoutForBoundsChange(newBounds) {
         return true;
-    };
-    UICollectionViewFlowLinearLayoutImpl.prototype.initialLayoutAttributesForAppearingItemAtIndexPath = function (itemIndexPath) {
-        var attrs = _super.prototype.initialLayoutAttributesForAppearingItemAtIndexPath.call(this, itemIndexPath);
+    }
+    initialLayoutAttributesForAppearingItemAtIndexPath(itemIndexPath) {
+        const attrs = super.initialLayoutAttributesForAppearingItemAtIndexPath(itemIndexPath);
         attrs.alpha = 1;
         return attrs;
-    };
-    UICollectionViewFlowLinearLayoutImpl.prototype.finalLayoutAttributesForDisappearingItemAtIndexPath = function (itemIndexPath) {
-        var attrs = _super.prototype.finalLayoutAttributesForDisappearingItemAtIndexPath.call(this, itemIndexPath);
+    }
+    finalLayoutAttributesForDisappearingItemAtIndexPath(itemIndexPath) {
+        const attrs = super.finalLayoutAttributesForDisappearingItemAtIndexPath(itemIndexPath);
         attrs.alpha = 1;
         return attrs;
-    };
-    UICollectionViewFlowLinearLayoutImpl.prototype.targetContentOffsetForProposedContentOffsetWithScrollingVelocity = function (proposedContentOffset, velocity) {
-        var owner = this._owner ? this._owner.get() : null;
+    }
+    targetContentOffsetForProposedContentOffsetWithScrollingVelocity(proposedContentOffset, velocity) {
+        const owner = this._owner ? this._owner.get() : null;
         if (!this.collectionView || !owner) {
-            return _super.prototype.targetContentOffsetForProposedContentOffsetWithScrollingVelocity.call(this, proposedContentOffset, velocity);
-        }
-        var size = owner._getRealWidthHeight();
-        if (this.scrollDirection === UICollectionViewScrollDirection.Horizontal) {
-            // Page width used for estimating and calculating paging.
-            var pageWidth = size.width + this.minimumInteritemSpacing;
-            // Make an estimation of the current page position.
-            var approximatePage = this.collectionView.contentOffset.x / pageWidth;
-            // Determine the current page based on velocity.
-            var currentPage = velocity.x === 0 ? Math.round(approximatePage) : velocity.x < 0.0 ? Math.floor(approximatePage) : Math.ceil(approximatePage);
-            // Create custom flickVelocity.
-            var flickVelocity = velocity.x * 0.3;
-            // Check how many pages the user flicked, if <= 1 then flickedPages should return 0.
-            var flickedPages = Math.abs(Math.round(flickVelocity)) <= 1 ? 0 : Math.round(flickVelocity);
-            var newPageIndex = currentPage + flickedPages;
+            return super.targetContentOffsetForProposedContentOffsetWithScrollingVelocity(proposedContentOffset, velocity);
+        }
+        const size = owner._getRealWidthHeight();
+        if (this.scrollDirection === 1) {
+            const pageWidth = size.width + this.minimumInteritemSpacing;
+            const approximatePage = this.collectionView.contentOffset.x / pageWidth;
+            const currentPage = velocity.x === 0 ? Math.round(approximatePage) : velocity.x < 0.0 ? Math.floor(approximatePage) : Math.ceil(approximatePage);
+            const flickVelocity = velocity.x * 0.3;
+            const flickedPages = Math.abs(Math.round(flickVelocity)) <= 1 ? 0 : Math.round(flickVelocity);
+            const newPageIndex = currentPage + flickedPages;
             selectedIndexProperty.nativeValueChange(owner, Math.min(Math.max(newPageIndex, 0), owner._childrenCount - 1));
-            // Calculate newHorizontalOffset.
-            var newHorizontalOffset = newPageIndex * pageWidth - this.collectionView.contentInset.left;
+            const newHorizontalOffset = newPageIndex * pageWidth - this.collectionView.contentInset.left;
             return CGPointMake(newHorizontalOffset, proposedContentOffset.y);
         }
         else {
-            // Page height used for estimating and calculating paging.
-            // let pageHeight = size.height + this.minimumLineSpacing;
-            var pageHeight = size.height;
-            // Make an estimation of the current page position.
-            var approximatePage = Math.max(0, this.collectionView.contentOffset.y / pageHeight);
-            // Determine the current page based on velocity.
-            var currentPage = velocity.y === 0 ? Math.round(approximatePage) : velocity.y < 0.0 ? Math.floor(approximatePage) : Math.ceil(approximatePage);
-            // Create custom flickVelocity.
-            var flickVelocity = velocity.y * 0.3;
-            // Check how many pages the user flicked, if <= 1 then flickedPages should return 0.
-            var flickedPages = Math.abs(Math.round(flickVelocity)) <= 1 ? 0 : Math.round(flickVelocity);
-            var newPageIndex = currentPage + flickedPages;
+            const pageHeight = size.height;
+            const approximatePage = Math.max(0, this.collectionView.contentOffset.y / pageHeight);
+            const currentPage = velocity.y === 0 ? Math.round(approximatePage) : velocity.y < 0.0 ? Math.floor(approximatePage) : Math.ceil(approximatePage);
+            const flickVelocity = velocity.y * 0.3;
+            const flickedPages = Math.abs(Math.round(flickVelocity)) <= 1 ? 0 : Math.round(flickVelocity);
+            const newPageIndex = currentPage + flickedPages;
             selectedIndexProperty.nativeValueChange(owner, Math.min(Math.max(newPageIndex, 0), owner._childrenCount - 1));
-            var newVerticalOffset = newPageIndex * pageHeight - this.collectionView.contentInset.top;
+            const newVerticalOffset = newPageIndex * pageHeight - this.collectionView.contentInset.top;
             return CGPointMake(proposedContentOffset.x, newVerticalOffset);
         }
-    };
-    return UICollectionViewFlowLinearLayoutImpl;
-}(UICollectionViewFlowLayout));
+    }
+};
+UICollectionViewFlowLinearLayoutImpl = UICollectionViewFlowLinearLayoutImpl_1 = __decorate([
+    NativeClass
+], UICollectionViewFlowLinearLayoutImpl);
 //# sourceMappingURL=index.ios.js.map