@nativescript-community/ui-pager 13.0.32 → 13.0.35

package/index.ios.js

@@ -1,6 +1,6 @@
-import { ChangeType, Color, Observable, ObservableArray, Property, ProxyViewContainer, StackLayout, Utils, View, profile } from '@nativescript/core';
+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 { ITEMDISPOSING, ITEMLOADING, Indicator, LOADMOREITEMS, 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) {
@@ -10,7 +10,7 @@ function notifyForItemAtIndex(owner, nativeView, view, eventName, index) {
         index,
         view,
         ios: nativeView,
-        android: undefined,
+        android: undefined
     };
     owner.notify(args);
     return args;
@@ -67,37 +67,33 @@ 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:
                                 for (let i = 0; i < args.addedCount; i++) {
                                     array.push(NSIndexPath.indexPathForRowInSection(args.index + i, 0));
                                 }
-                                offset =
-                                    collectionView.contentSize.width -
-                                        collectionView.contentOffset.x;
+                                offset = collectionView.contentSize.width - collectionView.contentOffset.x;
                                 collectionView.insertItemsAtIndexPaths(array);
                                 break;
                             case ChangeType.Delete:
@@ -122,16 +118,14 @@ export class Pager extends PagerBase {
                                 }
                                 break;
                             case ChangeType.Update:
-                                collectionView.reloadItemsAtIndexPaths([
-                                    NSIndexPath.indexPathForRowInSection(args.index, 0),
-                                ]);
+                                collectionView.reloadItemsAtIndexPaths([NSIndexPath.indexPathForRowInSection(args.index, 0)]);
                                 break;
                             default:
                                 break;
                         }
                         this._initAutoPlay(this.autoPlay);
                         if (this.itemCount === 0) {
-                            this._isInit = false;
+                            this.mIsInit = false;
                         }
                     }, null);
                 }
