Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yarn.lock

Author: farfromrefug

CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.1.2](https://github.com/nativescript-community/ui-pager/compare/v14.1.1...v14.1.2) (2023-03-21)
+
+
+### Bug Fixes
+
+* **ios:** potential crash while disposing ([cde7a15](https://github.com/nativescript-community/ui-pager/commit/cde7a15e31546a94768efe4790fce4ebef3c065b))
+
+
+
+
+
 ## [14.1.1](https://github.com/nativescript-community/ui-pager/compare/v14.1.0...v14.1.1) (2023-01-28)
 
 **Note:** Version bump only for package ui-pager

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "14.1.1",
+    "version": "14.1.2",
     "packages": [
         "packages/*"
     ],

packages/ui-pager-indicator/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.1.2](https://github.com/nativescript-community/ui-pager/compare/v14.1.1...v14.1.2) (2023-03-21)
+
+**Note:** Version bump only for package @nativescript-community/ui-pager-indicator
+
+
+
+
+
 ## [14.1.1](https://github.com/nativescript-community/ui-pager/compare/v14.1.0...v14.1.1) (2023-01-28)
 
 **Note:** Version bump only for package @nativescript-community/ui-pager-indicator

packages/ui-pager-indicator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-pager-indicator",
-    "version": "14.1.1",
+    "version": "14.1.2",
     "description": "A NativeScript Indicator for Pager / Carousel /CollectionView",
     "main": "index",
     "typings": "index.d.ts",

packages/ui-pager/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.1.2](https://github.com/nativescript-community/ui-pager/compare/v14.1.1...v14.1.2) (2023-03-21)
+
+**Note:** Version bump only for package @nativescript-community/ui-pager
+
+
+
+
+
 ## [14.1.1](https://github.com/nativescript-community/ui-pager/compare/v14.1.0...v14.1.1) (2023-01-28)
 
 **Note:** Version bump only for package @nativescript-community/ui-pager

packages/ui-pager/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-pager",
-    "version": "14.1.1",
+    "version": "14.1.2",
     "description": "A NativeScript Pager / Carousel component that allows the user to swipe left and right through pages of data. ",
     "main": "index",
     "typings": "index.d.ts",

src/ui-pager/index.android.ts

@@ -1,11 +1,10 @@
-import { ChangeType, Color, Device, ObservableArray, Property, Screen, StackLayout, Utils, View, ViewBase, profile } from '@nativescript/core';
+import { ChangeType, Device, Property, StackLayout, Utils, View, ViewBase, profile } from '@nativescript/core';
 import { KeyedTemplate } from '@nativescript/core/ui/core/view';
 import { isString } from '@nativescript/core/utils/types';
 import {
     ItemEventData,
     Orientation,
     PagerBase,
-    Transformer,
     autoPlayProperty,
     autoplayDelayProperty,
     disableSwipeProperty,

src/ui-pager/index.common.ts

@@ -3,17 +3,14 @@ import {
     Builder,
     CSSType,
     CoercibleProperty,
-    Color,
     ContainerView,
     CoreTypes,
     GridLayout,
     ItemsSource,
     KeyedTemplate,
     Label,
-    Length,
     Observable,
     ObservableArray,
-    PercentLength,
     Property,
     Template,
     Trace,
@@ -163,7 +160,7 @@ export abstract class PagerBase extends ContainerView implements AddChildFromBui
             const index = this._childrenViews.findIndex((s) => s.view === view);
             if (index !== -1) {
                 // this._removeChildView(index);
-                if (this.isLoaded) {
+                if (this.isLoaded && this._isAddedToNativeVisualTree) {
                     this.refresh();
                 }
             }
@@ -302,7 +299,7 @@ export abstract class PagerBase extends ContainerView implements AddChildFromBui
         super.onLayout(left, top, right, bottom);
         this._effectiveItemWidth = this.getMeasuredWidth() - this.effectivePaddingLeft - this.effectivePaddingRight;
         this._effectiveItemHeight = this.getMeasuredHeight() - this.effectivePaddingTop - this.effectivePaddingBottom;
-        if (global.isIOS && this.iosOverflowSafeAreaEnabled) {
+        if (__IOS__ && this.iosOverflowSafeAreaEnabled) {
             const safeArea = this.getSafeAreaInsets();
             this._effectiveItemHeight += safeArea.top + safeArea.bottom;
         }
@@ -311,9 +308,9 @@ export abstract class PagerBase extends ContainerView implements AddChildFromBui
     public convertToSize(length): number {
         let size = 0;
         if (this.orientation === 'horizontal') {
-            size = global.isIOS ? Utils.layout.getMeasureSpecSize((this as any)._currentWidthMeasureSpec) : this.getMeasuredWidth();
+            size = __IOS__ ? Utils.layout.getMeasureSpecSize((this as any)._currentWidthMeasureSpec) : this.getMeasuredWidth();
         } else {
-            size = global.isIOS ? Utils.layout.getMeasureSpecSize((this as any)._currentHeightMeasureSpec) : this.getMeasuredHeight();
+            size = __IOS__ ? Utils.layout.getMeasureSpecSize((this as any)._currentHeightMeasureSpec) : this.getMeasuredHeight();
         }
 
         let converted = 0;
@@ -378,7 +375,7 @@ circularModeProperty.register(PagerBase);
 export const selectedIndexProperty = new CoercibleProperty<PagerBase, number>({
     name: 'selectedIndex',
     defaultValue: -1,
-    // affectsLayout: global.isIOS,
+    // affectsLayout: __IOS__,
     coerceValue: (target, value) => {
         const items = target._childrenCount;
         if (items) {

src/ui-pager/index.ios.ts

@@ -1,4 +1,4 @@
-import { ChangeType, Color, EventData, KeyedTemplate, Observable, ObservableArray, Property, ProxyViewContainer, StackLayout, Utils, View, ViewBase, profile } from '@nativescript/core';
+import { ChangeType, EventData, KeyedTemplate, Observable, Property, ProxyViewContainer, StackLayout, Utils, View, ViewBase, profile } from '@nativescript/core';
 import {
     ItemEventData,
     Orientation,
@@ -9,8 +9,7 @@ import {
     itemTemplatesProperty,
     itemsProperty,
     orientationProperty,
-    selectedIndexProperty,
-    showIndicatorProperty
+    selectedIndexProperty
 } from './index.common';
 
 export * from './index.common';
@@ -381,6 +380,9 @@ export class Pager extends PagerBase {
         }
         // dispatch_async(main_queue, () => {
         if (this.mDataSource.collectionViewNumberOfItemsInSection(this.nativeViewProtected, 0) > maxMinIndex) {
+            // when we have custom layouts (they don't occupy 100% of the parent) and we use custom transformers we need to call setContentOffsetAnimated to take size into account. 
+            // Reference: https://stackoverflow.com/a/53798708/6015400
+            this.nativeViewProtected.setContentOffsetAnimated(CGPointMake(1, 0), !!animate);
             this.nativeViewProtected.scrollToItemAtIndexPathAtScrollPositionAnimated(
                 NSIndexPath.indexPathForItemInSection(maxMinIndex, 0),
                 this.orientation === 'vertical' ? UICollectionViewScrollPosition.CenteredVertically : UICollectionViewScrollPosition.CenteredHorizontally,