chore: refactor

Author: farfromrefug

src/ui-pager/index.common.ts

@@ -70,6 +70,20 @@ let UNIQUE_VIEW_TYPE = 0;
 
 @CSSType('Pager')
 export abstract class PagerBase extends ContainerView implements AddChildFromBuilder {
+    static mRegisteredTransformers = {};
+    // This one works along with existing NS property change event system
+    public static selectedIndexChangeEvent = 'selectedIndexChange';
+    public static scrollEvent = 'scroll';
+    public static swipeEvent = 'swipe';
+    public static swipeStartEvent = 'swipeStart';
+    public static swipeOverEvent = 'swipeOver';
+    public static swipeEndEvent = 'swipeEnd';
+    public static loadMoreItemsEvent = 'loadMoreItems';
+    public static itemLoadingEvent = 'itemLoading';
+    public static itemDisposingEvent = 'itemDisposing';
+
+    public static knownFunctions = ['itemTemplateSelector', 'itemIdGenerator']; // See component-builder.ts isKnownFunction
+
     public items: any[] | ItemsSource;
     public selectedIndex: number;
     public itemTemplate: string | Template;
@@ -83,31 +97,21 @@ export abstract class PagerBase extends ContainerView implements AddChildFromBui
     public autoPlayDelay: number;
     public autoPlay: boolean;
     public preserveIndexOnItemsChange: boolean = false;
-    // This one works along with existing NS property change event system
-    public static selectedIndexChangeEvent = 'selectedIndexChange';
-    public static scrollEvent = 'scroll';
-    public static swipeEvent = 'swipe';
-    public static swipeStartEvent = 'swipeStart';
-    public static swipeOverEvent = 'swipeOver';
-    public static swipeEndEvent = 'swipeEnd';
-    public static loadMoreItemsEvent = 'loadMoreItems';
-    public static itemLoadingEvent = 'itemLoading';
-    public static itemDisposingEvent = 'itemDisposing';
     public orientation: Orientation;
-    public _effectiveItemHeight: number;
-    public _effectiveItemWidth: number;
     public transformers: string;
     public loadMoreCount: number = 1;
-    public _childrenViews: { view: PagerItem; type: number }[];
-    abstract readonly _childrenCount: number;
     public disableSwipe: boolean = false;
-    public static knownFunctions = ['itemTemplateSelector', 'itemIdGenerator']; // See component-builder.ts isKnownFunction
+
+    abstract readonly _childrenCount: number;
+
+    protected _effectiveItemHeight: number;
+    protected _effectiveItemWidth: number;
+    public _childrenViews: { view: PagerItem; type: number }[];
 
     protected mObservableArrayInstance: ObservableArray<any>;
 
     abstract refresh(): void;
 
-    static mRegisteredTransformers = {};
     public static registerTransformer(key: string, transformer) {
         PagerBase.mRegisteredTransformers[key] = transformer;
     }

src/ui-pager/index.ios.ts

@@ -880,9 +880,7 @@ class UICollectionDelegateImpl extends NSObject implements UICollectionViewDeleg
 
     public collectionViewLayoutMinimumLineSpacingForSectionAtIndex(collectionView: UICollectionView, collectionViewLayout: UICollectionViewLayout, section: number): number {
         const owner = this._owner ? this._owner.get() : null;
-        if (!owner) return 0;
-        const result = owner._getSpacing();
-        return result;
+        return owner?._getSpacing() ?? 0;
     }
 
     public scrollViewWillBeginDragging(scrollView: UIScrollView): void {
@@ -1201,7 +1199,7 @@ class UICollectionViewFlowLinearLayoutImpl extends UICollectionViewFlowLayout {
         const owner = this._owner ? this._owner.get() : null;
         const originalLayoutAttribute = super.layoutAttributesForElementsInRect(rect);
         const visibleLayoutAttributes = NSMutableArray.alloc().init();
-        if (owner && owner.transformers) {
+        if (owner?.transformers) {
             const transformsArray = owner.transformers
                 .split(' ')
                 .map((s) => Pager.mRegisteredTransformers[s])
@@ -1217,11 +1215,10 @@ class UICollectionViewFlowLinearLayoutImpl extends UICollectionViewFlowLayout {
                     }
                 }
             }
-        } else {
-            return originalLayoutAttribute;
+            return visibleLayoutAttributes as any;
         }
 
-        return visibleLayoutAttributes as any;
+        return originalLayoutAttribute;
     }
 
     public shouldInvalidateLayoutForBoundsChange(newBounds: CGRect): boolean {