@@ -140,21 +134,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;
@@ -168,38 +161,31 @@ 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);
     }
     _getRealWidthHeight() {
         let height = 0;
         let width = 0;
-        width =
-            (layout.toDeviceIndependentPixels(this._effectiveItemWidth) -
-                (this.perPage * 2 * this._getSpacing() +
-                    this._getPeaking() * 2)) /
-                this.perPage;
-        height =
-            (layout.toDeviceIndependentPixels(this._effectiveItemHeight) -
-                (this.perPage * 2 * this._getSpacing() +
-                    this._getPeaking() * 2)) /
-                this.perPage;
+        width = (layout.toDeviceIndependentPixels(this._effectiveItemWidth) - (this.perPage * 2 * this._getSpacing() + this._getPeaking() * 2)) / this.perPage;
+        height = (layout.toDeviceIndependentPixels(this._effectiveItemHeight) - (this.perPage * 2 * this._getSpacing() + this._getPeaking() * 2)) / this.perPage;
         return { height, width };
     }
     _nextIndex() {
@@ -248,9 +234,7 @@ export class Pager extends PagerBase {
         return position;
     }
     get itemCount() {
-        return this._childrenCount
-            ? this._childrenCount + (this.circularMode ? 2 : 0)
-            : 0;
+        return this._childrenCount ? this._childrenCount + (this.circularMode ? 2 : 0) : 0;
     }
     get lastIndex() {
         if (this.items && this.items.length === 0) {
@@ -269,33 +253,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;
@@ -307,25 +305,21 @@ 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;
-        const size = this.orientation === 'vertical'
-            ? view.contentSize.height
-            : view.contentSize.width;
+        const size = this.orientation === 'vertical' ? view.contentSize.height : view.contentSize.width;
         if (!view || size === 0) {
             return;
         }
@@ -352,19 +346,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);
     }
@@ -385,8 +379,7 @@ export class Pager extends PagerBase {
         if (!this.nativeView) {
             return;
         }
-        this.indicatorView.center = CGPointMake(this.nativeView.center.x, this.nativeView.bounds.size.height -
-            this.indicatorView.intrinsicContentSize.height);
+        this.indicatorView.center = CGPointMake(this.nativeView.center.x, this.nativeView.bounds.size.height - this.indicatorView.intrinsicContentSize.height);
         const hasParent = this.indicatorView.superview;
         if (value) {
             if (!hasParent) {
@@ -404,9 +397,7 @@ export class Pager extends PagerBase {
         if (!this.pager)
             return;
         const contentSize = this.pager.contentSize;
-        const size = this.orientation === 'vertical'
-            ? contentSize.height
-            : contentSize.width;
+        const size = this.orientation === 'vertical' ? contentSize.height : contentSize.width;
         if (size === 0) {
             return;
         }
@@ -429,10 +420,8 @@ export class Pager extends PagerBase {
             }
         }
         dispatch_async(main_queue, () => {
-            if (this._dataSource.collectionViewNumberOfItemsInSection(this.pager, 0) > maxMinIndex) {
-                this.pager.scrollToItemAtIndexPathAtScrollPositionAnimated(NSIndexPath.indexPathForItemInSection(maxMinIndex, 0), this.orientation === 'vertical'
-                    ? 2
-                    : 16, !!animate);
+            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);
         });
@@ -446,8 +435,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;
             }
@@ -462,10 +451,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();
@@ -478,42 +467,78 @@ export class Pager extends PagerBase {
         super.onUnloaded();
     }
     disposeNativeView() {
-        this._delegate = null;
-        this._dataSource = 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.mMap.forEach(function (value, key) {
+            that.get()._removeContainer(key);
+            that.get()._clearCellViews(key);
+        }, that);
+        this.mMap.clear();
+    }
+    _clearCellViews(cell) {
+        const view = cell.view;
+        if (!view) {
+            return;
+        }
+        if (view.parent && !(view.parent instanceof Pager)) {
+            this._removeView(view.parent);
+        }
+        cell.owner = undefined;
+        const preparing = this.mPreparingCell;
+        this.mPreparingCell = true;
+        if (view.parent && !(view.parent instanceof Pager)) {
+            if (!(view.parent instanceof Pager)) {
+                this._removeView(view.parent);
+            }
+            else {
+                view.parent._removeView(view);
+            }
+        }
+        this.mPreparingCell = preparing;
+        this.mMap.delete(cell);
+    }
     [indicatorProperty.setNative](value) {
         this._setIndicator(value);
     }
     [indicatorColorProperty.setNative](value) {
         if (this.indicatorView) {
-            const color = (!value || value instanceof Color) ? value : new Color(value);
+            const color = !value || value instanceof Color ? value : new Color(value);
             this.indicatorView.tintColor = color ? color.ios : null;
         }
     }
     [indicatorSelectedColorProperty.setNative](value) {
         if (this.indicatorView) {
-            const color = (!value || value instanceof Color) ? value : new Color(value);
+            const color = !value || value instanceof Color ? value : new Color(value);
             this.indicatorView.currentPageTintColor = color ? color.ios : null;
         }
     }
     [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;
@@ -523,7 +548,7 @@ export class Pager extends PagerBase {
             index,
             android: undefined,
             ios: cell,
-            view,
+            view
         };
         this.notify(args);
         view = args.view;
@@ -533,19 +558,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);
@@ -555,8 +580,7 @@ export class Pager extends PagerBase {
         }
         this.pager.frame = this.nativeView.bounds;
         if (this.indicatorView && this.indicatorView.intrinsicContentSize) {
-            this.indicatorView.center = CGPointMake(this.nativeView.center.x, this.nativeView.bounds.size.height -
-                this.indicatorView.intrinsicContentSize.height);
+            this.indicatorView.center = CGPointMake(this.nativeView.center.x, this.nativeView.bounds.size.height - this.indicatorView.intrinsicContentSize.height);
         }
         const layoutView = this.pager.collectionViewLayout;
         if (!layoutView) {
@@ -564,24 +588,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);
@@ -599,7 +623,7 @@ export class Pager extends PagerBase {
                 android: undefined,
                 ios: cell,
                 view,
-                bindingContext,
+                bindingContext
             };
             this.notify(args);
             view = args.view || this._getDefaultItemContent(indexPath.row);
@@ -612,7 +636,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);
@@ -620,7 +644,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) {
@@ -636,7 +660,7 @@ export class Pager extends PagerBase {
             this._layoutCell(view, indexPath);
         }
         finally {
-            this._preparingCell = false;
+            this.mPreparingCell = false;
         }
     }
     _layoutCell(cellView, index) {
@@ -665,14 +689,10 @@ export class Pager extends PagerBase {
         let width = layout.toDeviceIndependentPixels(this._effectiveItemWidth);
         let height = layout.toDeviceIndependentPixels(this._effectiveItemHeight);
         if (this.orientation === 'vertical') {
-            height =
-                (height - (this._getSpacing() * 2 + this._getPeaking() * 2)) /
-                    this.perPage;
+            height = (height - (this._getSpacing() * 2 + this._getPeaking() * 2)) / this.perPage;
         }
         else {
-            width =
-                (width - (this._getSpacing() * 2 + this._getPeaking() * 2)) /
-                    this.perPage;
+            width = (width - (this._getSpacing() * 2 + this._getPeaking() * 2)) / this.perPage;
         }
         if (Number.isNaN(width)) {
             width = 0;
@@ -734,14 +754,14 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
                     bottom: inset,
                     left: 0,
                     right: 0,
-                    top: inset,
+                    top: inset
                 });
             }
             return new UIEdgeInsets({
                 bottom: 0,
                 left: inset,
                 right: inset,
-                top: 0,
+                top: 0
             });
         }
         return new UIEdgeInsets({ bottom: 0, left: 0, right: 0, top: 0 });
