fix(ios): circularMode fixes

Author: farfromrefug

src/ui-pager/index.ios.ts

@@ -242,26 +242,19 @@ export class Pager extends PagerBase {
     }
 
     get lastIndex(): number {
-        if (this.items && this.items.length === 0) {
-            return 0;
-        }
-        return this.circularMode ? this.itemCount - 3 : this.itemCount - 1;
+        return Math.max(0, this.circularMode ? this.itemCount - 3 : this.itemCount - 1);
     }
 
     get firstDummy(): number {
-        const count = this.itemCount;
-        if (count === 0) {
-            return 0;
-        }
-        return this.itemCount - 1;
+        return Math.max(0, this.itemCount - 1);
     }
 
     get lastDummy(): number {
         return this.lastIndex;
     }
 
     public get _childrenCount() {
-        return this.items?.length || this._childrenViews?.length || 0;
+        return this.items?.length ?? this._childrenViews?.length ?? 0;
     }
 
     public itemTemplateUpdated(oldData: any, newData: any): void {}
@@ -450,18 +443,9 @@ export class Pager extends PagerBase {
             return;
         }
         const maxMinIndex = Math.min(Math.max(0, index), this._childrenCount - 1);
-        if (!this.isLoaded) {
-            return selectedIndexProperty.nativeValueChange(this, maxMinIndex);
-        }
         const frame = this.page && this.page.frame;
-        if (this.page && frame) {
-            if (frame._executingContext) {
-                if (frame._executingContext.entry.resolvedPage !== this.page) {
-                    return selectedIndexProperty.nativeValueChange(this, maxMinIndex);
-                }
-            } else if (frame.currentPage !== this.page) {
-                return selectedIndexProperty.nativeValueChange(this, maxMinIndex);
-            }
+        if (!this.isLoaded || (this.page && frame && (frame._executingContext?.entry.resolvedPage !== this.page || frame.currentPage !== this.page))) {
+            return selectedIndexProperty.nativeValueChange(this, maxMinIndex);
         }
         // dispatch_async(main_queue, () => {
         if (this.mDataSource.collectionViewNumberOfItemsInSection(this.nativeViewProtected, 0) > maxMinIndex) {
@@ -480,7 +464,7 @@ export class Pager extends PagerBase {
     }
 
     @profile
-    public refresh() {
+    public refresh(delayUpdateScrollPosition = false) {
         if (!this.isLoaded || !this.nativeView) {
             this._isDataDirty = true;
             return;
@@ -500,7 +484,13 @@ export class Pager extends PagerBase {
         // dispatch_async(main_queue, () => {
         this.nativeViewProtected.reloadData();
         this.nativeViewProtected.collectionViewLayout.invalidateLayout();
-        this._updateScrollPosition();
+        if (delayUpdateScrollPosition) {
+            setTimeout(() => {
+                this._updateScrollPosition();
+            }, 0);
+        } else {
+            this._updateScrollPosition();
+        }
         this._initAutoPlay(this.autoPlay);
         // });
 
@@ -675,7 +665,7 @@ export class Pager extends PagerBase {
         // this refresh is just to handle size change
         const layoutKey = this._effectiveItemWidth + '_' + this._effectiveItemHeight;
         if (this.mLastLayoutKey !== layoutKey) {
-            this.refresh();
+            this.refresh(true);
         }
     }
 
@@ -991,12 +981,12 @@ class UICollectionDelegateImpl extends NSObject implements UICollectionViewDeleg
                     const contentSize = scrollView.contentSize;
                     const frameSize = scrollView.frame.size;
                     if (contentOffset.x <= 0) {
-                        scrollView.contentOffset = CGPointMake(contentSize.width - frameSize.width * 2, 0);
+                        scrollView.contentOffset = CGPointMake(contentSize.width - frameSize.width * 2 + 2 * owner._getPeaking(), 0);
                         if (owner.indicator) {
                             owner.indicator.setSelection(owner.lastIndex, false);
                         }
                     } else if (contentOffset.x + frameSize.width >= contentSize.width) {
-                        scrollView.contentOffset = CGPointMake(frameSize.width, 0);
+                        scrollView.contentOffset = CGPointMake(frameSize.width - 2 * owner._getPeaking(), 0);
                         if (owner.indicator) {
                             owner.indicator.setSelection(0, false);
                         }