@@ -756,15 +776,14 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
     UICollectionDelegateImpl.prototype.collectionViewWillDisplayCellForItemAtIndexPath = function (collectionView, cell, indexPath) {
         var 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) {
+            if (owner.items && indexPath.row === owner.lastIndex - owner.loadMoreCount) {
                 owner.notify({
                     eventName: LOADMOREITEMS,
-                    object: owner,
+                    object: owner
                 });
             }
         }
@@ -788,7 +807,7 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
             if (owner.lastEvent === 0) {
                 owner.notify({
                     eventName: Pager.swipeStartEvent,
-                    object: owner,
+                    object: owner
                 });
                 owner.lastEvent = 1;
             }
@@ -799,7 +818,7 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
         if (owner) {
             owner.notify({
                 eventName: Pager.swipeEvent,
-                object: owner,
+                object: owner
             });
         }
     };
@@ -813,21 +832,16 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
             if (owner.orientation === 'vertical') {
                 width = size.height;
                 offset = scrollView.contentOffset.y;
-                total =
-                    scrollView.contentSize.height -
-                        scrollView.bounds.size.height;
+                total = scrollView.contentSize.height - scrollView.bounds.size.height;
             }
             else {
                 width = size.width;
                 offset = scrollView.contentOffset.x;
-                total =
-                    scrollView.contentSize.width - scrollView.bounds.size.width;
+                total = scrollView.contentSize.width - scrollView.bounds.size.width;
             }
             var percent = offset / total;
             var progress = percent * (owner.itemCount - 1);
-            if (owner.indicatorView &&
-                owner.indicatorView.setWithProgressAnimated &&
-                !Number.isNaN(progress)) {
+            if (owner.indicatorView && owner.indicatorView.setWithProgressAnimated && !Number.isNaN(progress)) {
                 owner.indicatorView.progress = progress;
             }
             var index = parseInt(progress.toFixed(0), 10);
@@ -840,12 +854,12 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
                 selectedIndex: Math.floor(progress),
                 currentPosition: progress,
                 scrollX: owner.horizontalOffset,
-                scrollY: owner.verticalOffset,
+                scrollY: owner.verticalOffset
             });
             if (owner.lastEvent === 1) {
                 owner.notify({
                     eventName: Pager.swipeOverEvent,
-                    object: owner,
+                    object: owner
                 });
                 owner.lastEvent = 1;
             }
@@ -923,8 +937,7 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
             // (owner.nativeView as UICollectionView).setContentOffsetAnimated(CGPointMake((w * width) + 1, 0),false);
         }
     };
-    UICollectionDelegateImpl.prototype.scrollViewDidEndDraggingWillDecelerate = function (scrollView, decelerate) {
-    };
+    UICollectionDelegateImpl.prototype.scrollViewDidEndDraggingWillDecelerate = function (scrollView, decelerate) { };
     UICollectionDelegateImpl.prototype.scrollViewWillEndDraggingWithVelocityTargetContentOffset = function (scrollView, velocity, targetContentOffset) {
         var owner = this._owner ? this._owner.get() : null;
         if (!owner)
@@ -932,7 +945,7 @@ var UICollectionDelegateImpl = /** @class */ (function (_super) {
         if (owner.lastEvent === 1) {
             owner.notify({
                 eventName: Pager.swipeEndEvent,
-                object: owner,
+                object: owner
             });
             owner.lastEvent = 0;
         }
@@ -979,10 +992,9 @@ var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
             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();
+            owner.mPreparingCell = true;
+            collectionView.registerClassForCellWithReuseIdentifier(PagerCell.class(), "static-".concat(viewType));
+            cell = collectionView.dequeueReusableCellWithReuseIdentifierForIndexPath("static-".concat(viewType), indexPath) || PagerCell.initWithEmptyBackground();
             cell.index = index;
             var view = data.view;
             // if (view instanceof ProxyViewContainer) {
@@ -996,7 +1008,7 @@ var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
             }
             else if (cell.view !== view) {
                 owner._removeView(view);
-                cell.view.nativeViewProtected.removeFromSuperview();
+                // (cell.view.nativeViewProtected as UIView).removeFromSuperview();
                 cell.owner = new WeakRef(view);
             }
             if (view && !view.parent) {
@@ -1017,7 +1029,7 @@ var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
                 innerView.view = new WeakRef(view);
                 innerView.addSubview(view.nativeViewProtected);
                 cell.contentView.addSubview(innerView);
-                owner._map.set(cell, view);
+                owner.mMap.set(cell, view);
                 // } else {
                 //     cell.contentView.addSubview(view.nativeViewProtected);
                 // }
@@ -1031,12 +1043,11 @@ var UICollectionViewDataSourceImpl = /** @class */ (function (_super) {
             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);
-        cell =
-            collectionView.dequeueReusableCellWithReuseIdentifierForIndexPath(template.key, indexPath) || PagerCell.initWithEmptyBackground();
+        cell = collectionView.dequeueReusableCellWithReuseIdentifierForIndexPath(template.key, indexPath) || PagerCell.initWithEmptyBackground();
         cell.index = indexPath;
         if (owner) {
             var size = owner._getSize();
@@ -1083,8 +1094,7 @@ var UICollectionViewFlowLinearLayoutImpl = /** @class */ (function (_super) {
         var originalLayoutAttribute = _super.prototype.layoutAttributesForElementsInRect.call(this, rect);
         var visibleLayoutAttributes = [];
         if (owner) {
-            if (owner.transformers &&
-                owner.transformers.indexOf('scale') > -1) {
+            if (owner.transformers && owner.transformers.indexOf('scale') > -1) {
                 var count = originalLayoutAttribute.count;
                 for (var i = 0; i < count; i++) {
                     var attributes = originalLayoutAttribute.objectAtIndex(i);
@@ -1095,13 +1105,8 @@ var UICollectionViewFlowLinearLayoutImpl = /** @class */ (function (_super) {
                     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);
+                    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);
                     attributes.transform = CGAffineTransformScale(attributes.transform, 1, scale);
                 }
             }
@@ -1136,22 +1141,15 @@ var UICollectionViewFlowLinearLayoutImpl = /** @class */ (function (_super) {
             // 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);
+            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 flickedPages = Math.abs(Math.round(flickVelocity)) <= 1 ? 0 : Math.round(flickVelocity);
             var 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;
+            var newHorizontalOffset = newPageIndex * pageWidth - this.collectionView.contentInset.left;
             return CGPointMake(newHorizontalOffset, proposedContentOffset.y);
         }
         else {
@@ -1161,21 +1159,14 @@ var UICollectionViewFlowLinearLayoutImpl = /** @class */ (function (_super) {
             // 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);
+            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 flickedPages = Math.abs(Math.round(flickVelocity)) <= 1 ? 0 : Math.round(flickVelocity);
             var newPageIndex = currentPage + flickedPages;
             selectedIndexProperty.nativeValueChange(owner, Math.min(Math.max(newPageIndex, 0), owner._childrenCount - 1));
-            var newVerticalOffset = newPageIndex * pageHeight -
-                this.collectionView.contentInset.top;
+            var newVerticalOffset = newPageIndex * pageHeight - this.collectionView.contentInset.top;
             return CGPointMake(proposedContentOffset.x, newVerticalOffset);
         }
     };